diff --git a/res/layout/button_bar.xml b/res/layout/button_bar.xml
index 1bb2992..ae3d42d 100644
--- a/res/layout/button_bar.xml
+++ b/res/layout/button_bar.xml
@@ -14,23 +14,23 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/button_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/button_bar_background">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/button_bar"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:background="@color/button_bar_background">
 
     <Button
         style="@style/ButtonBar.Left"
         android:id="@+id/prev_button"
         android:layout_width="wrap_content"
-        android:layout_alignParentLeft="true"/>
+        android:layout_weight="1"/>
 
     <Button
         style="@style/ButtonBar.Right"
         android:id="@+id/next_button"
         android:layout_width="wrap_content"
-        android:layout_alignParentRight="true"
         android:text="@string/next" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6a65ea3..63fb4ce 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,6 +69,7 @@
         <item name="android:textColor">@color/primary_text</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:drawablePadding">6dp</item>
+        <item name="android:ellipsize">end</item>
     </style>
 
     <style name="ButtonBar.Left">