diff --git a/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java b/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java
index 928e713..cc1b095 100644
--- a/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java
+++ b/app/src/main/java/com/philliphsu/clock2/DaysOfWeek.java
@@ -27,6 +27,7 @@ public class DaysOfWeek implements DaysOfWeekHelper {
     private static final int[] LABELS_RES = new int[NUM_DAYS];
     
     static {
+        // TODO: use `new DateFormatSymbols().getShortWeekdays()` to set texts
         LABELS_RES[SUNDAY] = R.string.sun;
         LABELS_RES[MONDAY] = R.string.mon;
         LABELS_RES[TUESDAY] = R.string.tue;
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/CollapsedAlarmViewHolder.java b/app/src/main/java/com/philliphsu/clock2/alarms/CollapsedAlarmViewHolder.java
index db7285f..d78465b 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/CollapsedAlarmViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/CollapsedAlarmViewHolder.java
@@ -25,13 +25,13 @@ public class CollapsedAlarmViewHolder extends BaseAlarmViewHolder implements Ala
 
     @Deprecated // TODO: Delete this, the only usage is from AlarmsAdapter (SortedList), which is not used anymore.
     public CollapsedAlarmViewHolder(ViewGroup parent, OnListItemInteractionListener<Alarm> listener) {
-        super(parent, R.layout.item_alarm, listener, null);
+        super(parent, R.layout.item_collapsed_alarm, listener, null);
         mCountdown.setOnTickListener(this);
     }
 
     public CollapsedAlarmViewHolder(ViewGroup parent, OnListItemInteractionListener<Alarm> listener,
                                     AlarmController alarmController) {
-        super(parent, R.layout.item_alarm, listener, alarmController);
+        super(parent, R.layout.item_collapsed_alarm, listener, alarmController);
         mCountdown.setOnTickListener(this);
     }
 
diff --git a/app/src/main/res/layout/fragment_alarms.xml b/app/src/main/res/layout/fragment_alarms.xml
index 6b99a97..5cf8f54 100644
--- a/app/src/main/res/layout/fragment_alarms.xml
+++ b/app/src/main/res/layout/fragment_alarms.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.RecyclerView
     android:id="@+id/list"
-    android:name="com.philliphsu.clock.alarms.AlarmsFragment"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layoutManager="LinearLayoutManager"
-    tools:context="com.philliphsu.clock2.alarms.AlarmsFragment"
-    tools:listitem="@layout/item_alarm"
     android:scrollbars="vertical"/>
diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_collapsed_alarm.xml
similarity index 100%
rename from app/src/main/res/layout/item_alarm.xml
rename to app/src/main/res/layout/item_collapsed_alarm.xml
diff --git a/app/src/main/res/layout/item_expanded_alarm.xml b/app/src/main/res/layout/item_expanded_alarm.xml
index 8233122..8cb44bc 100644
--- a/app/src/main/res/layout/item_expanded_alarm.xml
+++ b/app/src/main/res/layout/item_expanded_alarm.xml
@@ -1,162 +1,190 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Wrapped in a CardView to simulate elevation of the main view.
+  - There will be margins around the card on devices that are pre-Lollipop,
+  - and the margin size is proportional to the set cardElevation. As a result, the
+  - default item animation when collapsing/expanding the ViewHolder shows the views
+  - that are common to both VHs (primarily the time text and the on-off switch)
+  - shifting slightly during the transition. We are neglecting this blight because
+  - we don't expect many devices below Lollipop using our app.
+  -->
+<!-- TODO: Write a layout for v21 that instead uses the elevation attribute normally.
+  - You may have to set a non-transparent background on the main view.
+  -->
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                    app:cardElevation="2dp"
+                                    app:cardCornerRadius="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/item_padding_top"
+            android:paddingStart="@dimen/item_padding_start"
+            android:paddingEnd="@dimen/item_padding_end">
+
+            <include layout="@layout/alarm_time_layout"/>
+
+            <LinearLayout
+                android:id="@+id/days"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="@dimen/item_padding_top"
-                android:paddingStart="@dimen/item_padding_start"
-                android:paddingEnd="@dimen/item_padding_end">
+                android:orientation="horizontal">
 
-    <include layout="@layout/alarm_time_layout"/>
+                <ToggleButton
+                    android:id="@+id/day0"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"/>
 
-    <LinearLayout
-        android:id="@+id/days"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+                <ToggleButton
+                    android:id="@+id/day1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day0"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"/>
+                <ToggleButton
+                    android:id="@+id/day2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day1"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
+                <ToggleButton
+                    android:id="@+id/day3"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day2"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
+                <ToggleButton
+                    android:id="@+id/day4"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day3"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
+                <ToggleButton
+                    android:id="@+id/day5"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day4"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
+                <ToggleButton
+                    android:id="@+id/day6"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:textAllCaps="true"
+                    android:textStyle="bold"
+                    android:background="?selectableItemBackground"
+                    android:textColor="@color/toggle_alarm_days"
+                    />
 
-        <ToggleButton
-            android:id="@+id/day5"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:hint="Add label"
+                android:layout_marginBottom="8dp"
+                android:gravity="center_vertical"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/ringtone"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:text="Ringtone"
+                    android:gravity="center_vertical"
+                    android:textAppearance="@style/TextAppearance.AppCompat"
+                    android:textSize="18sp"/>
+
+                <CheckBox
+                    android:id="@id/vibrate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="Vibrate"/>
+
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/dismiss"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dismiss_now"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_marginBottom="@dimen/item_margin_between_elements"/>
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/divider"
+            style="@style/Divider.Horizontal"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="end">
+
+            <Button
+                android:id="@+id/delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:text="@string/delete"/>
+
+            <Button
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:text="@string/save"/>
+
+        </LinearLayout>
 
-        <ToggleButton
-            android:id="@+id/day6"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAllCaps="true"
-            android:textStyle="bold"
-            android:background="?selectableItemBackground"
-            android:textColor="@color/toggle_alarm_days"
-            />
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:hint="Add label"
-        android:layout_marginBottom="8dp"
-        android:gravity="center_vertical"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/ringtone"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackground"
-            android:text="Ringtone"
-            android:gravity="center_vertical"
-            android:textAppearance="@style/TextAppearance.AppCompat"
-            android:textSize="18sp"/>
-
-        <CheckBox
-            android:id="@id/vibrate"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="Vibrate"/>
-
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/dismiss"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dismiss_now"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_marginBottom="@dimen/item_margin_between_elements"/>
-
-    <View
-        android:id="@+id/divider"
-        style="@style/Divider.Horizontal"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end">
-
-        <Button
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:text="@string/delete"/>
-
-        <Button
-            android:id="@+id/save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:text="@string/save"/>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file