diff --git a/app/src/main/res/layout/activity_zim_host.xml b/app/src/main/res/layout/activity_zim_host.xml
index da71d53a4..611ef9f7c 100644
--- a/app/src/main/res/layout/activity_zim_host.xml
+++ b/app/src/main/res/layout/activity_zim_host.xml
@@ -41,8 +41,10 @@
   <FrameLayout
       android:id="@+id/frameLayoutServer"
       android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+      android:layout_height="0dp"
+      android:layout_marginBottom="8dp"
       android:layout_marginTop="16dp"
+      app:layout_constraintBottom_toTopOf="@+id/startServerButton"
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintRight_toRightOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/server_textView"
@@ -50,15 +52,18 @@
 
   <Button
       android:id="@+id/startServerButton"
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginBottom="8dp"
+      android:layout_marginStart="8dp"
       android:layout_marginEnd="8dp"
+      android:layout_marginLeft="8dp"
       android:layout_marginRight="8dp"
-      android:text="@string/start_server_label"
       android:background="@color/greenTick"
+      android:text="@string/start_server_label"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
       />