diff --git a/app/src/main/res/layout/dialog_magisk_base.xml b/app/src/main/res/layout/dialog_magisk_base.xml
index 622bbc781..852e0eb31 100644
--- a/app/src/main/res/layout/dialog_magisk_base.xml
+++ b/app/src/main/res/layout/dialog_magisk_base.xml
@@ -12,225 +12,232 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/dialog_base_outside_container"
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.card.MaterialCardView
-            style="@style/WidgetFoundation.Card.Elevated"
-            android:layout_width="0dp"
+        <FrameLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardElevation="@dimen/margin_generic"
             app:layout_constrainedHeight="true"
-            app:cardUseCompatPadding="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_default="wrap"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintWidth_default="percent"
             app:layout_constraintWidth_max="400dp"
             app:layout_constraintWidth_percent="1">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <com.google.android.material.card.MaterialCardView
+                style="@style/WidgetFoundation.Card.Elevated"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:cardElevation="@dimen/margin_generic"
+                app:cardUseCompatPadding="true">
 
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/dialog_base_start"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_begin="16dp" />
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/dialog_base_end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_end="16dp" />
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/dialog_base_start"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_begin="16dp" />
 
-                <FrameLayout
-                    android:id="@+id/dialog_base_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toTopOf="@+id/dialog_base_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        style="@style/WidgetFoundation.Icon.Primary"
-                        gone="@{data.icon == 0}"
-                        srcCompat="@{data.icon}"
-                        android:layout_gravity="center"
-                        android:layout_marginTop="@dimen/l1"
-                        android:padding="0dp"
-                        tools:src="@drawable/ic_delete_md2" />
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        style="@style/WidgetFoundation.Image.Big"
-                        gone="@{data.iconRaw == null}"
-                        android:layout_gravity="center"
-                        android:layout_marginTop="@dimen/l1"
-                        android:src="@{data.iconRaw}"
-                        tools:src="@drawable/ic_delete_md2" />
-
-                </FrameLayout>
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/dialog_base_title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/l1"
-                    android:gravity="center"
-                    android:text="@{data.title}"
-                    android:textAppearance="@style/AppearanceFoundation.Title"
-                    app:layout_constraintEnd_toEndOf="@+id/dialog_base_end"
-                    app:layout_constraintStart_toStartOf="@+id/dialog_base_start"
-                    app:layout_constraintTop_toBottomOf="@+id/dialog_base_icon"
-                    tools:lines="1"
-                    tools:text="@tools:sample/lorem/random" />
-
-                <FrameLayout
-                    android:id="@+id/dialog_base_scroll"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/l_50"
-                    app:layout_constrainedHeight="true"
-                    app:layout_constraintBottom_toTopOf="@+id/dialog_base_space"
-                    app:layout_constraintEnd_toEndOf="@+id/dialog_base_end"
-                    app:layout_constraintStart_toStartOf="@+id/dialog_base_start"
-                    app:layout_constraintTop_toBottomOf="@+id/dialog_base_title">
-
-                    <androidx.core.widget.NestedScrollView
-                        gone="@{data.message.length == 0}"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/dialog_base_message"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:gravity="center"
-                            android:text="@{data.message}"
-                            android:textAppearance="@style/AppearanceFoundation.Body"
-                            tools:lines="3"
-                            tools:text="@tools:sample/lorem/random" />
-
-                    </androidx.core.widget.NestedScrollView>
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/dialog_base_end"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_end="16dp" />
 
                     <FrameLayout
