diff --git a/MyTracks/res/layout/track_widget_config.xml b/MyTracks/res/layout/track_widget_config.xml
index c35cb5a1b..93d910ceb 100644
--- a/MyTracks/res/layout/track_widget_config.xml
+++ b/MyTracks/res/layout/track_widget_config.xml
@@ -19,32 +19,24 @@ limitations under the License.
   android:layout_width="fill_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    <TableLayout
+    <LinearLayout
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
-      android:padding="8dp"
-      android:stretchColumns="0" >
-      <TableRow style="@style/TrackWidgetConfigRow" >
-        <Spinner
-          android:id="@+id/track_widget_config_item1"
-          style="@style/TrackWidgetConfigSpinner" />
-      </TableRow>
-      <TableRow style="@style/TrackWidgetConfigRow" >
-        <Spinner
-          android:id="@+id/track_widget_config_item2"
-          style="@style/TrackWidgetConfigSpinner" />
-      </TableRow>
-      <TableRow style="@style/TrackWidgetConfigRow" >
-        <Spinner
-          android:id="@+id/track_widget_config_item3"
-          style="@style/TrackWidgetConfigSpinner" />
-      </TableRow>
-      <TableRow style="@style/TrackWidgetConfigRow" >
-        <Spinner
-          android:id="@+id/track_widget_config_item4"
-          style="@style/TrackWidgetConfigSpinner" />
-      </TableRow>
-    </TableLayout>
+      android:orientation="vertical"
+      android:padding="8dp" >
+      <Spinner
+        android:id="@+id/track_widget_config_item1"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item2"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item3"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item4"
+        style="@style/TrackWidgetConfigSpinner" />
+    </LinearLayout>
   </ScrollView>
   <LinearLayout style="@style/BottomButtonBar" >
     <include layout="@layout/bottom_buttons" />
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 26d61e047..d858a1e47 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -229,15 +229,11 @@ limitations under the License.
     <item name="android:layout_width">63dp</item>
     <item name="android:src">@drawable/btn_stop_0</item>
   </style>
-  <!-- track widget config row -->
-  <style name="TrackWidgetConfigRow">
-    <item name="android:paddingBottom">20dp</item>
-    <item name="android:paddingTop">20dp</item>
-  </style>
   <!-- track widget config spiner -->
   <style name="TrackWidgetConfigSpinner">
     <item name="android:layout_gravity">center_horizontal</item>
     <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_margin">8dp</item>
     <item name="android:layout_width">fill_parent</item>
   </style>
   <!-- Track widget frame -->