diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml
index 327cbd1..bdffebb 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -22,8 +22,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="20dip">
+        android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
@@ -73,6 +72,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:inputType="textCapWords"
                 android:singleLine="true" />
         </TableRow>
         <TableRow
@@ -101,6 +101,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:inputType="textCapWords"
                 android:singleLine="true" />
         </TableRow>
         <TableRow
@@ -129,6 +130,7 @@
                 android:layout_height="wrap_content"
                 android:padding="10dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:inputType="textCapWords"
                 android:singleLine="true" />
         </TableRow>
         <TableRow
@@ -145,6 +147,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="10dip"
+                android:inputType="textCapWords"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:singleLine="true" />
         </TableRow>
@@ -162,6 +165,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="10dip"
+                android:inputType="textCapWords"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:singleLine="true" />
         </TableRow>
@@ -179,6 +183,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="10dip"
+                android:inputType="textCapCharacters"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:singleLine="true" />
         </TableRow>
@@ -196,6 +201,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="10dip"
+                android:inputType="textCapWords"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:singleLine="true" />
         </TableRow>