diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index f0f306c6ff..6e485a0edb 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -77,16 +77,19 @@
 
         <TableLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:paddingEnd="5dp">
 
             <TableRow
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:layout_weight="1"
                     android:orientation="horizontal">
 
                     <TextView
@@ -97,6 +100,8 @@
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
                         android:text="@string/time_offset"
+                        android:gravity="center_vertical"
+                        android:layout_weight="1"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textStyle="bold" />
 
@@ -115,11 +120,6 @@
                         android:padding="2dp" />
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
                     <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                         android:id="@+id/time"
                         android:layout_width="130dp"
@@ -135,80 +135,57 @@
                         android:text="@string/unit_minute_short"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                </LinearLayout>
             </TableRow>
 
             <TableRow
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical">
 
-                <LinearLayout
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_weight="1"
+                    android:padding="10dp"
+                    android:width="120dp"
+                    android:text="@string/careportal_newnstreatment_duration_label"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="bold" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:width="120dp"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
-                        android:text="@string/careportal_newnstreatment_duration_label"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textStyle="bold" />
+                <info.nightscout.androidaps.utils.ui.NumberPicker
+                    android:id="@+id/duration"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center_horizontal" />
 
-                </LinearLayout>
-
-                <LinearLayout
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_gravity="center_vertical"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
+                    android:text="@string/shorthour"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                    <info.nightscout.androidaps.utils.ui.NumberPicker
-                        android:id="@+id/duration"
-                        android:layout_width="130dp"
-                        android:layout_height="40dp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="start"
-                        android:minWidth="45dp"
-                        android:paddingStart="5dp"
-                        android:paddingEnd="5dp"
-                        android:text="@string/shorthour"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                </LinearLayout>
             </TableRow>
 
             <TableRow
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:padding="10dp"
                         android:width="120dp"
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
                         android:text="@string/treatments_wizard_carbs_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textStyle="bold" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
 
                     <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/carbs"
@@ -218,7 +195,6 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
                         android:gravity="start"
                         android:minWidth="45dp"
                         android:paddingStart="5dp"
@@ -226,7 +202,6 @@
                         android:text="@string/shortgramm"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                </LinearLayout>
             </TableRow>
         </TableLayout>