diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index cabf65bb..7e8ca5ca 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="be.mygod.vpnhotspot">
 
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
     <uses-feature android:name="android.hardware.wifi"/>
     <uses-feature
         android:name="android.hardware.wifi.direct"
diff --git a/mobile/src/main/res/layout/fragment_repeater.xml b/mobile/src/main/res/layout/fragment_repeater.xml
index d305801d..4619967c 100644
--- a/mobile/src/main/res/layout/fragment_repeater.xml
+++ b/mobile/src/main/res/layout/fragment_repeater.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
+            android:touchscreenBlocksFocus="false"
             android:id="@+id/toolbar">
 
             <Switch
@@ -34,7 +35,7 @@
             android:paddingBottom="8dp"
             android:paddingEnd="16dp"
             android:paddingStart="16dp"
-            android:paddingTop="8dp">
+            android:paddingTop="16dp">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -53,6 +54,7 @@
                 android:layout_height="wrap_content"
                 android:layout_column="2"
                 android:layout_row="0"
+                android:focusable="false"
                 android:text="@{data.ssid}"
                 android:textIsSelectable="true"
                 tools:text="DIRECT-rAnd0m"/>
@@ -70,6 +72,7 @@
                 android:layout_height="wrap_content"
                 android:layout_column="2"
                 android:layout_row="1"
+                android:focusable="false"
                 android:text="@{data.password}"
                 android:textIsSelectable="true"
                 tools:text="p4ssW0rd"/>
@@ -91,6 +94,7 @@
 
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/swipeRefresher"
+            android:descendantFocusability="blocksDescendants"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/mobile/src/main/res/layout/fragment_tethering.xml b/mobile/src/main/res/layout/fragment_tethering.xml
index b7f948e8..4fa72e97 100644
--- a/mobile/src/main/res/layout/fragment_tethering.xml
+++ b/mobile/src/main/res/layout/fragment_tethering.xml
@@ -12,6 +12,7 @@
             android:layout_width="match_parent"
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
+            android:touchscreenBlocksFocus="false"
             app:title="@string/app_name"
             android:id="@+id/toolbar"/>
         <FrameLayout
diff --git a/mobile/src/main/res/xml/pref_settings.xml b/mobile/src/main/res/xml/pref_settings.xml
index afa86b72..d8720fb2 100644
--- a/mobile/src/main/res/xml/pref_settings.xml
+++ b/mobile/src/main/res/xml/pref_settings.xml
@@ -6,6 +6,7 @@
             android:key="service.dns"
             android:title="@string/settings_service_dns"
             android:summary="%s"
+            android:singleLine="true"
             android:defaultValue="8.8.8.8:53"/>
         <Preference
             android:key="service.clean"