altosdroid: Clean up tab layout

Fuss with weights and gravitys, then add some wrapping layouts to get
things looking reasonable on small and larger screens.

Signed-off-by: Keith Packard <keithp@keithp.com>

4 files changed, 988 insertions, 949 deletions

diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
index 27c903d0..85c171b2 100644
--- a/altosdroid/res/layout/tab_flight.xml
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -22,379 +22,381 @@
     android:orientation="vertical" >
 
   <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_weight="0"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
+      android:orientation="vertical" >
 
-    <RelativeLayout
-	android:layout_width="0dp"
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal" >
 
-      <TextView
-	  android:id="@+id/speed_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/speed_label" />
-
-      <TextView
-	  android:id="@+id/speed_value"
-	  android:layout_width="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/speed_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/speed_label" />
+
+	<TextView
+	    android:id="@+id/speed_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/speed_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/speed_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/height_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/height_label" />
+
+	<TextView
+	    android:id="@+id/height_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/height_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal" >
 
-      <TextView
-	  android:id="@+id/height_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/height_label" />
-
-      <TextView
-	  android:id="@+id/height_value"
-	  android:layout_width="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/max_speed_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/max_speed_label" />
+
+	<TextView
+	    android:id="@+id/max_speed_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/max_speed_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/height_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-  </LinearLayout>
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/max_height_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/max_height_label" />
+
+	<TextView
+	    android:id="@+id/max_height_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/max_height_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal"
+	android:paddingTop="5dp" >
 
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
+      <RelativeLayout
+	  android:layout_width="0dp"
+	  android:layout_height="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/elevation_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/elevation_label" />
+
+	<TextView
+	    android:id="@+id/elevation_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/elevation_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+      <RelativeLayout
+	  android:layout_width="0dp"
+	  android:layout_height="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/range_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/range_label" />
+
+	<TextView
+	    android:id="@+id/range_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/range_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal"
+	android:paddingTop="5dp" >
 
-    <RelativeLayout
-	android:layout_width="0dp"
+      <RelativeLayout
+	  android:layout_width="0dp"
+	  android:layout_height="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/bearing_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/bearing_label" />
+
+	<TextView
+	    android:id="@+id/bearing_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/bearing_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+      <RelativeLayout
+	  android:layout_width="0dp"
+	  android:layout_height="wrap_content"
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/compass_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="" />
+
+	<TextView
+	    android:id="@+id/compass_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/compass_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal"
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/max_speed_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/max_speed_label" />
+	  android:layout_weight="1" >
+
+	<TextView
+	    android:id="@+id/distance_label"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/gnd_distance_label" />
+
+	<TextView
+	    android:id="@+id/distance_value"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_below="@id/distance_label"
+	    android:text=""
+	    android:textAppearance="?android:attr/textAppearanceSmall" />
+      </RelativeLayout>
 
       <TextView
-	  android:id="@+id/max_speed_value"
-	  android:layout_width="wrap_content"
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/max_speed_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
+	  android:layout_weight="1" >
+      </TextView>
+
+    </LinearLayout>
 
     <RelativeLayout
-	android:layout_width="0dp"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
       <TextView
-	  android:id="@+id/max_height_label"
+	  android:id="@+id/lat_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/max_height_label" />
+	  android:text="@string/latitude_label" />
 
       <TextView
-	  android:id="@+id/max_height_value"
+	  android:id="@+id/lat_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/max_height_label"
+	  android:layout_below="@id/lat_label"
 	  android:text=""
 	  android:textAppearance="?android:attr/textAppearanceSmall" />
     </RelativeLayout>
 
-  </LinearLayout>
-
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal"
-      android:paddingTop="5dp" >
-
     <RelativeLayout
-	android:layout_width="0dp"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
       <TextView
-	  android:id="@+id/elevation_label"
+	  android:id="@+id/lon_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/elevation_label" />
+	  android:text="@string/longitude_label" />
 
       <TextView
-	  android:id="@+id/elevation_value"
+	  android:id="@+id/lon_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/elevation_label"
+	  android:layout_below="@id/lon_label"
 	  android:text=""
 	  android:textAppearance="?android:attr/textAppearanceSmall" />
     </RelativeLayout>
 
     <RelativeLayout
