diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index a31c587feb..1c723e1fd8 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -48,88 +48,6 @@
             android:orientation="horizontal"
             android:padding="5dp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_custom"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_marginEnd="-4dp"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_manual"
-                android:text="@string/manual"
-                android:textColor="@color/tempTargetConfirmation"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:visibility="gone"
-                android:textSize="11sp" />
-
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_cancel"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_marginEnd="-4dp"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_cancel"
-                android:text="@string/cancel"
-                android:textColor="@color/tempTargetConfirmation"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textSize="11sp" />
-
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_eating_soon"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_marginEnd="-4dp"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_eatingsoon"
-                android:text="@string/eatingsoon"
-                android:textColor="@color/carbs"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textSize="11sp" />
-
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_activity"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_marginEnd="-4dp"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_activity"
-                android:text="@string/activity"
-                android:textColor="@color/exercise"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textSize="11sp" />
-
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/overview_temptarget_hypo"
-                style="?android:attr/buttonStyle"
-                android:layout_width="0px"
-                android:layout_height="fill_parent"
-                android:layout_weight="0.5"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:drawableTop="@drawable/ic_target_hypo"
-                android:text="@string/hypo"
-                android:textColor="@color/low"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textSize="11sp" />
-
-        </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -217,11 +135,94 @@
                 android:id="@+id/overview_temptarget_reason"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
 
         <include layout="@layout/datetime" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_temptarget_custom"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0px"
+                android:layout_height="fill_parent"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:drawableTop="@drawable/ic_target_manual"
+                android:text="@string/manual"
+                android:textColor="@color/tempTargetConfirmation"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:visibility="gone"
+                android:textSize="11sp" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_temptarget_cancel"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0px"
+                android:layout_height="fill_parent"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:drawableTop="@drawable/ic_target_cancel"
+                android:text="@string/cancel"
+                android:textColor="@color/tempTargetConfirmation"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_temptarget_eating_soon"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0px"
+                android:layout_height="fill_parent"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:drawableTop="@drawable/ic_target_eatingsoon"
+                android:text="@string/eatingsoon"
+                android:textColor="@color/carbs"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_temptarget_activity"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0px"
+                android:layout_height="fill_parent"
+                android:layout_marginEnd="-4dp"
+                android:layout_weight="0.5"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:drawableTop="@drawable/ic_target_activity"
+                android:text="@string/activity"
+                android:textColor="@color/exercise"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/overview_temptarget_hypo"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0px"
+                android:layout_height="fill_parent"
+                android:layout_weight="0.5"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:drawableTop="@drawable/ic_target_hypo"
+                android:text="@string/hypo"
+                android:textColor="@color/low"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textSize="11sp" />
+
+        </LinearLayout>
 
         <include layout="@layout/okcancel" />