diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
index 08b4f665..00d4e1c4 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
@@ -92,12 +92,12 @@ public class SettingsActivity extends AbsBaseActivity {
             }
 
             categoryPreference.setOnPreferenceClickListener(preference -> {
-                CategoryPreferenceDialog.newInstance().show(getParentFragmentManager(), CategoryPreferenceDialog.TAG);
+                CategoryPreferenceDialog.create().show(getParentFragmentManager(), CategoryPreferenceDialog.TAG);
                 return false;
             });
 
             nowPlayingPreference.setOnPreferenceClickListener(preference -> {
-                NowPlayingPreferenceDialog.newInstance().show(getParentFragmentManager(), NowPlayingPreferenceDialog.TAG);
+                NowPlayingPreferenceDialog.create().show(getParentFragmentManager(), NowPlayingPreferenceDialog.TAG);
                 return false;
             });
 
diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java
index 80ecdfb0..7af2f93c 100644
--- a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java
@@ -22,21 +22,18 @@ import java.util.stream.Collectors;
 public class CategoryPreferenceDialog extends DialogFragment {
     public static final String TAG = CategoryPreferenceDialog.class.getSimpleName();
 
-    public static CategoryPreferenceDialog newInstance() {
+    public static CategoryPreferenceDialog create() {
         return new CategoryPreferenceDialog();
     }
 
-    private CategoryAdapter adapter;
-
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View view = requireActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null);
         List<Category> categories = PreferenceUtil.getInstance(getContext()).getCategories();
-
-        adapter = new CategoryAdapter(categories);
-
+        CategoryAdapter adapter = new CategoryAdapter(categories);
         RecyclerView recyclerView = view.findViewById(R.id.recycler_view);
+
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerView.setAdapter(adapter);
         adapter.attachToRecyclerView(recyclerView);
diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java
index a1f8f463..30d733cf 100644
--- a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java
@@ -25,7 +25,7 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
 
     private int viewPagerPosition;
 
-    public static NowPlayingPreferenceDialog newInstance() {
+    public static NowPlayingPreferenceDialog create() {
         return new NowPlayingPreferenceDialog();
     }
 
@@ -34,11 +34,12 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null);
         ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager);
+        InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator);
+
         viewPager.setAdapter(new NowPlayingScreenAdapter(getContext()));
         viewPager.addOnPageChangeListener(this);
         viewPager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen().ordinal());
 
-        InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator);
         pageIndicator.setViewPager(viewPager);
         pageIndicator.onPageSelected(viewPager.getCurrentItem());
 
@@ -78,10 +79,11 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPa
 
             LayoutInflater inflater = LayoutInflater.from(context);
             ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_dialog_now_playing_item, collection, false);
-            collection.addView(layout);
 
             ImageView image = layout.findViewById(R.id.image);
             TextView title = layout.findViewById(R.id.title);
+
+            collection.addView(layout);
             image.setImageResource(nowPlayingScreen.drawableRes);
             title.setText(nowPlayingScreen.titleRes);