diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
index e41805f7..58584e18 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
@@ -3,15 +3,10 @@ package net.pokeranalytics.android.ui.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import io.realm.Realm
-import io.realm.kotlin.where
 import kotlinx.android.synthetic.main.activity_data_list.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.fragment.DataListFragment
-import net.pokeranalytics.android.util.PokerAnalyticsActivity
-import net.pokeranalytics.android.util.data.sessionDao
-import java.util.*
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 
 class DataListActivity : PokerAnalyticsActivity() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
index 9547d252..e96036f1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
@@ -3,17 +3,10 @@ package net.pokeranalytics.android.ui.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import io.realm.Realm
-import io.realm.kotlin.where
-import kotlinx.android.synthetic.main.activity_data_list.*
 import kotlinx.android.synthetic.main.activity_editable_data.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.fragment.DataListFragment
 import net.pokeranalytics.android.ui.fragment.EditableDataFragment
-import net.pokeranalytics.android.util.PokerAnalyticsActivity
-import net.pokeranalytics.android.util.data.sessionDao
-import java.util.*
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 
 class EditableDataActivity : PokerAnalyticsActivity() {
 
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 2b9e910a..d20aa00a 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
@@ -11,7 +11,7 @@ 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.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.util.data.sessionDao
 import java.util.*
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
index 1cb81bc4..46c97c87 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_new_session.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.fragment.NewSessionFragment
-import net.pokeranalytics.android.util.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 
 class NewSessionActivity: PokerAnalyticsActivity() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
similarity index 92%
rename from app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
index 49dee4a6..d6d582bf 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.ui.activity.components
 
 import android.os.Bundle
 import android.os.PersistableBundle
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index 353dad8b..2fe055ff 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.fragment_data_list.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
 class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index b28d90c6..5c2443b1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.adapter.components.*
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
 class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 6164094f..9b6c9118 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -17,9 +17,8 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.NewSessionActivity
 import net.pokeranalytics.android.ui.adapter.HistoryAdapter
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.util.data.sessionDao
-import timber.log.Timber
 import java.util.*
 
 class HistoryFragment : PokerAnalyticsFragment() {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
index 9cf088a5..baf60064 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
@@ -9,14 +9,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_new_session.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback
 import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
-import net.pokeranalytics.android.util.PokerAnalyticsActivity
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
 class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index d38518e3..294c1021 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
@@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.fragment_settings.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
 class SettingsFragment : PokerAnalyticsFragment(), DynamicRowDelegate, DynamicRowCallback {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
index d1ee53f9..d4e30457 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
@@ -4,9 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
 class StatsFragment : PokerAnalyticsFragment() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
index 377da2c8..06eab924 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
@@ -7,9 +7,6 @@ import kotlinx.android.synthetic.main.bottom_sheet_date.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.TimeFrame
-import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
-import net.pokeranalytics.android.util.DatePickerFragment
-import net.pokeranalytics.android.util.TimePickerFragment
 
 class BottomSheetDateFragment : BottomSheetFragment() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/DatePickerFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/util/DatePickerFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
index dd81a825..f40099be 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/DatePickerFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.ui.fragment.components
 
 import android.app.DatePickerDialog
 import android.app.Dialog
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
index 73825311..5f4b8df5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
@@ -1,8 +1,5 @@
 package net.pokeranalytics.android.ui.fragment.components
 
-import androidx.recyclerview.widget.RecyclerView
-import net.pokeranalytics.android.util.PokerAnalyticsFragment
-
 open class DynamicListFragment : PokerAnalyticsFragment() {
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
similarity index 78%
rename from app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
index ac67fe13..1c6365f5 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
@@ -1,8 +1,9 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.ui.fragment.components
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import io.realm.Realm
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 
 open class PokerAnalyticsFragment: Fragment() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/TimePickerFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/util/TimePickerFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt
index aeae4652..e01a5f59 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/TimePickerFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.ui.fragment.components
 
 import android.app.Dialog
 import android.app.TimePickerDialog
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 121f90c3..a56b0b25 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -13,8 +13,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:title="@string/app_name"
-		app:titleTextColor="@color/white" />
+		app:title="@string/app_name" />
 
 	<FrameLayout
 		android:id="@+id/container"
diff --git a/app/src/main/res/layout/fragment_new_session.xml b/app/src/main/res/layout/fragment_new_session.xml
index cb1e83b2..8fb00aa2 100644
--- a/app/src/main/res/layout/fragment_new_session.xml
+++ b/app/src/main/res/layout/fragment_new_session.xml
@@ -40,6 +40,9 @@
 			android:layout_height="match_parent"
 			app:contentScrim="?attr/colorPrimary"
 			app:expandedTitleGravity="bottom"
+			app:expandedTitleMarginStart="72dp"
+			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
+			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
 			<androidx.appcompat.widget.Toolbar
@@ -47,7 +50,6 @@
 				android:layout_width="match_parent"
 				android:layout_height="?attr/actionBarSize"
 				app:title="Poker Analytics"
-				app:titleMargins="0dp"
 				app:titleTextColor="@color/white"
 				app:layout_collapseMode="pin" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cf708458..94ee8611 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,20 +24,36 @@
 		<item name="android:background">@color/gray_darker</item>
 	</style>
 
+
 	<!-- Toolbar -->
 	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
 		<item name="android:background">@color/gray_darker</item>
 		<item name="titleTextColor">@color/white</item>
-		<item name="android:fontFamily">@font/roboto_bold</item>
+		<item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
 	</style>
 
-	<style name="PokerAnalyticsTheme.TextView">
-		<item name="android:textColor">@color/white</item>
+	<style name="PokerAnalyticsTheme.Toolbar.TitleAppearance">
+		<item name="android:textSize">20sp</item>
 		<item name="android:fontFamily">@font/roboto</item>
 	</style>
 
+	<style name="PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance">
+		<item name="android:textSize">32sp</item>
+		<item name="android:textColor">@color/white</item>
+	</style>
+
+	<style name="PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance">
+		<item name="android:textSize">20sp</item>
+		<item name="android:textColor">@color/white</item>
+	</style>
+
 
 	<!-- TextView -->
+	<style name="PokerAnalyticsTheme.TextView">
+		<item name="android:textColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.TextView.Title" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">22sp</item>
 		<item name="android:textColor">@color/white</item>