diff --git a/src/components/MapContainer.svelte b/src/components/MapContainer.svelte
index 6750ce9..cff43f4 100644
--- a/src/components/MapContainer.svelte
+++ b/src/components/MapContainer.svelte
@@ -2,7 +2,7 @@
 	import MapView from './map/MapView.svelte';
 	import GoogleMapProvider from '$lib/Provider/GoogleMapProvider';
 	import OpenStreetMapProvider from '$lib/Provider/OpenStreetMapProvider';
-	import { PUBLIC_OBA_MAP_PROVIDER, PUBLIC_OBA_GOOGLE_MAPS_API_KEY } from '$env/static/public';
+	import { PUBLIC_OBA_MAP_PROVIDER, PUBLIC_OBA_GOOGLE_MAPS_API_KEY as apiKey } from '$env/static/public';
 	import { createEventDispatcher, onMount } from 'svelte';
 
 	let mapProvider = null;
@@ -10,9 +10,9 @@
 
 	onMount(() => {
 		if (PUBLIC_OBA_MAP_PROVIDER === 'google') {
-			mapProvider = new GoogleMapProvider(PUBLIC_OBA_GOOGLE_MAPS_API_KEY);
+			mapProvider = new GoogleMapProvider(apiKey);
 		} else if (PUBLIC_OBA_MAP_PROVIDER === 'osm') {
-			mapProvider = new OpenStreetMapProvider();
+			mapProvider = new OpenStreetMapProvider(apiKey);
 		} else {
 			console.error('Unknown map provider:');
 		}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 9663751..a9cedfd 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -4,12 +4,7 @@
 	import ModalPane from '../components/navigation/ModalPane.svelte';
 	import StopPane from '../components/oba/StopPane.svelte';
 	import SearchResults from '../components/search/SearchResults.svelte';
-	import MapView from '../components/map/MapView.svelte';
 	import MapContainer from '$components/MapContainer.svelte';
-	import { PUBLIC_OBA_GOOGLE_MAPS_API_KEY as apiKey } from '$env/static/public';
-	import GoogleMapProvider from '$lib/Provider/GoogleMapProvider';
-
-	const mapProvider = new GoogleMapProvider(apiKey);
 
 	let stop;
 	let selectedTrip = null;
@@ -71,7 +66,7 @@
 	}
 </script>
 
-<div class="absolute left-0 right-0 top-0 z-40">
+<div class="absolute top-0 left-0 right-0 z-40">
 	<Header on:searchResults={handleSearch} />
 </div>
 
@@ -96,7 +91,7 @@
 				on:stopSelected={stopSelected}
 			/>
 		{:else}
-			<p class="p-4 text-center dark:text-gray-200">No results found.</p>
+			<p class="dark:text-gray-200 p-4 text-center">No results found.</p>
 		{/if}
 	</ModalPane>
 {/if}
@@ -108,5 +103,4 @@
 	{showRoute}
 	{showRouteMap}
 	{stop}
-	{mapProvider}
 />