diff --git a/MyTracks/res/layout-v14/help_buttons.xml b/MyTracks/res/layout-v14/help_buttons.xml
index ae20cb620..c116a4d80 100644
--- a/MyTracks/res/layout-v14/help_buttons.xml
+++ b/MyTracks/res/layout-v14/help_buttons.xml
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/help_about"
     android:layout_gravity="left"
diff --git a/MyTracks/res/layout-v14/marker_edit_buttons.xml b/MyTracks/res/layout-v14/marker_edit_buttons.xml
index f3ca559bc..238ec79cc 100644
--- a/MyTracks/res/layout-v14/marker_edit_buttons.xml
+++ b/MyTracks/res/layout-v14/marker_edit_buttons.xml
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/marker_edit_cancel"
     android:layout_gravity="left"
diff --git a/MyTracks/res/layout-v14/track_edit_buttons.xml b/MyTracks/res/layout-v14/track_edit_buttons.xml
index eb1baa891..f1757114a 100644
--- a/MyTracks/res/layout-v14/track_edit_buttons.xml
+++ b/MyTracks/res/layout-v14/track_edit_buttons.xml
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/track_edit_cancel"
     android:layout_gravity="left"
diff --git a/MyTracks/res/layout/bottom_buttons.xml b/MyTracks/res/layout-v14/track_widget_config_buttons.xml
similarity index 86%
rename from MyTracks/res/layout/bottom_buttons.xml
rename to MyTracks/res/layout-v14/track_widget_config_buttons.xml
index c6d36ee61..3f37518f4 100644
--- a/MyTracks/res/layout/bottom_buttons.xml
+++ b/MyTracks/res/layout-v14/track_widget_config_buttons.xml
@@ -15,14 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- In v14, postive button on the right. -->
   <Button
-    android:id="@+id/bottom_buttons_add"
+    android:id="@+id/track_widget_config_cancel"
     android:layout_gravity="left"
-    android:text="@string/generic_add"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/bottom_buttons_cancel"
-    android:layout_gravity="right"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
+  <Button
+    android:id="@+id/track_widget_config_add"
+    android:layout_gravity="right"
+    android:text="@string/generic_add"
+    style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index 38db80adf..1d11b6e53 100644
--- a/MyTracks/res/layout/help.xml
+++ b/MyTracks/res/layout/help.xml
@@ -24,6 +24,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_width="match_parent" />
   </ScrollView>
+  <View style="@style/BottomButtonDivider" />
   <LinearLayout style="@style/BottomButtonBar" >
     <include layout="@layout/help_buttons" />
   </LinearLayout>
diff --git a/MyTracks/res/layout/marker_edit.xml b/MyTracks/res/layout/marker_edit.xml
index 90cd620c3..750d38ca1 100644
--- a/MyTracks/res/layout/marker_edit.xml
+++ b/MyTracks/res/layout/marker_edit.xml
@@ -69,6 +69,7 @@ limitations under the License.
       </LinearLayout>
     </LinearLayout>
   </ScrollView>
+  <View style="@style/BottomButtonDivider" />
   <LinearLayout style="@style/BottomButtonBar" >
     <include layout="@layout/marker_edit_buttons" />
   </LinearLayout>
diff --git a/MyTracks/res/layout/track_edit.xml b/MyTracks/res/layout/track_edit.xml
index b179b81dd..1cdc5b516 100644
--- a/MyTracks/res/layout/track_edit.xml
+++ b/MyTracks/res/layout/track_edit.xml
@@ -50,7 +50,7 @@ limitations under the License.
           android:layout_weight="1"
           android:layout_width="0dp"
           style="@style/EditCategory" />
-        <Spinner          
+        <Spinner
           android:id="@+id/track_edit_activity_type_icon"
           android:layout_gravity="bottom"
           android:layout_height="wrap_content"
@@ -66,6 +66,7 @@ limitations under the License.
         style="@style/EditDescription" />
     </LinearLayout>
   </ScrollView>
+  <View style="@style/BottomButtonDivider" />
   <LinearLayout style="@style/BottomButtonBar" >
     <include layout="@layout/track_edit_buttons" />
   </LinearLayout>
diff --git a/MyTracks/res/layout/track_widget_config.xml b/MyTracks/res/layout/track_widget_config.xml
index a7c3a1e3e..851daed20 100644
--- a/MyTracks/res/layout/track_widget_config.xml
+++ b/MyTracks/res/layout/track_widget_config.xml
@@ -38,7 +38,8 @@ limitations under the License.
         style="@style/TrackWidgetConfigSpinner" />
     </LinearLayout>
   </ScrollView>
+  <View style="@style/BottomButtonDivider" />
   <LinearLayout style="@style/BottomButtonBar" >
