Update following testing! Bug fixes:

- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2

app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java

@@ -251,8 +251,8 @@ public class WatchUpdaterService extends WearableListenerService implements
         dataMap.putDouble("timestamp", lastBG.date);
         if (glucoseStatus == null) {
             dataMap.putString("slopeArrow", "");
-            dataMap.putString("delta", "");
+            dataMap.putString("delta", "--");
-            dataMap.putString("avgDelta", "");
+            dataMap.putString("avgDelta", "--");
         } else {
             dataMap.putString("slopeArrow", slopeArrow(glucoseStatus.delta));
             dataMap.putString("delta", deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units));
@@ -274,11 +274,13 @@ public class WatchUpdaterService extends WearableListenerService implements
             deltastring += "-";
 
         }
+
         if (units.equals(Constants.MGDL)) {
-            deltastring += DecimalFormatter.to1Decimal(Math.abs(deltaMGDL));
+            deltastring += DecimalFormatter.to0Decimal(Math.abs(deltaMGDL));
         } else {
             deltastring += DecimalFormatter.to1Decimal(Math.abs(deltaMMOL));
         }
+
         return deltastring;
     }
 
@@ -525,12 +527,18 @@ public class WatchUpdaterService extends WearableListenerService implements
             treatmentsInterface.updateTotalIOBTempBasals();
             IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
 
-            String iobTotal = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
+            String iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
             String iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
-            String iobString = iobTotal + " " + iobDetail;  //for generateStatusString()
             String cobString = generateCOBString();
             String tempBasal = generateBasalString(treatmentsInterface);
-            String status = generateStatusString(iobString,tempBasal,bolusIob,basalIob);
+
+            //bgi
+            String bgiString = "";
+            Profile profile = MainApp.getConfigBuilder().getProfile();
+            double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
+            bgiString = "" + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to1Decimal(bgi);
+
+            String status = generateStatusString(profile, tempBasal,iobSum, iobDetail, bgiString);
 
             //batteries
             int phoneBattery = getBatteryLevel(getApplicationContext());
@@ -543,7 +551,7 @@ public class WatchUpdaterService extends WearableListenerService implements
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_STATUS_PATH);
             //unique content
             dataMapRequest.getDataMap().putString("externalStatusString", status);
-            dataMapRequest.getDataMap().putString("iobTotal", iobTotal);
+            dataMapRequest.getDataMap().putString("iobSum", iobSum);
             dataMapRequest.getDataMap().putString("iobDetail", iobDetail);
             dataMapRequest.getDataMap().putBoolean("detailedIob", mPrefs.getBoolean("wear_detailediob", false));
             dataMapRequest.getDataMap().putString("cob", cobString);
@@ -551,6 +559,8 @@ public class WatchUpdaterService extends WearableListenerService implements
             dataMapRequest.getDataMap().putString("battery", "" + phoneBattery);
             dataMapRequest.getDataMap().putString("rigBattery", rigBattery);
             dataMapRequest.getDataMap().putString("openApsStatus", openApsStatus);
+            dataMapRequest.getDataMap().putString("bgi", bgiString);
+            dataMapRequest.getDataMap().putBoolean("showBgi", mPrefs.getBoolean("wear_showbgi", false));
             dataMapRequest.getDataMap().putInt("batteryLevel", (phoneBattery >= 30) ? 1 : 0);
             PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
             Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
@@ -576,11 +586,10 @@ public class WatchUpdaterService extends WearableListenerService implements
     }
 
     @NonNull