-                        android:id="@+id/dialog_base_container"
-                        gone="@{data.message.length != 0}"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                </FrameLayout>
-
-                <Space
-                    android:id="@+id/dialog_base_space"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/l1"
-                    app:layout_constraintBottom_toTopOf="@+id/dialog_base_buttons"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <FrameLayout
-                    android:id="@+id/dialog_base_buttons"
-                    style="?attr/buttonBarStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
-
-                    <androidx.appcompat.widget.ButtonBarLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/dialog_base_icon"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="bottom|center_horizontal"
-                        android:layoutDirection="locale"
-                        android:orientation="horizontal"
-                        android:paddingStart="12dp"
-                        android:paddingTop="4dp"
-                        android:paddingEnd="12dp"
-                        android:paddingBottom="4dp">
+                        app:layout_constraintBottom_toTopOf="@+id/dialog_base_title"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/dialog_base_button_4"
-                            style="@style/WidgetFoundation.Button.Text"
-                            gone="@{data.buttonIDGAF.icon == 0 &amp;&amp; data.buttonIDGAF.title.length == 0}"
-                            isEnabled="@{data.buttonIDGAF.isEnabled()}"
-                            android:layout_width="wrap_content"
+                        <androidx.appcompat.widget.AppCompatImageView
+                            style="@style/WidgetFoundation.Icon.Primary"
+                            gone="@{data.icon == 0}"
+                            srcCompat="@{data.icon}"
+                            android:layout_gravity="center"
+                            android:layout_marginTop="@dimen/l1"
+                            android:padding="0dp"
+                            tools:src="@drawable/ic_delete_md2" />
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            style="@style/WidgetFoundation.Image.Big"
+                            gone="@{data.iconRaw == null}"
+                            android:layout_gravity="center"
+                            android:layout_marginTop="@dimen/l1"
+                            android:src="@{data.iconRaw}"
+                            tools:src="@drawable/ic_delete_md2" />
+
+                    </FrameLayout>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/dialog_base_title"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/l1"
+                        android:gravity="center"
+                        android:text="@{data.title}"
+                        android:textAppearance="@style/AppearanceFoundation.Title"
+                        app:layout_constraintEnd_toEndOf="@+id/dialog_base_end"
+                        app:layout_constraintStart_toStartOf="@+id/dialog_base_start"
+                        app:layout_constraintTop_toBottomOf="@+id/dialog_base_icon"
+                        tools:lines="1"
+                        tools:text="@tools:sample/lorem/random" />
+
+                    <FrameLayout
+                        android:id="@+id/dialog_base_scroll"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/l_50"
+                        app:layout_constrainedHeight="true"
+                        app:layout_constraintBottom_toTopOf="@+id/dialog_base_space"
+                        app:layout_constraintEnd_toEndOf="@+id/dialog_base_end"
+                        app:layout_constraintStart_toStartOf="@+id/dialog_base_start"
+                        app:layout_constraintTop_toBottomOf="@+id/dialog_base_title">
+
+                        <androidx.core.widget.NestedScrollView
+                            gone="@{data.message.length == 0}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:id="@+id/dialog_base_message"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:text="@{data.message}"
+                                android:textAppearance="@style/AppearanceFoundation.Body"
+                                tools:lines="3"
+                                tools:text="@tools:sample/lorem/random" />
+
+                        </androidx.core.widget.NestedScrollView>
+
+                        <FrameLayout
+                            android:id="@+id/dialog_base_container"
+                            gone="@{data.message.length != 0}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </FrameLayout>
+
+                    <Space
+                        android:id="@+id/dialog_base_space"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/l1"
+                        app:layout_constraintBottom_toTopOf="@+id/dialog_base_buttons"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <FrameLayout
+                        android:id="@+id/dialog_base_buttons"
+                        style="?attr/buttonBarStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent">
+
+                        <androidx.appcompat.widget.ButtonBarLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:filterTouchesWhenObscured="true"
-                            android:onClick="@{() -> data.buttonIDGAF.clicked()}"
-                            android:text="@{data.buttonIDGAF.title}"
-                            app:icon="@{data.buttonIDGAF.icon}"
-                            tools:icon="@drawable/ic_bug_md2"
-                            tools:text="Button 1" />
+                            android:gravity="bottom|center_horizontal"
+                            android:layoutDirection="locale"
+                            android:orientation="horizontal"
+                            android:paddingStart="12dp"
+                            android:paddingTop="4dp"
+                            android:paddingEnd="12dp"
+                            android:paddingBottom="4dp">
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/dialog_base_button_2"
-                            style="@style/WidgetFoundation.Button.Text"
-                            gone="@{data.buttonNeutral.icon == 0 &amp;&amp; data.buttonNeutral.title.length == 0}"
-                            isEnabled="@{data.buttonNeutral.isEnabled()}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:filterTouchesWhenObscured="true"
-                            android:onClick="@{() -> data.buttonNeutral.clicked()}"
-                            android:text="@{data.buttonNeutral.title}"
-                            app:icon="@{data.buttonNeutral.icon}"
-                            app:iconGravity="textStart"
-                            tools:icon="@drawable/ic_bug_md2"
-                            tools:text="Button 1" />
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/dialog_base_button_4"
+                                style="@style/WidgetFoundation.Button.Text"
+                                gone="@{data.buttonIDGAF.icon == 0 &amp;&amp; data.buttonIDGAF.title.length == 0}"
+                                isEnabled="@{data.buttonIDGAF.isEnabled()}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:filterTouchesWhenObscured="true"
+                                android:onClick="@{() -> data.buttonIDGAF.clicked()}"
+                                android:text="@{data.buttonIDGAF.title}"
+                                app:icon="@{data.buttonIDGAF.icon}"
+                                tools:icon="@drawable/ic_bug_md2"
+                                tools:text="Button 1" />
 
