diff --git a/DroidFishApp/src/main/res/layout-land/dialog_color_picker.xml b/DroidFishApp/src/main/res/layout-land/dialog_color_picker.xml
index e326d7e..8548229 100644
--- a/DroidFishApp/src/main/res/layout-land/dialog_color_picker.xml
+++ b/DroidFishApp/src/main/res/layout-land/dialog_color_picker.xml
@@ -1,76 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Daniel Nilsson
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout 
-	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:orientation="horizontal">
-		
-	<net.margaritov.preference.colorpicker.ColorPickerView
-		android:id="@+id/color_picker_view"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:tag="landscape"
-	/>
-		
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_marginBottom="10dp">
-		
-		<TextView
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"	
-			android:text="@string/press_color_to_apply"
-			android:gravity="center"
-			android:layout_marginTop="6dp"
-			android:layout_marginLeft="6dp"
-			android:layout_marginRight="6dp"
-			android:layout_marginBottom="5dp"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
-
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/old_color_panel"
-			android:layout_width="fill_parent"
-			android:layout_height="40dp"
-			android:layout_weight="0.5"
-		/>
-	
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"	
-			android:text="↓"
-			android:textSize="20sp"
-			android:gravity="center"
-			android:layout_marginTop="10dp"
-			android:layout_marginBottom="10dp"
-		/>
-	
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/new_color_panel"
-			android:layout_width="fill_parent"
-			android:layout_height="40dp"
-			android:layout_weight="0.5"
-		/>
-	
-	</LinearLayout>
-	
-</LinearLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 Daniel Nilsson
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:orientation="horizontal">
+
+    <net.margaritov.preference.colorpicker.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tag="landscape" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/press_color_to_apply"
+            android:gravity="center"
+            android:layout_marginTop="6dp"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginBottom="5dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/old_color_panel"
+            android:layout_width="fill_parent"
+            android:layout_height="40dp"
+            android:layout_weight="0.5" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="↓"
+            android:textSize="20sp"
+            android:gravity="center"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp" />
+
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/new_color_panel"
+            android:layout_width="fill_parent"
+            android:layout_height="40dp"
+            android:layout_weight="0.5" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout-land/editboard.xml b/DroidFishApp/src/main/res/layout-land/editboard.xml
index 76e8be1..0af936d 100644
--- a/DroidFishApp/src/main/res/layout-land/editboard.xml
+++ b/DroidFishApp/src/main/res/layout-land/editboard.xml
@@ -3,163 +3,179 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <view
-        android:id="@+id/eb_chessboard"
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        class="org.petero.droidfish.activities.ChessBoardEdit"/>
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:paddingLeft="2dp" >
-        <LinearLayout
-            android:id="@+id/first_title_line"
+        android:layout_height="fill_parent">
+
+        <view
+            android:id="@+id/eb_chessboard"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
+            class="org.petero.droidfish.activities.ChessBoardEdit" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:layout_gravity="center_vertical"
-            android:background="#202020"
-            android:orientation="horizontal"
-            android:tag="title" >
-            <TextView
-                android:id="@+id/white_clock"
-                style="?android:attr/windowTitleStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:gravity="left"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="false"
-                android:singleLine="true"
-                android:tag="title" />
-            <TextView
-                android:id="@+id/title_text_summary"
-                style="?android:attr/windowTitleStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:tag="title"
-                android:text="@string/app_name" />
-            <TextView
-                android:id="@+id/black_clock"
-                style="?android:attr/windowTitleStyle"
-                android:layout_width="fill_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:gravity="right"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:tag="title" />
-        </LinearLayout>
-        <TextView
-            android:text=""
-            android:id="@+id/eb_status"
-            android:layout_width="fill_parent" 
-            android:layout_height="wrap_content" 
-            android:includeFontPadding="true"
-            android:fontFamily="monospace"
-            android:typeface="monospace"
-            android:textSize="12sp"/>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:id="@+id/LinearLayout03"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-            <Button
-                android:id="@+id/eb_cancel"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/cancel" />
-        </LinearLayout>
-        <LinearLayout
-            android:orientation="horizontal"
-            android:id="@+id/LinearLayout02"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-            <Button
-                android:text="@android:string/ok"
-                android:id="@+id/eb_ok"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-            </Button>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/footer"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:paddingLeft="2dp">
+
             <LinearLayout
-                android:id="@+id/second_title_line"
+                android:id="@+id/first_title_line"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:background="#202020"
-                android:gravity="bottom"
-                android:orientation="vertical"
-                android:tag="title" >
+                android:orientation="horizontal"
+                android:tag="title">
+
                 <TextView
-                    android:id="@+id/white_pieces"
-                    style="?android:attr/windowTitleStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_weight="1"
-                    android:ellipsize="marquee"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:gravity="left|center_vertical"
-                    android:marqueeRepeatLimit="marquee_forever"
-                    android:singleLine="true"
-                    android:tag="title"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textStyle="bold" />
-                <TextView
-                    android:id="@+id/title_text"
+                    android:id="@+id/white_clock"
                     style="?android:attr/windowTitleStyle"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center|center_vertical"
-                    android:tag="title"
-                    android:visibility="visible" />
-                <TextView
-                    android:id="@+id/black_pieces"
-                    style="?android:attr/windowTitleStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="match_parent"
+                    android:layout_marginTop="2dp"
                     android:layout_weight="1"
                     android:ellipsize="marquee"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
-                    android:gravity="left|center_vertical"
+                    android:gravity="left"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:scrollHorizontally="false"
+                    android:singleLine="true"
+                    android:tag="title" />
+
+                <TextView
+                    android:id="@+id/title_text_summary"
+                    style="?android:attr/windowTitleStyle"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:tag="title"
+                    android:text="@string/app_name" />
+
+                <TextView
+                    android:id="@+id/black_clock"
+                    style="?android:attr/windowTitleStyle"
+                    android:layout_width="fill_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="2dp"
+                    android:layout_weight="1"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="right"
                     android:marqueeRepeatLimit="marquee_forever"
                     android:scrollHorizontally="true"
                     android:singleLine="true"
