diff --git a/assets/background/banner.png b/assets/background/banner.png
new file mode 100644
index 0000000..a670a11
Binary files /dev/null and b/assets/background/banner.png differ
diff --git a/assets/background/tile.png b/assets/background/tile.png
new file mode 100644
index 0000000..93b449a
Binary files /dev/null and b/assets/background/tile.png differ
diff --git a/assets/splash/splash512.png b/assets/splash/splash512.png
new file mode 100644
index 0000000..70b5f95
Binary files /dev/null and b/assets/splash/splash512.png differ
diff --git a/lib/view/home.dart b/lib/view/home.dart
index 5ef2d81..402fe43 100644
--- a/lib/view/home.dart
+++ b/lib/view/home.dart
@@ -1,7 +1,6 @@
 import 'package:app/extensions/obtainProviderExtension.dart';
 import 'package:app/state/mapState.dart';
 import 'package:app/state/timeStatusState.dart';
-import 'package:app/util/loadingContainer.dart';
 import 'package:app/util/watchState.dart';
 import 'package:app/view/appInfo.dart';
 import 'package:app/view/locationSearch.dart';
@@ -10,7 +9,6 @@ import 'package:app/view/map.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:latlong2/latlong.dart';
-import 'package:provider/provider.dart';
 
 class HomeView extends StatefulWidget {
   const HomeView({super.key});
@@ -91,13 +89,17 @@ class _HomePageState extends State<HomeView> {
         ],
       ),
       floatingActionButton: FloatingActionButton(
-        child: WatchState<MapState>((context, state) => Icon(
-            locationEnabled
-                ? state.isCurrentlyLoading
-                    ? Icons.location_searching
-                    : Icons.my_location
-                : Icons.location_disabled
-        )),
+        child: WatchState<MapState>((context, state) {
+          if(locationEnabled)  {
+            if(state.isCurrentlyLoading) {
+              return const Padding(padding: EdgeInsets.all(15), child: CircularProgressIndicator(strokeWidth: 3));
+            } else {
+              return const Icon(Icons.my_location);
+            }
+          }
+
+          return const Icon(Icons.location_disabled);
+        }),
         onPressed: () async {
           MapState mapState = context.obtainState<MapState>();
           mapState.setLoading(true);
@@ -118,17 +120,8 @@ class _HomePageState extends State<HomeView> {
               child: StatusView(),
             );
           }),
-          Expanded(
-            child: Consumer<MapState>(
-              builder: (context, state, child) {
-                return LoadingContainer(
-                  loading: child == null,
-                  fetching: state.isCurrentlyLoading,
-                  child: const MapView(),
-                );
-              },
-              child: const MapView(),
-            ),
+          const Expanded(
+            child: MapView(),
           )
         ],
       ),