-    <include layout="@layout/bottom_buttons" />
+    <include layout="@layout/track_widget_config_buttons" />
   </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout-v14/bottom_buttons.xml b/MyTracks/res/layout/track_widget_config_buttons.xml
similarity index 90%
rename from MyTracks/res/layout-v14/bottom_buttons.xml
rename to MyTracks/res/layout/track_widget_config_buttons.xml
index 18a88de6d..60c7b25ac 100644
--- a/MyTracks/res/layout-v14/bottom_buttons.xml
+++ b/MyTracks/res/layout/track_widget_config_buttons.xml
@@ -16,13 +16,13 @@ limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
-    android:id="@+id/bottom_buttons_cancel"
+    android:id="@+id/track_widget_config_add"
     android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/bottom_buttons_add"
-    android:layout_gravity="right"
     android:text="@string/generic_add"
     style="@style/BottomButton" />
+  <Button
+    android:id="@+id/track_widget_config_cancel"
+    android:layout_gravity="right"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/values-v11/styles.xml b/MyTracks/res/values-v11/styles.xml
index 1152b1215..38664e8d4 100644
--- a/MyTracks/res/values-v11/styles.xml
+++ b/MyTracks/res/values-v11/styles.xml
@@ -20,19 +20,29 @@ limitations under the License.
     <item name="android:background">@drawable/ab_transparent_dark_holo</item>
   </style>
   <style name="BottomButton" parent="@android:style/Widget.Holo.Button.Borderless">
-    <!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
+    <!-- Same as BottomButton in values/styles.xml except inheriting from Widget.Holo.Button.Borderles. -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">0dp</item>
     <item name="android:maxLines">2</item>
   </style>
   <style name="BottomButtonBar" parent="@android:style/Holo.ButtonBar">
-    <!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent -->
+    <!--
+    Same as BottomButtonBar in values/styles.xml except inheriting from Holo.ButtonBar and
+    adding measureWithLargestChild.
+    -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
     <item name="android:measureWithLargestChild">true</item>
+    <item name="android:orientation">horizontal</item>
   </style>
+  <style name="BottomButtonDivider">
+    <item name="android:background">?android:attr/dividerVertical</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_marginLeft">4dp</item>
+    <item name="android:layout_marginRight">4dp</item>
+    <item name="android:layout_width">match_parent</item>
+  </style>    
   <style name="ListItem">
     <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
   </style>
diff --git a/MyTracks/res/values-v14/styles.xml b/MyTracks/res/values-v14/styles.xml
index c449821a0..47225d13a 100644
--- a/MyTracks/res/values-v14/styles.xml
+++ b/MyTracks/res/values-v14/styles.xml
@@ -17,18 +17,23 @@ limitations under the License.
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- The style for choose activity text -->
   <style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
-    <!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
+    <!--
+    Same as BottomButton in values/styles.xml except inheriting from 
+    Widget.DeviceDefault.Button.Borderless.
+    -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">0dp</item>
     <item name="android:maxLines">2</item>
   </style>
   <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
-    <!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent and adding measureWithLargestChild -->
+    <!--
+    Same as BottomButtonBar in values-11/styles.xml except inheriting from DeviceDefault.ButtonBar.
+    -->
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
     <item name="android:measureWithLargestChild">true</item>
+    <item name="android:orientation">horizontal</item>
   </style>
   <style name="StatsSmallLabel" parent="@style/TextSmall">
     <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 406522351..852add033 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -32,6 +32,12 @@ limitations under the License.
     <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
   </style>
+  <!-- bottom button divider -->
+  <style name="BottomButtonDivider">
+    <item name="android:layout_height">0dp</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:visibility">gone</item>
+  </style>
   <!-- edit category -->
   <style name="EditCategory" parent="@style/TextMedium">
     <item name="android:layout_width">match_parent</item>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
index 34631dc54..fad31d7eb 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
@@ -80,7 +80,7 @@ public class TrackWidgetConfigActivity extends Activity {
     configSpinner(item4, list, PreferencesUtils.getInt(
         this, R.string.track_widget_item4, PreferencesUtils.TRACK_WIDGET_ITEM4_DEFAULT));
 
-    findViewById(R.id.bottom_buttons_add).setOnClickListener(new View.OnClickListener() {
+    findViewById(R.id.track_widget_config_add).setOnClickListener(new View.OnClickListener() {
       public void onClick(View v) {
 
         // Push widget update to surface with newly set prefix
@@ -104,7 +104,7 @@ public class TrackWidgetConfigActivity extends Activity {
         finish();
       }
     });
-    findViewById(R.id.bottom_buttons_cancel).setOnClickListener(new View.OnClickListener() {
+    findViewById(R.id.track_widget_config_cancel).setOnClickListener(new View.OnClickListener() {
         @Override
       public void onClick(View v) {
         finish();