-                    android:tag="title"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textStyle="bold" />
+                    android:tag="title" />
+            </LinearLayout>
+
+            <TextView
+                android:text=""
+                android:id="@+id/eb_status"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="true"
+                android:fontFamily="monospace"
+                android:typeface="monospace"
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/LinearLayout03"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <Button
+                    android:id="@+id/eb_cancel"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/cancel" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:id="@+id/LinearLayout02"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <Button
+                    android:text="@android:string/ok"
+                    android:id="@+id/eb_ok"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/footer"
+                android:layout_width="fill_parent"
+                android:layout_height="match_parent"
+                android:gravity="bottom"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/second_title_line"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#202020"
+                    android:gravity="bottom"
+                    android:orientation="vertical"
+                    android:tag="title">
+
+                    <TextView
+                        android:id="@+id/white_pieces"
+                        style="?android:attr/windowTitleStyle"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_weight="1"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="left|center_vertical"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:singleLine="true"
+                        android:tag="title"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/title_text"
+                        style="?android:attr/windowTitleStyle"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center|center_vertical"
+                        android:tag="title"
+                        android:visibility="visible" />
+
+                    <TextView
+                        android:id="@+id/black_pieces"
+                        style="?android:attr/windowTitleStyle"
+                        android:layout_width="fill_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="left|center_vertical"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:tag="title"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textStyle="bold" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-<include layout="@layout/left_drawer"/>
+
+    <include layout="@layout/left_drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/DroidFishApp/src/main/res/layout-land/editoptions.xml b/DroidFishApp/src/main/res/layout-land/editoptions.xml
index 6580cfa..9bff242 100644
--- a/DroidFishApp/src/main/res/layout-land/editoptions.xml
+++ b/DroidFishApp/src/main/res/layout-land/editoptions.xml
@@ -17,7 +17,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-
         </ScrollView>
 
         <LinearLayout
@@ -45,9 +44,6 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@android:string/ok" />
-
         </LinearLayout>
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout-land/load_fen.xml b/DroidFishApp/src/main/res/layout-land/load_fen.xml
index 275a89c..680a6bf 100644
--- a/DroidFishApp/src/main/res/layout-land/load_fen.xml
+++ b/DroidFishApp/src/main/res/layout-land/load_fen.xml
@@ -31,7 +31,6 @@
                     android:id="@+id/loadfen_chessboard"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -53,11 +52,7 @@
                     android:layout_height="fill_parent"
                     android:layout_weight="1"
                     android:text="@android:string/ok" />
-
             </LinearLayout>
-
         </LinearLayout>
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout-land/main.xml b/DroidFishApp/src/main/res/layout-land/main.xml
index 5473222..9fcde08 100644
--- a/DroidFishApp/src/main/res/layout-land/main.xml
+++ b/DroidFishApp/src/main/res/layout-land/main.xml
@@ -3,115 +3,127 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <view
-        class="org.petero.droidfish.ChessBoardPlay"
-        android:id="@+id/chessboard"
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="2dp"
-        android:layout_marginTop="0dp"
-        android:orientation="vertical"
-        android:paddingLeft="1dp">
-        <include
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            layout="@layout/title">
-        </include>
-        <LinearLayout
-            android:id="@+id/buttons"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="6dp">
-            <ImageButton
-                android:id="@+id/custom3Button"
-                android:contentDescription="@string/buttonDesc_custom3"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom2Button"
-                android:contentDescription="@string/buttonDesc_custom2"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom1Button"
-                android:contentDescription="@string/buttonDesc_custom1"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/modeButton"
-                android:contentDescription="@string/buttonDesc_mode"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/undoButton"
-                android:contentDescription="@string/buttonDesc_back"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/redoButton"
-                android:contentDescription="@string/buttonDesc_forward"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-        </LinearLayout>
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="fill_parent" 
-            android:layout_height="wrap_content" 
-            android:includeFontPadding="true"
-            android:fontFamily="monospace"
-            android:typeface="monospace"
-            android:textSize="12sp"/>
+        android:layout_height="fill_parent">
+
         <view
-            class="org.petero.droidfish.view.MyRelativeLayout"
-            android:orientation="vertical"
+            class="org.petero.droidfish.ChessBoardPlay"
+            android:id="@+id/chessboard"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-            <ScrollView
-                android:id="@+id/scrollView"
+            android:layout_height="fill_parent" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="0dp"
+            android:orientation="vertical"
+            android:paddingLeft="1dp">
+
+            <include
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/title" />
+
+            <LinearLayout
+                android:id="@+id/buttons"
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="6dp">
+
+                <ImageButton
+                    android:id="@+id/custom3Button"
+                    android:contentDescription="@string/buttonDesc_custom3"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom2Button"
+                    android:contentDescription="@string/buttonDesc_custom2"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom1Button"
+                    android:contentDescription="@string/buttonDesc_custom1"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/modeButton"
+                    android:contentDescription="@string/buttonDesc_mode"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/undoButton"
+                    android:contentDescription="@string/buttonDesc_back"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/redoButton"
+                    android:contentDescription="@string/buttonDesc_forward"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="true"
+                android:fontFamily="monospace"
+                android:typeface="monospace"
+                android:textSize="12sp" />
+
+            <view
+                class="org.petero.droidfish.view.MyRelativeLayout"
+                android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <view
+                        class="org.petero.droidfish.view.MoveListView"
+                        android:id="@+id/moveList"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:includeFontPadding="true"
+                        android:padding="0dp" />
+                </ScrollView>
+
                 <view