-	android:layout_width="0dp"
+	android:id="@+id/apogee_view"
+	android:visibility="gone"
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/range_label"
+      <ImageView
+	  android:id="@+id/apogee_redled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/range_label" />
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:src="@drawable/grayled" />
 
-      <TextView
-	  android:id="@+id/range_value"
+      <ImageView
+	  android:id="@+id/apogee_greenled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/range_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-  </LinearLayout>
-
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal"
-      android:paddingTop="5dp" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	  android:layout_toRightOf="@id/apogee_redled"
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:paddingRight="5dp"
+	  android:src="@drawable/grayled" />
 
       <TextView
-	  android:id="@+id/bearing_label"
+	  android:id="@+id/apogee_voltage_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/bearing_label" />
+	  android:layout_toRightOf="@id/apogee_greenled"
+	  android:text="@string/apogee_voltage_label" />
 
       <TextView
-	  android:id="@+id/bearing_value"
+	  android:id="@+id/apogee_voltage_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/bearing_label"
 	  android:text=""
 	  android:textAppearance="?android:attr/textAppearanceSmall" />
     </RelativeLayout>
 
     <RelativeLayout
-	android:layout_width="0dp"
+	android:id="@+id/main_view"
+	android:visibility="gone"
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/compass_label"
+      <ImageView
+	  android:id="@+id/main_redled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="" />
+	  android:contentDescription="@string/main_voltage_label"
+	  android:src="@drawable/grayled" />
 
-      <TextView
-	  android:id="@+id/compass_value"
+      <ImageView
+	  android:id="@+id/main_greenled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/compass_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-  </LinearLayout>
-
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal"
-      android:paddingTop="5dp" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	  android:layout_toRightOf="@id/main_redled"
+	  android:contentDescription="@string/main_voltage_label"
+	  android:paddingRight="5dp"
+	  android:src="@drawable/grayled" />
 
       <TextView
-	  android:id="@+id/distance_label"
+	  android:id="@+id/main_voltage_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/gnd_distance_label" />
+	  android:layout_toRightOf="@id/main_greenled"
+	  android:text="@string/main_voltage_label" />
 
       <TextView
-	  android:id="@+id/distance_value"
+	  android:id="@+id/main_voltage_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/distance_label"
 	  android:text=""
 	  android:textAppearance="?android:attr/textAppearanceSmall" />
     </RelativeLayout>
-
-    <TextView
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1" >
-    </TextView>
-
   </LinearLayout>
-
-  <RelativeLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingTop="5dp" >
-
-    <TextView
-	android:id="@+id/lat_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/latitude_label" />
-
-    <TextView
-	android:id="@+id/lat_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_alignParentRight="true"
-	android:layout_below="@id/lat_label"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </RelativeLayout>
-
-  <RelativeLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingTop="5dp" >
-
-    <TextView
-	android:id="@+id/lon_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/longitude_label" />
-
-    <TextView
-	android:id="@+id/lon_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_alignParentRight="true"
-	android:layout_below="@id/lon_label"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </RelativeLayout>
-
-  <RelativeLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingTop="5dp" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/apogee_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/apogee_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/apogee_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_toRightOf="@id/apogee_redled"
-	android:contentDescription="@string/apogee_voltage_label"
-	android:paddingRight="5dp"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/apogee_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_toRightOf="@id/apogee_greenled"
-	android:text="@string/apogee_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/apogee_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_alignParentRight="true"
-	android:layout_below="@id/apogee_voltage_label"
-	android:layout_toRightOf="@id/apogee_greenled"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </RelativeLayout>
-
-  <RelativeLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:paddingTop="5dp" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/main_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/main_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/main_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_toRightOf="@id/main_redled"
-	android:contentDescription="@string/main_voltage_label"
-	android:paddingRight="5dp"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/main_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_toRightOf="@id/main_greenled"
-	android:text="@string/main_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/main_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_alignParentRight="true"
-	android:layout_below="@id/main_voltage_label"
-	android:layout_toRightOf="@id/main_greenled"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </RelativeLayout>
-
 </LinearLayout>
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index 2388a20b..952abd49 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -26,6 +26,7 @@
       android:baselineAligned="true"
       android:orientation="horizontal"
       android:layout_weight="1">
+
     <LinearLayout
 	android:id="@+id/map_online"
 	android:orientation="horizontal"
@@ -33,11 +34,12 @@
 	android:layout_height="fill_parent"
 	android:layout_weight="1">
     </LinearLayout>
