diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml
index aa0a2343ed34dc0a83b0500fb4d31c4154be0486..9e2a61dfe3d8e7022deacaef6c1e7edb8e77bbbf 100644
--- a/res/layout/display_one_line.xml
+++ b/res/layout/display_one_line.xml
@@ -9,11 +9,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/rounded_bottom"
-    android:clipChildren="false"
     android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -22,7 +19,8 @@
         <com.android.calculator2.CalculatorScrollView
             android:id="@+id/formula_scroll_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:overScrollMode="never"
             android:scrollbars="none">
 
@@ -30,7 +28,8 @@
                 android:id="@+id/formula"
                 style="@style/DisplayTextStyle.Formula"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
                 android:ellipsize="none"
                 android:longClickable="true"
                 android:singleLine="true"
@@ -43,11 +42,19 @@
             android:id="@+id/result"
             style="@style/DisplayTextStyle.Result"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:bufferType="spannable"
             android:singleLine="true"
             android:textColor="@color/display_result_text_color"
             android:visibility="invisible" />
+        
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
     </FrameLayout>
 
     <include layout="@layout/drag_handle" />