diff --git a/CuckooChessApp/src/main/res/layout-land/main.xml b/CuckooChessApp/src/main/res/layout-land/main.xml
index 8e09e46..b67f08f 100644
--- a/CuckooChessApp/src/main/res/layout-land/main.xml
+++ b/CuckooChessApp/src/main/res/layout-land/main.xml
@@ -1,45 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-	<view
-		class="org.petero.cuckoochess.ChessBoard"
-    	android:id="@+id/chessboard"
-	    android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"/>
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-    	android:orientation="vertical"
-	    android:layout_width="fill_parent"
-    	android:layout_height="fill_parent">
-	<TextView
-	    android:id="@+id/status"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="wrap_content" 
-	    android:includeFontPadding="true"
-	    android:typeface="monospace"
-	    android:textSize="10dip"/>
-	<ScrollView
-		android:id="@+id/scrollView"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="1">
-		<TextView
-		    android:id="@+id/moveList"
-		    android:layout_width="fill_parent" 
-		    android:layout_height="wrap_content" 
-		    android:includeFontPadding="true"
-		    android:typeface="monospace"
-		    android:textSize="10dip"/>
-   	</ScrollView>
-	<TextView
-	    android:id="@+id/thinking"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="wrap_content" 
-	    android:includeFontPadding="true"
-	    android:typeface="monospace"
-	    android:textSize="10dip"/>
-	</LinearLayout>
+    android:layout_height="fill_parent"
+    android:orientation="horizontal">
+
+    <include layout="@layout/main_content" />
+
 </LinearLayout>
diff --git a/CuckooChessApp/src/main/res/layout/main.xml b/CuckooChessApp/src/main/res/layout/main.xml
index 1723648..5117d67 100644
--- a/CuckooChessApp/src/main/res/layout/main.xml
+++ b/CuckooChessApp/src/main/res/layout/main.xml
@@ -1,40 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >
-<view
-	class="org.petero.cuckoochess.ChessBoard"
-    android:id="@+id/chessboard"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"/>
-<TextView
-    android:id="@+id/status"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:includeFontPadding="true"
-    android:typeface="monospace"
-    android:textSize="10dip"/>
-<ScrollView
-	android:id="@+id/scrollView"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_weight="1">
-	<TextView
-    android:id="@+id/moveList"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:includeFontPadding="true"
-    android:typeface="monospace"
-    android:textSize="10dip"/>
-</ScrollView>
-<TextView
-    android:id="@+id/thinking"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:includeFontPadding="true"
-    android:typeface="monospace"
-    android:textSize="10dip"/>
+    android:orientation="vertical">
+
+    <include layout="@layout/main_content" />
 
 </LinearLayout>
diff --git a/CuckooChessApp/src/main/res/layout/main_content.xml b/CuckooChessApp/src/main/res/layout/main_content.xml
new file mode 100644
index 0000000..faf25f3
--- /dev/null
+++ b/CuckooChessApp/src/main/res/layout/main_content.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <org.petero.cuckoochess.ChessBoard
+        android:id="@+id/chessboard"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="true"
+            android:textSize="10dip"
+            android:typeface="monospace" />
+
+        <ScrollView
+            android:id="@+id/scrollView"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <TextView
+                android:id="@+id/moveList"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="true"
+                android:textSize="10dip"
+                android:typeface="monospace" />
+        </ScrollView>
+
+        <TextView
+            android:id="@+id/thinking"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="true"
+            android:textSize="10dip"
+            android:typeface="monospace" />
+
+    </LinearLayout>
+
+</merge>
\ No newline at end of file