-                        <Space
-                            android:id="@+id/spacer"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_weight="1"
-                            android:visibility="invisible" />
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/dialog_base_button_2"
+                                style="@style/WidgetFoundation.Button.Text"
+                                gone="@{data.buttonNeutral.icon == 0 &amp;&amp; data.buttonNeutral.title.length == 0}"
+                                isEnabled="@{data.buttonNeutral.isEnabled()}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:filterTouchesWhenObscured="true"
+                                android:onClick="@{() -> data.buttonNeutral.clicked()}"
+                                android:text="@{data.buttonNeutral.title}"
+                                app:icon="@{data.buttonNeutral.icon}"
+                                app:iconGravity="textStart"
+                                tools:icon="@drawable/ic_bug_md2"
+                                tools:text="Button 1" />
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/dialog_base_button_3"
-                            style="@style/WidgetFoundation.Button.Text"
-                            gone="@{data.buttonNegative.icon == 0 &amp;&amp; data.buttonNegative.title.length == 0}"
-                            isEnabled="@{data.buttonNegative.isEnabled()}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:filterTouchesWhenObscured="true"
-                            android:onClick="@{() -> data.buttonNegative.clicked()}"
-                            android:text="@{data.buttonNegative.title}"
-                            app:icon="@{data.buttonNegative.icon}"
-                            tools:icon="@drawable/ic_bug_md2"
-                            tools:text="Button 1" />
+                            <Space
+                                android:id="@+id/spacer"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:visibility="invisible" />
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/dialog_base_button_1"
-                            style="@style/WidgetFoundation.Button.Text"
-                            gone="@{data.buttonPositive.icon == 0 &amp;&amp; data.buttonPositive.title.length == 0}"
-                            isEnabled="@{data.buttonPositive.isEnabled()}"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:filterTouchesWhenObscured="true"
-                            android:onClick="@{() -> data.buttonPositive.clicked()}"
-                            android:text="@{data.buttonPositive.title}"
-                            app:icon="@{data.buttonPositive.icon}"
-                            app:iconGravity="textStart"
-                            tools:icon="@drawable/ic_bug_md2"
-                            tools:text="Button 1" />
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/dialog_base_button_3"
+                                style="@style/WidgetFoundation.Button.Text"
+                                gone="@{data.buttonNegative.icon == 0 &amp;&amp; data.buttonNegative.title.length == 0}"
+                                isEnabled="@{data.buttonNegative.isEnabled()}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:filterTouchesWhenObscured="true"
+                                android:onClick="@{() -> data.buttonNegative.clicked()}"
+                                android:text="@{data.buttonNegative.title}"
+                                app:icon="@{data.buttonNegative.icon}"
+                                tools:icon="@drawable/ic_bug_md2"
+                                tools:text="Button 1" />
 
-                    </androidx.appcompat.widget.ButtonBarLayout>
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/dialog_base_button_1"
+                                style="@style/WidgetFoundation.Button.Text"
+                                gone="@{data.buttonPositive.icon == 0 &amp;&amp; data.buttonPositive.title.length == 0}"
+                                isEnabled="@{data.buttonPositive.isEnabled()}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:filterTouchesWhenObscured="true"
+                                android:onClick="@{() -> data.buttonPositive.clicked()}"
+                                android:text="@{data.buttonPositive.title}"
+                                app:icon="@{data.buttonPositive.icon}"
+                                app:iconGravity="textStart"
+                                tools:icon="@drawable/ic_bug_md2"
+                                tools:text="Button 1" />
 
-                </FrameLayout>
+                        </androidx.appcompat.widget.ButtonBarLayout>
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    </FrameLayout>
 
-        </com.google.android.material.card.MaterialCardView>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </FrameLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>