-                    class="org.petero.droidfish.view.MoveListView"
-                    android:id="@+id/moveList"
-                    android:layout_width="fill_parent" 
-                    android:layout_height="wrap_content" 
-                    android:includeFontPadding="true"
-                    android:padding="0dp"/>
-            </ScrollView>
-            <view
-                class="org.petero.droidfish.view.MyScrollView"
-                android:id="@+id/scrollViewBot"
-                android:layout_alignParentBottom="true"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/thinking"
-                    android:tag="thinking"
-                    android:layout_width="fill_parent" 
-                    android:layout_height="wrap_content" 
-                    android:includeFontPadding="true"
-                    android:fontFamily="monospace"
-                    android:typeface="monospace"
-                    android:textSize="12sp"/>
+                    class="org.petero.droidfish.view.MyScrollView"
+                    android:id="@+id/scrollViewBot"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/thinking"
+                        android:tag="thinking"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:includeFontPadding="true"
+                        android:fontFamily="monospace"
+                        android:typeface="monospace"
+                        android:textSize="12sp" />
+                </view>
             </view>
-        </view>
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-<include layout="@layout/left_drawer"/>
-<include layout="@layout/right_drawer"/>
+
+    <include layout="@layout/left_drawer" />
+
+    <include layout="@layout/right_drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/DroidFishApp/src/main/res/layout/create_network_engine.xml b/DroidFishApp/src/main/res/layout/create_network_engine.xml
index 2b520b8..265a82c 100644
--- a/DroidFishApp/src/main/res/layout/create_network_engine.xml
+++ b/DroidFishApp/src/main/res/layout/create_network_engine.xml
@@ -1,21 +1,20 @@
 <?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="wrap_content"
+    android:orientation="horizontal"
     android:padding="10dp">
+
     <TextView
-        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:paddingRight="10dp"
-        android:text="@string/engine_name">
-    </TextView>
-    <EditText
-        android:id="@+id/create_network_engine" 
         android:layout_height="wrap_content"
+        android:paddingRight="10dp"
+        android:text="@string/engine_name" />
+
+    <EditText
+        android:id="@+id/create_network_engine"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:inputType="text">
-    </EditText>
+        android:inputType="text" />
 </LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/create_pgn_file.xml b/DroidFishApp/src/main/res/layout/create_pgn_file.xml
index 8b877fb..a32555f 100644
--- a/DroidFishApp/src/main/res/layout/create_pgn_file.xml
+++ b/DroidFishApp/src/main/res/layout/create_pgn_file.xml
@@ -1,21 +1,20 @@
 <?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="wrap_content"
+    android:orientation="horizontal"
     android:padding="10dp">
+
     <TextView
-        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:paddingRight="10dp"
-        android:text="@string/filename">
-    </TextView>
-    <EditText
-        android:id="@+id/create_pgn_filename" 
         android:layout_height="wrap_content"
+        android:paddingRight="10dp"
+        android:text="@string/filename" />
+
+    <EditText
+        android:id="@+id/create_pgn_filename"
         android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:inputType="text">
-    </EditText>
+        android:inputType="text" />
 </LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/dialog_color_picker.xml b/DroidFishApp/src/main/res/layout/dialog_color_picker.xml
index 8ba75f2..bb63b6b 100644
--- a/DroidFishApp/src/main/res/layout/dialog_color_picker.xml
+++ b/DroidFishApp/src/main/res/layout/dialog_color_picker.xml
@@ -1,77 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Daniel Nilsson
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:orientation="vertical">
-		
-	<net.margaritov.preference.colorpicker.ColorPickerView
-		android:id="@+id/color_picker_view"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:tag="portrait"
-	/>
-	
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"	
-		android:text="@string/press_color_to_apply"
-		android:gravity="left"
-		android:layout_marginLeft="6dp"
-		android:layout_marginRight="6dp"
-		android:layout_marginBottom="5dp"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
-	
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="40dp"
-		android:orientation="horizontal"
-		android:layout_below="@id/color_picker_view"
-		android:layout_marginBottom="10dp">
-
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/old_color_panel"
-			android:layout_width="0px"
-			android:layout_height="fill_parent"
-			android:layout_weight="0.5"
-		/>
-	
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="fill_parent"	
-			android:text="→"
-			android:textSize="20sp"
-			android:gravity="center"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"
-		/>
-	
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/new_color_panel"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="0.5"
-		/>
-	
-	</LinearLayout>
-	
-</LinearLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 Daniel Nilsson
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp">
+
+    <net.margaritov.preference.colorpicker.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:tag="portrait" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dp"
+        android:layout_marginRight="6dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="left"
+        android:text="@string/press_color_to_apply"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_below="@id/color_picker_view"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/old_color_panel"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.5" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:text="→"
+            android:textSize="20sp" />
+
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/new_color_panel"
+            android:layout_width="0px"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/drawer_list_item.xml b/DroidFishApp/src/main/res/layout/drawer_list_item.xml
index 86d5b2e..276ae8f 100644
--- a/DroidFishApp/src/main/res/layout/drawer_list_item.xml
+++ b/DroidFishApp/src/main/res/layout/drawer_list_item.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:padding="12dp"
     android:textColor="#FFBEBEBE"
-    android:textSize="20sp">
-</TextView>
+    android:textSize="20sp" />
diff --git a/DroidFishApp/src/main/res/layout/edit_comments.xml b/DroidFishApp/src/main/res/layout/edit_comments.xml
index 06e1874..5e54855 100644
--- a/DroidFishApp/src/main/res/layout/edit_comments.xml
+++ b/DroidFishApp/src/main/res/layout/edit_comments.xml
@@ -1,76 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
+
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:stretchColumns="1"
-        android:padding="10dp">
+        android:padding="10dp"
+        android:stretchColumns="1">
+
         <TableRow>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="10dp"
-                android:text="@string/comment_before">
-            </TextView>
+                android:text="@string/comment_before" />
+
             <EditText
-                android:id="@+id/ed_comments_pre" 
+                android:id="@+id/ed_comments_pre"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:minLines="2"
-                android:inputType="textMultiLine">
-            </EditText>
+                android:inputType="textMultiLine"
+                android:minLines="2" />
         </TableRow>
+
         <TableRow>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/comment_move">
-            </TextView>
+                android:text="@string/comment_move" />
+
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:orientation="horizontal">
+
                 <EditText
                     android:id="@+id/ed_comments_move"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:lines="1"
