diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5dc3b07..1bbebe8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -5,6 +5,12 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "com.supanadit.geosmart"
     compileSdk = flutter.compileSdkVersion
@@ -30,11 +36,20 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.debug
+            signingConfig = signingConfigs.release
         }
     }
 }
diff --git a/lib/page/map_page.dart b/lib/page/map_page.dart
index 66811f1..8543524 100644
--- a/lib/page/map_page.dart
+++ b/lib/page/map_page.dart
@@ -37,6 +37,7 @@ class _MapPageState extends State<MapPage> {
         }
       });
     });
+
     Geolocator.getPositionStream().listen((Position position) {
       if (isTracking && isGranted) {
         BlocProvider.of<PositionBloc>(context).add(
@@ -85,13 +86,15 @@ class _MapPageState extends State<MapPage> {
                   },
                 ),
                 Container(
-                  child: Image.asset("assets/images/logo.png"),
                   width: 70,
                   height: 70,
                   alignment: Alignment.topLeft,
                   margin: EdgeInsets.only(left: 10.0),
+                  child: Image.asset("assets/images/logo.png"),
                 ),
                 Container(
+                  margin: EdgeInsets.only(bottom: 50.0),
+                  alignment: Alignment.bottomCenter,
                   child: TextButton(
                     style: TextButton.styleFrom(
                       backgroundColor: (state is PositionTrackingStarted)
@@ -119,8 +122,6 @@ class _MapPageState extends State<MapPage> {
                       style: TextStyle(color: Colors.white),
                     ),
                   ),
-                  margin: EdgeInsets.only(bottom: 50.0),
-                  alignment: Alignment.bottomCenter,
                 )
               ],
             );