-    private String generateStatusString(String iobString, String tempBasal, IobTotal bolusIob, IobTotal basalIob) {
+    private String generateStatusString(Profile profile, String tempBasal, String iobSum, String iobDetail, String bgiString) {
 
         String status = "";
 
-        Profile profile = MainApp.getConfigBuilder().getProfile();
         if (profile == null) {
             status = MainApp.sResources.getString(R.string.noprofile);
             return status;
@@ -595,14 +604,19 @@ public class WatchUpdaterService extends WearableListenerService implements
             lastLoopStatus = true;
         }
 
+        String iobString = "";
+        if (mPrefs.getBoolean("wear_detailediob", false)) {
+            iobString = iobSum + " " + iobDetail;
+        } else {
+            iobString = iobSum + "U";
+        }
+
         status += tempBasal + " " + iobString;
 
         //add BGI if shown, otherwise return
-        if (!mPrefs.getBoolean("wear_showbgi", false)) {
+        if (mPrefs.getBoolean("wear_showbgi", false)) {
-            return status;
+            status += " " + bgiString;
         }
-        double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
-        status += " " + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to2Decimal(bgi);
 
         return status;
     }

wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java

@@ -49,7 +49,7 @@ import lecho.lib.hellocharts.view.LineChartView;
 public  abstract class BaseWatchFace extends WatchFace implements SharedPreferences.OnSharedPreferenceChangeListener {
     public final static IntentFilter INTENT_FILTER;
     public static final long[] vibratePattern = {0,400,300,400,300,400};
-    public TextView mTime, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mLoop, mDay, mMonth, isAAPSv2, mHighLight, mLowLight;
+    public TextView mTime, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mAvgDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mBgi, mLoop, mDay, mMonth, isAAPSv2, mHighLight, mLowLight;
     public double datetime;
     public RelativeLayout mRelativeLayout;
     public LinearLayout mLinearLayout, mLinearLayout2, mDate;
@@ -84,19 +84,21 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     protected SharedPreferences sharedPrefs;
 
     public boolean detailedIOB = false;
+    public boolean showBGI = false;
     public String openApsStatus = "0";
     public String externalStatusString = "no status";
     public String sSgv = "---";
     public String sDirection = "--";
     public String sUploaderBattery = "--";
     public String sRigBattery = "--";
-    public String sDelta = "-";
+    public String sDelta = "--";
-    public String sAvgDelta = "-";
+    public String sAvgDelta = "--";
     public String sBasalRate = "-.--U/h";
     public String sIOB1 = "IOB";
     public String sIOB2 = "-.--";
     public String sCOB1 = "Carb";
     public String sCOB2 = "--g";
+    public String sBgi = "--";
 
     @Override
     public void onCreate() {
@@ -145,11 +147,13 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 mIOB2 = (TextView) stub.findViewById(R.id.iobView);
                 mCOB1 = (TextView) stub.findViewById(R.id.cob_text);
                 mCOB2 = (TextView) stub.findViewById(R.id.cobView);
+                mBgi =  (TextView) stub.findViewById(R.id.bgiView);
                 mStatus = (TextView) stub.findViewById(R.id.externaltstatus);
                 mBasalRate = (TextView) stub.findViewById(R.id.tmpBasal);
                 mUploaderBattery = (TextView) stub.findViewById(R.id.uploader_battery);
                 mRigBattery = (TextView) stub.findViewById(R.id.rig_battery);
                 mDelta = (TextView) stub.findViewById(R.id.delta);
+                mAvgDelta = (TextView) stub.findViewById(R.id.avgdelta);
                 isAAPSv2 = (TextView) stub.findViewById(R.id.AAPSv2);
                 mHighLight = (TextView) stub.findViewById(R.id.highLight);
                 mLowLight = (TextView) stub.findViewById(R.id.lowLight);
@@ -220,8 +224,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             wakeLock.acquire(50);
 
             setDataFields();
-
             missedReadingAlert();
+
             mRelativeLayout.measure(specW, specH);
             mRelativeLayout.layout(0, 0, mRelativeLayout.getMeasuredWidth(),
                     mRelativeLayout.getMeasuredHeight());
@@ -256,10 +260,12 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 sUploaderBattery = dataMap.getString("battery");
                 sRigBattery = dataMap.getString("rigBattery");
                 detailedIOB = dataMap.getBoolean("detailedIob");
-                sIOB1 = dataMap.getString("iobTotal") + "U";
+                sIOB1 = dataMap.getString("iobSum") + "U";
                 sIOB2 = dataMap.getString("iobDetail");
                 sCOB1 = "Carb";
                 sCOB2 = dataMap.getString("cob");
+                sBgi = dataMap.getString("bgi");
+                showBGI = dataMap.getBoolean("showBgi");
                 externalStatusString = dataMap.getString("externalStatusString");
                 openApsStatus = dataMap.getString("openApsStatus");
                 batteryLevel = dataMap.getInt("batteryLevel");
@@ -315,8 +321,14 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             } else {
                 mDelta.setVisibility(View.GONE);
             }
+        }
+
+        if (mAvgDelta != null) {
             if (sharedPrefs.getBoolean("showAvgDelta", true)) {
-                mDelta.append("  " + sAvgDelta);
+                mAvgDelta.setText(sAvgDelta);
+                mAvgDelta.setVisibility(View.VISIBLE);
+            } else {
+                mAvgDelta.setVisibility(View.GONE);
             }
         }
 
@@ -420,6 +432,15 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             }
         }
 
