diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
index 4ba36967f..2c597dda7 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
@@ -97,12 +97,10 @@ public class ZimHostActivity extends AppCompatActivity implements
           if (isMobileDataEnabled(context)) {
             mobileDataDialog();
           } else {
-            if(flag) {
-            serverStopped();
-            isStarted = false;
-            }
-            else
-            {
+            if (flag) {
+              serverStopped();
+              isStarted = false;
+            } else {
               startHotspotDialog();
             }
           }
diff --git a/app/src/main/res/layout/activity_zim_host.xml b/app/src/main/res/layout/activity_zim_host.xml
index 0d7669d69..1fcf5d027 100644
--- a/app/src/main/res/layout/activity_zim_host.xml
+++ b/app/src/main/res/layout/activity_zim_host.xml
@@ -33,19 +33,18 @@
       android:layout_marginTop="16dp"
       android:text="@string/server_textview_default_message"
       android:textAlignment="center"
-      app:layout_constraintTop_toBottomOf="@id/appBarLayout2"
-      app:layout_constraintVertical_chainStyle="packed"
+      app:layout_constraintTop_toBottomOf="@+id/appBarLayout2"
+      tools:layout_editor_absoluteX="-16dp"
       />
 
   <FrameLayout
       android:id="@+id/frameLayoutServer"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="150dp"
-      app:layout_constraintBottom_toTopOf="@id/startServerButton"
+      android:layout_marginTop="16dp"
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/server_textView"
+      app:layout_constraintTop_toBottomOf="@+id/server_textView"
       />
 
   <Button