diff --git a/lib/activeFires.dart b/lib/activeFires.dart
index 005855f..a805333 100644
--- a/lib/activeFires.dart
+++ b/lib/activeFires.dart
@@ -67,10 +67,13 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
         child: const Icon(Icons.location_searching),
         backgroundColor: fires600,
         label: S.of(context).addYourCurrentPosition,
-        labelWidget: Container(
-          color: Colors.white,
-          child: Text(S.of(context).addYourCurrentPosition,
-              style: const TextStyle(color: Colors.black38)),
+        labelWidget: Padding(
+          padding: const EdgeInsets.only(right: 16.0),
+          child: Container(
+            color: Colors.white,
+            child: Text(S.of(context).addYourCurrentPosition,
+                style: const TextStyle(color: Colors.black38)),
+          ),
         ),
         onTap: () {
           onAddYourLocation(onAdd);
@@ -80,10 +83,13 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
         child: const Icon(Icons.edit_location),
         backgroundColor: fires600,
         label: S.of(context).addSomePlace,
-        labelWidget: Container(
-          color: Colors.white,
-          child: Text(S.of(context).addSomePlace,
-              style: const TextStyle(color: Colors.black38)),
+        labelWidget: Padding(
+          padding: const EdgeInsets.only(right: 16.0),
+          child: Container(
+            color: Colors.white,
+            child: Text(S.of(context).addSomePlace,
+                style: const TextStyle(color: Colors.black38)),
+          ),
         ),
         onTap: () {
           onAddOtherLocation(onAdd);
@@ -238,33 +244,25 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
                 },
               ),
             ),
-            floatingActionButtonLocation:
-                FloatingActionButtonLocation.centerFloat,
+            floatingActionButton: SpeedDial(
+              icon: Icons.add,
+              activeIcon: Icons.close,
+              backgroundColor: fires600,
+              spacing: 12,
+              children: _fabMiniMenuItemList(context, view.onAdd),
+            ),
             bottomNavigationBar: const GlobalFiresBottomStats(),
             body: view.isLoading
                 ? const FiresSpinner()
                 : hasLocations
-                    ? Stack(children: <Widget>[
-                        RefreshIndicator(
-                            child: _buildSavedLocations(
-                                context,
-                                view.yourLocations,
-                                view.onDelete,
-                                view.onToggleSubs,
-                                view.onTap),
-                            onRefresh: () async {
-                              final Completer<void> completer =
-                                  Completer<void>();
-                              view.onRefresh(completer);
-                              return completer.future;
-                            }),
-                        SpeedDial(
-                          icon: Icons.add,
-                          activeIcon: Icons.close,
-                          backgroundColor: fires600,
-                          children: _fabMiniMenuItemList(context, view.onAdd),
-                        )
-                      ])
+                    ? RefreshIndicator(
+                        child: _buildSavedLocations(context, view.yourLocations,
+                            view.onDelete, view.onToggleSubs, view.onTap),
+                        onRefresh: () async {
+                          final Completer<void> completer = Completer<void>();
+                          view.onRefresh(completer);
+                          return completer.future;
+                        })
                     : Center(
                         child: CenteredColumn(children: <Widget>[
                         RoundedBtn(