+        if (mBgi != null) {
+            if (showBGI) {
+                mBgi.setText(sBgi);
+                mBgi.setVisibility(View.VISIBLE);
+            } else {
+                mBgi.setVisibility(View.GONE);
+            }
+        }
+        
         if (mStatus != null) {
             if (sharedPrefs.getBoolean("showExternalStatus", true)) {
                 mStatus.setText(externalStatusString);
@@ -436,14 +457,14 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                     mLoop.setText(openApsStatus + "'");
                     if (Integer.valueOf(openApsStatus) > 14) {
                         loopLevel = 0;
-                        if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
+                        //if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
                             mLoop.setBackgroundResource(R.drawable.loop_red_25);
-                        }
+                        //}
                     } else {
                         loopLevel = 1;
-                        if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
+                        //if (getCurrentWatchMode() == WatchMode.INTERACTIVE) {
                             mLoop.setBackgroundResource(R.drawable.loop_green_25);
-                        }
+                        //}
                     }
                 } else {
                     mLoop.setText("-'");
@@ -516,7 +537,9 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
         if(layoutSet){
             setDataFields();
         }
+        invalidate();
     }
+
     protected abstract void setColorDark();
     protected abstract void setColorBright();
     protected abstract void setColorLowRes();

wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java

@@ -68,6 +68,12 @@ public class Cockpit extends BaseWatchFace {
             }
         }
 
+        if (loopLevel == 1) {
+            mLoop.setBackgroundResource(R.drawable.loop_green_25);
+        } else {
+            mLoop.setBackgroundResource(R.drawable.loop_red_25);
+        }
+
         invalidate();
 
     }

wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java

@@ -102,7 +102,9 @@ public class Home2 extends BaseWatchFace {
         }
         mRigBattery.setTextColor(Color.BLACK);
         mDelta.setTextColor(Color.BLACK);
+        mAvgDelta.setTextColor(Color.BLACK);
         mBasalRate.setTextColor(Color.BLACK);
+        mBgi.setTextColor(Color.BLACK);
 
         if (loopLevel == 1) {
             mLoop.setBackgroundResource(R.drawable.loop_green_25);
@@ -132,9 +134,11 @@ public class Home2 extends BaseWatchFace {
         mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
         mTimestamp.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_Timestamp));
         mDelta.setTextColor(Color.BLACK);
+        mAvgDelta.setTextColor(Color.BLACK);
         mRigBattery.setTextColor(Color.BLACK);
         mUploaderBattery.setTextColor(Color.BLACK);
         mBasalRate.setTextColor(Color.BLACK);
+        mBgi.setTextColor(Color.BLACK);
         mIOB1.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
         mIOB2.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
         mCOB1.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
@@ -196,7 +200,9 @@ public class Home2 extends BaseWatchFace {
             }
             mRigBattery.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+            mAvgDelta.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
             mBasalRate.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
