diff --git a/app/src/main/res/layout/account_row.xml b/app/src/main/res/layout/account_row.xml
index 79efa4a6..0b159825 100644
--- a/app/src/main/res/layout/account_row.xml
+++ b/app/src/main/res/layout/account_row.xml
@@ -9,6 +9,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/action"
+        android:scrollHorizontally="true"
         android:textSize="20sp"
         android:layout_marginBottom="6dp">
     </TextView>
diff --git a/app/src/main/res/layout/account_spinner.xml b/app/src/main/res/layout/account_spinner.xml
index e4c68a81..410a5324 100644
--- a/app/src/main/res/layout/account_spinner.xml
+++ b/app/src/main/res/layout/account_spinner.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/spinnerLayout"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
     <TableRow
-        android:id="@+id/spinnerRow"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="5dip" >
+        tools:ignore="UselessParent"
+        android:padding="5sp" >
 
         <ImageView
             android:id="@+id/spinnerImage"
-            android:contentDescription="@string/app_name" />
+            android:contentDescription="@string/account" />
 
         <TextView
             android:id="@+id/spinnerText"
-            android:textSize="18dp"
-            android:paddingLeft="6dip"
+            android:textSize="18sp"
+            android:paddingStart="8sp"
+            android:paddingEnd="0sp"
             android:textColor="@android:color/black" />
 
     </TableRow>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 0436159b..4cb2dc9d 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -11,10 +11,10 @@
     tools:context=".AboutActivity">
 
     <ScrollView
-        android:id="@+id/aboutView"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:scrollbars="vertical"
+        tools:ignore="UselessParent"
         android:fillViewport="true" >
 
     <TextView
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index e592f39f..49dcd584 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -32,6 +32,7 @@
             android:hint="@string/your_name"
             android:inputType="textPersonName|textCapWords"
             android:textSize="18sp"
+            android:autofillHints="name"
             android:layout_width="fill_parent">
         </EditText>
 
@@ -51,6 +52,7 @@
             android:hint="@string/user_id"
             android:textSize="18sp"
             android:inputType="textEmailAddress"
+            android:autofillHints="username"
             android:layout_width="fill_parent">
         </EditText>
 
@@ -70,6 +72,7 @@
             android:hint="@string/password"
             android:textSize="18sp"
             android:inputType="textPassword"
+            android:importantForAutofill="no"
             android:layout_width="fill_parent">
         </EditText>
 
@@ -89,6 +92,7 @@
             android:hint="@string/sip_uri_of_proxy_server"
             android:textSize="18sp"
             android:inputType="textEmailAddress"
+            android:importantForAutofill="no"
             android:layout_width="fill_parent" >
         </EditText>
 
@@ -98,6 +102,7 @@
             android:hint="@string/sip_uri_of_another_proxy_server"
             android:textSize="18sp"
             android:inputType="textEmailAddress"
+            android:importantForAutofill="no"
             android:layout_width="fill_parent" >
         </EditText>
 
@@ -110,6 +115,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
+                android:layout_toStartOf="@id/Register"
                 android:textSize="18sp"
                 android:textColor="@android:color/black"
                 android:onClick="onClick"
@@ -178,7 +184,10 @@
             android:textSize="18sp"
             android:paddingTop="0dp"
             android:paddingStart="10dp"
+            android:paddingEnd="0dp"
             android:scrollHorizontally="true"
+            android:hint="@string/stun_server_default"
+            android:importantForAutofill="no"
             android:inputType="textEmailAddress" >
         </EditText>
 
@@ -216,7 +225,8 @@
             android:layout_height="wrap_content"
             android:hint="@string/sip_uri"
             android:textSize="18sp"
-            android:inputType="textEmailAddress"
+            android:inputType="textUri"
+            android:importantForAutofill="no"
             android:layout_width="fill_parent">
         </EditText>
 
@@ -229,6 +239,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
+                android:layout_toStartOf="@id/Default"
                 android:textSize="18sp"
                 android:textColor="@android:color/black"
                 android:onClick="onClick"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d85ae97..91412470 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,7 @@
         Factory default value is \'stun.l.google.com:19302\', pointing to public Google STUN server.
         Username and password are currently not supported.
     </string>
+    <string name="stun_server_default">stun.l.google.com:19302</string>
     <string name="media_encryption">Media Encryption</string>
     <string name="media_encryption_help">Selects media transport encryption protocol.\n
         &#8226; ZRTP (recommended) means that ZRTP end-to-end media encryption negotiation is tried after