-                    android:minEms="3"
+                    android:enabled="false"
                     android:inputType="text"
-                    android:enabled="false">
-                </EditText>
+                    android:lines="1"
+                    android:minEms="3" />
+
                 <EditText
-                    android:id="@+id/ed_comments_nag" 
+                    android:id="@+id/ed_comments_nag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:inputType="text"
                     android:lines="1"
-                    android:minEms="3"
-                    android:inputType="text">
-                </EditText>
+                    android:minEms="3" />
             </LinearLayout>
         </TableRow>
+
         <TableRow>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/comment_after">
-            </TextView>
+                android:text="@string/comment_after" />
+
             <EditText
-                android:id="@+id/ed_comments_post" 
+                android:id="@+id/ed_comments_post"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:minLines="5"
-                android:inputType="textMultiLine">
-            </EditText>
+                android:inputType="textMultiLine"
+                android:minLines="5" />
         </TableRow>
     </TableLayout>
 </ScrollView>
diff --git a/DroidFishApp/src/main/res/layout/edit_headers.xml b/DroidFishApp/src/main/res/layout/edit_headers.xml
index d62e0f2..82402be 100644
--- a/DroidFishApp/src/main/res/layout/edit_headers.xml
+++ b/DroidFishApp/src/main/res/layout/edit_headers.xml
@@ -1,109 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
+
     <TableLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:stretchColumns="1"
         android:padding="10dp">
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/header_event">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_event" 
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/header_site">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_site" 
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/header_date">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_date"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/header_round"
-              android:paddingRight="10dp">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_round" 
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/white">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_white"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/black">
-          </TextView>
-          <EditText
-              android:id="@+id/ed_header_black" 
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:layout_weight="1"
-              android:inputType="text">
-          </EditText>
-      </TableRow>
-      <TableRow>
-          <TextView
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:text="@string/header_result">
-          </TextView>
-          <Spinner
-              android:id="@+id/ed_game_result"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-          </Spinner>
-      </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/header_event" />
+
+            <EditText
+                android:id="@+id/ed_header_event"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/header_site" />
+
+            <EditText
+                android:id="@+id/ed_header_site"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/header_date" />
+
+            <EditText
+                android:id="@+id/ed_header_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/header_round"
+                android:paddingRight="10dp" />
+
+            <EditText
+                android:id="@+id/ed_header_round"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/white" />
+
+            <EditText
+                android:id="@+id/ed_header_white"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/black" />
+
+            <EditText
+                android:id="@+id/ed_header_black"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:inputType="text" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/header_result" />
+
+            <Spinner
+                android:id="@+id/ed_game_result"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </TableRow>
     </TableLayout>
 </ScrollView>
diff --git a/DroidFishApp/src/main/res/layout/edit_move_counters.xml b/DroidFishApp/src/main/res/layout/edit_move_counters.xml
index 4141ea7..de2cad6 100644
--- a/DroidFishApp/src/main/res/layout/edit_move_counters.xml
+++ b/DroidFishApp/src/main/res/layout/edit_move_counters.xml
@@ -3,38 +3,40 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:padding="10dp">
+
     <TableRow
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingRight="10dp"
-            android:text="@string/halfmove">
-        </TextView>
+            android:text="@string/halfmove" />
+
         <EditText
             android:id="@+id/ed_cnt_halfmove"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:minEms="3"
-            android:inputType="number">
-        </EditText>
+            android:inputType="number" />
     </TableRow>
+
     <TableRow
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingRight="10dp"
-            android:text="@string/fullmove">
-        </TextView>
+            android:text="@string/fullmove" />
+
         <EditText
             android:id="@+id/ed_cnt_fullmove"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:minEms="3"
-            android:inputType="number">
-        </EditText>
+            android:inputType="number" />
     </TableRow>
 </TableLayout>
diff --git a/DroidFishApp/src/main/res/layout/editboard.xml b/DroidFishApp/src/main/res/layout/editboard.xml
index 2e5f2db..8bcfde7 100644
--- a/DroidFishApp/src/main/res/layout/editboard.xml
+++ b/DroidFishApp/src/main/res/layout/editboard.xml
@@ -3,53 +3,55 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <include
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/title">
-    </include>
-    <view
-        class="org.petero.droidfish.activities.ChessBoardEdit"
-        android:id="@+id/eb_chessboard"
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
-    </view>
-    <TextView
-        android:text=""
-        android:id="@+id/eb_status"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content" 
-        android:includeFontPadding="true"
-        android:fontFamily="monospace"
-        android:typeface="monospace"
-        android:textSize="12sp">
-    </TextView>
-    <LinearLayout
-        android:orientation="horizontal"
-        android:id="@+id/LinearLayout02"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Button
-            android:text="@string/cancel"
-            android:id="@+id/eb_cancel"
+
+        <include
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
-        </Button>
-        <Button
-            android:text="@android:string/ok"
-            android:id="@+id/eb_ok"
+            layout="@layout/title" />
+
+        <view
+            class="org.petero.droidfish.activities.ChessBoardEdit"
+            android:id="@+id/eb_chessboard"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
+
+        <TextView
+            android:text=""
+            android:id="@+id/eb_status"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
-        </Button>
+            android:includeFontPadding="true"
+            android:fontFamily="monospace"
+            android:typeface="monospace"
+            android:textSize="12sp" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:id="@+id/LinearLayout02"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:text="@string/cancel"
+                android:id="@+id/eb_cancel"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <Button
+                android:text="@android:string/ok"
+                android:id="@+id/eb_ok"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-<include layout="@layout/left_drawer"/>
+
+    <include layout="@layout/left_drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/DroidFishApp/src/main/res/layout/editoptions.xml b/DroidFishApp/src/main/res/layout/editoptions.xml
index 5e86082..a468d44 100644
--- a/DroidFishApp/src/main/res/layout/editoptions.xml
+++ b/DroidFishApp/src/main/res/layout/editoptions.xml
@@ -16,7 +16,6 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
-
         </ScrollView>
 
         <LinearLayout
