diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index 2bfe8b04d55dee38ebac2e10cfcaa7c9c9762561..0f5e5094e5456aa60ff4e37d6533ce59a0fe77a1 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -201,27 +201,26 @@
 
     <EditText
         android:id="@+id/value_server_uri"
-        android:layout_width="128dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:ems="10"
         android:inputType="text|textUri"
         android:text="@string/default_mqtt_server_uri"
-        app:layout_constraintStart_toEndOf="@+id/label_server_uri"
-        app:layout_constraintTop_toBottomOf="@+id/separator_mqtt" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/label_server_uri" />
 
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:onClick="connectMqtt"
         android:text="@android:string/ok"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/value_server_uri"
         app:layout_constraintTop_toBottomOf="@+id/separator_mqtt" />
 
     <TextView
@@ -239,17 +238,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/text_send_updates_brightness"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/label_server_uri" />
+        app:layout_constraintTop_toBottomOf="@+id/value_server_uri" />
 
     <CheckBox
         android:id="@+id/checkBox_send_rotation_ahrs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/text_send_updates_rotationahrs"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/checkBox_send_brightness" />