diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
new file mode 100644
index 0000000..55dff28
--- /dev/null
+++ b/res/layout-land/main.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+android:id="@+id/mainlayout"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent"
+android:orientation="vertical"
+xmlns:android="http://schemas.android.com/apk/res/android"
+>
+<include layout="@layout/textviews" />
+<LinearLayout
+android:id="@+id/buttonlayout"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:orientation="horizontal"
+xmlns:android="http://schemas.android.com/apk/res/android"
+>
+<include layout="@layout/buttons"/>
+</LinearLayout>
+</LinearLayout>
diff --git a/res/layout/buttons.xml b/res/layout/buttons.xml
new file mode 100644
index 0000000..dd43018
--- /dev/null
+++ b/res/layout/buttons.xml
@@ -0,0 +1,30 @@
+<merge
+xmlns:android="http://schemas.android.com/apk/res/android"
+>
+<Button
+android:id="@+id/singlebtn"
+android:layout_weight="1"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:text="@string/singlelog"
+>
+</Button>
+<Button
+android:id="@+id/startstopbtn"
+android:layout_weight="1"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:text="@string/startlog"
+android:layout_below="@+id/singlebtn"
+>
+</Button>
+<Button
+android:id="@+id/preferencebtn"
+android:layout_weight="1"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:text="@string/preferences"
+android:layout_below="@+id/startstopbtn"
+>
+</Button>
+</merge>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 89d15f2..660c46f 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,75 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-android:id="@+id/widget28"
+android:id="@+id/mainlayout"
 android:layout_width="fill_parent"
 android:layout_height="fill_parent"
 android:orientation="vertical"
 xmlns:android="http://schemas.android.com/apk/res/android"
 >
-<TextView
-android:id="@+id/title"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:text="APRSdroid early beta"
-android:textSize="12pt"
-android:textStyle="bold"
-android:gravity="center"
->
-</TextView>
-<TextView
-android:id="@+id/latlon"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:layout_marginTop="5pt"
-android:layout_marginBottom="5pt"
-android:text="Coordinates"
-android:textSize="10pt"
-android:gravity="center"
->
-</TextView>
-<TextView
-android:id="@+id/status"
-android:layout_width="wrap_content"
-android:layout_height="wrap_content"
-android:text="status"
->
-</TextView>
-<TextView
-android:id="@+id/packet"
-android:layout_width="wrap_content"
-android:layout_height="wrap_content"
-android:layout_marginBottom="10pt"
-android:text="packet"
->
-</TextView>
-<RelativeLayout
+<include layout="@layout/textviews" />
+<LinearLayout
 android:id="@+id/buttonlayout"
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
-android:layout_gravity="bottom"
+android:orientation="vertical"
+xmlns:android="http://schemas.android.com/apk/res/android"
 >
-<Button
-android:id="@+id/singlebtn"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:text="@string/singlelog"
->
-</Button>
-<Button
-android:id="@+id/startstopbtn"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:text="@string/startlog"
-android:layout_below="@+id/singlebtn"
->
-</Button>
-<Button
-android:id="@+id/preferencebtn"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:text="@string/preferences"
-android:layout_below="@+id/startstopbtn"
->
-</Button>
-</RelativeLayout>
+<include layout="@layout/buttons" />
+</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/textviews.xml b/res/layout/textviews.xml
new file mode 100644
index 0000000..5efbb1b
--- /dev/null
+++ b/res/layout/textviews.xml
@@ -0,0 +1,40 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<TextView
+android:id="@+id/title"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:text="APRSdroid early beta"
+android:textSize="12pt"
+android:textStyle="bold"
+android:gravity="center"
+>
+</TextView>
+<TextView
+android:id="@+id/latlon"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_marginTop="5pt"
+android:layout_marginBottom="5pt"
+android:text="Coordinates"
+android:textSize="10pt"
+android:gravity="center"
+>
+</TextView>
+<TextView
+android:id="@+id/status"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:text="status"
+>
+</TextView>
+<TextView
+android:id="@+id/packet"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:layout_weight="1"
+android:text="packet"
+android:textColor="#20a020"
+android:typeface="monospace"
+>
+</TextView>
+</merge>