diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
index d85ae7b0..a4fdad7b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
@@ -8,6 +8,8 @@ import io.realm.Realm
 import kotlinx.android.synthetic.main.activity_home.*
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.fragment.HistoryFragment
+import net.pokeranalytics.android.ui.fragment.SettingsFragment
+import net.pokeranalytics.android.ui.fragment.StatsFragment
 import net.pokeranalytics.android.util.PokerAnalyticsActivity
 import net.pokeranalytics.android.util.data.sessionDao
 import java.util.*
@@ -27,15 +29,15 @@ class HomeActivity : PokerAnalyticsActivity() {
 	private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
 		when (item.itemId) {
 			net.pokeranalytics.android.R.id.navigation_history -> {
-				displayHistoryFragment()
+				displayFragment(0)
 				return@OnNavigationItemSelectedListener true
 			}
-			net.pokeranalytics.android.R.id.navigation_dashboard -> {
-
+			net.pokeranalytics.android.R.id.navigation_stats -> {
+				displayFragment(1)
 				return@OnNavigationItemSelectedListener true
 			}
-			net.pokeranalytics.android.R.id.navigation_notifications -> {
-
+			net.pokeranalytics.android.R.id.navigation_settings -> {
+				displayFragment(2)
 				return@OnNavigationItemSelectedListener true
 			}
 		}
@@ -79,11 +81,16 @@ class HomeActivity : PokerAnalyticsActivity() {
 	}
 
 	/**
-	 * Display the history fragment
+	 * Display a new fragment
 	 */
-	private fun displayHistoryFragment() {
+	private fun displayFragment(index: Int) {
+
+		val fragment = when(index) {
+			0 -> HistoryFragment()
+			1 -> StatsFragment()
+			else -> SettingsFragment()
+		}
 
-		val historyFragment = HistoryFragment()
 		val fragmentManager = supportFragmentManager
 		val count = fragmentManager.backStackEntryCount
 		for (i in 0 until count) {
@@ -91,10 +98,10 @@ class HomeActivity : PokerAnalyticsActivity() {
 		}
 
 		val fragmentTransaction = fragmentManager.beginTransaction()
-		fragmentTransaction.replace(net.pokeranalytics.android.R.id.container, historyFragment)
+		fragmentTransaction.replace(net.pokeranalytics.android.R.id.container, fragment)
 		fragmentTransaction.commit()
 
-
 	}
 
+
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
index 658e2986..f9bdfe8f 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
@@ -7,11 +7,10 @@ import io.realm.Realm
 
 open class PokerAnalyticsActivity : AppCompatActivity() {
 
-	private lateinit var realm: Realm
+	private val realm = Realm.getDefaultInstance()
 
 	override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
 		super.onCreate(savedInstanceState, persistentState)
-		realm = Realm.getDefaultInstance()
 	}
 
 	override fun onDestroy() {
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index 6daee079..2b0f820c 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -7,12 +7,12 @@
             android:title="@string/title_history"/>
 
     <item
-            android:id="@+id/navigation_dashboard"
+            android:id="@+id/navigation_stats"
             android:icon="@drawable/ic_dashboard_black_24dp"
             android:title="@string/title_stats"/>
 
     <item
-            android:id="@+id/navigation_notifications"
+            android:id="@+id/navigation_settings"
             android:icon="@drawable/ic_notifications_black_24dp"
             android:title="@string/title_settings"/>