@@ -44,9 +43,6 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@android:string/ok" />
-
         </LinearLayout>
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/load_fen.xml b/DroidFishApp/src/main/res/layout/load_fen.xml
index 83014fe..9539c0f 100644
--- a/DroidFishApp/src/main/res/layout/load_fen.xml
+++ b/DroidFishApp/src/main/res/layout/load_fen.xml
@@ -22,7 +22,6 @@
                     android:id="@+id/loadfen_chessboard"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -42,9 +41,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:text="@android:string/ok" />
-
             </LinearLayout>
-
         </LinearLayout>
 
         <ListView
@@ -52,7 +49,5 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:focusable="false" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/main.xml b/DroidFishApp/src/main/res/layout/main.xml
index 2b07460..5c98207 100644
--- a/DroidFishApp/src/main/res/layout/main.xml
+++ b/DroidFishApp/src/main/res/layout/main.xml
@@ -3,114 +3,126 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <include
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        layout="@layout/title">
-    </include>
-    <view
-        class="org.petero.droidfish.ChessBoardPlay"
-        android:id="@+id/chessboard"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dp"
-        android:paddingTop="1dp">
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="0dp" 
-            android:layout_height="wrap_content" 
-            android:layout_weight="1"
-            android:includeFontPadding="true"
-            android:fontFamily="monospace"
-            android:typeface="monospace"
-            android:textSize="12sp"/>
-        <LinearLayout
-            android:id="@+id/buttons"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <ImageButton
-                android:id="@+id/custom3Button"
-                android:contentDescription="@string/buttonDesc_custom3"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom2Button"
-                android:contentDescription="@string/buttonDesc_custom2"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom1Button"
-                android:contentDescription="@string/buttonDesc_custom1"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/modeButton"
-                android:contentDescription="@string/buttonDesc_mode"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/undoButton"
-                android:contentDescription="@string/buttonDesc_back"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/redoButton"
-                android:contentDescription="@string/buttonDesc_forward"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-        </LinearLayout>
-    </LinearLayout>
-    <view
-        class="org.petero.droidfish.view.MyRelativeLayout"
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
-        <ScrollView
-            android:id="@+id/scrollView"
+
+        <include
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-            <view
-                class="org.petero.droidfish.view.MoveListView"
-                android:id="@+id/moveList"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content" 
-                android:includeFontPadding="true"
-                android:padding="0dp"/>
-        </ScrollView>
+            android:layout_height="wrap_content"
+            layout="@layout/title" />
+
         <view
-            class="org.petero.droidfish.view.MyScrollView"
-            android:id="@+id/scrollViewBot"
-            android:layout_alignParentBottom="true"
+            class="org.petero.droidfish.ChessBoardPlay"
+            android:id="@+id/chessboard"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="fill_parent" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="6dp"
+            android:paddingTop="1dp">
+
             <TextView
-                android:id="@+id/thinking"
-                android:tag="thinking"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content" 
+                android:id="@+id/status"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:includeFontPadding="true"
                 android:fontFamily="monospace"
                 android:typeface="monospace"
-                android:textSize="12sp"/>
+                android:textSize="12sp" />
+
+            <LinearLayout
+                android:id="@+id/buttons"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <ImageButton
+                    android:id="@+id/custom3Button"
+                    android:contentDescription="@string/buttonDesc_custom3"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom2Button"
+                    android:contentDescription="@string/buttonDesc_custom2"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom1Button"
+                    android:contentDescription="@string/buttonDesc_custom1"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/modeButton"
+                    android:contentDescription="@string/buttonDesc_mode"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/undoButton"
+                    android:contentDescription="@string/buttonDesc_back"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/redoButton"
+                    android:contentDescription="@string/buttonDesc_forward"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <view
+            class="org.petero.droidfish.view.MyRelativeLayout"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <ScrollView
+                android:id="@+id/scrollView"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+                <view
+                    class="org.petero.droidfish.view.MoveListView"
+                    android:id="@+id/moveList"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="true"
+                    android:padding="0dp" />
+            </ScrollView>
+
+            <view
+                class="org.petero.droidfish.view.MyScrollView"
+                android:id="@+id/scrollViewBot"
+                android:layout_alignParentBottom="true"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/thinking"
+                    android:tag="thinking"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="true"
+                    android:fontFamily="monospace"
+                    android:typeface="monospace"
+                    android:textSize="12sp" />
+            </view>
         </view>
-    </view>
-</LinearLayout>
-<include layout="@layout/left_drawer"/>
-<include layout="@layout/right_drawer"/>
+    </LinearLayout>
+
+    <include layout="@layout/left_drawer" />
+
+    <include layout="@layout/right_drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/DroidFishApp/src/main/res/layout/main_left_handed.xml b/DroidFishApp/src/main/res/layout/main_left_handed.xml
index ba4b0b3..8f3825f 100644
--- a/DroidFishApp/src/main/res/layout/main_left_handed.xml
+++ b/DroidFishApp/src/main/res/layout/main_left_handed.xml
@@ -3,116 +3,128 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_marginRight="2dp"
-        android:layout_weight="1"
-        android:layout_width="0dip"
-        android:layout_height="fill_parent"
-        android:paddingRight="1dp">
-        <include
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            layout="@layout/title">
-        </include>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
         <LinearLayout
-            android:id="@+id/buttons"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="6dp">
-            <ImageButton
-                android:id="@+id/custom3Button"
-                android:contentDescription="@string/buttonDesc_custom3"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom2Button"
-                android:contentDescription="@string/buttonDesc_custom2"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/custom1Button"
-                android:contentDescription="@string/buttonDesc_custom1"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/modeButton"
-                android:contentDescription="@string/buttonDesc_mode"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/undoButton"
-                android:contentDescription="@string/buttonDesc_back"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-            <ImageButton
-                android:id="@+id/redoButton"
-                android:contentDescription="@string/buttonDesc_forward"
-                android:layout_width="36dp"
-                android:layout_height="32dp">
-            </ImageButton>
-        </LinearLayout>
-        <TextView
-            android:id="@+id/status"
-            android:layout_width="fill_parent" 
-            android:layout_height="wrap_content" 
-            android:includeFontPadding="true"
-            android:fontFamily="monospace"
-            android:typeface="monospace"
-            android:textSize="12sp"/>
-        <view
-            class="org.petero.droidfish.view.MyRelativeLayout"
             android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-            <ScrollView
