diff --git a/java/res/layout/main.xml b/java/res/layout/main.xml
index 921ffa5b5..bfc0572c5 100644
--- a/java/res/layout/main.xml
+++ b/java/res/layout/main.xml
@@ -12,19 +12,35 @@
 		<TableRow>
 			<Button android:text="@string/main_setup_configure_imes"
 				android:id="@+id/main_setup_btn_configure_imes"
-				android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
 			<Button android:text="@string/main_setup_input_lang"
-				android:id="@+id/main_setup_btn_input_lang" android:layout_width="wrap_content"
-				android:layout_height="wrap_content"></Button>
+				android:id="@+id/main_setup_btn_input_lang"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
 		</TableRow>
 		<TableRow>
-			<Button android:text="@string/main_setup_set_ime" android:id="@+id/main_setup_btn_set_ime"
-				android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+			<Button android:text="@string/main_setup_set_ime"
+				android:id="@+id/main_setup_btn_set_ime"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
 			<Button android:text="@string/main_setup_get_dicts"
-				android:id="@+id/main_setup_btn_get_dicts" android:layout_width="wrap_content"
-				android:layout_height="wrap_content"></Button>
+				android:id="@+id/main_setup_btn_get_dicts"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+		</TableRow>
+		<TableRow>
+			<Button android:text="@string/main_setup_settings"
+				android:id="@+id/main_setup_btn_settings"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+			<EditText android:text="@string/main_setup_test"
+				android:id="@+id/main_setup_edit_test"
+				android:layout_width="fill_parent"
+				android:gravity="center"
+				android:layout_height="wrap_content" />
 		</TableRow>
 	</TableLayout>
 	<TextView android:layout_height="wrap_content" android:id="@+id/main_description"
-		android:layout_width="wrap_content"></TextView>
+		android:layout_width="wrap_content" />
 </LinearLayout>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 3cf8c4dd9..1d16ee20d 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -636,6 +636,8 @@
     <string name="main_setup_set_ime">Set input method</string>
     <string name="main_setup_get_dicts">Get dictionaries</string>
     <string name="main_setup_input_lang">Input languages</string>
+    <string name="main_setup_settings">Settings</string>
+    <string name="main_setup_test">Test</string>
     <string name="main_body"><Data>
       <![CDATA["
         <h2>Enabling Hacker's Keyboard</h2>
diff --git a/java/src/org/pocketworkstation/pckeyboard/Main.java b/java/src/org/pocketworkstation/pckeyboard/Main.java
index bb8e02fb1..7e7069879 100644
--- a/java/src/org/pocketworkstation/pckeyboard/Main.java
+++ b/java/src/org/pocketworkstation/pckeyboard/Main.java
@@ -87,6 +87,13 @@ public void onClick(View v) {
             }
         });
         // PluginManager.getPluginDictionaries(getApplicationContext()); // why?
+
+        final Button setup5 = (Button) findViewById(R.id.main_setup_btn_settings);
+        setup5.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                startActivityForResult(new Intent(that, LatinIMESettings.class), 0);
+            }
+        });
     }    
 }