+            mBgi.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
 
             if (loopLevel == 1) {
                 mLoop.setBackgroundResource(R.drawable.loop_green_25);

wear/src/main/res/layout/rect_activity_home_2.xml

@@ -6,33 +6,28 @@
     android:id="@+id/main_layout">
 
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
         android:textAlignment="center"
         android:weightSum="1">
 
         <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
+            android:layout_weight="0.27"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
-            android:paddingTop="5dp"
+            android:textAlignment="center">
-            android:textAlignment="center"
-            android:weightSum="1">
 
             <TextView
                 android:id="@+id/loop"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
+                android:layout_gravity="bottom|center"
-                android:layout_marginBottom="2dp"
                 android:background="@drawable/loop_grey_25"
-                android:gravity="center|right"
+                android:gravity="center"
-                android:paddingRight="7dp"
-                android:paddingTop="-2dp"
                 android:text="--'"
                 android:textAlignment="center"
                 android:textColor="#FFFFFF"
@@ -60,8 +55,7 @@
                 android:baselineAligned="false"
                 android:gravity="center_vertical"
                 android:orientation="vertical"
-                android:textAlignment="center"
+                android:textAlignment="center">
-                android:weightSum="1">
 
                 <TextView
                     android:id="@+id/direction"
@@ -79,11 +73,8 @@
                     android:id="@+id/timestamp"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
                     android:layout_marginBottom="2dp"
-                    android:gravity="center_horizontal|bottom"
+                    android:gravity="center"
-                    android:paddingEnd="8dp"
-                    android:paddingStart="6dp"
                     android:text="--'"
                     android:textColor="#FFFFFF"
                     android:textSize="14sp"
@@ -94,25 +85,47 @@
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
             android:id="@+id/secondary_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            android:layout_gravity="center"
+            android:layout_weight="0.10"
+            android:background="@color/light_grey"
+            android:gravity="center"
+            android:orientation="vertical"
             android:padding="1dp">
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:layout_width="match_parent"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
+                android:layout_gravity="center"
-                android:layout_gravity="center_horizontal">
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingEnd="2dp"
+                android:paddingStart="2dp"
+                android:textAlignment="center">
 
                 <TextView
                     android:id="@+id/delta"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:text="delta"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="+/-"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/avgdelta"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="avg"
                     android:textAlignment="center"
                     android:textColor="#000000"
                     android:textSize="12sp"
@@ -120,9 +133,11 @@
 
                 <TextView
                     android:id="@+id/uploader_battery"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="#000000"
@@ -131,9 +146,11 @@
 
                 <TextView
                     android:id="@+id/rig_battery"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="#000000"
@@ -143,19 +160,36 @@
 
                 <TextView
                     android:id="@+id/tmpBasal"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1.7"
+                    android:gravity="center"
                     android:text="-.--U/h"
                     android:textAlignment="center"
                     android:textColor="#000000"
                     android:textSize="12sp"
                     android:textStyle="bold" />
 
+                <TextView
+                    android:id="@+id/bgiView"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="bgi"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+
                 <TextView
                     android:id="@+id/AAPSv2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_weight="0"
                     android:text=""
                     android:visibility="gone" />
 
@@ -166,24 +200,34 @@
         <LinearLayout
             android:id="@+id/tertiary_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
+            android:layout_weight="0.22"
             android:background="@color/black"
+            android:gravity="center"
             android:orientation="vertical"
             android:padding="1dp">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="center"
+                android:baselineAligned="false"
+                android:gravity="center"
                 android:orientation="horizontal"
-                android:textAlignment="center">
+                android:weightSum="7">
+
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:baselineAligned="false"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
                     android:textAlignment="center">
 
@@ -191,6 +235,8 @@
                         android:id="@+id/cob_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="Carb"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"
@@ -200,6 +246,8 @@
                         android:id="@+id/cobView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="--g"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -208,13 +256,18 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
                 <TextView
                     android:id="@+id/watch_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-3dp"
+                    android:layout_gravity="center"
-                    android:layout_marginTop="-2dp"
+                    android:gravity="center"
-                    android:paddingLeft="14dp"
                     android:text="12:00"
                     android:textAlignment="center"
                     android:textColor="#FFFFFF"
@@ -223,11 +276,10 @@
                 <LinearLayout
                     android:id="@+id/date_time"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical|center_horizontal"
+                    android:layout_gravity="center"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingLeft="2sp"
                     android:textAlignment="center"
                     android:visibility="gone">
 
@@ -235,7 +287,8 @@
                         android:id="@+id/day"
                         android:layout_width="23dp"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="day"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -245,26 +298,35 @@
                         android:id="@+id/month"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="mth"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp" />
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
                 <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="center"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingLeft="12dp"
                     android:textAlignment="center">
 
+
                     <TextView
                         android:id="@+id/iob_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="IOB"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -275,6 +337,8 @@
                         android:id="@+id/iobView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="--U"
                         android:textColor="#FFFFFF"
                         android:textSize="14sp"
@@ -282,6 +346,12 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
             </LinearLayout>
 
         </LinearLayout>
@@ -289,9 +359,9 @@
         <lecho.lib.hellocharts.view.LineChartView
             android:id="@+id/chart"
             android:layout_width="match_parent"
-            android:layout_height="75dp"
+            android:layout_height="0px"
             android:layout_gravity="bottom"
-            android:layout_marginTop="5dp"
+            android:layout_weight="0.41"
             android:gravity="center_horizontal|top" />
 
     </LinearLayout>

wear/src/main/res/layout/round_activity_home_2.xml

@@ -6,33 +6,35 @@
     android:id="@+id/main_layout">
 
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
         android:textAlignment="center"
-        android:weightSum="1">
+        android:weightSum="1.1">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0px"
+            android:orientation="vertical"
+            android:layout_weight="0.05">
+        </LinearLayout>
 
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
-            android:textAlignment="center"
-            android:paddingTop="15dp"
-            android:weightSum="1"
             android:layout_gravity="center_horizontal"
+            android:layout_weight="0.27"
             android:gravity="center_horizontal"
-            android:layout_marginTop="-5dp">
+            android:orientation="horizontal"
+            android:textAlignment="center">
 
             <TextView
                 android:id="@+id/loop"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
+                android:layout_gravity="bottom|center"
-                android:layout_marginBottom="2dp"
                 android:background="@drawable/loop_grey_25"
-                android:gravity="center|right"
+                android:gravity="center"
-                android:paddingRight="7dp"
-                android:paddingTop="-2dp"
                 android:text="--'"
                 android:textAlignment="center"
                 android:textColor="#FFFFFF"
@@ -41,17 +43,17 @@
 
             <TextView
                 android:id="@+id/sgv"
-                android:textSize="38sp"
-                android:text="---"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
                 android:layout_gravity="center_horizontal|bottom"
+                android:layout_marginBottom="-2dp"
                 android:gravity="bottom|right"
                 android:paddingLeft="5dp"
                 android:paddingRight="5dp"
-                android:layout_marginBottom="-2dp"
+                android:paddingTop="-2dp"
-                android:paddingTop="-2dp" />
+                android:text="---"
+                android:textColor="#FFFFFF"
+                android:textSize="38sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -60,8 +62,8 @@
                 android:baselineAligned="false"
                 android:gravity="center_vertical"
                 android:orientation="vertical"
-                android:textAlignment="center"
+                android:paddingEnd="4dp"
-                android:weightSum="1">
+                android:textAlignment="center">
 
                 <TextView
                     android:id="@+id/direction"
@@ -79,11 +81,8 @@
                     android:id="@+id/timestamp"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
                     android:layout_marginBottom="2dp"
-                    android:gravity="center_horizontal|bottom"
+                    android:gravity="center"
-                    android:paddingEnd="8dp"
-                    android:paddingStart="6dp"
                     android:text="--'"
                     android:textColor="#FFFFFF"
                     android:textSize="14sp"
@@ -94,68 +93,111 @@
         </LinearLayout>
 
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
             android:id="@+id/secondary_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
+            android:layout_gravity="center"
+            android:layout_weight="0.10"
+            android:background="@color/light_grey"
+            android:gravity="center"
+            android:orientation="vertical"
             android:padding="1dp">
 
             <LinearLayout
-                android:orientation="horizontal"
+                android:layout_width="match_parent"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
+                android:layout_gravity="center"
-                android:layout_gravity="center_horizontal">
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingEnd="5dp"
+                android:paddingStart="5dp"
+                android:textAlignment="center">
 
                 <TextView
                     android:id="@+id/delta"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:text="delta"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="+/-"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:textSize="14sp"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/avgdelta"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="avg"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/uploader_battery"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:textSize="14sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/rig_battery"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:textSize="14sp"
+                    android:textSize="13sp"
                     android:textStyle="bold"
                     android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/tmpBasal"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0px"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10sp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1.7"
+                    android:gravity="center"
                     android:text="-.--U/h"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:textSize="14sp"
+                    android:textSize="13sp"
                     android:textStyle="bold" />
 
+                <TextView
+                    android:id="@+id/bgiView"
+                    android:layout_width="0px"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="bgi"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="13sp"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+
                 <TextView
                     android:id="@+id/AAPSv2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_weight="0"
                     android:text=""
                     android:visibility="gone" />
 
@@ -166,24 +208,34 @@
         <LinearLayout
             android:id="@+id/tertiary_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
+            android:layout_weight="0.22"
             android:background="@color/black"
+            android:gravity="center"
             android:orientation="vertical"
             android:padding="1dp">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
+                android:layout_gravity="center"
+                android:baselineAligned="false"
+                android:gravity="center"
                 android:orientation="horizontal"
-                android:textAlignment="center">
+                android:weightSum="7">
+
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:baselineAligned="false"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
                     android:textAlignment="center">
 
@@ -191,6 +243,8 @@
                         android:id="@+id/cob_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="Carb"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"
@@ -200,6 +254,8 @@
                         android:id="@+id/cobView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="--g"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -208,13 +264,18 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
                 <TextView
                     android:id="@+id/watch_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-3dp"
+                    android:layout_gravity="center"
-                    android:layout_marginTop="-2dp"
+                    android:gravity="center"
-                    android:paddingLeft="20sp"
                     android:text="12:00"
                     android:textAlignment="center"
                     android:textColor="#FFFFFF"
@@ -223,11 +284,10 @@
                 <LinearLayout
                     android:id="@+id/date_time"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical|center_horizontal"
+                    android:layout_gravity="center"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingLeft="2sp"
                     android:textAlignment="center"
                     android:visibility="gone">
 
@@ -235,7 +295,8 @@
                         android:id="@+id/day"
                         android:layout_width="23dp"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="day"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -245,26 +306,35 @@
                         android:id="@+id/month"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="mth"
                         android:textColor="#FFFFFF"
                         android:textSize="12sp" />
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
                 <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical"
+                    android:layout_gravity="center"
-                    android:gravity="center_horizontal"
+                    android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingLeft="18sp"
                     android:textAlignment="center">
 
+
                     <TextView
                         android:id="@+id/iob_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="IOB"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
@@ -275,6 +345,8 @@
                         android:id="@+id/iobView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
                         android:text="--U"
                         android:textColor="#FFFFFF"
                         android:textSize="14sp"
@@ -282,6 +354,12 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="0px"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"></LinearLayout>
+
             </LinearLayout>
 
         </LinearLayout>
@@ -289,10 +367,18 @@
         <lecho.lib.hellocharts.view.LineChartView
             android:id="@+id/chart"
             android:layout_width="match_parent"
-            android:layout_height="75dp"
+            android:layout_height="0px"
             android:layout_gravity="bottom"
+            android:layout_weight="0.41"
             android:gravity="center_horizontal|top" />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0px"
+            android:orientation="vertical"
+            android:layout_weight="0.05">
+        </LinearLayout>
+
     </LinearLayout>
 
 </RelativeLayout>

wear/src/main/res/xml/preferences.xml

@@ -43,8 +43,17 @@
 
     <CheckBoxPreference
         android:defaultValue="true"
-        android:key="show_temp_basal"
+        android:key="showDelta"
-        android:title="Show Temp Basal"
+        android:summary="Show delta. (Circle WF)"
+        android:title="Show Delta"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showAvgDelta"
+        android:summary="Show the avgDelta."
+        android:title="Show AvgDelta"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -62,6 +71,13 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="show_temp_basal"
+        android:title="Show Basal Rate"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="showExternalStatus"
@@ -69,30 +85,6 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="showDelta"
-        android:summary="Show delta. (Circle WF)"
-        android:title="Show Delta"
-        app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="showAvgDelta"
-        android:summary="Show the avgDelta."
-        android:title="Show AvgDelta"
-        app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="showAgo"
-        android:summary="Minutes since last reading. (Circle WF)"
-        android:title="Show Ago"
-        app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
-
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="showBG"
@@ -109,6 +101,14 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showAgo"
+        android:summary="Minutes since last reading. (Circle WF)"
+        android:title="Show Ago"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
+
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="dark"