diff --git a/application/res/layout/aliasadd.xml b/application/res/layout/aliasadd.xml
index 04aad9e..fd9e8e8 100644
--- a/application/res/layout/aliasadd.xml
+++ b/application/res/layout/aliasadd.xml
@@ -13,8 +13,8 @@
         android:id="@+id/aliases"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
-       <LinearLayout
-           android:orientation="horizontal"
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
         <EditText
@@ -23,26 +23,29 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:layout_weight="1" />
-           <Button
-               android:id="@+id/add"
+        <Button
+            android:id="@+id/add"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:enabled="false"
-            android:text="Add" />
-       </LinearLayout>
-       <LinearLayout
-           android:orientation="horizontal"
+            android:text="Add"
+            android:minWidth="50px" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/ok"
-            android:text="Ok" />
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/cancel"
-            android:text="Cancel" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/ok"
+            android:text="Ok"
+            android:minWidth="75px" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/cancel"
+            android:text="Cancel"
+            android:minWidth="75px" />
     </LinearLayout>
 </LinearLayout>
diff --git a/application/res/layout/channeladd.xml b/application/res/layout/channeladd.xml
index 02ee7c6..51376ee 100644
--- a/application/res/layout/channeladd.xml
+++ b/application/res/layout/channeladd.xml
@@ -30,39 +30,42 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:text="@string/channel_add_description"
         android:padding="5px" />
     <ListView
-        android:id="@+id/channels"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-       <LinearLayout
-           android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <EditText
-            android:id="@+id/channel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:text="#"
-            android:layout_weight="1" />
-           <Button
-               android:id="@+id/add"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_add" />
-       </LinearLayout>
-       <LinearLayout
-           android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/ok"
-            android:text="@string/action_ok" />
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/cancel"
-            android:text="@string/action_cancel" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+		android:id="@+id/channels"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content" />
+        <LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content">
+	        <EditText
+	            android:id="@+id/channel"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:singleLine="true"
+	            android:text="#"
+	            android:layout_weight="1" />
+            <Button
+                android:id="@+id/add"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/action_add"
+                android:minWidth="50px" />
+        </LinearLayout>
+        <LinearLayout
+	        android:orientation="horizontal"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content">
+            <Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/ok"
+				android:text="@string/action_ok"
+                android:minWidth="75px" />
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:id="@+id/cancel"
+				android:text="@string/action_cancel"
+				android:minWidth="75px" />
+        </LinearLayout>
+</LinearLayout>
diff --git a/application/res/layout/commandadd.xml b/application/res/layout/commandadd.xml
index ad57b30..89ebdf0 100644
--- a/application/res/layout/commandadd.xml
+++ b/application/res/layout/commandadd.xml
@@ -33,8 +33,8 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:id="@+id/commands"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
-       <LinearLayout
-           android:orientation="horizontal"
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
         <EditText
@@ -44,25 +44,28 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:singleLine="true"
             android:text="/"
             android:layout_weight="1" />
-           <Button
-               android:id="@+id/add"
+        <Button
+            android:id="@+id/add"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/action_add" />
-       </LinearLayout>
-       <LinearLayout
-           android:orientation="horizontal"
+            android:text="@string/action_add"
+            android:minWidth="50px" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/ok"
-            android:text="@string/action_ok" />
-           <Button
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:id="@+id/cancel"
-            android:text="@string/action_cancel" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/ok"
+            android:text="@string/action_ok"
+            android:minWidth="75px" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/cancel"
+            android:text="@string/action_cancel"
+            android:minWidth="75px" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file