-                android:id="@+id/scrollView"
+            android:layout_marginRight="2dp"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:paddingRight="1dp">
+
+            <include
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/title" />
+
+            <LinearLayout
+                android:id="@+id/buttons"
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp">
+
+                <ImageButton
+                    android:id="@+id/custom3Button"
+                    android:contentDescription="@string/buttonDesc_custom3"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom2Button"
+                    android:contentDescription="@string/buttonDesc_custom2"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/custom1Button"
+                    android:contentDescription="@string/buttonDesc_custom1"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/modeButton"
+                    android:contentDescription="@string/buttonDesc_mode"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/undoButton"
+                    android:contentDescription="@string/buttonDesc_back"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+
+                <ImageButton
+                    android:id="@+id/redoButton"
+                    android:contentDescription="@string/buttonDesc_forward"
+                    android:layout_width="36dp"
+                    android:layout_height="32dp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="true"
+                android:fontFamily="monospace"
+                android:typeface="monospace"
+                android:textSize="12sp" />
+
+            <view
+                class="org.petero.droidfish.view.MyRelativeLayout"
+                android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
+
+                <ScrollView
+                    android:id="@+id/scrollView"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <view
+                        class="org.petero.droidfish.view.MoveListView"
+                        android:id="@+id/moveList"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:includeFontPadding="true"
+                        android:padding="0dp" />
+                </ScrollView>
+
                 <view
-                    class="org.petero.droidfish.view.MoveListView"
-                    android:id="@+id/moveList"
-                    android:layout_width="fill_parent" 
-                    android:layout_height="wrap_content" 
-                    android:includeFontPadding="true"
-                    android:padding="0dp"/>
-            </ScrollView>
-            <view
-                class="org.petero.droidfish.view.MyScrollView"
-                android:id="@+id/scrollViewBot"
-                android:layout_alignParentBottom="true"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/thinking"
-                    android:tag="thinking"
-                    android:layout_width="fill_parent" 
-                    android:layout_height="wrap_content" 
-                    android:includeFontPadding="true"
-                    android:fontFamily="monospace"
-                    android:typeface="monospace"
-                    android:textSize="12sp"/>
+                    class="org.petero.droidfish.view.MyScrollView"
+                    android:id="@+id/scrollViewBot"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/thinking"
+                        android:tag="thinking"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:includeFontPadding="true"
+                        android:fontFamily="monospace"
+                        android:typeface="monospace"
+                        android:textSize="12sp" />
+                </view>
             </view>
-        </view>
+        </LinearLayout>
+
+        <view
+            class="org.petero.droidfish.ChessBoardPlay"
+            android:id="@+id/chessboard"
+            android:layout_weight="0"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
     </LinearLayout>
-    <view
-        class="org.petero.droidfish.ChessBoardPlay"
-        android:id="@+id/chessboard"
-        android:layout_weight="0"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-</LinearLayout>
-<include layout="@layout/left_drawer"/>
-<include layout="@layout/right_drawer"/>
+
+    <include layout="@layout/left_drawer" />
+
+    <include layout="@layout/right_drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/DroidFishApp/src/main/res/layout/network_engine_config.xml b/DroidFishApp/src/main/res/layout/network_engine_config.xml
index 6a5c2dc..35f60bf 100644
--- a/DroidFishApp/src/main/res/layout/network_engine_config.xml
+++ b/DroidFishApp/src/main/res/layout/network_engine_config.xml
@@ -3,42 +3,44 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
+
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:padding="10dp">
+
         <TextView
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:paddingRight="10dp"
-            android:text="@string/host_name">
-        </TextView>
+            android:text="@string/host_name" />
+
         <EditText
-            android:id="@+id/network_engine_host" 
+            android:id="@+id/network_engine_host"
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:inputType="text">
-        </EditText>
+            android:inputType="text" />
     </LinearLayout>
+
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:padding="10dp">
+
         <TextView
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:paddingRight="10dp"
-            android:text="@string/network_port">
-        </TextView>
+            android:text="@string/network_port" />
+
         <EditText
-            android:id="@+id/network_engine_port" 
+            android:id="@+id/network_engine_port"
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:inputType="number">
-        </EditText>
+            android:inputType="number" />
     </LinearLayout>
 </LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/num_variations.xml b/DroidFishApp/src/main/res/layout/num_variations.xml
index ea37df4..14ba3e8 100644
--- a/DroidFishApp/src/main/res/layout/num_variations.xml
+++ b/DroidFishApp/src/main/res/layout/num_variations.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
+
     <EditText
-        android:id="@+id/numvar_edittext" 
+        android:id="@+id/numvar_edittext"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:inputType="number">
-    </EditText>
+        android:inputType="number" />
+
     <SeekBar
         android:id="@+id/numvar_seekbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    </SeekBar>
+        android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/seekbar_preference.xml b/DroidFishApp/src/main/res/layout/seekbar_preference.xml
index d0773ae..51baea1 100644
--- a/DroidFishApp/src/main/res/layout/seekbar_preference.xml
+++ b/DroidFishApp/src/main/res/layout/seekbar_preference.xml
@@ -37,9 +37,7 @@
                     android:textSize="12dp"
                     android:textStyle="italic"
                     android:typeface="monospace" />
-
             </LinearLayout>
-
         </LinearLayout>
 
         <SeekBar
