diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
index 91439d739..f0d975787 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
@@ -89,6 +89,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.inject.Inject;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
@@ -753,10 +754,15 @@ public abstract class CoreReaderFragment extends BaseFragment
   }
 
   private KiwixWebView initalizeWebView(String url) {
-    AttributeSet attrs = StyleUtils.getAttributes(requireActivity(), R.xml.webview);
-    KiwixWebView webView = createWebView(attrs);
-    loadUrl(url, webView);
-    return webView;
+    //if(requireContext() != null) {
+    AttributeSet attrs = StyleUtils.getAttributes(getActivity(), R.xml.webview);
+      KiwixWebView webView = createWebView(attrs);
+      loadUrl(url, webView);
+      return webView;
+    //} else{
+    //  Log.e("KIWIX", "initalizeWebView: CONTEXXT NOT FOUND, NULL");
+    //  return null;
+    //}
   }
 
   @NotNull protected ToolbarScrollingKiwixWebView createWebView(AttributeSet attrs) {
diff --git a/custom/detekt_baseline.xml b/custom/detekt_baseline.xml
index 49228c6da..1c9b44536 100644
--- a/custom/detekt_baseline.xml
+++ b/custom/detekt_baseline.xml
@@ -3,7 +3,7 @@
   <Blacklist></Blacklist>
   <Whitelist>
     <ID>LongParameterList:DownloadCustom.kt$DownloadCustom$( id: String = "", title: String = "", description: String = "", language: String = "", creator: String = "", publisher: String = "", date: String = "", url: String = "", articleCount: String = "", mediaCount: String = "", size: String = "", name: String = "", favIcon: String = "" )</ID>
-    <ID>MagicNumber:CustomDownloadFragment.kt$CustomDownloadActivity$3</ID>
+    <ID>MagicNumber:CustomDownloadFragment.kt$CustomDownloadFragment$3</ID>
     <ID>TooGenericExceptionThrown:ActivityExtensions.kt$throw RuntimeException( """ applicationContext is ${applicationContext::class.java.simpleName} application is ${application::class.java.simpleName} """.trimIndent() )</ID>
   </Whitelist>
 </SmellBaseline>
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/download/CustomDownloadFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/download/CustomDownloadFragment.kt
index 7c83dab1f..4f92057ef 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/download/CustomDownloadFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/download/CustomDownloadFragment.kt
@@ -67,11 +67,7 @@ class CustomDownloadFragment : BaseFragment() {
     savedInstanceState: Bundle?
   ): View? {
     super.onCreate(savedInstanceState)
-    return inflater.inflate(R.layout.activity_custom_download, container, false)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
+    val root = inflater.inflate(R.layout.activity_custom_download, container, false)
     val activity = requireActivity() as CoreMainActivity
     downloadViewModel.state.observe(viewLifecycleOwner, Observer(::render))
     compositeDisposable.add(
@@ -80,6 +76,11 @@ class CustomDownloadFragment : BaseFragment() {
         Throwable::printStackTrace
       )
     )
+    return root
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
     cd_download_button.setOnClickListener { downloadViewModel.actions.offer(ClickedDownload) }
     cd_retry_button.setOnClickListener { downloadViewModel.actions.offer(ClickedRetry) }
   }
diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
index 3739cb857..2a804a153 100644
--- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
+++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
@@ -36,10 +36,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.navigation.fragment.findNavController
 import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super
 import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions.Super.ShouldCall
-import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.navigate
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.setupDrawerToggle
 import org.kiwix.kiwixmobile.core.main.CoreReaderFragment
 import org.kiwix.kiwixmobile.core.main.MainMenu
@@ -133,8 +133,9 @@ class CustomReaderFragment : CoreReaderFragment() {
           requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB)
         } else {
           activity?.finish()
+          // val acct = requireActivity() as AppCompatActivity
           // trans?.apply { add(R.id.custom_drawer_container, fragment).commit() }
-          with(activity as AppCompatActivity) { navigate(R.id.customDownloadFragment) }
+          findNavController().navigate(R.id.customDownloadFragment)
         }
       }
     )
diff --git a/custom/src/main/res/navigation/custom_nav_graph.xml b/custom/src/main/res/navigation/custom_nav_graph.xml
index 41509fb6d..2da8d6828 100644
--- a/custom/src/main/res/navigation/custom_nav_graph.xml
+++ b/custom/src/main/res/navigation/custom_nav_graph.xml
@@ -28,6 +28,9 @@
       android:name="pageUrl"
       android:defaultValue=""
       app:argType="string" />
+    <action
+      android:id="@+id/action_customReaderFragment_to_customDownloadFragment"
+      app:destination="@id/customDownloadFragment" />
   </fragment>
   <fragment
     android:id="@+id/historyFragment"