diff --git a/src/lib/cards/BaseCard/BaseEditingCard.svelte b/src/lib/cards/BaseCard/BaseEditingCard.svelte
index 931a622..062d866 100644
--- a/src/lib/cards/BaseCard/BaseEditingCard.svelte
+++ b/src/lib/cards/BaseCard/BaseEditingCard.svelte
@@ -56,7 +56,7 @@
 
 	const cardDef = $derived(CardDefinitionsByType[item.cardType]);
 
-	const minW = $derived(cardDef.minW ?? (isMobile() ? 4 : 2));
+	const minW = $derived(cardDef.minW ?? (isMobile() ? 2 : 2));
 	const minH = $derived(cardDef.minH ?? (isMobile() ? 2 : 2));
 
 	const maxW = $derived(cardDef.maxW ?? COLUMNS);
diff --git a/src/lib/cards/MapCard/CreateMapCardModal.svelte b/src/lib/cards/MapCard/CreateMapCardModal.svelte
index bc3d481..7e2151a 100644
--- a/src/lib/cards/MapCard/CreateMapCardModal.svelte
+++ b/src/lib/cards/MapCard/CreateMapCardModal.svelte
@@ -28,7 +28,7 @@
 				item.cardData.lon = data.lon;
 				item.cardData.name = data.display_name?.split(',')[0] || search;
 				item.cardData.type = data.class || 'city';
-				item.cardData.zoom = getZoomLevel(data.class);
+				item.cardData.zoom = Math.max(getZoomLevel(data.class),  getZoomLevel(data.type));
 			} else {
 				throw new Error('response not ok');
 			}
@@ -43,34 +43,38 @@
 </script>
 
 <Modal open={true} closeButton={false}>
-	<Subheading>Enter a city and country</Subheading>
-	<Input bind:value={search} />
+	<form
+		onsubmit={async () => {
+			if (await fetchLocation()) oncreate();
+		}}
+		class="flex flex-col gap-2"
+	>
+		<Subheading>Enter a address or city</Subheading>
+		<Input bind:value={search} class="mt-4" />
 
-	{#if errorMessage}
-		<Alert type="error" title="Failed to create map card"><span>{errorMessage}</span></Alert>
-	{/if}
+		{#if errorMessage}
+			<Alert type="error" title="Failed to create map card"><span>{errorMessage}</span></Alert>
+		{/if}
 
-	<p class="text-xs">
-		Geocoding by <a
-			href="https://nominatim.openstreetmap.org/"
-			class="text-accent-800 dark:text-accent-300"
-			target="_blank">Nominatim</a
-		>
-		/ ©
-		<a
-			href="https://www.openstreetmap.org/copyright"
-			class="text-accent-800 dark:text-accent-300"
-			target="_blank">OpenStreetMap contributors</a
-		>
-	</p>
+		<p class="text-xs mt-2">
+			Geocoding by <a
+				href="https://nominatim.openstreetmap.org/"
+				class="text-accent-800 dark:text-accent-300"
+				target="_blank">Nominatim</a
+			>
+			/ ©
+			<a
+				href="https://www.openstreetmap.org/copyright"
+				class="text-accent-800 dark:text-accent-300"
+				target="_blank">OpenStreetMap contributors</a
+			>
+		</p>
 
-	<div class="mt-4 flex justify-end gap-2">
-		<Button onclick={oncancel} variant="ghost">Cancel</Button>
-		<Button
-			disabled={isFetchingLocation}
-			onclick={async () => {
-				if (await fetchLocation()) oncreate();
-			}}>{isFetchingLocation ? 'Creating...' : 'Create'}</Button
-		>
-	</div>
+		<div class="mt-4 flex justify-end gap-2">
+			<Button onclick={oncancel} variant="ghost">Cancel</Button>
+			<Button type="submit" disabled={isFetchingLocation}
+				>{isFetchingLocation ? 'Creating...' : 'Create'}</Button
+			>
+		</div>
+	</form>
 </Modal>
diff --git a/src/lib/cards/MapCard/Map.svelte b/src/lib/cards/MapCard/Map.svelte
index e127f3d..f06389e 100644
--- a/src/lib/cards/MapCard/Map.svelte
+++ b/src/lib/cards/MapCard/Map.svelte
@@ -22,7 +22,9 @@
 	});
 
 	onMount(() => {
-		if (!mapContainer || !env.PUBLIC_MAPBOX_TOKEN) return;
+		if (!mapContainer || !env.PUBLIC_MAPBOX_TOKEN) {
+			console.log('no map container or no mapbox token');
+		}
 
 		try {
 			mapboxgl.accessToken = env.PUBLIC_MAPBOX_TOKEN;