diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f651ff6679..a05f382584 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.rockbox"
-      android:versionCode="1"
-      android:versionName="1.0"
-      android:installLocation="auto">
-    <application android:icon="@drawable/launcher" android:label="@string/app_name" android:debuggable="true">
-        <activity android:name=".RockboxActivity"
-                  android:launchMode="singleTask"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait"
-                  android:configChanges="orientation|keyboardHidden" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-      	</activity>
-        <service android:name=".RockboxService"/>
-        <receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver"
-				  android:enabled="true"
-				  android:exported="true">
-    		<intent-filter>
-        		<action android:name="android.intent.action.MEDIA_BUTTON" />
-    		</intent-filter>
+	package="org.rockbox"
+	android:versionCode="1"
+	android:versionName="1.0"
+	android:installLocation="auto">
+	<application android:icon="@drawable/launcher" 
+		android:label="@string/app_name" 
+		android:debuggable="true">
+
+		<activity android:name=".RockboxActivity"
+			android:launchMode="singleTask"
+			android:label="@string/app_name"
+			android:screenOrientation="portrait"
+			android:configChanges="orientation|keyboardHidden" >
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>		
+
+		<activity android:name="KeyboardActivity" 
+				  android:theme="@android:style/Theme.Dialog">
+		</activity>
+		
+		<activity android:name="YesnoActivity" 
+				  android:theme="@android:style/Theme.Dialog">
+		</activity>
+
+		<service android:name=".RockboxService"/>
+
+		<receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver"
+			android:enabled="true"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.MEDIA_BUTTON" />
+			</intent-filter>
 		</receiver>
 
-    <activity android:name="KeyboardActivity" android:theme="@android:style/Theme.Dialog"></activity>
-    <activity android:name="YesnoActivity" android:theme="@android:style/Theme.Dialog"></activity>
-</application>
-<uses-sdk android:minSdkVersion="4" />
-<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
-
-
+	</application>
 
+	<uses-sdk android:minSdkVersion="4" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 
 </manifest> 
diff --git a/android/res/layout/keyboardinput.xml b/android/res/layout/keyboardinput.xml
index 124eda8fbe..215cde04f8 100644
--- a/android/res/layout/keyboardinput.xml
+++ b/android/res/layout/keyboardinput.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<AbsoluteLayout android:id="@+id/AbsoluteLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"><EditText android:layout_height="wrap_content" android:text="Some Text" android:layout_width="fill_parent" android:id="@+id/KbdInput"></EditText>
-</AbsoluteLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"> 
+	android:layout_width="fill_parent" 
+	android:layout_height="fill_parent"	
+	<EditText android:layout_height="wrap_content" 
+		android:text="Some Text" 
+		android:layout_width="fill_parent" 
+		android:id="@+id/KbdInput">
+	</EditText>
+</LinearLayout>
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index 4361cfe8aa..840fb4ca24 100644
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -2,6 +2,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
+    android:layout_height="fill_parent">
 </LinearLayout>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index a2762ddd74..729935c196 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     
-    <string name="app_name">Rockbox</string>
+<string name="app_name">Rockbox</string>
 <string name="notification">Rockbox</string>
 <string name="OK">OK</string>
 <string name="Cancel">Cancel</string>