diff --git a/lib/addevent.dart b/lib/addevent.dart
index 242ce79f1fa77c1a1697ae644a26224b54a4ae88..102a491027a77b326a6d06b3f25ea344e7df35b5 100644
--- a/lib/addevent.dart
+++ b/lib/addevent.dart
@@ -526,3 +526,4 @@ class _AddEventPageState extends State<AddEvent>  {
 }
 
 //TODO: update shared preferences current event on adding event!
+//TODO: long urn string is not displayed correctly!
\ No newline at end of file
diff --git a/lib/configuration.dart b/lib/configuration.dart
index 1301311d2fa796c811d6a7c7f4bb8bc6db5ab1dd..8b9b93c57295fd676809aec2495af346ecef371a 100644
--- a/lib/configuration.dart
+++ b/lib/configuration.dart
@@ -130,7 +130,8 @@ class _MyHomePageState extends State<Configuration> {
             child:
             Center(
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                mainAxisSize: MainAxisSize.max,
                 children: <Widget>[
                   const SizedBox(height: 50),
                   const Text(
@@ -217,8 +218,8 @@ class _MyHomePageState extends State<Configuration> {
                     enabled: false,
                     style: _statusStyle,
                     controller: TextEditingController(
-                        text: _status,
-                  ),
+                      text: _status,
+                    ),
                   ),
                   const SizedBox(height: 15.0),
 
@@ -228,11 +229,11 @@ class _MyHomePageState extends State<Configuration> {
           ),
         ),
         bottomNavigationBar: Container(
-          margin: const EdgeInsets.symmetric(vertical: 10.0),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.end,
+          margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 5.0),
+          child:Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            mainAxisSize: MainAxisSize.max,
             children: [
-              //const SizedBox(width: 10.0),
               FloatingActionButton.extended(
                 heroTag: null,
                 tooltip: 'Export events to local .json file',
@@ -242,7 +243,6 @@ class _MyHomePageState extends State<Configuration> {
                   dumpToFile();
                 },
               ),
-              const SizedBox(width: 50),
               FloatingActionButton.extended(
                 heroTag: null,
                 tooltip: 'Download corresponding devices and store locally',
@@ -253,7 +253,6 @@ class _MyHomePageState extends State<Configuration> {
                   //TODO: display failed as user feedback somehow
                 },
               ),
-              const SizedBox(width: 5.0),
             ],
           ),
         )
diff --git a/lib/overview.dart b/lib/overview.dart
index 9ff03e591d329950b8f1c0dd61431a19ebb84684..59e7aff68f571bf4738604bcad3933cfbd4340dd 100644
--- a/lib/overview.dart
+++ b/lib/overview.dart
@@ -7,7 +7,6 @@ class Overview extends StatelessWidget {
   Widget _buildPopupInfoDialog(BuildContext context) {
 
     return AlertDialog(
-      title: const Text('Information'),
       content: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.center,
diff --git a/lib/viewevents.dart b/lib/viewevents.dart
index b5f0c7c3ba15a1294f31768729600d02e98bcc7b..18c8ea9c2d70f97494e2b070ee0151614c9d9f10 100644
--- a/lib/viewevents.dart
+++ b/lib/viewevents.dart
@@ -237,15 +237,13 @@ class _ViewEvents extends State<ViewEvents> {
           ),
         ),
       ),
-      bottomNavigationBar: Row(
-        mainAxisAlignment: MainAxisAlignment.end,
-        children: [
-          const SizedBox(width: 10),
-          Text(_status, style: _statusStyle),
-          const SizedBox(width: 50),
-          Container(
-            margin: const EdgeInsets.symmetric(vertical: 10.0),
-            child:
+      bottomNavigationBar: Container(
+        margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 5.0),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const SizedBox(width: 1),
+            Text(_status, style: _statusStyle),
             FloatingActionButton.extended(
               heroTag: null,
               tooltip: 'Upload Events',
@@ -255,9 +253,8 @@ class _ViewEvents extends State<ViewEvents> {
                 syncEvents();
               },
             ),
-          ),
-          const SizedBox(width: 5.0),
-        ],
+          ],
+        ),
       ),
     );
   }