-    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_offline"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						/>
+
+    <org.altusmetrum.AltosDroid.AltosMapOffline
+	android:id="@+id/map_offline"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"/>
   </FrameLayout>
   
   <LinearLayout
diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index f7a69f21..88648c3b 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -16,465 +16,480 @@
      59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 
-<TableLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:stretchColumns="2,3"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-  <TableRow
-      android:padding="2dip"
+  <TableLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:stretchColumns="2,3"
+      android:layout_weight="0"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content">
-    
-    <ImageView
-	android:id="@+id/battery_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/battery_voltage_label"
-	android:src="@drawable/grayled"
-	/>
-
-    <ImageView
-	android:id="@+id/battery_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/battery_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:id="@+id/battery_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/battery_voltage_label" />
-
-    <TextView
-	android:id="@+id/battery_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-  </TableRow>
-
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/receiver_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/receiver_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/receiver_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/receiver_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/receiver_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/receiver_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/receiver_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:id="@+id/logging_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/logging_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:id="@+id/logging_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/logging_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:id="@+id/logging_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/logging_label" />
-
-    <TextView
-	android:id="@+id/logging_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_below="@id/logging_label"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:id="@+id/gps_locked_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/gps_locked_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:id="@+id/gps_locked_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/gps_locked_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:id="@+id/gps_locked_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/gps_locked_label" />
-
-    <TextView
-	android:id="@+id/gps_locked_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_below="@id/gps_locked_label"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:id="@+id/gps_ready_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/gps_ready_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:id="@+id/gps_ready_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/gps_ready_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:id="@+id/gps_ready_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/gps_ready_label" />
-
-    <TextView
-	android:id="@+id/gps_ready_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_below="@id/gps_ready_label"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/apogee_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/apogee_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/apogee_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/apogee_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/apogee_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/apogee_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/apogee_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/main_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/main_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/main_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/main_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/main_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/main_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/main_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/ignite_a_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_a_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/ignite_a_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_a_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/ignite_a_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/ignite_a_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/ignite_a_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/ignite_b_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_b_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/ignite_b_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_b_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/ignite_b_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/ignite_b_voltage_label" />
-
-    <TextView
-	android:visibility="gone"
-	android:id="@+id/ignite_b_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
-	android:visibility="gone"
-	android:id="@+id/ignite_c_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_c_voltage_label"
-	android:src="@drawable/grayled" />
 
-    <ImageView
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      
+      <ImageView
+	  android:id="@+id/battery_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/battery_voltage_label"
+	  android:src="@drawable/grayled"
+	  />
+
+      <ImageView
+	  android:id="@+id/battery_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/battery_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/battery_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/battery_voltage_label" />
+
+      <TextView
+	  android:id="@+id/battery_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall"
+	  />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/receiver_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_c_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_c_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <ImageView
+	  android:id="@+id/receiver_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/receiver_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/receiver_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/receiver_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/receiver_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/receiver_voltage_label" />
+
+      <TextView
+	  android:id="@+id/receiver_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/logging_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/logging_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/logging_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/logging_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/logging_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/logging_label" />
+
+      <TextView
+	  android:id="@+id/logging_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_below="@id/logging_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/gps_locked_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/gps_locked_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/gps_locked_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/gps_locked_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/gps_locked_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/gps_locked_label" />
+
+      <TextView
+	  android:id="@+id/gps_locked_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_below="@id/gps_locked_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/gps_ready_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/gps_ready_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/gps_ready_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/gps_ready_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/gps_ready_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/gps_ready_label" />
+
+      <TextView
+	  android:id="@+id/gps_ready_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_below="@id/gps_ready_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/apogee_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_c_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/ignite_c_voltage_label" />
-
-    <TextView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <ImageView
+	  android:id="@+id/apogee_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/apogee_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/apogee_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/apogee_voltage_label" />
+
+      <TextView
+	  android:id="@+id/apogee_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/main_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_c_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" >
-
-    <ImageView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/main_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/main_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/main_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/main_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/main_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/main_voltage_label" />
+
+      <TextView
+	  android:id="@+id/main_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/ignite_a_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_d_redled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_d_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <ImageView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/ignite_a_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_a_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/ignite_a_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_a_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/ignite_a_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/ignite_a_voltage_label" />
+
+      <TextView
+	  android:id="@+id/ignite_a_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/ignite_b_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_d_greenled"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:contentDescription="@string/ignite_d_voltage_label"
-	android:src="@drawable/grayled" />
-
-    <TextView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/ignite_b_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_b_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/ignite_b_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_b_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/ignite_b_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/ignite_b_voltage_label" />
+
+      <TextView
+	  android:id="@+id/ignite_b_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/ignite_c_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_d_voltage_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text="@string/ignite_d_voltage_label" />
-
-    <TextView
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/ignite_c_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_c_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/ignite_c_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_c_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/ignite_c_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/ignite_c_voltage_label" />
+
+      <TextView
+	  android:id="@+id/ignite_c_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:id="@+id/ignite_d_row"
 	android:visibility="gone"
