diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 022f82a025..4cf9f304ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -582,10 +582,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 overview_delta_large?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
                 overview_delta_large?.setTextColor(color)
                 overview_delta?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}\n${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
+                overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
+                overview_long_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
             } else {
                 overview_delta?.text = "Δ " + resourceHelper.gs(R.string.notavailable)
                 overview_avgdelta?.text = ""
+                overview_long_avgdelta?.text = ""
             }
 
             // strike through if BG is old
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 998a06148b..6fc79c29f5 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -27,97 +27,122 @@
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/overview_bg"
-        app:layout_constraintEnd_toStartOf="@+id/overview_arrow"
+        app:layout_constraintEnd_toStartOf="@+id/overview_arrows_llayout"
         app:layout_constraintStart_toEndOf="@+id/overview_bg"
         app:layout_constraintTop_toTopOf="@+id/overview_bg" />
 
 
-    <ImageView
-        android:id="@+id/overview_arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        app:layout_constraintEnd_toStartOf="@+id/overview_deltas_llayout"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@+id/overview_delta_large"
-        app:layout_constraintTop_toTopOf="@+id/overview_delta_large"
-        android:paddingTop="18dp"
-        app:srcCompat="@drawable/ic_flat" />
-
     <LinearLayout
-        android:id="@+id/overview_deltas_llayout"
+        android:id="@+id/overview_arrows_llayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="@+id/overview_bg"
-        app:layout_constraintEnd_toStartOf="@+id/overview_apsmode_llayout"
-        app:layout_constraintStart_toEndOf="@+id/overview_arrow"
+        app:layout_constraintEnd_toStartOf="@+id/overview_deltas_llayout"
+        app:layout_constraintStart_toEndOf="@+id/overview_delta_large"
         app:layout_constraintTop_toTopOf="parent">
 
+        <ImageView
+            android:id="@+id/overview_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:srcCompat="@drawable/ic_flat" />
+
         <TextView
             android:id="@+id/overview_timeago"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            app:layout_constraintTop_toTopOf="@+id/overview_long_avgdelta"
             android:text="n/a"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-            <LinearLayout
+    </LinearLayout>
+
+    <TableLayout
+        android:id="@+id/overview_deltas_llayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/overview_apsmode_llayout"
+        app:layout_constraintStart_toEndOf="@+id/overview_arrows_llayout"
+        app:layout_constraintBottom_toBottomOf="@+id/overview_arrows_llayout">
+
+        <TableRow
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="Δ: "
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+            <TextView
+                android:id="@+id/overview_delta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="n/a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:textAlignment="textEnd"
-                        android:text="Δ: "
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+        </TableRow>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:textAlignment="textEnd"
-                        android:text="15m Δ: \n40m Δ: "
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+        <TableRow
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-                </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="15m Δ: "
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+            <TextView
+                android:id="@+id/overview_avgdelta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="n/a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                    <TextView
-                        android:id="@+id/overview_delta"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:textAlignment="textEnd"
-                        android:text="n/a"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+        </TableRow>
 
-                    <TextView
-                        android:id="@+id/overview_avgdelta"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:textAlignment="textEnd"
-                        android:text="n/a"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+        <TableRow
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-                </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="40m Δ: "
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-            </LinearLayout>
+            <TextView
+                android:id="@+id/overview_long_avgdelta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textAlignment="textEnd"
+                android:text="n/a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-    </LinearLayout>
+        </TableRow>
+
+    </TableLayout>
 
     <LinearLayout
         android:id="@+id/overview_apsmode_llayout"