diff --git a/MyTracks/res/layout-v14/help_buttons.xml b/MyTracks/res/layout-v14/help_buttons.xml
index 095eb5311..ae20cb620 100644
--- a/MyTracks/res/layout-v14/help_buttons.xml
+++ b/MyTracks/res/layout-v14/help_buttons.xml
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/help_about"
+    android:layout_gravity="left"
     android:text="@string/help_about"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/help_ok"
+    android:layout_gravity="right"
     android:text="@string/generic_ok"
     style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout-v14/marker_edit_buttons.xml b/MyTracks/res/layout-v14/marker_edit_buttons.xml
index dd1583d6e..f3ca559bc 100644
--- a/MyTracks/res/layout-v14/marker_edit_buttons.xml
+++ b/MyTracks/res/layout-v14/marker_edit_buttons.xml
@@ -17,9 +17,11 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/marker_edit_cancel"
+    android:layout_gravity="left"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/marker_edit_done"
+    android:layout_gravity="right"
     style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout-v14/track_edit_buttons.xml b/MyTracks/res/layout-v14/track_edit_buttons.xml
index 72fe2a949..eb1baa891 100644
--- a/MyTracks/res/layout-v14/track_edit_buttons.xml
+++ b/MyTracks/res/layout-v14/track_edit_buttons.xml
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/track_edit_cancel"
+    android:layout_gravity="left"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/track_edit_save"
+    android:layout_gravity="right"
     android:text="@string/generic_save"
     style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/help_buttons.xml b/MyTracks/res/layout/help_buttons.xml
index d5b867e6a..60e8410a0 100644
--- a/MyTracks/res/layout/help_buttons.xml
+++ b/MyTracks/res/layout/help_buttons.xml
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/help_ok"
+    android:layout_gravity="left"
     android:text="@string/generic_ok"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/help_about"
+    android:layout_gravity="right"
     android:text="@string/help_about"
     style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/marker_edit_buttons.xml b/MyTracks/res/layout/marker_edit_buttons.xml
index 35deaea48..122ee3552 100644
--- a/MyTracks/res/layout/marker_edit_buttons.xml
+++ b/MyTracks/res/layout/marker_edit_buttons.xml
@@ -17,9 +17,11 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/marker_edit_done"
+    android:layout_gravity="left"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/marker_edit_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/layout/track_edit_buttons.xml b/MyTracks/res/layout/track_edit_buttons.xml
index 3c19a39f6..2da07a662 100644
--- a/MyTracks/res/layout/track_edit_buttons.xml
+++ b/MyTracks/res/layout/track_edit_buttons.xml
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <Button
     android:id="@+id/track_edit_save"
+    android:layout_gravity="left"
     android:text="@string/generic_save"
     style="@style/BottomButton" />
   <Button
     android:id="@+id/track_edit_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/styles.xml b/MyTracks/res/values/styles.xml
index 864e625b5..0f05740e0 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -24,12 +24,14 @@ limitations under the License.
     <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>
   <!-- The style for the bottom button bar -->
   <style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:orientation">horizontal</item>
+    <item name="android:measureWithLargestChild">true</item>
   </style>
   <!-- The style for choose upload service check box -->
   <style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">