diff --git a/app/src/main/res/layout-land/dialog_time_picker_numpad.xml b/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
index 48b45ea..11d25a6 100644
--- a/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
+++ b/app/src/main/res/layout-land/dialog_time_picker_numpad.xml
@@ -2,15 +2,16 @@
 <!-- TOneverDO: Use LinearLayout as root container when the
 dialog is a DialogFragment (or a subclass of), or else LWM
 doesn't work. -->
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/input_time"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/numeric_keypad_output_box_height"
+        android:layout_width="@dimen/left_side_width"
+        android:layout_height="match_parent"
         android:gravity="center"
         android:textSize="@dimen/text_size_display_3"
         android:fontFamily="sans-serif"
@@ -21,11 +22,11 @@ doesn't work. -->
 
     <com.philliphsu.clock2.editalarm.NumpadTimePicker
         android:id="@+id/number_grid"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/numeric_keypad_height"
-        android:layout_below="@id/input_time"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
         android:layout_marginTop="@dimen/bottom_sheet_vertical_space"
         android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
         android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"/>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_time_picker_numpad.xml b/app/src/main/res/layout/dialog_time_picker_numpad.xml
index 48b45ea..ef798ab 100644
--- a/app/src/main/res/layout/dialog_time_picker_numpad.xml
+++ b/app/src/main/res/layout/dialog_time_picker_numpad.xml
@@ -2,10 +2,11 @@
 <!-- TOneverDO: Use LinearLayout as root container when the
 dialog is a DialogFragment (or a subclass of), or else LWM
 doesn't work. -->
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/input_time"
@@ -28,4 +29,4 @@ doesn't work. -->
         android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
         android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"/>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-land-v21/dimens.xml b/app/src/main/res/values-land-v21/dimens.xml
new file mode 100644
index 0000000..989ede0
--- /dev/null
+++ b/app/src/main/res/values-land-v21/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="numeric_keypad_cell_height">50dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 2f3ffac..47ad4e9 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -2,20 +2,17 @@
     <dimen name="grid_element_text_size">24sp</dimen>
 
     <!-- NumpadTimePickerDialog -->
-    <dimen name="numpad_height">300dp</dimen> <!-- TODO: Deprecated -->
-    <dimen name="numeric_keypad_cell_height">64dp</dimen>
-    <dimen name="numeric_keypad_output_box_height">80dp</dimen>
-    <dimen name="numeric_keypad_height">344dp</dimen> <!-- 4 * (numeric_keypad_cell_height) + 88dp pre-21 FAB height -->
-    <dimen name="numeric_keypad_backspace_height">88dp</dimen> <!-- Same as pre-21 FAB height -->
-    <dimen name="numeric_keypad_fab_bottom_margin">0dp</dimen> <!-- 88dp height already big enough -->
+    <dimen name="numeric_keypad_cell_height">42dp</dimen>
+    <!--<dimen name="numeric_keypad_height">344dp</dimen> &lt;!&ndash; 4 * (numeric_keypad_cell_height) + 88dp pre-21 FAB height &ndash;&gt;-->
+    <!--<dimen name="numeric_keypad_backspace_height">88dp</dimen> &lt;!&ndash; Same as pre-21 FAB height &ndash;&gt;-->
+    <!--<dimen name="numeric_keypad_fab_bottom_margin">0dp</dimen> &lt;!&ndash; 88dp height already big enough &ndash;&gt;-->
 
     <!-- NumberGridTimePickerDialog -->
-    <!--TODO: We don't actually use this. -->
-    <dimen name="number_grid_height">220dp</dimen> <!-- 5 * (number_grid_minute_cell_height) -->
+    <!--<dimen name="number_grid_height">220dp</dimen> &lt;!&ndash; 5 * (number_grid_minute_cell_height) &ndash;&gt;-->
     <dimen name="number_grid_hour_cell_height">55dp</dimen> <!-- 4 * 55 == 5 * (number_grid_minute_cell_height) -->
     <dimen name="number_grid_minute_cell_height">44dp</dimen>
     <!--TODO: Change the height suffix to size or dimen, because this is used as a width in landscape and a height in portrait. -->
-    <dimen name="half_day_button_bar_height">64dp</dimen>
+    <dimen name="half_day_button_bar_height">72dp</dimen>
     <dimen name="number_grid_24_hour_item_primary_text_size">26sp</dimen>
     <dimen name="number_grid_minute_text_size">20sp</dimen>