diff --git a/app/build.gradle b/app/build.gradle
index 867158573..b011f1e75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,11 +47,11 @@ repositories {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
-    compile 'com.android.support:recyclerview-v7:25.1.0'
-    compile 'com.android.support:cardview-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.android.support:support-v4:25.1.0'
-    compile 'com.android.support:support-v13:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
+    compile 'com.android.support:cardview-v7:25.1.1'
+    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:support-v4:25.1.1'
+    compile 'com.android.support:support-v13:25.1.1'
     compile 'com.jakewharton:butterknife:8.5.1'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.github.clans:fab:1.6.4'
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
index 9604aaf3e..54b1080f4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/Policy.java
@@ -11,7 +11,6 @@ public class Policy {
     public static final int DENY = 1;
     public static final int ALLOW = 2;
 
-
     public int uid, policy;
     public long until;
     public boolean logging = true, notification = true;
@@ -22,6 +21,7 @@ public class Policy {
         String[] pkgs = pm.getPackagesForUid(uid);
         if (pkgs != null && pkgs.length > 0) {
             info = pm.getPackageInfo(pkgs[0], 0);
+            this.uid = uid;
             packageName = pkgs[0];
             appName = info.applicationInfo.loadLabel(pm).toString();
         } else throw new PackageManager.NameNotFoundException();
diff --git a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
index 4e39c5c4d..61c36cbd7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/superuser/SuRequestActivity.java
@@ -87,11 +87,10 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
 
         switch (Global.Configs.suResponseType) {
             case AUTO_DENY:
-                event.trigger();
+                handleAction(Policy.DENY, 0);
                 return;
             case AUTO_ALLOW:
-                policy.policy = Policy.ALLOW;
-                event.trigger(policy);
+                handleAction(Policy.ALLOW, 0);
                 return;
             case PROMPT:
             default:
@@ -157,9 +156,12 @@ public class SuRequestActivity extends AppCompatActivity implements CallbackHand
     }
 
     void handleAction(int action) {
+        handleAction(action, timeoutList[timeout.getSelectedItemPosition()]);
+    }
+
+    void handleAction(int action, int time) {
         policy.policy = action;
         event.trigger(policy);
-        int time = timeoutList[timeout.getSelectedItemPosition()];
         if (time >= 0) {
             policy.until = time == 0 ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
             new SuDatabaseHelper(this).addPolicy(policy);
diff --git a/app/src/main/res/layout/fragment_install.xml b/app/src/main/res/layout/fragment_install.xml
index 11ce7f8ca..e2a930b64 100644
--- a/app/src/main/res/layout/fragment_install.xml
+++ b/app/src/main/res/layout/fragment_install.xml
@@ -1,213 +1,222 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginTop="?attr/actionBarSize"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/install_info_card"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_marginTop="6dp"
-        style="?attr/cardStyle"
-        app:cardUseCompatPadding="true">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="5dp">
-
-            <TextView
-                android:id="@+id/install_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:padding="5dp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/current_version_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:padding="5dp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:maxWidth="400dp"
-        android:minWidth="400dp">
+        android:orientation="vertical">
 
         <android.support.v7.widget.CardView
-            android:id="@+id/bootimage_card"
-            android:layout_gravity="center"
+            android:id="@+id/install_info_card"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:layout_marginTop="6dp"
             style="?attr/cardStyle"
-            app:cardUseCompatPadding="true"
-            android:layout_width="match_parent">
+            app:cardUseCompatPadding="true">
 
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp">
+                android:padding="5dp">
 
                 <TextView
+                    android:id="@+id/install_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:paddingBottom="10dp"
-                    android:text="@string/boot_image_title"
+                    android:padding="5dp"
                     android:textStyle="bold" />
 
+                <TextView
+                    android:id="@+id/current_version_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:padding="5dp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:maxWidth="400dp"
+            android:minWidth="400dp">
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/bootimage_card"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="6dp"
+                style="?attr/cardStyle"
+                app:cardUseCompatPadding="true"
+                android:layout_width="match_parent">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="15dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingBottom="10dp"
+                        android:text="@string/boot_image_title"
+                        android:textStyle="bold" />
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="15dp"
+                        android:layout_marginStart="15dp">
+
+                        <Spinner
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:id="@+id/block_spinner"
+                            android:layout_weight="1" />
+
+                        <Button
+                            android:text="@string/detect_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/detect_bootimage"/>
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/install_option_card"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="6dp"
+                style="?attr/cardStyle"
+                app:cardUseCompatPadding="true"
+                android:layout_width="match_parent">
+
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="15dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:paddingBottom="10dp"
+                        android:text="@string/advanced_settings_title"
+                        android:textStyle="bold" />
+
+                    <CheckBox
+                        android:text="@string/keep_force_encryption"
+                        android:id="@+id/keep_force_enc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="25dp"
+                        android:layout_marginStart="25dp" />
+
+                    <CheckBox
+                        android:text="@string/keep_dm_verity"
+                        android:id="@+id/keep_verity"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="25dp"
+                        android:layout_marginStart="25dp" />
+
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/flash_button"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_marginTop="6dp"
+                style="?attr/cardStyle"
+                app:cardUseCompatPadding="true"
+                android:layout_width="match_parent"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:clickable="true">
+
                 <LinearLayout
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginEnd="15dp"
-                    android:layout_marginStart="15dp">
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="25dp"
+                    android:layout_marginStart="25dp">
 
-                    <Spinner
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:id="@+id/block_spinner"
-                        android:layout_weight="1" />
-
-                    <Button
-                        android:text="@string/detect_button"
-                        android:layout_width="wrap_content"
+                    <ImageView
+                        android:layout_width="50dp"
                         android:layout_height="wrap_content"
-                        android:id="@+id/detect_bootimage"/>
+                        app:srcCompat="@mipmap/ic_launcher"
+                        android:id="@+id/imageView"
+                        android:layout_weight="0"
+                        android:layout_marginEnd="20dp"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/magiskify"
+                        android:ems="10"
+                        android:gravity="center"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:textAllCaps="false"
+                        android:textSize="20sp"
+                        android:fontFamily="sans-serif" />
+
+                    <FrameLayout
+                        android:layout_width="50dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:layout_marginStart="20dp">
+
+                    </FrameLayout>
+
                 </LinearLayout>
 
-            </LinearLayout>
-
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/install_option_card"
-            android:layout_gravity="center"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="6dp"
-            style="?attr/cardStyle"
-            app:cardUseCompatPadding="true"
-            android:layout_width="match_parent">
+            </android.support.v7.widget.CardView>
 
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingBottom="10dp"
-                    android:text="@string/advanced_settings_title"
-                    android:textStyle="bold" />
-
-                <CheckBox
-                    android:text="@string/keep_force_encryption"
-                    android:id="@+id/keep_force_enc"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="25dp"
-                    android:layout_marginStart="25dp" />
-
-                <CheckBox
-                    android:text="@string/keep_dm_verity"
-                    android:id="@+id/keep_verity"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="25dp"
-                    android:layout_marginStart="25dp" />
-
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/flash_button"
-            android:layout_gravity="center"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginTop="6dp"
-            style="?attr/cardStyle"
-            app:cardUseCompatPadding="true"
-            android:layout_width="match_parent"
-            android:foreground="?android:attr/selectableItemBackground"
-            android:clickable="true">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginEnd="25dp"
-                android:layout_marginStart="25dp">
-
-                <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    app:srcCompat="@mipmap/ic_launcher"
-                    android:id="@+id/imageView"
-                    android:layout_weight="0"
-                    android:layout_marginEnd="20dp"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@string/magiskify"
-                    android:ems="10"
-                    android:gravity="center"
-                    android:layout_weight="1"
-                    android:textStyle="bold"
-                    android:textAllCaps="false"
-                    android:textSize="20sp"
-                    android:fontFamily="sans-serif" />
-
-                <FrameLayout
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0"
-                    android:layout_marginStart="20dp">
-
-                </FrameLayout>
-
-            </LinearLayout>
-
-        </android.support.v7.widget.CardView>
-
+        </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+
+</ScrollView>