diff --git a/app/src/main/java/guide/graphql/toc/MainActivity.kt b/app/src/main/java/guide/graphql/toc/MainActivity.kt
index 56b9e45..ac5f68e 100644
--- a/app/src/main/java/guide/graphql/toc/MainActivity.kt
+++ b/app/src/main/java/guide/graphql/toc/MainActivity.kt
@@ -2,29 +2,37 @@ package guide.graphql.toc
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI
 import guide.graphql.toc.databinding.ActivityMainBinding
 
+
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
+    private lateinit var navController: NavController
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
 
+        val navHostFragment = supportFragmentManager
+            .findFragmentById(R.id.nav_host_fragment) as NavHostFragment?
+
+        navController = navHostFragment!!.navController
+
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
 
         NavigationUI.setupActionBarWithNavController(
             this,
-            findNavController(R.id.nav_host_fragment)
+            navController
         )
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        return findNavController(R.id.nav_host_fragment).navigateUp() || super.onSupportNavigateUp()
+        return navController.navigateUp() || super.onSupportNavigateUp()
     }
 }
diff --git a/app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt b/app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt
index 8839ec6..3aee80f 100644
--- a/app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt
+++ b/app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt
@@ -2,7 +2,6 @@ package guide.graphql.toc.ui.chapters
 
 import android.util.Log
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.liveData
 import com.apollographql.apollo.coroutines.toDeferred
@@ -13,8 +12,6 @@ import guide.graphql.toc.apolloClient
 
 class ChaptersViewModel : ViewModel() {
 
-    val bookId: LiveData<Int> = MutableLiveData(0)
-
     val chapterList: LiveData<Resource<List<ChaptersQuery.Chapter>>> = liveData {
         emit(Resource.loading(null))
         try {
diff --git a/app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt b/app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt
index d333882..e147660 100644
--- a/app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt
+++ b/app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt
@@ -1,9 +1,7 @@
 package guide.graphql.toc.ui.sections
 
 import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
+import androidx.lifecycle.*
 import com.apollographql.apollo.coroutines.toDeferred
 import com.apollographql.apollo.exception.ApolloException
 import guide.graphql.toc.Resource
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 84173e6..3710a93 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
             android:theme="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"