@@ -52,7 +50,5 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/select_game.xml b/DroidFishApp/src/main/res/layout/select_game.xml
index b024e83..7eb5622 100644
--- a/DroidFishApp/src/main/res/layout/select_game.xml
+++ b/DroidFishApp/src/main/res/layout/select_game.xml
@@ -26,7 +26,5 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:focusable="false" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/select_game_list_item.xml b/DroidFishApp/src/main/res/layout/select_game_list_item.xml
index 6e4d6aa..18ceed2 100644
--- a/DroidFishApp/src/main/res/layout/select_game_list_item.xml
+++ b/DroidFishApp/src/main/res/layout/select_game_list_item.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:padding="5dp"
-    android:textSize="14sp">
-</TextView>
+    android:textSize="14sp"></TextView>
diff --git a/DroidFishApp/src/main/res/layout/select_percentage.xml b/DroidFishApp/src/main/res/layout/select_percentage.xml
index 5691a95..4fb13cc 100644
--- a/DroidFishApp/src/main/res/layout/select_percentage.xml
+++ b/DroidFishApp/src/main/res/layout/select_percentage.xml
@@ -18,7 +18,5 @@
             android:layout_width="100dip"
             android:layout_height="wrap_content"
             android:inputType="numberDecimal" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/title.xml b/DroidFishApp/src/main/res/layout/title.xml
index 29434a9..6a964c5 100644
--- a/DroidFishApp/src/main/res/layout/title.xml
+++ b/DroidFishApp/src/main/res/layout/title.xml
@@ -8,7 +8,8 @@
     android:paddingRight="2dp"
     android:paddingBottom="4dp"
     android:orientation="vertical"
-    android:tag="title" >
+    android:tag="title">
+
     <LinearLayout
         android:id="@+id/first_title_line"
         android:layout_width="fill_parent"
@@ -16,7 +17,8 @@
         android:layout_gravity="center_vertical"
         android:layout_marginTop="2dp"
         android:orientation="horizontal"
-        android:tag="title" >
+        android:tag="title">
+
         <TextView
             android:id="@+id/white_clock"
             style="?android:attr/windowTitleStyle"
@@ -31,8 +33,8 @@
             android:scrollHorizontally="false"
             android:singleLine="true"
             android:textSize="14sp"
-            android:tag="title" >
-        </TextView>
+            android:tag="title" />
+
         <TextView
             android:id="@+id/title_text"
             style="?android:attr/windowTitleStyle"
@@ -42,8 +44,8 @@
             android:gravity="center"
             android:textSize="14sp"
             android:tag="title"
-            android:text="@string/app_name">
-        </TextView>
+            android:text="@string/app_name" />
+
         <TextView
             android:id="@+id/black_clock"
             style="?android:attr/windowTitleStyle"
@@ -58,9 +60,9 @@
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textSize="14sp"
-            android:tag="title" >
-        </TextView>
+            android:tag="title" />
     </LinearLayout>
+
     <LinearLayout
         android:id="@+id/second_title_line"
         android:orientation="horizontal"
@@ -68,7 +70,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginBottom="-4dp"
-        android:tag="title" >
+        android:tag="title">
+
         <TextView
             android:id="@+id/white_pieces"
             style="?android:attr/windowTitleStyle"
@@ -84,8 +87,8 @@
             android:tag="title"
             android:textSize="14sp"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold">
-        </TextView>
+            android:textStyle="bold" />
+
         <TextView
             android:id="@+id/title_text_summary"
             style="?android:attr/windowTitleStyle"
@@ -95,8 +98,8 @@
             android:gravity="center|center_vertical"
             android:tag="title"
             android:textSize="14sp"
-            android:text="">
-        </TextView>
+            android:text="" />
+
         <TextView
             android:id="@+id/black_pieces"
             style="?android:attr/windowTitleStyle"
@@ -113,7 +116,6 @@
             android:tag="title"
             android:textSize="14sp"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold">
-        </TextView>
+            android:textStyle="bold" />
     </LinearLayout>
 </LinearLayout>
diff --git a/DroidFishApp/src/main/res/layout/tooltip.xml b/DroidFishApp/src/main/res/layout/tooltip.xml
index e7339fe..e8b1ac6 100644
--- a/DroidFishApp/src/main/res/layout/tooltip.xml
+++ b/DroidFishApp/src/main/res/layout/tooltip.xml
@@ -6,11 +6,6 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <!--<View-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="5dp"-->
-            <!--android:background="@drawable/shadow_upward" />-->
-
         <LinearLayout
             android:id="@+id/toolTip_container"
             android:layout_width="match_parent"
@@ -37,9 +32,6 @@
                 android:gravity="center"
                 android:text="Default Description"
                 android:textColor="@color/White" />
-
         </LinearLayout>
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/uci_option_button.xml b/DroidFishApp/src/main/res/layout/uci_option_button.xml
index c746861..a30ad21 100644
--- a/DroidFishApp/src/main/res/layout/uci_option_button.xml
+++ b/DroidFishApp/src/main/res/layout/uci_option_button.xml
@@ -5,5 +5,4 @@
         android:id="@+id/eo_label"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/uci_option_check.xml b/DroidFishApp/src/main/res/layout/uci_option_check.xml
index f41d3e9..7c39ae1 100644
--- a/DroidFishApp/src/main/res/layout/uci_option_check.xml
+++ b/DroidFishApp/src/main/res/layout/uci_option_check.xml
@@ -5,5 +5,4 @@
         android:id="@+id/eo_value"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/uci_option_combo.xml b/DroidFishApp/src/main/res/layout/uci_option_combo.xml
index 5e001fe..2354e61 100644
--- a/DroidFishApp/src/main/res/layout/uci_option_combo.xml
+++ b/DroidFishApp/src/main/res/layout/uci_option_combo.xml
@@ -15,7 +15,5 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/uci_option_spin.xml b/DroidFishApp/src/main/res/layout/uci_option_spin.xml
index f6b771c..14bfe22 100644
--- a/DroidFishApp/src/main/res/layout/uci_option_spin.xml
+++ b/DroidFishApp/src/main/res/layout/uci_option_spin.xml
@@ -16,7 +16,5 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:inputType="numberSigned" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/layout/uci_option_string.xml b/DroidFishApp/src/main/res/layout/uci_option_string.xml
index ed03f12..bd54792 100644
--- a/DroidFishApp/src/main/res/layout/uci_option_string.xml
+++ b/DroidFishApp/src/main/res/layout/uci_option_string.xml
@@ -16,7 +16,5 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:inputType="text" />
-
     </LinearLayout>
