diff --git a/res/layout/activity_discover.xml b/res/layout/activity_discover.xml
index 770c82a..e78fe84 100644
--- a/res/layout/activity_discover.xml
+++ b/res/layout/activity_discover.xml
@@ -1,7 +1,9 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -9,22 +11,30 @@
     tools:context="protect.babymonitor.MonitorActivity" >
 
     <TextView
-        android:id="@+id/textView1"
+        android:id="@+id/parentDeviceTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/parentDevice"
+        android:textSize="25sp" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="15dip" />
+
+    <TextView
+        android:id="@+id/selectChildDeviceTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="27dp"
-        android:text="Select a Child Device:"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:text="@string/selectChildDevice"
+        android:textSize="20sp" />
 
     <TableLayout
         android:id="@+id/ServiceTable"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/textView1"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="47dp" >
+        android:layout_weight="0.32"
+        android:padding="10dp" >
     </TableLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7e325b4..4f6b4d0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,5 +14,7 @@
     <string name="stopped">Stopped</string>
     <string name="streaming">Streaming...</string>
     <string name="waitingForParent">Waiting for Parent...</string>
+    <string name="parentDevice">Parent Device</string>
+    <string name="selectChildDevice">Select Child Device:</string>
 
 </resources>