-	android:id="@+id/ignite_d_voltage_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <TextView
-	android:id="@+id/receiver_lat_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_column="2"
-	android:text="@string/receiver_latitude_label" />
-
-    <TextView
-	android:id="@+id/receiver_lat_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <TextView
-	android:id="@+id/receiver_lon_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_column="2"
-	android:text="@string/receiver_longitude_label" />
-
-    <TextView
-	android:id="@+id/receiver_lon_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-
-  <TableRow
-      android:padding="2dip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content">
-
-    <TextView
-	android:id="@+id/receiver_alt_label"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:layout_column="2"
-	android:text="@string/receiver_altitude_label" />
-
-    <TextView
-	android:id="@+id/receiver_alt_value"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:text=""
-	android:textAppearance="?android:attr/textAppearanceSmall" />
-  </TableRow>
-</TableLayout>
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  android:id="@+id/ignite_d_redled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_d_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <ImageView
+	  android:id="@+id/ignite_d_greenled"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:contentDescription="@string/ignite_d_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/ignite_d_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/ignite_d_voltage_label" />
+
+      <TextView
+	  android:id="@+id/ignite_d_voltage_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/receiver_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_column="2"
+	  android:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/receiver_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_column="2"
+	  android:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+
+    <TableRow
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/receiver_alt_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_column="2"
+	  android:text="@string/receiver_altitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_alt_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </TableRow>
+  </TableLayout>
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml
index c2806629..201f45ed 100644
--- a/altosdroid/res/layout/tab_recover.xml
+++ b/altosdroid/res/layout/tab_recover.xml
@@ -15,217 +15,237 @@
      with this program; if not, write to the Free Software Foundation, Inc.,
      59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<TextView
-			android:id="@+id/bearing_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/bearing_label" />
-
-		<TextView
-			android:id="@+id/bearing_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/bearing_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<TextView
-			android:id="@+id/direction_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/direction_label" />
-
-		<TextView
-			android:id="@+id/direction_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/direction_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/distance_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/distance_label" />
-
-		<TextView
-			android:id="@+id/distance_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/distance_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_latitude_label" />
-
-		<TextView
-			android:id="@+id/target_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_longitude_label" />
-
-		<TextView
-			android:id="@+id/target_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/receiver_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_latitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/receiver_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_longitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_height_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_height_label" />
-
-		<TextView
-			android:id="@+id/max_height_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_height_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_speed_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_speed_label" />
-
-		<TextView
-			android:id="@+id/max_speed_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_speed_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_accel_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_accel_label" />
-
-		<TextView
-			android:id="@+id/max_accel_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_accel_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_weight="0"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical" >
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <TextView
+	  android:id="@+id/bearing_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/bearing_label" />
+
+      <TextView
+	  android:id="@+id/bearing_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@+id/bearing_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <TextView
+	  android:id="@+id/direction_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/direction_label" />
+
+      <TextView
+	  android:id="@+id/direction_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@+id/direction_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/distance_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/distance_label" />
+
+      <TextView
+	  android:id="@+id/distance_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@+id/distance_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/target_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/target_latitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/target_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/target_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/target_longitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/target_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/receiver_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/receiver_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/receiver_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/receiver_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/max_height_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/max_height_label" />
+
+      <TextView
+	  android:id="@+id/max_height_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/max_height_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/max_speed_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/max_speed_label" />
+
+      <TextView
+	  android:id="@+id/max_speed_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/max_speed_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/max_accel_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/max_accel_label" />
+
+      <TextView
+	  android:id="@+id/max_accel_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/max_accel_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
 </LinearLayout>