diff --git a/LocationRinger/res/layout/list.xml b/LocationRinger/res/layout/list.xml
deleted file mode 100644
index d169124..0000000
--- a/LocationRinger/res/layout/list.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
diff --git a/LocationRinger/res/layout/ringtone_fragment.xml b/LocationRinger/res/layout/ringtone_fragment.xml
index bde96f1..aaa1c72 100644
--- a/LocationRinger/res/layout/ringtone_fragment.xml
+++ b/LocationRinger/res/layout/ringtone_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/ringtone_options"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <EditText
         android:id="@+id/ringtone"
diff --git a/LocationRinger/res/layout/toggle_button_fragment.xml b/LocationRinger/res/layout/toggle_button_fragment.xml
index ad94fee..00e0659 100644
--- a/LocationRinger/res/layout/toggle_button_fragment.xml
+++ b/LocationRinger/res/layout/toggle_button_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/ringtone_options"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <ToggleButton
         android:id="@+id/toggle"
diff --git a/LocationRinger/res/layout/volume_fragment.xml b/LocationRinger/res/layout/volume_fragment.xml
index 9f79cd5..3588a08 100644
--- a/LocationRinger/res/layout/volume_fragment.xml
+++ b/LocationRinger/res/layout/volume_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/volume_label"
+    <include
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:background="@android:drawable/title_bar"
-        android:text="@string/volume"
-        android:textColor="#FFFFFF" />
+        layout="@layout/feature_title_bar" />
 
     <SeekBar
         android:id="@+id/volume"