diff --git a/app/build.gradle b/app/build.gradle
index 9a8ce060..0121f553 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.google.android.material:material:$supportLib"
+    implementation "com.google.android.material:material:$material"
     implementation "androidx.appcompat:appcompat:$supportLib"
     implementation "androidx.legacy:legacy-support-v4:$supportLib"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayout"
diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt
index 0f216d95..9f23368c 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt
@@ -12,6 +12,7 @@ import android.os.CountDownTimer
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.animation.AnimationUtils
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
@@ -85,7 +86,7 @@ class MainActivity : AppCompatActivity() {
         drawerGetLocation = header.findViewById(R.id.drawer_get_location)
         val navController = findNavController(R.id.nav_host)
 
-        appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky), drawerLayout)
+        appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout)
         setupActionBarWithNavController(navController, appBarConfig)
         navView.setupWithNavController(navController)
 
@@ -110,8 +111,11 @@ class MainActivity : AppCompatActivity() {
             openGitHub()
         }
 
+        drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse))
         drawerGetLocation.setOnClickListener {
+            it.isEnabled = false
             updateLocation()
+            it.postDelayed({ it.isEnabled = true }, 3600)
         }
     }
 
@@ -155,9 +159,9 @@ class MainActivity : AppCompatActivity() {
 
     private fun getPreciseLocation() {
         fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->
-            val lat = location?.latitude ?: 0.0
-            val lon = location?.longitude ?: 0.0
-            val height = location?.altitude ?: 0.0
+            val lat = location?.latitude ?: 51.5074
+            val lon = location?.longitude ?: 0.1278
+            val height = location?.altitude ?: 48.0
 
             preferences.edit {
                 putDouble("LATITUDE", lat)
@@ -166,13 +170,14 @@ class MainActivity : AppCompatActivity() {
                 apply()
             }
             updateDrawerValues()
+            Toast.makeText(this, "Location was set", Toast.LENGTH_SHORT).show()
         }
     }
 
     private fun updateDrawerValues() {
-        val lat = preferences.getDouble("LATITUDE", 0.0)
-        val lon = preferences.getDouble("LONGITUDE", 0.0)
-        val height = preferences.getDouble("HEIGHT", 0.0)
+        val lat = preferences.getDouble("LATITUDE", 51.5074)
+        val lon = preferences.getDouble("LONGITUDE", 0.1278)
+        val height = preferences.getDouble("HEIGHT", 48.0)
 
         drawerLat.text = String.format("%.4f", lat)
         drawerLon.text = String.format("%.4f", lon)
diff --git a/app/src/main/res/anim/pulse.xml b/app/src/main/res/anim/pulse.xml
new file mode 100644
index 00000000..9ff3476b
--- /dev/null
+++ b/app/src/main/res/anim/pulse.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="1800"
+        android:fromXScale="1"
+        android:fromYScale="1"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:repeatCount="infinite"
+        android:repeatMode="reverse"
+        android:toXScale="0.6"
+        android:toYScale="0.6" />
+
+    <rotate
+        android:duration="3600"
+        android:fromDegrees="0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:repeatCount="infinite"
+        android:startOffset="0"
+        android:toDegrees="720" />
+
+    <alpha
+        android:duration="1800"
+        android:fromAlpha="1"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:repeatCount="infinite"
+        android:repeatMode="reverse"
+        android:toAlpha="0.6" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/drawer_gradient.xml b/app/src/main/res/drawable/drawer_gradient.xml
index 73fe2d2f..e37eedb0 100644
--- a/app/src/main/res/drawable/drawer_gradient.xml
+++ b/app/src/main/res/drawable/drawer_gradient.xml
@@ -1,8 +1,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="90"
-        android:endColor="@color/colorPrimaryDark"
-        android:startColor="@color/colorPrimary"
+        android:angle="270"
+        android:endColor="#181818"
+        android:startColor="@color/surfaceDark"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
deleted file mode 100644
index 375680b6..00000000
--- a/app/src/main/res/drawable/ic_add.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 73fe2d2f..e37eedb0 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,8 +1,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="90"
-        android:endColor="@color/colorPrimaryDark"
-        android:startColor="@color/colorPrimary"
+        android:angle="270"
+        android:endColor="#181818"
+        android:startColor="@color/surfaceDark"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 901801c5..ae3b91dd 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -7,10 +7,10 @@
         android:translateX="70.26573"
         android:translateY="70.26573">
         <path
-            android:fillColor="#ffffff"
+            android:fillColor="#C0C0C0"
             android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
         <path
-            android:fillColor="#ffffff"
+            android:fillColor="#C0C0C0"
             android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 5470c151..3630c908 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FFE082"
         android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sat_desc_right.xml b/app/src/main/res/drawable/ic_sat_desc_right.xml
deleted file mode 100644
index 52eddad3..00000000
--- a/app/src/main/res/drawable/ic_sat_desc_right.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
-        android:fillType="evenOdd"
-        android:pathData="m22.862,114.121a2.864,2.864 90,0 1,-1.701 -0.85l-19.334,-19.331a2.864,2.864 90,0 1,0 -4.027l26.584,-26.625a2.864,2.864 90,0 1,1.835 -0.805l7.922,-0.626 -5.773,-5.772a2.864,2.864 90,0 1,0 -4.027l19.602,-19.644a2.864,2.864 90,0 1,4.073 -0l5.773,5.772 0.627,-7.92a2.864,2.864 90,0 1,0.805 -1.835l26.629,-26.58a2.864,2.864 90,0 1,4.073 -0l19.289,19.286a2.864,2.864 90,0 1,0 4.072l-26.584,26.625a2.864,2.864 90,0 1,-1.835 0.805l-7.922,0.626 5.773,5.772a2.864,2.864 90,0 1,0 4.072l-19.603,19.599a2.864,2.864 90,0 1,-4.073 -0l-5.773,-5.772 -0.626,7.92a2.864,2.864 90,0 1,-0.806 1.835l-26.629,26.58a2.864,2.864 90,0 1,-2.059 0.85,2.864 2.864,90 0,1 -0.269,-0zM23.176,107.23 L47.03,83.38 47.835,72.685 42.42,67.271 31.724,68.121 7.87,91.926zM72.674,47.85 L83.371,47 107.225,23.194 91.919,7.891 68.109,31.741 67.259,42.436z"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
-        android:fillType="evenOdd"
-        android:pathData="m65.347,115.806a2.864,2.864 90,1 1,0 -5.727c11.457,-0 22.876,-4.351 31.634,-13.107 8.741,-8.74 13.095,-20.174 13.095,-31.614a2.864,2.864 90,1 1,5.728 -0c0,12.897 -4.935,25.829 -14.773,35.664 -9.85,9.848 -22.772,14.785 -35.684,14.785z"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
-        android:fillType="evenOdd"
-        android:pathData="m65.347,127a2.864,2.864 90,1 1,0 -5.727c14.325,-0 28.612,-5.441 39.547,-16.375 10.935,-10.933 16.378,-25.233 16.378,-39.541a2.864,2.864 90,1 1,5.728 -0c0,15.763 -6.025,31.562 -18.055,43.59 -12.029,12.028 -27.818,18.052 -43.597,18.052z"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
-        android:fillType="evenOdd"
-        android:pathData="m65.347,104.698a2.864,2.864 90,1 1,0 -5.727c8.62,-0 17.201,-3.263 23.778,-9.839 6.577,-6.576 9.855,-15.174 9.855,-23.774a2.864,2.864 90,1 1,5.728 -0c0,10.061 -3.861,20.153 -11.533,27.824 -7.672,7.671 -17.756,11.517 -27.829,11.517z"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
-        android:fillType="evenOdd"
-        android:pathData="m65.347,93.475a2.864,2.864 90,1 1,0 -5.727c5.737,-0 11.453,-2.174 15.836,-6.557 4.384,-4.383 6.558,-10.098 6.558,-15.834a2.864,2.864 90,1 1,5.728 -0c0,7.192 -2.757,14.406 -8.236,19.883 -5.479,5.478 -12.693,8.234 -19.887,8.234z"
-        android:strokeColor="#00000000" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml
deleted file mode 100644
index ea6ddcdf..00000000
--- a/app/src/main/res/drawable/ic_sputnik.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
-</vector>
diff --git a/app/src/main/res/layout-land/fragment_worldmap.xml b/app/src/main/res/layout-land/fragment_worldmap.xml
index 26f765e8..bc30a868 100644
--- a/app/src/main/res/layout-land/fragment_worldmap.xml
+++ b/app/src/main/res/layout-land/fragment_worldmap.xml
@@ -25,7 +25,6 @@
         android:layout_gravity="bottom|start"
         android:layout_marginStart="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
-        app:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/ic_sat_asc_right" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a379fe7e..573b6d07 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,10 +18,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@color/colorBackground"
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/drawer_header"
-        app:itemTextColor="@color/colorDrawerText"
         app:menu="@menu/drawer_menu" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 41ef0d5d..7ef133f7 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -13,8 +13,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary">
+            android:layout_height="?attr/actionBarSize">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/timer_layout"
@@ -28,10 +27,9 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/next_aos_pattern"
-                    android:textSize="24sp"
+                    android:textSize="32sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 29149bbc..b9608ce2 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -9,10 +9,10 @@
 
     <ImageView
         android:id="@+id/drawer_sat_img"
-        android:layout_width="116dp"
-        android:layout_height="116dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:contentDescription="@string/app_name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -21,9 +21,8 @@
     <TextView
         android:id="@+id/drawer_title"
         style="@style/DrawerHeader.Title"
-        android:layout_marginStart="8dp"
         android:text="@string/title"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/drawer_lat"
         app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
 
     <TextView
@@ -81,13 +80,15 @@
 
     <ImageView
         android:id="@+id/drawer_get_location"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="32dp"
-        android:contentDescription="@string/placeholder"
-        app:layout_constraintBottom_toBottomOf="@+id/drawer_height_value"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/drawer_lat_value"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:contentDescription="@string/drawer_locator"
+        app:layout_constraintBottom_toTopOf="@+id/drawer_lat"
+        app:layout_constraintEnd_toStartOf="@+id/drawer_sat_img"
+        app:layout_constraintStart_toEndOf="@+id/drawer_subtitle"
+        app:layout_constraintTop_toTopOf="@+id/drawer_subtitle"
         app:srcCompat="@drawable/ic_location" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_sky.xml b/app/src/main/res/layout/fragment_sky.xml
index 837256f6..a1ca4b6a 100644
--- a/app/src/main/res/layout/fragment_sky.xml
+++ b/app/src/main/res/layout/fragment_sky.xml
@@ -13,7 +13,6 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
-        app:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_sat_asc_left" />
diff --git a/app/src/main/res/layout/fragment_worldmap.xml b/app/src/main/res/layout/fragment_worldmap.xml
index 26f765e8..bc30a868 100644
--- a/app/src/main/res/layout/fragment_worldmap.xml
+++ b/app/src/main/res/layout/fragment_worldmap.xml
@@ -25,7 +25,6 @@
         android:layout_gravity="bottom|start"
         android:layout_marginStart="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
-        app:backgroundTint="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/ic_sat_asc_right" />
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index d811d233..0b7e08b7 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -7,17 +7,22 @@
         <item
             android:id="@+id/nav_sky"
             android:title="@string/menu_sky" />
+        <item
+            android:id="@+id/nav_single_sat"
+            android:title="@string/menu_single_sat" />
         <item
             android:id="@+id/nav_map"
             android:title="@string/menu_map" />
     </group>
 
-    <item android:title="@string/menu_about">
+    <item android:title="@string/about">
         <menu>
             <item
                 android:id="@+id/nav_credits"
                 android:title="@string/menu_credits" />
+            <item
+                android:id="@+id/nav_about"
+                android:title="@string/menu_about" />
         </menu>
     </item>
-
 </menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cfe..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index a811060e..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index a76d18d2..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index c05b50e7..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 574d16b1..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 449eba13..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 5d70f712..3f0ac12a 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -11,6 +11,12 @@
         android:label="@string/menu_sky"
         tools:layout="@layout/fragment_sky" />
 
+    <fragment
+        android:id="@+id/nav_single_sat"
+        android:name="com.rtbishop.lookingsat.ui.SkyFragment"
+        android:label="@string/menu_single_sat"
+        tools:layout="@layout/fragment_sky" />
+
     <fragment
         android:id="@+id/nav_radar"
         android:name="com.rtbishop.lookingsat.ui.RadarFragment"
@@ -29,4 +35,10 @@
         android:label="@string/menu_credits"
         tools:layout="@layout/fragment_credits" />
 
+    <fragment
+        android:id="@+id/nav_about"
+        android:name="com.rtbishop.lookingsat.ui.CreditsFragment"
+        android:label="@string/menu_credits"
+        tools:layout="@layout/fragment_credits" />
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f5f7469b..a8056094 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#000020</color>
-    <color name="colorPrimaryDark">#000010</color>
-    <color name="colorAccent">#C0C0C0</color>
-
-    <color name="colorDrawerText">#C0C0C0</color>
-    <color name="colorBackground">#212121</color>
+    <color name="brandLight">#FFE082</color>
+    <color name="textOnLight">#101010</color>
+    <color name="surfaceDark">#080808</color>
+    <color name="textOnDark">#C0C0C0</color>
+    <color name="colorError">#800000</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ba6c6979..637d4c8c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
-    <dimen name="drawer_header_height">280dp</dimen>
+    <dimen name="drawer_header_height">300dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a3c53b5..63e25968 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,24 +7,18 @@
 
     <string name="menu_sky">Sky at a Glance</string>
     <string name="menu_radar">Radar View</string>
-    <string name="menu_map">Map View</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_about">About the App</string>
-    <string name="menu_github">Go to GitHub</string>
+    <string name="menu_single_sat">Single Sat Passes</string>
+    <string name="menu_map">World Map View</string>
     <string name="menu_credits">Credits</string>
+    <string name="menu_about">About the App</string>
 
-    <string name="device_location_summary">Allow the app to get your location</string>
     <string name="latitude">Latitude: </string>
-    <string name="latitude_def">-90.0000</string>
-    <string name="latitude_summary">Ground station latitude from -90 to 90</string>
+    <string name="latitude_def">51.5074</string>
     <string name="longitude">Longitude: </string>
-    <string name="longitude_def">-180.0000</string>
-    <string name="longitude_summary">Ground station longitude from -180 to 180</string>
+    <string name="longitude_def">0.1278</string>
     <string name="height">Height AMSL: </string>
-    <string name="height_def">51.0m</string>
-    <string name="height_summary">Ground station height in meters AMSL</string>
+    <string name="height_def">48.0m</string>
 
-    <string name="menu_update_location">Update location</string>
     <string name="menu_fetch_transmitters">Fetch Transmitters</string>
     <string name="menu_save_to_db">Save to DB</string>
     <string name="menu_load_from_db">Load from DB</string>
@@ -32,7 +26,9 @@
     <string name="menu_load_tle">Load TLE</string>
     <string name="menu_exit">Exit</string>
 
-    <string name="next_aos_pattern">Next AOS in %02d:%02d:%02d</string>
+    <string name="next_aos_pattern">AOS in %02d:%02d:%02d</string>
+    <string name="drawer_locator">Drawer Locator</string>
     <string name="map_content">Nasa Map</string>
     <string name="placeholder">Placeholder</string>
+    <string name="about">About</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ab618002..ed749233 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,15 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@color/colorBackground</item>
+    <style name="AppTheme" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/brandLight</item>
+        <item name="colorSecondary">@color/brandLight</item>
+        <item name="colorSurface">@color/surfaceDark</item>
+        <item name="colorError">@color/colorError</item>
+
+        <item name="colorOnPrimary">@color/textOnLight</item>
+        <item name="colorOnSecondary">@color/textOnLight</item>
+        <item name="colorOnSurface">@color/textOnDark</item>
+        <item name="colorOnError">@color/textOnDark</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -16,22 +21,19 @@
     <style name="DrawerHeader">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/colorDrawerText</item>
+        <item name="android:textColor">@color/textOnDark</item>
     </style>
 
     <style name="DrawerHeader.Title">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
-        <item name="android:textSize">32sp</item>
-    </style>
-
-    <style name="DrawerHeader.Item">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">36sp</item>
     </style>
 
     <style name="DrawerHeader.Value">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Large</item>
-        <item name="android:textSize">24sp</item>
+        <item name="android:textSize">27sp</item>
+    </style>
+
+    <style name="DrawerHeader.Item">
+        <item name="android:textSize">18sp</item>
     </style>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index a66a5bf5..3c59fa6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ task clean(type: Delete) {
 }
 
 ext {
+    material = '1.2.0-alpha01'
     supportLib = '1.0.0'
     constraintLayout = '1.1.3'