-
 </layout>
diff --git a/DroidFishApp/src/main/res/menu/edit_file_options_menu.xml b/DroidFishApp/src/main/res/menu/edit_file_options_menu.xml
index e418b53..9ad6a53 100644
--- a/DroidFishApp/src/main/res/menu/edit_file_options_menu.xml
+++ b/DroidFishApp/src/main/res/menu/edit_file_options_menu.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/item_delete_file"
-        android:title="@string/delete_file">
-    </item>
+        android:title="@string/delete_file" />
 </menu>
diff --git a/DroidFishApp/src/main/res/values/attrs.xml b/DroidFishApp/src/main/res/values/attrs.xml
index b9eaaf5..81a9f77 100644
--- a/DroidFishApp/src/main/res/values/attrs.xml
+++ b/DroidFishApp/src/main/res/values/attrs.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="FloatingActionButton">
-        <attr name="fab_colorPressed" format="color"/>
-        <attr name="fab_colorDisabled" format="color"/>
-        <attr name="fab_colorNormal" format="color"/>
-        <attr name="fab_icon" format="reference"/>
+        <attr name="fab_colorPressed" format="color" />
+        <attr name="fab_colorDisabled" format="color" />
+        <attr name="fab_colorNormal" format="color" />
+        <attr name="fab_icon" format="reference" />
         <attr name="fab_size" format="enum">
-            <enum name="normal" value="0"/>
-            <enum name="mini" value="1"/>
+            <enum name="normal" value="0" />
+            <enum name="mini" value="1" />
         </attr>
-        <attr name="fab_title" format="string"/>
-        <attr name="fab_stroke_visible" format="boolean"/>
+        <attr name="fab_title" format="string" />
+        <attr name="fab_stroke_visible" format="boolean" />
     </declare-styleable>
     <declare-styleable name="AddFloatingActionButton">
-        <attr name="fab_plusIconColor" format="color"/>
+        <attr name="fab_plusIconColor" format="color" />
     </declare-styleable>
     <declare-styleable name="FloatingActionsMenu">
-        <attr name="fab_addButtonColorPressed" format="color"/>
-        <attr name="fab_addButtonColorNormal" format="color"/>
+        <attr name="fab_addButtonColorPressed" format="color" />
+        <attr name="fab_addButtonColorNormal" format="color" />
         <attr name="fab_addButtonSize" format="enum">
-            <enum name="normal" value="0"/>
-            <enum name="mini" value="1"/>
+            <enum name="normal" value="0" />
+            <enum name="mini" value="1" />
         </attr>
-        <attr name="fab_addButtonPlusIconColor" format="color"/>
-        <attr name="fab_addButtonStrokeVisible" format="boolean"/>
-        <attr name="fab_labelStyle" format="reference"/>
+        <attr name="fab_addButtonPlusIconColor" format="color" />
+        <attr name="fab_addButtonStrokeVisible" format="boolean" />
+        <attr name="fab_labelStyle" format="reference" />
         <attr name="fab_labelsPosition" format="enum">
-            <enum name="left" value="0"/>
-            <enum name="right" value="1"/>
+            <enum name="left" value="0" />
+            <enum name="right" value="1" />
         </attr>
         <attr name="fab_expandDirection" format="enum">
-            <enum name="up" value="0"/>
-            <enum name="down" value="1"/>
-            <enum name="left" value="2"/>
-            <enum name="right" value="3"/>
+            <enum name="up" value="0" />
+            <enum name="down" value="1" />
+            <enum name="left" value="2" />
+            <enum name="right" value="3" />
         </attr>
     </declare-styleable>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/DroidFishApp/src/main/res/values/dimen.xml b/DroidFishApp/src/main/res/values/dimen.xml
index a2b506e..7db7a30 100644
--- a/DroidFishApp/src/main/res/values/dimen.xml
+++ b/DroidFishApp/src/main/res/values/dimen.xml
@@ -1,17 +1,12 @@
 <resources>
     <dimen name="fab_size_normal">56dp</dimen>
     <dimen name="fab_size_mini">40dp</dimen>
-
     <dimen name="fab_icon_size">24dp</dimen>
-
     <dimen name="fab_plus_icon_size">14dp</dimen>
     <dimen name="fab_plus_icon_stroke">2dp</dimen>
-
     <dimen name="fab_shadow_offset">3dp</dimen>
     <dimen name="fab_shadow_radius">9dp</dimen>
-
     <dimen name="fab_stroke_width">1dp</dimen>
-
     <dimen name="fab_actions_spacing">16dp</dimen>
     <dimen name="fab_labels_margin">8dp</dimen>
 </resources>
diff --git a/DroidFishApp/src/main/res/values/ids.xml b/DroidFishApp/src/main/res/values/ids.xml
index 9b7c8b2..48ab7ad 100644
--- a/DroidFishApp/src/main/res/values/ids.xml
+++ b/DroidFishApp/src/main/res/values/ids.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="fab_expand_menu_button" type="id"/>
-    <item name="fab_label" type="id"/>
-</resources>
\ No newline at end of file
+    <item name="fab_expand_menu_button" type="id" />
+    <item name="fab_label" type="id" />
+</resources>
diff --git a/DroidFishApp/src/main/res/values/styles.xml b/DroidFishApp/src/main/res/values/styles.xml
index 234f61e..1c58a5f 100644
--- a/DroidFishApp/src/main/res/values/styles.xml
+++ b/DroidFishApp/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="AppTheme" parent="Theme.AppCompat">
         <item name="colorPrimary">#000000</item>
         <item name="colorPrimaryDark">#000000</item>