diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
index abb1018d4..c9a7609d5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -16,6 +16,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Utils;
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index 7e45dd2d7..35bd582ba 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -229,10 +229,10 @@ public class SettingsActivity extends Activity {
                     getApplication().suNotificationType = Utils.getPrefsInt(prefs, "su_notification", 1);
                     break;
                 case "developer_logging":
-                    getApplication().devLogging = prefs.getBoolean("developer_logging", false);
+                    MagiskManager.devLogging = prefs.getBoolean("developer_logging", false);
                     break;
                 case "shell_logging":
-                    getApplication().shellLogging = prefs.getBoolean("shell_logging", false);
+                    MagiskManager.shellLogging = prefs.getBoolean("shell_logging", false);
                     break;
             }
             setSummary();
diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutCardRow.java b/app/src/main/java/com/topjohnwu/magisk/components/AboutCardRow.java
similarity index 97%
rename from app/src/main/java/com/topjohnwu/magisk/AboutCardRow.java
rename to app/src/main/java/com/topjohnwu/magisk/components/AboutCardRow.java
index 41372a505..db022cc97 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutCardRow.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/AboutCardRow.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,6 +26,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.R;
+
 /**
  * @author dvdandroid
  */
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 479b3bc6d..1d92f6413 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -56,35 +56,35 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
                     </LinearLayout>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_version_info"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_info_outline"
                         app:text="@string/app_version"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_changelog"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_history"
                         app:text="@string/app_changelog"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_developers"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_person"
                         app:text="@string/app_developers"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_translators"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_language"
                         app:text="@string/app_translators"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/app_source_code"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -109,14 +109,14 @@
                     android:layout_marginBottom="8dp"
                     android:orientation="vertical">
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/support_thread"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         app:icon="@drawable/ic_xda"
                         app:text="@string/support_thread"/>
 
-                    <com.topjohnwu.magisk.AboutCardRow
+                    <com.topjohnwu.magisk.components.AboutCardRow
                         android:id="@+id/donation"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"