diff --git a/app/build.gradle b/app/build.gradle
index 2854a2e..ec3756f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,39 +40,52 @@ android {
     }
 }
 
+
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.firebase:firebase-database-ktx:20.1.0'
-    implementation 'com.google.firebase:firebase-database:20.1.0'
+    implementation 'com.google.firebase:firebase-database-ktx:20.2.0'
+    implementation 'com.google.firebase:firebase-database:20.2.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0"
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
 
     // Testing dependencies
+    implementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.5.1') {
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude module: 'recyclerview-v7'
+        exclude module: "protobuf-lite"
+    }
+    androidTestImplementation "org.hamcrest:hamcrest:2.2"
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
+    // https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy
+    implementation 'net.bytebuddy:byte-buddy-android:1.14.4'
+
     // Optional -- Mockito framework
-    testImplementation 'org.mockito:mockito-core:5.0.0'
+    testImplementation 'org.mockito:mockito-core:5.3.1'
+    testImplementation 'org.mockito:mockito-android:5.3.1'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0'
-    testImplementation 'io.mockk:mockk:1.13.4'
+    testImplementation 'io.mockk:mockk:1.13.5'
 
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:31.1.0')
+    implementation platform('com.google.firebase:firebase-bom:31.5.0')
 
     // Add the dependency for the Firebase library
     // When using the BoM, you don't specify versions in Firebase library dependencies
@@ -95,11 +108,11 @@ dependencies {
     implementation 'com.firebaseui:firebase-ui-storage:8.0.2'
 
     // Also add the dependency for the Google Play services library and specify its version
-    implementation 'com.google.android.gms:play-services-auth:20.4.1'
+    implementation 'com.google.android.gms:play-services-auth:20.5.0'
 
     // Add the dependency for Glide
-    implementation 'com.github.bumptech.glide:glide:4.15.0'
-    kapt 'com.github.bumptech.glide:compiler:4.15.0'
+    implementation 'com.github.bumptech.glide:glide:4.15.1'
+    kapt 'com.github.bumptech.glide:compiler:4.15.1'
 
     // Konfetti by https://github.com/DanielMartinus/Konfetti
     implementation 'nl.dionsegijn:konfetti-xml:2.0.2'
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt
new file mode 100644
index 0000000..5b87b9d
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CalendarActivityTest.kt
@@ -0,0 +1,18 @@
+package com.symphony.mrfit.ui
+
+import org.junit.Assert.*
+
+import org.junit.Test
+
+class CalendarActivityTest {
+    //behavioral
+    @Test
+    fun onCreate() {
+    }
+    @Test
+    fun onStart() {
+    }
+    @Test
+    fun onSupportNavigateUp() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
new file mode 100644
index 0000000..6aa60e6
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CoreFunctionalityTest.kt
@@ -0,0 +1,150 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class CoreFunctionalityTest {
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<MainActivity>()
+
+    /**
+     * Test a run through of the app's core functionality. It should:
+     * Log in with the credentials 'demo@email.com' and 'pass123'
+     * Start a new workout
+     * Make a new workout called "Automated Testing"
+     * Add 3 exercises to it, whichever 3 are at the top of the list
+     * Start the workout, wait 5 seconds, then finish the workout
+     * Return to the home screen after
+     * Navigate to and delete this new workout
+     * Navigate to the user's profile and log out
+     */
+    @Test
+    fun coreFunctionality() {
+        // Wait to automatically move past welcome screen
+        Thread.sleep(100)
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
+
+        // Attempt to log in
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(TEST_EMAIL), closeSoftKeyboard())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(TEST_PASS), closeSoftKeyboard())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.loginButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_homeActivity))
+            .check(matches(isDisplayed()))
+
+        // Navigate to the Template selection screen
+        Espresso.onView(withId(R.id.workoutButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
+
+        // Make a new workout and name it
+        Espresso.onView(withId(R.id.newWorkoutButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.routineNameEditText))
+            .perform(clearText())
+            .perform(typeText(TEST_TEMPLATE), closeSoftKeyboard())
+
+        // Add 3 exercises
+        // 1st Exercise
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+        // 2nd Exercise
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(1, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+        // 3rd Exercise
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .perform(click())
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseListView))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(2, click()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .perform(click())
+        Thread.sleep(1000)
+
+        // Start the workout and finish it after 10 seconds
+        Espresso.onView(withId(R.id.startWorkoutButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_currentActivity))
+            .check(matches(isDisplayed()))
+        Thread.sleep(10000)
+        Espresso.onView(withId(R.id.finishWorkoutButton))
+            .perform(click())
+        Espresso.onView(withText("Good job!")).check(matches(isDisplayed()))
+        Espresso.onView(withText("Return Home")).perform(click())
+
+        // Navigate back and delete workout
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.workoutButton))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withText(TEST_TEMPLATE))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.deleteWorkoutButton))
+            .perform(click())
+        Espresso.pressBack()
+        Thread.sleep(1000)
+
+        // Navigate to user profile and log out
+        Espresso.onView(withId(R.id.userLayout))
+            .perform(click())
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.layout_profileActivity))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.logoutButton))
+            .perform(click())
+    }
+
+    companion object {
+        const val TEST_EMAIL = "demo@email.com"
+        const val TEST_PASS = "pass123"
+        const val TEST_TEMPLATE = "Automated Testing"
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
new file mode 100644
index 0000000..3eff07c
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
@@ -0,0 +1,56 @@
+package com.symphony.mrfit.ui
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.Assert.assertEquals
+
+
+
+
+@RunWith(AndroidJUnit4::class)
+class CurrentWorkoutActivityTest {
+    //behavioral
+    @Test
+    fun onCreate() {
+
+    }
+    //behavioral
+    @Test
+    fun onStart() {
+
+    }
+    @Test
+    fun gotoHome() {
+        // Start the activity
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val intent = Intent(context, HomeActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        val expectedFlags = (Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                Intent.FLAG_ACTIVITY_CLEAR_TASK or
+                Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        assertEquals(expectedFlags, intent.flags)
+        assertEquals(context.packageName, intent.component?.packageName)
+        assertEquals(HomeActivity::class.java.name, intent.component?.className)
+    }
+    //behavioral
+    @Test
+    fun onSupportNavigateUp() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt
new file mode 100644
index 0000000..b4086ae
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CustomExercisesActivityTest.kt
@@ -0,0 +1,27 @@
+package com.symphony.mrfit.ui
+
+import androidx.test.core.app.ApplicationProvider
+import com.symphony.mrfit.data.exercise.ExerciseViewModel
+import com.symphony.mrfit.data.model.Exercise
+import org.junit.Assert.*
+import org.junit.Before
+
+import org.junit.Test
+
+class CustomExercisesActivityTest {
+    //behavioral
+    //TODO
+    @Test
+    fun onCreate() {
+    }
+    @Test
+    fun onStart() {
+    }
+    @Test
+    fun onSupportNavigateUp() {
+    }
+    @Test
+    fun deleteExercise(){
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
new file mode 100644
index 0000000..bb258ad
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -0,0 +1,70 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class ExerciseTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<ExerciseActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_exerciseSelectionActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.exerciseScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.exerciseListView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.exerciseSearchTextView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.exerciseSearchEditText))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.exerciseSearchButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.button2))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
new file mode 100644
index 0000000..d422f68
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -0,0 +1,22 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.ext.junit.rules.activityScenarioRule
+import org.junit.Rule
+import org.junit.Test
+
+class GoalsActivityTest {
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<GoalsActivity>()
+
+    //TODO
+    @Test
+    fun checkActivityVisibility() {
+    }
+}
+
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
new file mode 100644
index 0000000..7dc1366
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HelperTest.kt
@@ -0,0 +1,29 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.app.Activity
+import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.Test
+import java.util.*
+
+
+class HelperTest{
+    private lateinit var activity: Activity
+
+    //test functionality of calendar method
+    @Test
+    fun toCalendarconvertsDatetoCalendar() {
+        val date = Date()
+        val cal = Helper.toCalendar(date)
+        assertThat(cal.get(Calendar.YEAR), `is`(Calendar.getInstance().get(Calendar.YEAR)))
+        assertThat(cal.get(Calendar.MONTH), `is`(Calendar.getInstance().get(Calendar.MONTH)))
+        assertThat(cal.get(Calendar.DAY_OF_MONTH), `is`(Calendar.getInstance().get(Calendar.DAY_OF_MONTH))
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
new file mode 100644
index 0000000..118c83a
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -0,0 +1,84 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.core.IsNot.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class HomeActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<HomeActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_homeActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.homeScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.userLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.homeProfilePicture))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.homeWelcomeTextView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.homeNameTextView))
+            .check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.homeScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.settingsCog))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.scheduleButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.pastWorkout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.workoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.historyList))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
index 41094ea..eb6f532 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
@@ -1,14 +1,13 @@
 /*
- *  Created by Team Symphony on 2/24/23, 11:21 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 2/24/23, 11:20 PM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
 
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -33,7 +32,8 @@ class LoginActivityTest {
      */
     @Test
     fun checkActivityVisibility() {
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
@@ -41,19 +41,19 @@ class LoginActivityTest {
      */
     @Test
     fun checkViewVisibility() {
-        onView(withId(R.id.loginEmail))
+        Espresso.onView(withId(R.id.loginEmail))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.loginPassword))
+        Espresso.onView(withId(R.id.loginPassword))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginButton))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.googleButton))
+        Espresso.onView(withId(R.id.googleButton))
             .check(matches(isDisplayed()))
 
-        onView(withId(R.id.toRegisterTextView))
+        Espresso.onView(withId(R.id.toRegisterTextView))
             .check(matches(isDisplayed()))
     }
 
@@ -62,37 +62,36 @@ class LoginActivityTest {
      */
     @Test
     fun checkFailedLogin() {
-        onView(withId(R.id.loginEmail))
-            .perform(ViewActions.typeText(TEST_EMAIL), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginPassword))
-            .perform(ViewActions.typeText(TEST_PASS), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(TEST_EMAIL), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(TEST_PASS), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginButton))
             .perform(click())
 
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
     /**
      * Test if login works
      */
-    /*
     @Test
     fun checkValidLogin() {
-        onView(withId(R.id.loginEmail))
-            .perform(ViewActions.typeText(REAL_EMAIL), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginPassword))
-            .perform(ViewActions.typeText(REAL_PASS), ViewActions.closeSoftKeyboard())
-        onView(withId(R.id.loginButton))
+        Espresso.onView(withId(R.id.loginEmail))
+            .perform(typeText(REAL_EMAIL), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginPassword))
+            .perform(typeText(REAL_PASS), closeSoftKeyboard())
+        Espresso.onView(withId(R.id.loginButton))
             .perform(click())
-        onView(withId(R.id.layout_loginActivity)).check(matches(isDisplayed()))
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 
-     */
-
     companion object {
 
-        const val REAL_EMAIL = "test@symphony.com"
-        const val REAL_PASS = "abcd1234"
+        const val REAL_EMAIL = "demo@symphony.com"
+        const val REAL_PASS = "pass123"
         const val TEST_EMAIL = "fake_email@symphony.com"
         const val TEST_PASS = "1234abcd"
     }
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
new file mode 100644
index 0000000..76aee11
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -0,0 +1,61 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class TemplateSelectionActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<RoutineSelectionActivity>()
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_selectionActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.selectionScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.routineListView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.newWorkoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
index e15a655..ed0b9c1 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -1,38 +1,164 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
 package com.symphony.mrfit.ui
 
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.symphony.mrfit.R
-import org.junit.Assert.*
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
 import org.junit.Rule
-
 import org.junit.Test
+import org.junit.runner.RunWith
 
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
 class UserProfileActivityTest {
 
+    @Before
+    fun setUp() {
+    }
+
     @get:Rule
     var activityScenarioRule = activityScenarioRule<UserProfileActivity>()
 
-    /*tests if you can logout from user profile*/
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_profileActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
     @Test
     fun checkViewVisibility() {
-        onView(withId(R.id.profileScreenView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.profileScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.profilePicture))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.profileNameTextView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.editProfileButton))
+            .check(matches(not(isDisplayed())))
+
+        Espresso.onView(withId(R.id.heightLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.weightLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.ageLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.stuffLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.goalsButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.notificationsButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.historyButton))
+            .check(matches(isDisplayed()))
 
-        onView(withId(R.id.profileNameTextView))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.customExercisesButton))
+            .check(matches(isDisplayed()))
 
-        onView(withId(R.id.weightLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.settingLayout))
+            .check(matches(isDisplayed()))
 
-        onView(withId(R.id.ageLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.notificationToggle))
+            .check(matches(not(isDisplayed())))
 
-        onView(withId(R.id.heightLayout))
-            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(withId(R.id.logoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.deleteButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+
+    /**
+     * Test if the Notifications button navigates properly
+     */
+    @Test
+    fun notificationsButtonTest() {
+        Espresso.onView(withId(R.id.notificationsButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_notificationLogActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Goals button navigates properly
+     */
+    @Test
+    fun goalsButtonTest() {
+        Espresso.onView(withId(R.id.goalsButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_goalsActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the History button navigates properly
+     */
+    @Test
+    fun historyButtonTest() {
+        Espresso.onView(withId(R.id.historyButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_workoutHistoryActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Exercises button navigates properly
+     */
+    @Test
+    fun exerciseButtonTest() {
+        Espresso.onView(withId(R.id.customExercisesButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_customExerciseActivity))
+            .check(matches(isDisplayed()))
+        Espresso.pressBack()
+        Thread.sleep(500)
+    }
+
+    /**
+     * Test if the Logout button navigates properly
+     */
+    @Test
+    fun logoutButtonTest() {
+        Espresso.onView(withId(R.id.logoutButton))
+            .perform(click())
+        Espresso.onView(withId(R.id.layout_loginActivity))
+            .check(matches(isDisplayed()))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
new file mode 100644
index 0000000..3057e4e
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -0,0 +1,93 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class WorkoutRoutineActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<WorkoutRoutineActivity>(
+        intent = Intent(
+            ApplicationProvider.getApplicationContext(),
+            WorkoutRoutineActivity::class.java
+        )
+            .putExtra(WorkoutTemplateActivity.EXTRA_IDENTITY, "test")
+    )
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_workoutBuilderActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(1000)
+        Espresso.onView(withId(R.id.routineScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.headerLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.routineNameEditText))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.workoutPlaylistEditText))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.openPlaylistButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.workoutListView))
+            .check(matches(not(isDisplayed())))
+
+        Espresso.onView(withId(R.id.routineScreenButtons))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.startWorkoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.newExerciseButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.saveWorkoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.deleteWorkoutButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.loadingSpinner))
+            .check(matches(not(isDisplayed())))
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
new file mode 100644
index 0000000..ac1eb55
--- /dev/null
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -0,0 +1,86 @@
+/*
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/22/23, 6:05 AM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.symphony.mrfit.R
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4ClassRunner::class)
+@LargeTest
+class WorkoutTemplateActivityTest {
+
+    @Before
+    fun setUp() {
+    }
+
+    @get:Rule
+    var activityScenarioRule = activityScenarioRule<WorkoutTemplateActivity>(
+        intent = Intent(
+            ApplicationProvider.getApplicationContext(),
+            WorkoutTemplateActivity::class.java
+        )
+            .putExtra(WorkoutRoutineActivity.EXTRA_ROUTINE, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_IDENTITY, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_EXERCISE, "test")
+            .putExtra(WorkoutTemplateActivity.EXTRA_LIST, ArrayList<String>())
+    )
+
+    /**
+     * Test if the activity is displayed and visible to user
+     */
+    @Test
+    fun checkActivityVisibility() {
+        Espresso.onView(withId(R.id.layout_exerciseBuilderActivity))
+            .check(matches(isDisplayed()))
+    }
+
+    /**
+     * Test if all the appropriate components are visible
+     */
+    @Test
+    fun checkViewVisibility() {
+        Thread.sleep(500)
+        Espresso.onView(withId(R.id.templateScreenView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.exerciseCardView))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.editDuration))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.editDistance))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.repsAndSetsLayout))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.editReps))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.editSets))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.deleteTemplateButton))
+            .check(matches(isDisplayed()))
+
+        Espresso.onView(withId(R.id.saveTemplateButton))
+            .check(matches(isDisplayed()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e6be84..1bf2511 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 9:44 PM
+  ~  Created by Team Symphony on 4/21/23, 3:22 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 9:44 PM
+  ~  Last modified 4/21/23, 3:22 PM
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,6 +25,14 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.MrFit"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.DateTimeActivity"
+            android:exported="false"
+            android:parentActivityName=".ui.MainActivity" />
+        <activity
+            android:name=".ManualWorkoutActivity"
+            android:exported="false"
+            android:parentActivityName=".ui.MainActivity" />
         <activity
             android:name=".ui.CustomExercisesActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt b/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
index e55af3c..3ec22b7 100644
--- a/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
+++ b/app/src/main/java/com/symphony/mrfit/AddStockExercises.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:27 PM
+ *  Last modified 4/22/23, 6:13 AM
  */
 
 package com.symphony.mrfit
@@ -29,10 +29,6 @@ class AddStockExercises : AppCompatActivity() {
             this, ExerciseViewModelFactory()
         )[ExerciseViewModel::class.java]
 
-        /**
-         * TODO: Replace all Uri parses with appropriate images
-         */
-
         exerciseViewModel.addExercise(
             Exercise(
                 "Walking",
diff --git a/app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt
new file mode 100644
index 0000000..d47d000
--- /dev/null
+++ b/app/src/main/java/com/symphony/mrfit/ManualWorkoutActivity.kt
@@ -0,0 +1,237 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 3:22 PM
+ */
+
+package com.symphony.mrfit
+
+import android.app.Activity
+import android.content.ContentValues
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.firebase.Timestamp
+import com.symphony.mrfit.data.exercise.ExerciseViewModel
+import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
+import com.symphony.mrfit.data.exercise.RoutineAdapter2
+import com.symphony.mrfit.data.model.History
+import com.symphony.mrfit.data.profile.ProfileViewModel
+import com.symphony.mrfit.data.profile.ProfileViewModelFactory
+import com.symphony.mrfit.databinding.ActivityManualWorkoutBinding
+import com.symphony.mrfit.ui.DateTimeActivity
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * Screen for the User to manually add a workout History
+ */
+
+class ManualWorkoutActivity : AppCompatActivity() {
+
+    private var layoutManager: RecyclerView.LayoutManager? = null
+    private lateinit var exerciseViewModel: ExerciseViewModel
+    private lateinit var profileViewModel: ProfileViewModel
+    private lateinit var binding: ActivityManualWorkoutBinding
+    private lateinit var startTimeSelection: TextView
+    private lateinit var endTimeSelection: TextView
+    private var startTime: Long = 0
+    private var endTime: Long = 0
+    private val dateFormat = SimpleDateFormat(
+        "MMMM dd, yyyy 'at' hh:mm a",
+        Locale.getDefault()
+    )
+
+    private val launchStartTimePicker =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+
+            if (result.resultCode == Activity.RESULT_OK) {
+                // User picked a time, sanity check it is before the current end time
+                val newStart = Calendar.getInstance()
+                newStart.timeInMillis = result.data!!.getLongExtra(EXTRA_TIME, 0)
+                val t = Calendar.getInstance()
+                t.timeInMillis = endTime
+                if (newStart.after(t)) {
+                    // Times are off, set the end time to at least 1 minute after the new start time
+                    val diff = intent.getLongExtra(TIME_DIFF, ONE_MINUTE.toLong())
+                    t.timeInMillis = newStart.timeInMillis + diff
+                }
+                startTime = newStart.timeInMillis
+                endTime = t.timeInMillis
+
+                // Set the text views
+                setText()
+            } else if (result.resultCode == Activity.RESULT_CANCELED) {
+                /* Intentionally left blank */
+            }
+        }
+
+    private val launchEndTimePicker =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+
+            if (result.resultCode == Activity.RESULT_OK) {
+                // User picked a time, sanity check it is before the current end time
+                val newEnd = Calendar.getInstance()
+                newEnd.timeInMillis = result.data!!.getLongExtra(EXTRA_TIME, 0)
+                val t = Calendar.getInstance()
+                t.timeInMillis = startTime
+                if (newEnd.before(t)) {
+                    // Times are off, set the start time to at least 1 minute before the new end time
+                    val diff = intent.getLongExtra(TIME_DIFF, ONE_MINUTE.toLong())
+                    t.timeInMillis = newEnd.timeInMillis - diff
+                }
+                endTime = newEnd.timeInMillis
+                startTime = t.timeInMillis
+
+                // Set the text views
+                setText()
+            } else if (result.resultCode == Activity.RESULT_CANCELED) {
+                /* Intentionally left blank */
+            }
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityManualWorkoutBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        exerciseViewModel = ViewModelProvider(
+            this, ExerciseViewModelFactory()
+        )[ExerciseViewModel::class.java]
+        profileViewModel = ViewModelProvider(
+            this, ProfileViewModelFactory()
+        )[ProfileViewModel::class.java]
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onStart() {
+        super.onStart()
+
+        val routineList = binding.templateRecyclerList
+        val startTimePicker = binding.startTimeRow
+        val endTimePicker = binding.endTimeRow
+        startTimeSelection = binding.startTimeSelection
+        endTimeSelection = binding.endTimeSelection
+        val save = binding.saveManualWorkoutButton
+
+        var selectedThing = intent.getIntExtra(SAVED_SELECTION, -999)
+        var routineName = ""
+        var routineID = ""
+        var selection = false
+
+        fun update(name: String, id: String, num: Int) {
+            routineName = name
+            routineID = id
+            selection = true
+            selectedThing = num
+        }
+
+        // Set the layout of the grid of routines presented to the user
+        layoutManager = GridLayoutManager(this, 2)
+        routineList.layoutManager = layoutManager
+
+        // Initialize the current date time, will be overwritten later if needed
+        startTime = intent.getLongExtra(SAVED_START, Date().time)
+        endTime = intent.getLongExtra(SAVED_END, Date().time + ONE_MINUTE)
+        setText()
+
+        // Initialize the routine list, then listen to it to update the UI
+        exerciseViewModel.getUserRoutines()
+        exerciseViewModel.workoutRoutineList.observe(this, Observer {
+            Log.d(ContentValues.TAG, "Updating routine list")
+            val workoutRoutineList = it ?: return@Observer
+
+            routineList.adapter = RoutineAdapter2(this, workoutRoutineList, ::update, selectedThing)
+
+        })
+
+        /**
+         * Navigate to a screen for the user to select a start time, await its result
+         * If selected time is after end time, adjust end time accordingly
+         */
+        startTimePicker.setOnClickListener {
+            intent.putExtra(SAVED_START, startTime)
+            intent.putExtra(SAVED_END, endTime)
+            intent.putExtra(SAVED_SELECTION, selectedThing)
+            intent.putExtra(TIME_DIFF, endTime - startTime)
+            val picker = Intent(this, DateTimeActivity::class.java)
+            picker.putExtra(EXTRA_TIME, startTime)
+            launchStartTimePicker.launch(picker)
+        }
+
+        /**
+         * Navigate to a screen for the user to select an end time, await its result
+         * If selected time is before start time, adjust start time accordingly
+         */
+        endTimePicker.setOnClickListener {
+            intent.putExtra(SAVED_START, startTime)
+            intent.putExtra(SAVED_END, endTime)
+            intent.putExtra(SAVED_SELECTION, selectedThing)
+            intent.putExtra(TIME_DIFF, endTime - startTime)
+            val picker = Intent(this, DateTimeActivity::class.java)
+            picker.putExtra(EXTRA_TIME, endTime)
+            launchEndTimePicker.launch(picker)
+        }
+
+        /**
+         * Create a history from the given information and add it to the database
+         * A template must be selected
+         * The end time must not be before the start time
+         */
+        save.setOnClickListener {
+            if (selection) {
+                if (startTime < endTime) {
+                    profileViewModel.addWorkoutToHistory(
+                        History(
+                            routineName,
+                            Timestamp(Date(startTime)),
+                            endTime - startTime,
+                            routineID
+                        )
+                    )
+                    finish()
+                } else {
+                    Toast.makeText(
+                        this,
+                        "Times are out of order",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+            } else {
+                Toast.makeText(
+                    this,
+                    "Must select a template",
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+
+    private fun setText() {
+        startTimeSelection.text = dateFormat.format(startTime)
+        endTimeSelection.text = dateFormat.format(endTime)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressedDispatcher.onBackPressed()
+        return true
+    }
+
+    companion object {
+        const val EXTRA_TIME = "passed time"
+        const val SAVED_START = "saved start time"
+        const val SAVED_END = "saved end time"
+        const val SAVED_SELECTION = "saved selection"
+        const val TIME_DIFF = "difference between times"
+        const val ONE_MINUTE = 60000
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt
new file mode 100644
index 0000000..42af742
--- /dev/null
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/RoutineAdapter2.kt
@@ -0,0 +1,79 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 3:22 PM
+ */
+
+package com.symphony.mrfit.data.exercise
+
+import android.content.Context
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.recyclerview.widget.RecyclerView
+import com.symphony.mrfit.R
+import com.symphony.mrfit.data.model.WorkoutRoutine
+
+/**
+ * Adapter for dynamically populating card_routine with information read from a list of Routines
+ */
+
+class RoutineAdapter2(
+    val context: Context,
+    val data: ArrayList<WorkoutRoutine>,
+    val update: (String, String, Int) -> Unit,
+    private var selectedPos: Int
+) : RecyclerView.Adapter<RoutineAdapter2.ViewHolder>() {
+
+
+    override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): ViewHolder {
+        val v = LayoutInflater.from(viewGroup.context)
+            .inflate(R.layout.card_routine, viewGroup, false)
+        if (selectedPos == -999)
+            selectedPos = RecyclerView.NO_POSITION
+        return ViewHolder(v)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onBindViewHolder(holder: ViewHolder, i: Int) {
+        val colour: Int = if (selectedPos == i) {
+            R.color.off_garnet
+        } else {
+            R.color.garnet
+        }
+        holder.cardBackground.background = ColorDrawable(context.getColor(colour))
+        holder.routineTitle.text = data[i].name
+
+        /**
+         * Change the selected item
+         */
+        holder.itemView.setOnClickListener {
+            notifyItemChanged(selectedPos)
+            selectedPos = holder.absoluteAdapterPosition
+            notifyItemChanged(selectedPos)
+            update(data[selectedPos].name, data[selectedPos].routineID, selectedPos)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    inner class ViewHolder(routineView: View) : RecyclerView.ViewHolder(routineView) {
+
+        var routineTitle: TextView
+        var routineDetail: TextView
+        var cardBackground: RelativeLayout
+
+        init {
+            routineTitle = routineView.findViewById(R.id.workoutNameTextView)
+            routineDetail = routineView.findViewById(R.id.workoutDescriptionTextView)
+            cardBackground = routineView.findViewById(R.id.cardBackground)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
index e485500..c1d6d02 100644
--- a/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/exercise/WorkoutAdapter.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:22 PM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.data.exercise
@@ -31,7 +31,12 @@ import com.symphony.mrfit.ui.WorkoutTemplateActivity.Companion.EXTRA_LIST
  * a passed list of Workouts, as well as the parent Routine's ID and workoutList
  */
 
-class WorkoutAdapter (val context: Context, val data: ArrayList<Workout>, private val rID: String, private val rList: ArrayList<String>): RecyclerView.Adapter<WorkoutAdapter.ViewHolder>() {
+class WorkoutAdapter(
+    val context: Context,
+    val data: ArrayList<Workout>,
+    private val rID: String,
+    private val rList: ArrayList<String>
+) : RecyclerView.Adapter<WorkoutAdapter.ViewHolder>() {
 
     private var storage: FirebaseStorage = Firebase.storage
 
diff --git a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
index 5bdac84..4ab6e3c 100644
--- a/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
+++ b/app/src/main/java/com/symphony/mrfit/data/profile/UserRepository.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/19/23, 7:07 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 7:07 PM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.data.profile
@@ -50,21 +50,26 @@ class UserRepository {
      * Pull the currently logged in user's profile from Firestore
      */
     suspend fun getCurrentUser() : User? {
-        Log.d(TAG, "Retrieving User ${auth.currentUser!!.uid} from Firestore")
-        val doc = auth.currentUser!!.uid
-        val docRef = database.collection(USER_COLLECTION).document(doc)
-        return try {
-            val snapshot = docRef.get().await()
-            // Something wrong happened when deleting this user, fix it
-            if (snapshot.get("userID") == null) {
-                LoginRepository().delete()
-                LoginRepository().logout()
-                User("delete")
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Retrieving User ${user.uid} from Firestore")
+            val doc = user.uid
+            val docRef = database.collection(USER_COLLECTION).document(doc)
+            return try {
+                val snapshot = docRef.get().await()
+                // Something wrong happened when deleting this user, fix it
+                if (snapshot.get("userID") == null) {
+                    LoginRepository().delete()
+                    LoginRepository().logout()
+                    User("delete")
+                }
+                snapshot.toObject<User>()
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error getting document", e)
+                null
             }
-            snapshot.toObject<User>()
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error getting document", e)
-            null
+        } else {
+            return user
         }
     }
 
@@ -97,15 +102,17 @@ class UserRepository {
      * Only called when a user is being deleted, remove their document from Firestore
      */
     suspend fun removeUser() {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Removing User ${user.uid} from Firestore")
-        try {
-            database.collection(USER_COLLECTION).document(user.uid)
-                .delete()
-                .await()
-            Log.d(TAG, "DocumentSnapshot successfully deleted!")
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error deleting document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Removing User ${user.uid} from Firestore")
+            try {
+                database.collection(USER_COLLECTION).document(user.uid)
+                    .delete()
+                    .await()
+                Log.d(TAG, "DocumentSnapshot successfully deleted!")
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error deleting document", e)
+            }
         }
     }
 
@@ -113,14 +120,16 @@ class UserRepository {
      * Add a new Workout History to the user's subcollection
      */
     suspend fun addWorkoutHistory(history: History) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the history of ${user.uid}")
-        try {
-            val docRef = database.collection(USER_COLLECTION).document(user.uid)
-                .collection(HISTORY_COLLECTION).add(history).await()
-            docRef.update("historyID", docRef.id).await()
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error writing documents: ", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the history of ${user.uid}")
+            try {
+                val docRef = database.collection(USER_COLLECTION).document(user.uid)
+                    .collection(HISTORY_COLLECTION).add(history).await()
+                docRef.update("historyID", docRef.id).await()
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error writing documents: ", e)
+            }
         }
     }
 
@@ -128,37 +137,43 @@ class UserRepository {
      * Delete a given history via its ID
      */
     suspend fun deleteWorkoutHistory(historyID: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting history $historyID belonging to ${user.uid}")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(HISTORY_COLLECTION)
-            .document(historyID)
-            .delete()
-            .await()
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting history $historyID belonging to ${user.uid}")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(HISTORY_COLLECTION)
+                .document(historyID)
+                .delete()
+                .await()
+        }
     }
 
     /**
      * Get a user's complete Workout History
      */
     suspend fun getWorkoutHistory(): ArrayList<History> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val historyList = arrayListOf<History>()
-        Log.d(TAG, "Getting the history of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(HISTORY_COLLECTION)
-                .get()
-                .await()
+        if (user != null) {
+            Log.d(TAG, "Getting the history of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(HISTORY_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                historyList.add(document.toObject())
+                for (document in result) {
+                    historyList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return historyList
+        } else {
+            return historyList
         }
-        return historyList
     }
 
     /**
@@ -191,69 +206,78 @@ class UserRepository {
      * Add a new Notification to the user's notification subcollection
      */
     suspend fun addNotification(notification: Notification) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the history of ${user.uid}")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(NOTIFICATION_COLLECTION)
-            .document(notification.date!!.toDate().time.toString())
-            .set(notification)
-            .await()
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the history of ${user.uid}")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(NOTIFICATION_COLLECTION)
+                .document(notification.date!!.toDate().time.toString())
+                .set(notification)
+                .await()
+        }
     }
 
     /**
      * Get a user's scheduled and past notifications
      */
     suspend fun getNotifications(): ArrayList<Notification> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val notificationList = arrayListOf<Notification>()
-        Log.d(TAG, "Getting the notifications of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(NOTIFICATION_COLLECTION)
-                .get()
-                .await()
+        if (user == null) {
+            return notificationList
+        } else {
+            Log.d(TAG, "Getting the notifications of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(NOTIFICATION_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                notificationList.add(document.toObject())
+                for (document in result) {
+                    notificationList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return notificationList
         }
-        return notificationList
     }
 
     /**
      * Remove a notification from the user's subcollection
      */
     suspend fun deleteNotification(date: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting notification with timestamp: $date")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(NOTIFICATION_COLLECTION)
-            .document(date)
-            .delete()
-            .await()
-
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting notification with timestamp: $date")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(NOTIFICATION_COLLECTION)
+                .document(date)
+                .delete()
+                .await()
+        }
     }
 
     /**
      * Add a new Goal to the user's goal subcollection
      */
     suspend fun addGoal(goal: Goal) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Adding to the goals of ${user.uid}")
-        try {
-            val docRef = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .add(goal)
-                .await()
-            docRef.update("goalID", docRef.id).await()
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error writing document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Adding to the goals of ${user.uid}")
+            try {
+                val docRef = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .add(goal)
+                    .await()
+                docRef.update("goalID", docRef.id).await()
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error writing document", e)
+            }
         }
     }
 
@@ -261,16 +285,18 @@ class UserRepository {
      * Update an existing goal with its id
      */
     suspend fun updateGoal(goal: Goal) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Updating goal ${goal.goalID} belonging to ${user.uid}")
-        try {
-            database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .document(goal.goalID!!)
-                .set(goal)
-        } catch (e: java.lang.Exception) {
-            Log.w(TAG, "Error writing document", e)
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Updating goal ${goal.goalID} belonging to ${user.uid}")
+            try {
+                database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .document(goal.goalID!!)
+                    .set(goal)
+            } catch (e: java.lang.Exception) {
+                Log.w(TAG, "Error writing document", e)
+            }
         }
     }
 
@@ -278,38 +304,43 @@ class UserRepository {
      * Get a user's scheduled and past goals
      */
     suspend fun getGoals(): ArrayList<Goal> {
-        val user = auth.currentUser!!
+        val user = auth.currentUser
         val goalList = arrayListOf<Goal>()
-        Log.d(TAG, "Getting the goals of ${user.uid}")
-        try {
-            val result = database.collection(USER_COLLECTION)
-                .document(user.uid)
-                .collection(GOAL_COLLECTION)
-                .get()
-                .await()
+        if (user == null) {
+            return goalList
+        } else {
+            Log.d(TAG, "Getting the goals of ${user.uid}")
+            try {
+                val result = database.collection(USER_COLLECTION)
+                    .document(user.uid)
+                    .collection(GOAL_COLLECTION)
+                    .get()
+                    .await()
 
-            for (document in result) {
-                goalList.add(document.toObject())
+                for (document in result) {
+                    goalList.add(document.toObject())
+                }
+            } catch (e: java.lang.Exception) {
+                Log.d(TAG, "Error getting documents: ", e)
             }
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error getting documents: ", e)
+            return goalList
         }
-        return goalList
     }
 
     /**
      * Remove a goal from the user's subcollection
      */
     suspend fun deleteGoal(goalID: String) {
-        val user = auth.currentUser!!
-        Log.d(TAG, "Deleting goal with ID: $goalID")
-        database.collection(USER_COLLECTION)
-            .document(user.uid)
-            .collection(GOAL_COLLECTION)
-            .document(goalID)
-            .delete()
-            .await()
-
+        val user = auth.currentUser
+        if (user != null) {
+            Log.d(TAG, "Deleting goal with ID: $goalID")
+            database.collection(USER_COLLECTION)
+                .document(user.uid)
+                .collection(GOAL_COLLECTION)
+                .document(goalID)
+                .delete()
+                .await()
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
index 93d369e..377d797 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CalendarActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 6:07 PM
+ *  Created by Team Symphony on 4/20/23, 2:11 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 6:06 PM
+ *  Last modified 4/20/23, 2:08 AM
  */
 
 package com.symphony.mrfit.ui
@@ -36,6 +36,10 @@ import com.symphony.mrfit.ui.Helper.toCalendar
 import java.text.SimpleDateFormat
 import java.util.*
 
+/**
+ * Screen featuring a Material UI-based Calendar widget for easy date selection
+ */
+
 class CalendarActivity : AppCompatActivity() {
 
     private var layoutManager: RecyclerView.LayoutManager? = null
@@ -77,6 +81,10 @@ class CalendarActivity : AppCompatActivity() {
             profileViewModel.getNotifications()
         }
 
+        /**
+         * Cancel a pending notification
+         * PendingIntent must match the notificaiton to be cancelled
+         */
         @RequiresApi(Build.VERSION_CODES.M)
         fun cancelNotification(time: String) {
             val notificationIntent = Intent(applicationContext, Notifications::class.java)
@@ -98,6 +106,7 @@ class CalendarActivity : AppCompatActivity() {
         layoutManager = LinearLayoutManager(this)
         alarmList.layoutManager = layoutManager
 
+        // Populate the calendar with current notifications
         profileViewModel.getNotifications()
         profileViewModel.notifications.observe(this, Observer {
             Log.d(ContentValues.TAG, "Filling in username")
@@ -106,6 +115,7 @@ class CalendarActivity : AppCompatActivity() {
             val todayAlerts = ArrayList<Notification>()
             notifDays.clear()
 
+            // Iterate over all notifications, note any on the currently selected date
             for (n in notifications) {
                 notifDays.add(n)
                 val notificationDate = n.date!!.toDate()
@@ -126,6 +136,7 @@ class CalendarActivity : AppCompatActivity() {
             calendar.setEvents(alertDays)
         })
 
+        // When a new day is selected, check for notifications on that date
         calendar.setOnDayClickListener(object : OnDayClickListener {
             override fun onDayClick(eventDay: EventDay) {
                 val clickedDay = eventDay.calendar
@@ -146,10 +157,6 @@ class CalendarActivity : AppCompatActivity() {
             }
         })
 
-        /**
-         * TODO: Pass the currently selected date to the new intent
-         *  then receive selected date to position selected day on restart
-         */
         newAlarm.setOnClickListener {
             val intent = Intent(this, NotificationActivity::class.java)
             intent.putExtra(EXTRA_DATE, calendar.firstSelectedDate.timeInMillis)
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
index 2b60a48..3a8bb0d 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CurrentWorkoutActivity.kt
@@ -1,18 +1,17 @@
 /*
- *  Created by Team Symphony on 4/19/23, 4:23 PM
+ *  Created by Team Symphony on 4/21/23, 10:36 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 4:15 PM
+ *  Last modified 4/21/23, 10:36 PM
  */
 
 package com.symphony.mrfit.ui
 
-import android.app.Dialog
 import android.content.ContentValues
 import android.content.Intent
 import android.os.Bundle
 import android.os.SystemClock
 import android.util.Log
-import android.widget.Button
+import android.view.LayoutInflater
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -20,6 +19,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.Timestamp
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
@@ -78,6 +78,8 @@ class CurrentWorkoutActivity : AppCompatActivity() {
 
         /**
          * Retrieve the extras passed to this intent
+         * passedRoutineName = The name of the parent routine
+         * passedRoutineID = The ID of the parent routine
          * passedList = The workoutList from the parent Routine
          */
         val passedRoutineName = intent.getStringExtra(EXTRA_STRING)
@@ -104,6 +106,10 @@ class CurrentWorkoutActivity : AppCompatActivity() {
 
         cancelButton.setOnClickListener { onSupportNavigateUp() }
 
+        /**
+         * When finishing a workout, save it to the User's history and display
+         * a congratulation dialog
+         */
         finishButton.setOnClickListener {
             timer.stop()
             val timeSpent = SystemClock.elapsedRealtime() - timer.base
@@ -122,20 +128,21 @@ class CurrentWorkoutActivity : AppCompatActivity() {
             ).show()
 
 
-            val dialog = Dialog(this)
-            dialog.setContentView(R.layout.activity_post_workout)
-            dialog.setTitle("Post Workout")
+            // Create the dialog and inflate its view like an activity
+            val materialDialog = MaterialAlertDialogBuilder(this)
+            val dialogView = LayoutInflater.from(this)
+                .inflate(R.layout.activity_post_workout, null, false)
+
+            materialDialog.setView(dialogView)
 
-            val goals = dialog.findViewById<Button>(R.id.gotoGoalsButton)
-            val home = dialog.findViewById<Button>(R.id.returnHomeButton)
-            val text = dialog.findViewById<TextView>(R.id.postWorkoutTime)
+            val text = dialogView.findViewById<TextView>(R.id.postWorkoutTime)
             val startTime = SimpleDateFormat(
-                "'You started this workout at' hh:mm a",
+                "'You started this workout at 'hh:mm a",
                 Locale.getDefault()
             )
                 .format(Date().time - timeSpent)
             val endTime = SimpleDateFormat(
-                "' and finished at ' hh:mm a",
+                "' and finished at 'hh:mm a",
                 Locale.getDefault()
             )
                 .format(Date())
@@ -157,19 +164,19 @@ class CurrentWorkoutActivity : AppCompatActivity() {
 
             text.text = startTime + endTime + totalTime
 
-            dialog.setOnCancelListener {
+            materialDialog.setOnCancelListener {
                 gotoHome()
             }
 
-            home.setOnClickListener {
+            materialDialog.setPositiveButton(getString(R.string.button_return_home)) { _, _ ->
                 gotoHome()
             }
 
-            goals.setOnClickListener {
+            materialDialog.setNeutralButton(getString(R.string.button_update_goals)) { _, _ ->
                 gotoGoals()
             }
 
-            dialog.show()
+            materialDialog.show()
         }
     }
 
diff --git a/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
index da06dd4..16cb5fb 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/CustomExercisesActivity.kt
@@ -1,20 +1,23 @@
 /*
- *  Created by Team Symphony on 4/19/23, 5:18 PM
+ *  Created by Team Symphony on 4/20/23, 7:03 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 5:17 PM
+ *  Last modified 4/20/23, 7:03 PM
  */
 
 package com.symphony.mrfit.ui
 
-import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.widget.*
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.Toast
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
@@ -25,6 +28,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.signature.ObjectKey
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import com.symphony.mrfit.R
@@ -34,6 +38,10 @@ import com.symphony.mrfit.data.exercise.ExerciseViewModelFactory
 import com.symphony.mrfit.data.model.Exercise
 import com.symphony.mrfit.databinding.ActivityCustomExercisesBinding
 
+/**
+ * Screen for the User to manage their custom Exercises
+ */
+
 class CustomExercisesActivity : AppCompatActivity() {
 
     private var layoutManager: RecyclerView.LayoutManager? = null
@@ -95,27 +103,36 @@ class CustomExercisesActivity : AppCompatActivity() {
         }
     }
 
+    /**
+     * Remove the associated Exercise from the database
+     */
     private fun deleteExercise(exeID: String) {
         exerciseViewModel.deleteExercise(exeID)
         exerciseViewModel.getExercisesByUser()
     }
 
+    /**
+     * Create a dialog for the User to create a new Exercise
+     */
     private fun newExercise() {
-        val dialog = Dialog(this)
-        dialog.setContentView(R.layout.popup_new_exercise)
-        dialog.setTitle("New Exercise")
-
-        val image = dialog.findViewById<ImageView>(R.id.editExerciseImage)
-        val name = dialog.findViewById<EditText>(R.id.editExerciseName)
-        val desc = dialog.findViewById<EditText>(R.id.editDesc)
-        val tags = dialog.findViewById<EditText>(R.id.editTags)
-        val reps = dialog.findViewById<CheckBox>(R.id.repsCheckBox)
-        val sets = dialog.findViewById<CheckBox>(R.id.setsCheckBox)
-        val duration = dialog.findViewById<CheckBox>(R.id.durationCheckBox)
-        val distance = dialog.findViewById<CheckBox>(R.id.distanceCheckBox)
-        val save = dialog.findViewById<Button>(R.id.saveExerciseButton)
-        val cancel = dialog.findViewById<Button>(R.id.cancelExerciseButton)
-
+        // Create the dialog and inflate its view like an activity
+        val materialDialog = MaterialAlertDialogBuilder(this)
+        val dialogView = LayoutInflater.from(this)
+            .inflate(R.layout.popup_new_exercise, null, false)
+
+        materialDialog.setView(dialogView)
+            .setTitle("New Exercise")
+
+        val image = dialogView.findViewById<ImageView>(R.id.editExerciseImage)
+        val name = dialogView.findViewById<EditText>(R.id.editExerciseName)
+        val desc = dialogView.findViewById<EditText>(R.id.editDesc)
+        val tags = dialogView.findViewById<EditText>(R.id.editTags)
+        val reps = dialogView.findViewById<CheckBox>(R.id.repsCheckBox)
+        val sets = dialogView.findViewById<CheckBox>(R.id.setsCheckBox)
+        val duration = dialogView.findViewById<CheckBox>(R.id.durationCheckBox)
+        val distance = dialogView.findViewById<CheckBox>(R.id.distanceCheckBox)
+
+        // Observe some livedata to know when the user has selected an image
         thumbnail.observe(this, Observer {
             val thumbnail = it ?: return@Observer
 
@@ -125,6 +142,10 @@ class CustomExercisesActivity : AppCompatActivity() {
                 .into(image)
         })
 
+        /**
+         * Add secondary hint text when the tags field to show User proper entry
+         * Remove this hint when tags field loses focus
+         */
         tags.setOnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
                 tags.hint = "At home, Cardio, etc."
@@ -145,7 +166,12 @@ class CustomExercisesActivity : AppCompatActivity() {
             intent.type = "image/*"
             photoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         }
-        save.setOnClickListener {
+
+        /**
+         * Make a new Exercise and save it to the database
+         * Name cannot be empty
+         */
+        materialDialog.setPositiveButton(getString(R.string.button_save)) { dialog, _ ->
             if (name.text.isNotEmpty()) {
                 val newName = name.text.toString()
                 var newDesc = ""
@@ -181,30 +207,38 @@ class CustomExercisesActivity : AppCompatActivity() {
             }
         }
 
-        cancel.setOnClickListener {
+        materialDialog.setNegativeButton(getString(R.string.button_cancel)) { dialog, _ ->
             dialog.dismiss()
         }
 
-        dialog.show()
+        materialDialog.show()
     }
 
+    /**
+     * Create a dialog for the User to edit an Exercise
+     * Should be passed to the recycler's adapter
+     */
     private fun editExercise(exercise: Exercise) {
-        val dialog = Dialog(this)
-        dialog.setContentView(R.layout.popup_new_exercise)
-        dialog.setTitle("Edit Exercise")
-
-        val image = dialog.findViewById<ImageView>(R.id.editExerciseImage)
-        val name = dialog.findViewById<EditText>(R.id.editExerciseName)
-        val desc = dialog.findViewById<EditText>(R.id.editDesc)
-        val tags = dialog.findViewById<EditText>(R.id.editTags)
-        val reps = dialog.findViewById<CheckBox>(R.id.repsCheckBox)
-        val sets = dialog.findViewById<CheckBox>(R.id.setsCheckBox)
-        val duration = dialog.findViewById<CheckBox>(R.id.durationCheckBox)
-        val distance = dialog.findViewById<CheckBox>(R.id.distanceCheckBox)
-        val save = dialog.findViewById<Button>(R.id.saveExerciseButton)
-        val cancel = dialog.findViewById<Button>(R.id.cancelExerciseButton)
+        // Create the dialog and inflate its view like an activity
+        val materialDialog = MaterialAlertDialogBuilder(this)
+        val dialogView = LayoutInflater.from(this)
+            .inflate(R.layout.popup_new_exercise, null, false)
+
+        materialDialog.setView(dialogView)
+            .setTitle("Edit Exercise")
+
+
+        val image = dialogView.findViewById<ImageView>(R.id.editExerciseImage)
+        val name = dialogView.findViewById<EditText>(R.id.editExerciseName)
+        val desc = dialogView.findViewById<EditText>(R.id.editDesc)
+        val tags = dialogView.findViewById<EditText>(R.id.editTags)
+        val reps = dialogView.findViewById<CheckBox>(R.id.repsCheckBox)
+        val sets = dialogView.findViewById<CheckBox>(R.id.setsCheckBox)
+        val duration = dialogView.findViewById<CheckBox>(R.id.durationCheckBox)
+        val distance = dialogView.findViewById<CheckBox>(R.id.distanceCheckBox)
         var loadDefault = true
 
+        // Populate the dialog with info from the Exercise
         name.setText(exercise.name)
         desc.setText(exercise.description)
         tags.setText(exercise.tags.toString().drop(1).dropLast(1))
@@ -213,6 +247,7 @@ class CustomExercisesActivity : AppCompatActivity() {
         duration.isChecked = exercise.durationFlag
         distance.isChecked = exercise.distanceFlag
 
+        // Observe some livedata to know when the user has changed the picture
         thumbnail.observe(this, Observer {
             val thumbnail = it ?: return@Observer
 
@@ -228,6 +263,8 @@ class CustomExercisesActivity : AppCompatActivity() {
             }
         })
 
+        // Add secondary hint text when the tags field to show User proper entry
+        // Remove this hint when tags field loses focus
         tags.setOnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
                 tags.hint = "At home, Cardio, etc."
@@ -249,17 +286,16 @@ class CustomExercisesActivity : AppCompatActivity() {
             photoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         }
 
-        /**
-         * TODO: If a field is empty, replace it with placeholder text
-         */
-        save.setOnClickListener {
+        // Save any changes to the Exercise
+        // If a field is blank, the old data persists
+        materialDialog.setPositiveButton(getString(R.string.button_save)) { dialog, _ ->
             var newName = exercise.name
             if (name.text.isNotEmpty())
                 newName = name.text.toString()
-            var newDesc = ""
+            var newDesc = exercise.description
             if (desc.text.isNotEmpty())
                 newDesc = desc.text.toString()
-            var newTags = ArrayList<String>()
+            var newTags = exercise.tags
             if (tags.text.isNotEmpty())
                 newTags = ArrayList(tags.text.toString().split(",", ", "))
             val newExercise = Exercise(
@@ -281,11 +317,11 @@ class CustomExercisesActivity : AppCompatActivity() {
             dialog.dismiss()
         }
 
-        cancel.setOnClickListener {
+        materialDialog.setNegativeButton(getString(R.string.button_cancel)) { dialog, _ ->
             dialog.dismiss()
         }
 
-        dialog.show()
+        materialDialog.show()
     }
 
     override fun onSupportNavigateUp(): Boolean {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt
new file mode 100644
index 0000000..c397612
--- /dev/null
+++ b/app/src/main/java/com/symphony/mrfit/ui/DateTimeActivity.kt
@@ -0,0 +1,81 @@
+/*
+ *  Created by Team Symphony on 4/21/23, 3:22 PM
+ *  Copyright (c) 2023 . All rights reserved.
+ *  Last modified 4/21/23, 2:03 PM
+ */
+
+package com.symphony.mrfit.ui
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import com.applandeo.materialcalendarview.EventDay
+import com.applandeo.materialcalendarview.listeners.OnDayClickListener
+import com.symphony.mrfit.ManualWorkoutActivity.Companion.EXTRA_TIME
+import com.symphony.mrfit.databinding.ActivityDateTimeBinding
+import java.util.*
+
+class DateTimeActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityDateTimeBinding
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityDateTimeBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val datePicker = binding.dialogDatePicker
+        val timePicker = binding.dialogTimePicker
+        val okay = binding.dateTimeOK
+        val cancel = binding.dateTimeCancel
+
+        val cal = Calendar.getInstance()
+        cal.timeInMillis = intent.getLongExtra(EXTRA_TIME, Date().time)
+        var year = cal.get(Calendar.YEAR)
+        var month = cal.get(Calendar.MONTH)
+        var day = cal.get(Calendar.DAY_OF_MONTH)
+        var hour = cal.get(Calendar.HOUR)
+        var minute = cal.get(Calendar.MINUTE)
+
+        datePicker.setDate(cal)
+        timePicker.hour = hour
+        timePicker.minute = minute
+
+        timePicker.setOnTimeChangedListener { _, selectedHour, selectedMinute ->
+            hour = selectedHour
+            minute = selectedMinute
+        }
+
+        datePicker.setOnDayClickListener(object : OnDayClickListener {
+            override fun onDayClick(eventDay: EventDay) {
+                val clickedDay = eventDay.calendar
+                year = clickedDay.get(Calendar.YEAR)
+                month = clickedDay.get(Calendar.MONTH)
+                day = clickedDay.get(Calendar.DAY_OF_MONTH)
+            }
+        })
+
+        okay.setOnClickListener {
+            val t = Calendar.getInstance()
+            t.set(year, month, day, hour, minute)
+            val intent = Intent()
+            intent.putExtra(EXTRA_TIME, t.timeInMillis)
+            this.setResult(Activity.RESULT_OK, intent)
+            this.finish()
+        }
+
+        cancel.setOnClickListener {
+            this.setResult(Activity.RESULT_CANCELED)
+            this.finish()
+        }
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressedDispatcher.onBackPressed()
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
index 964cdb6..9f7e7e9 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/ExerciseActivity.kt
@@ -1,23 +1,25 @@
 /*
- *  Created by Team Symphony on 4/2/23, 10:27 PM
+ *  Created by Team Symphony on 4/21/23, 3:22 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 10:27 PM
+ *  Last modified 4/21/23, 1:31 PM
  */
 
 package com.symphony.mrfit.ui
 
 import android.app.Activity
-import android.app.Dialog
 import android.content.ContentValues
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.Button
+import android.view.inputmethod.InputMethodManager
 import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.ImageView
+import android.widget.Toast
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
@@ -27,6 +29,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.exercise.ExerciseAdapter
 import com.symphony.mrfit.data.exercise.ExerciseViewModel
@@ -108,48 +111,73 @@ class ExerciseActivity : AppCompatActivity() {
         }
 
         newExe.setOnClickListener {
-            val dialog = Dialog(this)
-            dialog.setContentView(R.layout.popup_new_exercise)
-            dialog.setTitle("New Exercise")
-
-            val image = dialog.findViewById<ImageView>(R.id.editExerciseImage)
-            val name = dialog.findViewById<EditText>(R.id.editExerciseName)
-            val desc = dialog.findViewById<EditText>(R.id.editDesc)
-            val tags = dialog.findViewById<EditText>(R.id.editTags)
-            val reps = dialog.findViewById<CheckBox>(R.id.repsCheckBox)
-            val sets = dialog.findViewById<CheckBox>(R.id.setsCheckBox)
-            val duration = dialog.findViewById<CheckBox>(R.id.durationCheckBox)
-            val distance = dialog.findViewById<CheckBox>(R.id.distanceCheckBox)
-            val save = dialog.findViewById<Button>(R.id.saveExerciseButton)
-            val cancel = dialog.findViewById<Button>(R.id.cancelExerciseButton)
-
-            thumbnail.observe(this, Observer {
-                val thumbnail = it ?: return@Observer
-
-                Glide.with(this).load(thumbnail).into(image)
-            })
-
-            tags.setOnFocusChangeListener { _, hasFocus ->
-                if (hasFocus)
-                    tags.hint = "At home, Cardio, etc."
-                if (!hasFocus)
-                    tags.hint = ""
-            }
+            newExercise()
+        }
+    }
+
+    /**
+     * Create a dialog for the User to create an Exercise
+     */
+    private fun newExercise() {
+        // Create the dialog and inflate its view like an activity
+        val materialDialog = MaterialAlertDialogBuilder(this)
+        val dialogView = LayoutInflater.from(this)
+            .inflate(R.layout.popup_new_exercise, null, false)
+
+        materialDialog.setView(dialogView)
+            .setTitle("New Exercise")
+
+
+        val image = dialogView.findViewById<ImageView>(R.id.editExerciseImage)
+        val name = dialogView.findViewById<EditText>(R.id.editExerciseName)
+        val desc = dialogView.findViewById<EditText>(R.id.editDesc)
+        val tags = dialogView.findViewById<EditText>(R.id.editTags)
+        val reps = dialogView.findViewById<CheckBox>(R.id.repsCheckBox)
+        val sets = dialogView.findViewById<CheckBox>(R.id.setsCheckBox)
+        val duration = dialogView.findViewById<CheckBox>(R.id.durationCheckBox)
+        val distance = dialogView.findViewById<CheckBox>(R.id.distanceCheckBox)
+
+        // Observe some livedata to know when the user has changed the picture
+        thumbnail.observe(this, Observer {
+            val thumbnail = it ?: return@Observer
+            Glide.with(this)
+                .load(thumbnail)
+                .into(image)
+        })
 
-            image.setOnClickListener {
-                val intent = Intent()
-                intent.action = Intent.ACTION_GET_CONTENT
-                intent.type = "image/*"
-                photoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        // Add secondary hint text when the tags field to show User proper entry
+        // Remove this hint when tags field loses focus
+        tags.setOnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) {
+                tags.hint = "At home, Cardio, etc."
+                val inputMethodManager: InputMethodManager =
+                    getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                inputMethodManager.showSoftInput(
+                    tags,
+                    InputMethodManager.SHOW_IMPLICIT
+                )
             }
+            if (!hasFocus)
+                tags.hint = ""
+        }
+
+        image.setOnClickListener {
+            val intent = Intent()
+            intent.action = Intent.ACTION_GET_CONTENT
+            intent.type = "image/*"
+            photoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        }
 
-            /**
-             * TODO: If a field is empty, replace it with placeholder text
-             */
-            save.setOnClickListener {
+        // Save the new exercise to the database, name cannot be empty
+        materialDialog.setPositiveButton(getString(R.string.button_save)) { dialog, _ ->
+            if (name.text.isNotEmpty()) {
                 val newName = name.text.toString()
-                val newDesc = desc.text.toString()
-                val newTags = ArrayList(tags.text.toString().split(",", ", "))
+                var newDesc = ""
+                if (desc.text.isNotEmpty())
+                    newDesc = desc.text.toString()
+                var newTags = ArrayList<String>()
+                if (tags.text.isNotEmpty())
+                    newTags = ArrayList(tags.text.toString().split(",", ", "))
                 val newExercise = Exercise(
                     name = newName,
                     description = newDesc,
@@ -166,14 +194,21 @@ class ExerciseActivity : AppCompatActivity() {
 
                 dialog.dismiss()
                 goBack(newID)
+            } else {
+                Toast.makeText(
+                    this,
+                    "You must name your exercise",
+                    Toast.LENGTH_SHORT
+                )
+                    .show()
             }
+        }
 
-            cancel.setOnClickListener {
-                dialog.dismiss()
-            }
-
-            dialog.show()
+        materialDialog.setNegativeButton(getString(R.string.button_cancel)) { dialog, _ ->
+            dialog.dismiss()
         }
+
+        materialDialog.show()
     }
 
     private fun goBack(newID: String) {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
index 64cd418..ed5532c 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/GoalsActivity.kt
@@ -1,22 +1,26 @@
 /*
- *  Created by Team Symphony on 4/19/23, 10:42 PM
+ *  Created by Team Symphony on 4/20/23, 7:03 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/19/23, 10:42 PM
+ *  Last modified 4/20/23, 5:47 PM
  */
 
 package com.symphony.mrfit.ui
 
-import android.app.Dialog
 import android.content.ContentValues
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.EditText
+import android.widget.Spinner
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.exercise.GoalAdapter
 import com.symphony.mrfit.data.model.Goal
@@ -30,6 +34,10 @@ import nl.dionsegijn.konfetti.core.emitter.Emitter
 import java.text.DecimalFormat
 import java.util.concurrent.TimeUnit
 
+/**
+ * Screen for the User to manage their Goals
+ */
+
 class GoalsActivity : AppCompatActivity() {
 
     private var layoutManager: RecyclerView.LayoutManager? = null
@@ -64,25 +72,99 @@ class GoalsActivity : AppCompatActivity() {
             emitter = Emitter(duration = 100, TimeUnit.MILLISECONDS).max(100)
         )
 
-        fun deleteGoal(goalID: String) {
-            profileViewModel.deleteGoal(goalID)
-            profileViewModel.getGoals()
+        /**
+         * Create a dialog for the user to make a new Goal
+         */
+        fun newGoal() {
+            // Create the dialog and inflate its view like an activity
+            val materialDialog = MaterialAlertDialogBuilder(this)
+            val dialogView = LayoutInflater.from(this)
+                .inflate(R.layout.popup_new_goal, null, false)
+
+            materialDialog.setView(dialogView)
+                .setTitle("New Goal")
+
+            val name = dialogView.findViewById<EditText>(R.id.newGoalName)
+            val num = dialogView.findViewById<EditText>(R.id.goalNumber)
+            val dropdown = dialogView.findViewById<Spinner>(R.id.goalSpinner)
+            val other = dialogView.findViewById<EditText>(R.id.otherInput)
+
+            // When "Other", the last option is selected in the spinner
+            // make the associated EditText visible
+            dropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>?,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    if (position == dropdown.adapter.count - 1) {
+                        other.visibility = View.VISIBLE
+                    } else {
+                        other.visibility = View.GONE
+                    }
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                }
+
+            }
+
+            // Save the new Goal, if any fields are empty use placeholders
+            materialDialog.setPositiveButton("Save") { dialog, _ ->
+                var newName = "New Goal"
+                if (name.text.isNotEmpty())
+                    newName = name.text.toString()
+                var newEnd = ZERO.toDouble()
+                if (num.text.isNotEmpty())
+                    newEnd = num.text.toString().toDouble()
+                var newType = dropdown.selectedItem.toString()
+                if (newType == "Other") {
+                    if (other.text.isNotEmpty()) {
+                        newType = other.text.toString()
+                    }
+                }
+
+                profileViewModel.addGoal(
+                    Goal(
+                        newName,
+                        ZERO.toDouble(),
+                        newEnd,
+                        newType
+                    )
+                )
+
+                profileViewModel.getGoals()
+                dialog.dismiss()
+            }
+
+            materialDialog.setNegativeButton("Cancel") { dialog, _ ->
+                dialog.dismiss()
+            }
+
+            materialDialog.show()
         }
 
+        /**
+         * Create a dialog for the user to edit an existing Goal
+         * Should be passed to the recycler's adapter
+         */
         fun editGoal(goal: Goal) {
+            // Create the dialog and inflate its view like an activity
             val format = DecimalFormat("0.#")
-            val dialog = Dialog(this)
-            dialog.setContentView(R.layout.popup_edit_goal)
-            dialog.setTitle("New Goal")
-
-            val name = dialog.findViewById<EditText>(R.id.editGoalName)
-            val prog = dialog.findViewById<EditText>(R.id.progressGoalEditText)
-            val end = dialog.findViewById<EditText>(R.id.endGoalEditText)
-            val dropdown = dialog.findViewById<Spinner>(R.id.editGoalSpinner)
-            val other = dialog.findViewById<EditText>(R.id.editGoalOther)
-            val save = dialog.findViewById<Button>(R.id.saveEditGoalButton)
-            val cancel = dialog.findViewById<Button>(R.id.cancelEditGoalButton)
+            val materialDialog = MaterialAlertDialogBuilder(this)
+            val dialogView = LayoutInflater.from(this)
+                .inflate(R.layout.popup_edit_goal, null, false)
 
+            materialDialog.setView(dialogView)
+
+            val name = dialogView.findViewById<EditText>(R.id.editGoalName)
+            val prog = dialogView.findViewById<EditText>(R.id.progressGoalEditText)
+            val end = dialogView.findViewById<EditText>(R.id.endGoalEditText)
+            val dropdown = dialogView.findViewById<Spinner>(R.id.editGoalSpinner)
+            val other = dialogView.findViewById<EditText>(R.id.editGoalOther)
+
+            // Populate the dialog with appropriate info from the Goal
             name.setText(goal.name)
             prog.hint = format.format(goal.progress)
             end.hint = format.format(goal.endGoal)
@@ -95,6 +177,8 @@ class GoalsActivity : AppCompatActivity() {
             }
             other.hint = goal.quantifier
 
+            // When "Other", the last option is selected in the spinner
+            // make the associated EditText visible
             dropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
                     parent: AdapterView<*>?,
@@ -114,7 +198,11 @@ class GoalsActivity : AppCompatActivity() {
 
             }
 
-            save.setOnClickListener {
+            /**
+             * Save the edited goal
+             * If a field is empty, the old value persists
+             */
+            materialDialog.setPositiveButton(getString(R.string.button_save)) { dialog, _ ->
                 var newName = goal.name
                 if (name.text.isNotEmpty())
                     newName = name.text.toString()
@@ -143,6 +231,7 @@ class GoalsActivity : AppCompatActivity() {
                     )
                 )
 
+                // User finished their goal, grats
                 if (newProg >= newEnd) {
                     confetti.start(party)
                     Toast.makeText(this, "Congrats on reaching your goal!", Toast.LENGTH_SHORT)
@@ -153,11 +242,20 @@ class GoalsActivity : AppCompatActivity() {
                 dialog.dismiss()
             }
 
-            cancel.setOnClickListener {
+            materialDialog.setNegativeButton(getString(R.string.button_cancel)) { dialog, _ ->
                 dialog.dismiss()
             }
 
-            dialog.show()
+            materialDialog.show()
+        }
+
+        /**
+         * Remove the associated Goal from the database
+         * Should be passed to the recycler's adapter
+         */
+        fun deleteGoal(goalID: String) {
+            profileViewModel.deleteGoal(goalID)
+            profileViewModel.getGoals()
         }
 
         spinner.visibility = View.VISIBLE
@@ -180,69 +278,9 @@ class GoalsActivity : AppCompatActivity() {
         })
 
         newGoal.setOnClickListener {
-            val dialog = Dialog(this)
-            dialog.setContentView(R.layout.popup_new_goal)
-            dialog.setTitle("New Goal")
-
-            val name = dialog.findViewById<EditText>(R.id.newGoalName)
-            val num = dialog.findViewById<EditText>(R.id.goalNumber)
-            val dropdown = dialog.findViewById<Spinner>(R.id.goalSpinner)
-            val other = dialog.findViewById<EditText>(R.id.otherInput)
-            val save = dialog.findViewById<Button>(R.id.saveGoalButton)
-            val cancel = dialog.findViewById<Button>(R.id.cancelGoalButton)
-
-            dropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?,
-                    view: View?,
-                    position: Int,
-                    id: Long
-                ) {
-                    if (position == dropdown.adapter.count - 1) {
-                        other.visibility = View.VISIBLE
-                    } else {
-                        other.visibility = View.GONE
-                    }
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                }
-
-            }
-
-            save.setOnClickListener {
-                var newName = "New Goal"
-                if (name.text.isNotEmpty())
-                    newName = name.text.toString()
-                var newEnd = ZERO.toDouble()
-                if (num.text.isNotEmpty())
-                    newEnd = num.text.toString().toDouble()
-                var newType = dropdown.selectedItem.toString()
-                if (newType == "Other") {
-                    if (other.text.isNotEmpty()) {
-                        newType = other.text.toString()
-                    }
-                }
-
-                profileViewModel.addGoal(
-                    Goal(
-                        newName,
-                        ZERO.toDouble(),
-                        newEnd,
-                        newType
-                    )
-                )
-
-                profileViewModel.getGoals()
-                dialog.dismiss()
-            }
-
-            cancel.setOnClickListener {
-                dialog.dismiss()
-            }
-
-            dialog.show()
+            newGoal()
         }
+
     }
 
     override fun onSupportNavigateUp(): Boolean {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
index 1a210e9..45caee5 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/HomeActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/7/23, 7:13 PM
+ *  Created by Team Symphony on 4/21/23, 3:22 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/7/23, 7:13 PM
+ *  Last modified 4/21/23, 3:17 PM
  */
 
 package com.symphony.mrfit.ui
@@ -20,6 +20,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.signature.ObjectKey
 import com.google.firebase.auth.FirebaseAuth
+import com.symphony.mrfit.ManualWorkoutActivity
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.exercise.HistoryAdapter
 import com.symphony.mrfit.data.profile.ProfileViewModel
@@ -61,6 +62,7 @@ class HomeActivity : AppCompatActivity() {
         val name = binding.homeNameTextView
         val pfp = binding.homeProfilePicture
         val scheduleWorkout = binding.scheduleButton
+        val manualWorkout = binding.pastWorkout
         val startWorkout = binding.workoutButton
         val historyList = binding.historyList
 
@@ -115,6 +117,11 @@ class HomeActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        manualWorkout.setOnClickListener {
+            val intent = Intent(this, ManualWorkoutActivity::class.java)
+            startActivity(intent)
+        }
+
         startWorkout.setOnClickListener {
             val intent = Intent(this, RoutineSelectionActivity::class.java)
             startActivity(intent)
diff --git a/app/src/main/java/com/symphony/mrfit/ui/MainActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/MainActivity.kt
index b1b6a39..270bbae 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/MainActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/MainActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/7/23, 7:13 PM
+ *  Created by Team Symphony on 4/20/23, 2:11 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/7/23, 7:13 PM
+ *  Last modified 4/20/23, 2:01 AM
  */
 
 package com.symphony.mrfit.ui
@@ -42,12 +42,15 @@ class MainActivity : AppCompatActivity() {
         // firebaseAuth.addAuthStateListener(this.authStateListener)
         val user = Firebase.auth.currentUser
         if (user != null) {
-            // User is signed in
+            // User is signed in, proceed to Home
             val intent = Intent(this, HomeActivity::class.java)
             startActivity(intent)
             finish()
         } else {
-            // No user is signed in
+            // No user is signed in, proceed to Login
+            val intent = Intent(this, LoginActivity::class.java)
+            startActivity(intent)
+            finish()
         }
     }
 
diff --git a/app/src/main/java/com/symphony/mrfit/ui/NotificationActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/NotificationActivity.kt
index b5321ea..64430df 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/NotificationActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/NotificationActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/2/23, 6:07 PM
+ *  Created by Team Symphony on 4/20/23, 7:03 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/2/23, 6:07 PM
+ *  Last modified 4/20/23, 6:13 PM
  */
 
 package com.symphony.mrfit.ui
@@ -55,12 +55,14 @@ class NotificationActivity : AppCompatActivity() {
     override fun onStart() {
         super.onStart()
 
+        // Check if on an Android version that needs notification permissions
         if (Build.VERSION.SDK_INT >= 33) {
             notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
         } else {
             hasNotificationPermissionGranted = true
         }
 
+        // Get the date passed from the calendar and set the date dials to it
         val date = intent.getLongExtra(EXTRA_DATE, ZERO.toLong())
         if (date != ZERO.toLong()) {
             val cal = Calendar.getInstance()
@@ -74,7 +76,9 @@ class NotificationActivity : AppCompatActivity() {
 
         createNotificationChannel()
         binding.scheduleNotificationButton.setOnClickListener {
+            // Check and ask for permissions if needed
             if (checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED) {
+                // Do not allow an empty message
                 if (binding.messageET.text!!.isNotEmpty()) {
                     scheduleNotification()
                 } else {
@@ -169,6 +173,9 @@ class NotificationActivity : AppCompatActivity() {
 
     }
 
+    /**
+     * Parse the pickers for the selected date and time
+     */
     @RequiresApi(Build.VERSION_CODES.M)
     private fun getTime(): Long {
         val minute = binding.timePicker.minute
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
index 2ed8cc9..f64367e 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutHistoryActivity.kt
@@ -1,24 +1,25 @@
 /*
- *  Created by Team Symphony on 4/1/23, 11:17 PM
+ *  Created by Team Symphony on 4/20/23, 7:03 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 11:17 PM
+ *  Last modified 4/20/23, 4:59 PM
  */
 
 package com.symphony.mrfit.ui
 
-import android.app.Dialog
 import android.content.ContentValues
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.symphony.mrfit.ManualWorkoutActivity
 import com.symphony.mrfit.R
 import com.symphony.mrfit.data.exercise.HistoryAdapter2
 import com.symphony.mrfit.data.model.History
@@ -29,6 +30,10 @@ import com.symphony.mrfit.ui.WorkoutTemplateActivity.Companion.EXTRA_IDENTITY
 import java.text.SimpleDateFormat
 import java.util.*
 
+/**
+ * Screen for the User to manage their workout History
+ */
+
 class WorkoutHistoryActivity : AppCompatActivity() {
 
     private var layoutManager: RecyclerView.LayoutManager? = null
@@ -49,52 +54,9 @@ class WorkoutHistoryActivity : AppCompatActivity() {
         super.onStart()
 
         val historyList = binding.historyList
+        val manualHistory = binding.addHistoryButton
         val spinner = binding.loadingSpinner
 
-        fun deleteHistory(historyID: String) {
-            profileViewModel.deleteWorkoutFromHistory(historyID)
-        }
-
-        fun openHistory(history: History) {
-            val dialog = Dialog(this)
-            dialog.setContentView(R.layout.popup_workout_history)
-            dialog.setTitle("Workout History")
-
-            val name = dialog.findViewById<TextView>(R.id.workoutHistoryName)
-            val startMessage = dialog.findViewById<TextView>(R.id.historyStartedTextView)
-            val endMessage = dialog.findViewById<TextView>(R.id.historyEndedTextView)
-            val openRoutine = dialog.findViewById<Button>(R.id.openHistoryRoutineButton)
-            val ok = dialog.findViewById<Button>(R.id.okHistoryButton)
-
-            name.text = history.name
-
-            startMessage.text = SimpleDateFormat(
-                "'Started at' MMMM dd, yyyy 'at' hh:mm a",
-                Locale.getDefault()
-            )
-                .format(history.date!!.toDate().time - history.duration!!)
-            endMessage.text = SimpleDateFormat(
-                "'Finished at' MMMM dd, yyyy 'at' hh:mm a",
-                Locale.getDefault()
-            )
-                .format(history.date.toDate())
-
-
-            openRoutine.setOnClickListener {
-                val intent = Intent(this, WorkoutRoutineActivity::class.java)
-                intent.putExtra(EXTRA_IDENTITY, history.routine)
-                startActivity(intent)
-                dialog.dismiss()
-                this.finish()
-            }
-
-            ok.setOnClickListener {
-                dialog.dismiss()
-            }
-
-            dialog.show()
-        }
-
         spinner.visibility = View.VISIBLE
 
         //Get data of current User and populate the page
@@ -113,6 +75,71 @@ class WorkoutHistoryActivity : AppCompatActivity() {
                 HistoryAdapter2(this, workoutHistory, ::deleteHistory, ::openHistory)
             spinner.visibility = View.GONE
         })
+
+        manualHistory.setOnClickListener {
+            newHistory()
+        }
+    }
+
+    /**
+     * Remove the associated History from the database
+     */
+    private fun deleteHistory(historyID: String) {
+        profileViewModel.deleteWorkoutFromHistory(historyID)
+    }
+
+    /**
+     * Create a dialog for more detail on the associated History
+     * Allow the user to navigate directly to its Template if desired
+     */
+    private fun openHistory(history: History) {
+        // Create the dialog and inflate its view like an activity
+        val materialDialog = MaterialAlertDialogBuilder(this)
+        val dialogView = LayoutInflater.from(this)
+            .inflate(R.layout.popup_workout_history, null, false)
+
+        materialDialog.setView(dialogView)
+
+        val name = dialogView.findViewById<TextView>(R.id.workoutHistoryName)
+        val startMessage = dialogView.findViewById<TextView>(R.id.historyStartedTextView)
+        val endMessage = dialogView.findViewById<TextView>(R.id.historyEndedTextView)
+
+        // Populate the dialog with appropriate info from the History
+        name.text = history.name
+        startMessage.text = SimpleDateFormat(
+            "'Started at' MMMM dd, yyyy 'at' hh:mm a",
+            Locale.getDefault()
+        )
+            .format(history.date!!.toDate().time - history.duration!!)
+        endMessage.text = SimpleDateFormat(
+            "'Finished at' MMMM dd, yyyy 'at' hh:mm a",
+            Locale.getDefault()
+        )
+            .format(history.date.toDate())
+
+        // Navigate to the associated Template
+        // Finish this activity so a back press returns to the User's Profile
+        materialDialog.setNeutralButton(getString(R.string.button_open_routine)) { dialog, _ ->
+            val intent = Intent(this, WorkoutRoutineActivity::class.java)
+            intent.putExtra(EXTRA_IDENTITY, history.routine)
+            startActivity(intent)
+            dialog.dismiss()
+            this.finish()
+        }
+
+        materialDialog.setPositiveButton(getString(R.string.button_ok)) { dialog, _ ->
+            dialog.dismiss()
+        }
+
+        materialDialog.show()
+    }
+
+    /**
+     * Navigate to a screen to manually add a History to the User's database
+     */
+    private fun newHistory() {
+        val intent = Intent(this, ManualWorkoutActivity::class.java)
+        startActivity(intent)
     }
 
     override fun onSupportNavigateUp(): Boolean {
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
index 899e3d4..080b8e9 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutRoutineActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/1/23, 10:04 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 8:42 PM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
@@ -43,9 +43,14 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     private lateinit var profileViewModel: ProfileViewModel
     private lateinit var exerciseViewModel: ExerciseViewModel
     private lateinit var binding: ActivityWorkoutRoutineBinding
-    private lateinit var routineName: EditText
+    private lateinit var workoutList: RecyclerView
+    private lateinit var routineNameText: EditText
     private lateinit var routinePlaylist: EditText
     private lateinit var passedRoutineID: String
+    private var routineName: String? = null
+    private var playlist: String? = null
+    private var exercises: ArrayList<String> = ArrayList()
+    private var passedList: ArrayList<String> = ArrayList()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -64,14 +69,13 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     override fun onStart() {
         super.onStart()
 
-
         Log.d(ContentValues.TAG, "Activity has (Re)Started")
 
         // Bind variables to View elements
         val spinner = binding.loadingSpinner
-        routineName = binding.routineNameEditText
+        routineNameText = binding.routineNameEditText
         routinePlaylist = binding.workoutPlaylistEditText
-        val workoutList = binding.workoutListView
+        workoutList = binding.workoutListView
         val startWorkout = binding.startWorkoutButton
         val newExercise = binding.newExerciseButton
         val saveWorkout = binding.saveWorkoutButton
@@ -81,43 +85,55 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         placeholderText.visibility = View.VISIBLE
         workoutList.visibility = View.GONE
-        spinner.visibility = View.VISIBLE
 
         /**
          * Retrieve the extras passed to this intent
          * passedID = The ID of the parent Routine
          * passedName = The Name of the parent Routine
          * passedList = The workoutList from the parent Routine
+         * savedName = The Name of the template if it was navigated away from
+         * savedMusic = The playlist for the template if it was navigated away from
          */
         passedRoutineID = intent.getStringExtra(EXTRA_IDENTITY)!!
-        var passedList = ArrayList<String>()
-
+        routineName = intent.getStringExtra(SAVED_NAME)
+        playlist = intent.getStringExtra(SAVED_PLAYLIST)
 
         // Set the layout of the list of workouts presented to the user
         layoutManager = LinearLayoutManager(this)
         workoutList.layoutManager = layoutManager
-
-        // Populate the list with the workouts associated with this routine
         exerciseViewModel.getRoutine(passedRoutineID)
         exerciseViewModel.routine.observe(this, Observer {
             val routine = it ?: return@Observer
 
-            routineName.setText(routine.name)
-            if (routine.playlist != null) {
-                routinePlaylist.setText(routine.playlist)
+            if (routineName != null) {
+                routineNameText.setText(routineName)
+                routinePlaylist.setText(playlist)
+            } else {
+                routineName = routine.name
+            }
+            routineNameText.setText(routineName)
+            if (playlist != null) {
+                routinePlaylist.setText(playlist)
+            } else if (routine.playlist != null) {
+                playlist = routine.playlist
+                routinePlaylist.setText(playlist)
             } else {
                 routinePlaylist.setText(BLANK)
             }
             if (routine.workoutList != null) {
-                placeholderText.visibility = View.GONE
-                workoutList.visibility = View.VISIBLE
-                passedList = routine.workoutList
-                exerciseViewModel.getWorkouts(routine.workoutList)
+                if (routine.workoutList.isNotEmpty()) {
+                    exercises = routine.workoutList
+                    spinner.visibility = View.VISIBLE
+                    passedList = routine.workoutList
+                    exerciseViewModel.getWorkouts(exercises)
+                }
             }
         })
         exerciseViewModel.workoutList.observe(this, Observer {
             val workList = it ?: return@Observer
             workoutList.adapter = WorkoutAdapter(this, workList, passedRoutineID, passedList)
+            placeholderText.visibility = View.GONE
+            workoutList.visibility = View.VISIBLE
             spinner.visibility = View.GONE
         })
 
@@ -134,13 +150,9 @@ class WorkoutRoutineActivity : AppCompatActivity() {
         // then return to their Home screen
         startWorkout.setOnClickListener {
             // Check if the routine name is empty
-            var newRoutineName = NEW_ROUTINE
-            if (routineName.text.isNotEmpty()) {
-                newRoutineName = routineName.text.toString()
-            }
-            save()
+            saveRoutine()
             val intent = Intent(this, CurrentWorkoutActivity::class.java)
-            intent.putExtra(EXTRA_STRING, newRoutineName)
+            intent.putExtra(EXTRA_STRING, routineName)
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
             intent.putExtra(EXTRA_LIST, passedList)
             startActivity(intent)
@@ -148,7 +160,6 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         // Navigate to a screen to make a new workout
         newExercise.setOnClickListener {
-            save()
             val intent = Intent(this, WorkoutTemplateActivity::class.java)
             intent.putExtra(EXTRA_ROUTINE, passedRoutineID)
             intent.putExtra(EXTRA_IDENTITY, NEW_ID)
@@ -159,7 +170,7 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
         // Save the current Routine and go back to the user's Home screen
         saveWorkout.setOnClickListener {
-            save()
+            saveRoutine()
             finish()
         }
 
@@ -178,23 +189,41 @@ class WorkoutRoutineActivity : AppCompatActivity() {
 
     override fun onPause() {
         super.onPause()
-        save()
+        tempSave()
+    }
+
+    private fun tempSave() {
+        val n: String? = if (routineNameText.text.isNotEmpty())
+            routineNameText.text.toString()
+        else
+            routineName
+        val p: String? = if (routinePlaylist.text.isNotEmpty())
+            routinePlaylist.text.toString()
+        else
+            playlist
+        intent.putExtra(SAVED_NAME, n)
+        intent.putExtra(SAVED_PLAYLIST, p)
     }
 
-    // Save the current routine info
-    private fun save() {
-        var newRoutineName = NEW_ROUTINE
-        if (routineName.text.isNotEmpty()) {
-            newRoutineName = routineName.text.toString()
+    /**
+     * Save the current routine
+     */
+    private fun saveRoutine() {
+        routineName = NEW_ROUTINE
+        if (routineNameText.text.isNotEmpty()) {
+            routineName = routineNameText.text.toString()
         }
         var newRoutinePlaylist = BLANK
         if (routinePlaylist.text!!.isNotEmpty()) {
             newRoutinePlaylist = routinePlaylist.text.toString()
         }
-        exerciseViewModel.updateRoutine(newRoutineName, newRoutinePlaylist, passedRoutineID)
+        exerciseViewModel.updateRoutine(routineName!!, newRoutinePlaylist, passedRoutineID)
     }
 
-    // Find which music service to link to
+    /**
+     * Attempt to link to a music service
+     * Parse the text in the playlist field for which service to use
+     */
     private fun playMusic(playlist: String) {
         // Check if the linked playlist is from Youtube
         if (playlist.contains("youtube")) {
@@ -220,9 +249,10 @@ class WorkoutRoutineActivity : AppCompatActivity() {
     }
 
     companion object {
-        const val DEFAULT_DESC = "Workout Description"
         const val EXTRA_ROUTINE = "passed routine id"
         const val NEW_ID = "NEW"
+        const val SAVED_NAME = "saved template name"
+        const val SAVED_PLAYLIST = "saved playlist"
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
index 9e9fd2f..86833ea 100644
--- a/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
+++ b/app/src/main/java/com/symphony/mrfit/ui/WorkoutTemplateActivity.kt
@@ -1,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/1/23, 7:44 PM
+ *  Created by Team Symphony on 4/22/23, 6:21 AM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/1/23, 7:41 PM
+ *  Last modified 4/22/23, 6:05 AM
  */
 
 package com.symphony.mrfit.ui
@@ -222,7 +222,7 @@ class WorkoutTemplateActivity : AppCompatActivity() {
                         .child(ExerciseRepository.EXERCISE_PICTURE)
                         .child(exercise.exerciseID!!)
                 )
-                .placeholder(R.drawable.cactuar)
+                .placeholder(R.drawable.glide_placeholder)
                 .into(exeCard.exerciseImage)
             exeCard.exerciseNameTextView.text = exercise.name
             exeCard.exerciseTagsTextView.text = exercise.tags.toString()
diff --git a/app/src/main/res/layout/activity_current_workout.xml b/app/src/main/res/layout/activity_current_workout.xml
index 133ee4b..2f1537f 100644
--- a/app/src/main/res/layout/activity_current_workout.xml
+++ b/app/src/main/res/layout/activity_current_workout.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 4:23 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 4:13 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_currentActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.CurrentWorkoutActivity">
diff --git a/app/src/main/res/layout/activity_custom_exercises.xml b/app/src/main/res/layout/activity_custom_exercises.xml
index 7b2bff5..9720ce2 100644
--- a/app/src/main/res/layout/activity_custom_exercises.xml
+++ b/app/src/main/res/layout/activity_custom_exercises.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 2:50 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_customExerciseActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.CustomExercisesActivity">
diff --git a/app/src/main/res/layout/activity_date_time.xml b/app/src/main/res/layout/activity_date_time.xml
new file mode 100644
index 0000000..d79ce53
--- /dev/null
+++ b/app/src/main/res/layout/activity_date_time.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Created by Team Symphony on 4/21/23, 5:28 PM
+  ~  Copyright (c) 2023 . All rights reserved.
+  ~  Last modified 4/21/23, 5:17 PM
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.DateTimeActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.applandeo.materialcalendarview.CalendarView
+            android:id="@+id/dialogDatePicker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:headerColor="?colorPrimary"
+            app:todayLabelColor="@color/design_default_color_on_secondary"
+            app:type="one_day_picker" />
+
+        <TimePicker
+            android:id="@+id/dialogTimePicker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:timePickerMode="spinner" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/dateTimeCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="@string/button_cancel"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/dateTimeOK"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="@string/button_ok" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml
index 5a040ec..290e077 100644
--- a/app/src/main/res/layout/activity_exercise.xml
+++ b/app/src/main/res/layout/activity_exercise.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/7/23, 7:13 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/7/23, 7:12 PM
+  ~  Last modified 4/21/23, 10:16 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_exerciseSelectionActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.ExerciseActivity">
 
 
     <LinearLayout
+        android:id="@+id/exerciseScreenView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="20dp"
diff --git a/app/src/main/res/layout/activity_goals.xml b/app/src/main/res/layout/activity_goals.xml
index b2c4710..96f9774 100644
--- a/app/src/main/res/layout/activity_goals.xml
+++ b/app/src/main/res/layout/activity_goals.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 6:46 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 6:46 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_goalsActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.GoalsActivity">
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index ab954b0..28d33ee 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/19/23, 5:18 PM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 5:06 PM
+  ~  Last modified 4/21/23, 4:39 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -14,127 +14,127 @@
     android:elevation="5dp"
     tools:context=".ui.HomeActivity">
 
-    <ScrollView
+    <LinearLayout
         android:id="@+id/homeScreenView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
+            android:id="@+id/userLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="@drawable/dropshadow_background"
+            android:elevation="5dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/homeProfilePicture"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_margin="6dp"
+                android:layout_weight="0"
+                android:contentDescription="@string/profile_picture"
+                app:srcCompat="@drawable/placeholder_profile_picture"
+                tools:ignore="ImageContrastCheck" />
 
             <LinearLayout
-                android:id="@+id/userLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/dropshadow_background"
-                android:elevation="5dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/homeProfilePicture"
-                    android:layout_width="120dp"
-                    android:layout_height="120dp"
-                    android:layout_margin="6dp"
-                    android:layout_weight="0"
-                    android:contentDescription="@string/profile_picture"
-                    app:srcCompat="@drawable/placeholder_profile_picture"
-                    tools:ignore="ImageContrastCheck" />
-
-                <LinearLayout
-                    android:layout_width="216dp"
-                    android:layout_height="122dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_weight="0"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/templateNameTextView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/welcome"
-                        android:textColor="#616161" />
+                <TextView
+                    android:id="@+id/homeWelcomeTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/welcome"
+                    android:textColor="#616161" />
 
                     <TextView
                         android:id="@+id/homeNameTextView"
-                        android:layout_width="212dp"
-                        android:layout_height="86dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         android:text="@string/PLACEHOLDER_TEXT"
                         android:textSize="34sp"
-                        android:textStyle="bold"
-                        tools:ignore="TextSizeCheck" />
-
+                        android:textColor="@color/black"
+                        android:textStyle="bold" />
                 </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/imageView"
-                    android:layout_width="32dp"
-                    android:layout_height="73dp"
-                    app:srcCompat="@drawable/settings"
-                    android:contentDescription="TODO"
-                    tools:ignore="ContentDescription,HardcodedText" />
+            <ImageView
+                android:id="@+id/settingsCog"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_margin="5dp"
+                android:layout_weight="0"
+                android:contentDescription="TODO"
+                app:srcCompat="@drawable/settings"
+                tools:ignore="ContentDescription,HardcodedText" />
 
-            </LinearLayout>
+        </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/linearLayout"
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/scheduleButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
-                android:orientation="vertical">
+                android:text="@string/button_schedule"
+                tools:ignore="VisualLintButtonSize" />
 
-                <Button
-                    android:id="@+id/scheduleButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/button_schedule"
-                    tools:ignore="VisualLintButtonSize" />
+            <Button
+                android:id="@+id/pastWorkout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/button_old_workout" />
 
-                <Button
-                    android:id="@+id/workoutButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/button_workout"
-                    tools:ignore="VisualLintButtonSize" />
+            <Button
+                android:id="@+id/workoutButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/button_workout"
+                tools:ignore="VisualLintButtonSize" />
 
-            </LinearLayout>
+        </LinearLayout>
 
-            <LinearLayout
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginBottom="24dp"
-                android:orientation="vertical">
+                android:text="@string/label_workout_history"
+                android:textSize="24sp" />
 
-                <TextView
-                    android:id="@+id/textView10"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/label_workout_history"
-                    android:textSize="24sp" />
+            <TextView
+                android:id="@+id/historyText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-                <TextView
-                    android:id="@+id/historyText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/historyList"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-            </LinearLayout>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/historyList"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
         </LinearLayout>
-    </ScrollView>
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/loadingSpinner"
diff --git a/app/src/main/res/layout/activity_manual_workout.xml b/app/src/main/res/layout/activity_manual_workout.xml
new file mode 100644
index 0000000..94d01ab
--- /dev/null
+++ b/app/src/main/res/layout/activity_manual_workout.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Created by Team Symphony on 4/20/23, 7:03 PM
+  ~  Copyright (c) 2023 . All rights reserved.
+  ~  Last modified 4/20/23, 7:03 PM
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ManualWorkoutActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/templateRecyclerList"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="20dp"
+            android:layout_weight="1">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+        <TableLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <TableRow
+                android:id="@+id/startTimeRow"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="10dp"
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/startTimeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:gravity="end"
+                    android:text="Start Time:" />
+
+                <TextView
+                    android:id="@+id/startTimeSelection"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:text="MMMM dd, yyyy at hh:mm" />
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@android:drawable/ic_menu_day" />
+            </TableRow>
+
+            <TableRow
+                android:id="@+id/endTimeRow"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="10dp"
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/endTimeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:gravity="end"
+                    android:text="End Time:" />
+
+                <TextView
+                    android:id="@+id/endTimeSelection"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="3dp"
+                    android:text="MMMM dd, yyyy at hh:mm" />
+
+                <ImageView
+                    android:id="@+id/imageView3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@android:drawable/ic_menu_day" />
+            </TableRow>
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/saveManualWorkoutButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:text="@string/button_save" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notification_log.xml b/app/src/main/res/layout/activity_notification_log.xml
index 892274c..08fb56e 100644
--- a/app/src/main/res/layout/activity_notification_log.xml
+++ b/app/src/main/res/layout/activity_notification_log.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 9:44 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 9:42 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_notificationLogActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.NotificationLogActivity">
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index cbd2818..b5bc9e9 100644
--- a/app/src/main/res/layout/activity_post_workout.xml
+++ b/app/src/main/res/layout/activity_post_workout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 8:15 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 8:15 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,7 +39,6 @@
             android:gravity="center"
             android:maxLines="2"
             android:text="Good job!"
-            android:textColor="#000000"
             android:textSize="24sp" />
 
         <TextView
@@ -60,7 +59,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/gotoGoalsButton"
@@ -73,8 +73,7 @@
                 android:id="@+id/returnHomeButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:text="@string/button_return_home" />
+                android:layout_margin="10dp" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index f09f774..1484b7c 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/7/23, 7:13 PM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/7/23, 6:43 PM
+  ~  Last modified 4/21/23, 4:12 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_registerActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.RegisterActivity">
diff --git a/app/src/main/res/layout/activity_routine_selection.xml b/app/src/main/res/layout/activity_routine_selection.xml
index ec3be1f..b682128 100644
--- a/app/src/main/res/layout/activity_routine_selection.xml
+++ b/app/src/main/res/layout/activity_routine_selection.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 2/24/23, 11:21 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/24/23, 11:20 PM
+  ~  Last modified 4/21/23, 9:24 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_selectionActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.RoutineSelectionActivity">
diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml
index e11894a..0adfb7d 100644
--- a/app/src/main/res/layout/activity_user_profile.xml
+++ b/app/src/main/res/layout/activity_user_profile.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/19/23, 5:18 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 5:06 PM
+  ~  Last modified 4/21/23, 8:40 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_profileActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.UserProfileActivity">
@@ -15,7 +16,9 @@
     <ScrollView
         android:id="@+id/profileScreenView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -45,6 +48,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:text="@string/PLACEHOLDER_TEXT"
+                    android:textColor="@color/black"
                     android:textSize="20sp"
                     android:textStyle="bold" />
 
@@ -216,6 +220,7 @@
                         android:text="@string/label_settings" />
 
                     <LinearLayout
+                        android:id="@+id/notificationToggle"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_workout_history.xml b/app/src/main/res/layout/activity_workout_history.xml
index fc2c7b5..9ad8c8c 100644
--- a/app/src/main/res/layout/activity_workout_history.xml
+++ b/app/src/main/res/layout/activity_workout_history.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 10:04 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 10:04 PM
+  ~  Last modified 4/22/23, 6:05 AM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_workoutHistoryActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.WorkoutHistoryActivity">
@@ -38,6 +39,20 @@
 
     </LinearLayout>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/addHistoryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:clickable="true"
+        android:contentDescription="@string/button_new_exercise"
+        android:rotation="45"
+        android:src="@android:drawable/ic_menu_close_clear_cancel"
+        app:backgroundTint="@color/garnet"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:ignore="ContentDescription,KeyboardInaccessibleWidget" />
+
     <ProgressBar
         android:id="@+id/loadingSpinner"
         style="@android:style/Widget.ProgressBar.Inverse"
diff --git a/app/src/main/res/layout/activity_workout_routine.xml b/app/src/main/res/layout/activity_workout_routine.xml
index 1a09085..54c7e7a 100644
--- a/app/src/main/res/layout/activity_workout_routine.xml
+++ b/app/src/main/res/layout/activity_workout_routine.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/2/23, 1:04 AM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:01 AM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_workoutBuilderActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="1"
@@ -41,10 +42,12 @@
                 android:layout_marginTop="10dp"
                 android:ems="10"
                 android:hint="@string/label_routine_name"
+                android:importantForAutofill="no"
                 android:inputType="textPersonName"
                 android:minHeight="48dp"
-                android:importantForAutofill="no"
-                android:textAlignment="center" />
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textColorHint="@color/black" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -55,7 +58,8 @@
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/material_dynamic_neutral40">
 
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/workoutPlaylistEditText"
@@ -63,7 +67,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
                         android:layout_marginRight="10dp"
-                        android:hint="@string/workout_playlist" />
+                        android:hint="@string/workout_playlist"
+                        android:textColor="@color/black"
+                        android:textColorHint="@color/black" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <Button
diff --git a/app/src/main/res/layout/activity_workout_template.xml b/app/src/main/res/layout/activity_workout_template.xml
index 5f9fc14..ce8a588 100644
--- a/app/src/main/res/layout/activity_workout_template.xml
+++ b/app/src/main/res/layout/activity_workout_template.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/19/23, 4:10 PM
+  ~  Created by Team Symphony on 4/21/23, 10:18 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 4:07 PM
+  ~  Last modified 4/21/23, 10:16 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_exerciseBuilderActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".data.model.Workout">
 
     <LinearLayout
-        android:layout_width="380dp"
-        android:layout_height="699dp"
-        android:layout_marginStart="17dp"
-        android:layout_marginTop="17dp"
-        android:layout_marginEnd="14dp"
-        android:layout_marginBottom="15dp"
+        android:id="@+id/templateScreenView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="15dp"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -33,8 +30,8 @@
             android:visibility="visible" />
 
         <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
             android:id="@+id/durationLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp">
@@ -84,8 +81,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="5dp"
                     android:layout_weight="1"
-                    android:hint="@string/hint_reps"
                     android:digits="0123456789."
+                    android:hint="@string/hint_reps"
                     android:inputType="numberDecimal"
                     android:maxLength="4"
                     android:visibility="visible" />
@@ -105,8 +102,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:layout_weight="1"
-                    android:hint="@string/hint_sets"
                     android:digits="0123456789."
+                    android:hint="@string/hint_sets"
                     android:inputType="numberDecimal"
                     android:maxLength="4" />
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/card_exercise.xml b/app/src/main/res/layout/card_exercise.xml
index f58ebe6..531ea79 100644
--- a/app/src/main/res/layout/card_exercise.xml
+++ b/app/src/main/res/layout/card_exercise.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 2/26/23, 11:15 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/26/23, 11:15 AM
+  ~  Last modified 4/22/23, 6:19 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,14 +9,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
-    
-        <!-- In the above cardview widget cardelevation property will give elevation to your card view
+
+    <!-- In the above cardview widget cardelevation property will give elevation to your card view
     card corner radius will provide radius to your card view card background color will give
     background color to your card view card max elevation will give the cardview maximum
     elevation card prevent corner overlap will add padding to CardView on v20 and before to
@@ -24,18 +23,21 @@
     will add padding in API v21+ as well to have the same measurements with previous versions -->
 
     <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <!-- Image View to display an image for the exercise -->
         <ImageView
-        android:id="@+id/exerciseImage"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_margin="10dp"
-        android:contentDescription="@string/app_name"
-        android:padding="5dp"
-        android:src="@drawable/cactuar" />
+            android:id="@+id/exerciseImage"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:contentDescription="@string/app_name"
+            android:padding="5dp"
+            android:src="@drawable/cactuar" />
 
         <!-- Text View to display Exercise Name -->
         <TextView
@@ -46,7 +48,6 @@
             android:layout_marginTop="10dp"
             android:layout_toEndOf="@id/exerciseImage"
             android:text="@string/PLACEHOLDER_TEXT"
-            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
 
@@ -69,6 +70,7 @@
             android:layout_below="@id/exerciseTagsTextView"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:layout_toEndOf="@id/exerciseImage"
             android:drawablePadding="2dp"
             android:text="@string/PLACEHOLDER_TEXT" />
diff --git a/app/src/main/res/layout/card_exercise2.xml b/app/src/main/res/layout/card_exercise2.xml
index 068417e..c53dd11 100644
--- a/app/src/main/res/layout/card_exercise2.xml
+++ b/app/src/main/res/layout/card_exercise2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 2:50 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 2:50 PM
+  ~  Last modified 4/22/23, 6:19 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,7 +9,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
@@ -55,7 +54,6 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
                 android:text="@string/PLACEHOLDER_TEXT"
-                android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/card_goal.xml b/app/src/main/res/layout/card_goal.xml
index 19f701f..e5ee07d 100644
--- a/app/src/main/res/layout/card_goal.xml
+++ b/app/src/main/res/layout/card_goal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 10:40 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,13 +24,13 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,12 +38,14 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/goalName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
                 android:text="Goal name" />
 
             <TextView
                 android:id="@+id/goalProgress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="___ / 50 days" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/card_history.xml b/app/src/main/res/layout/card_history.xml
index 4310e13..dda46fd 100644
--- a/app/src/main/res/layout/card_history.xml
+++ b/app/src/main/res/layout/card_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 4:23 AM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 4:20 AM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -25,8 +25,7 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:background="@drawable/border_thick"
+        android:layout_height="wrap_content"
         android:gravity="center">
 
         <TextView
@@ -36,13 +35,12 @@ will add padding in API v21+ as well to have the same measurements with previous
             android:layout_margin="10dp"
             android:layout_weight="1"
             android:text="@string/PLACEHOLDER_TEXT"
-            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="right"
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/card_history2.xml b/app/src/main/res/layout/card_history2.xml
index b601639..b5771f2 100644
--- a/app/src/main/res/layout/card_history2.xml
+++ b/app/src/main/res/layout/card_history2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 10:43 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,13 +24,13 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,12 +38,14 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/historyName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
                 android:text="history name" />
 
             <TextView
                 android:id="@+id/historyProgress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="Exercised for hh:mm:ss on MMMM dd, yyyy" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/card_notification.xml b/app/src/main/res/layout/card_notification.xml
index 5edc382..0c064aa 100644
--- a/app/src/main/res/layout/card_notification.xml
+++ b/app/src/main/res/layout/card_notification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/2/23, 3:50 AM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/2/23, 1:29 AM
+  ~  Last modified 4/21/23, 10:43 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -24,13 +24,13 @@ will add padding in API v21+ as well to have the same measurements with previous
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:padding="10dp">
 
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -38,29 +38,31 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:id="@+id/notificationMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
                 android:text="Notification Message" />
 
             <TextView
                 android:id="@+id/notificationTimeAndDate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:text="Scheduled for Date and Time" />
         </LinearLayout>
 
         <Button
             android:id="@+id/cancelNotificationButton"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/button_cancel"
-            style="?android:attr/buttonBarButtonStyle"
             android:visibility="gone" />
 
         <Button
             android:id="@+id/deleteNotifcationButton"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/button_delete"
-            style="?android:attr/buttonBarButtonStyle"
             android:visibility="visible" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/card_routine.xml b/app/src/main/res/layout/card_routine.xml
index 719d588..04791f2 100644
--- a/app/src/main/res/layout/card_routine.xml
+++ b/app/src/main/res/layout/card_routine.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 2/24/23, 11:21 PM
+  ~  Created by Team Symphony on 4/21/23, 3:22 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/24/23, 11:20 PM
+  ~  Last modified 4/21/23, 2:52 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,15 +23,16 @@ prevent intersections between the Card content and rounded corners. Card use com
 will add padding in API v21+ as well to have the same measurements with previous versions -->
 
     <RelativeLayout
+        android:id="@+id/cardBackground"
         android:layout_width="match_parent"
         android:layout_height="100dp"
         android:background="@color/garnet"
-        app:layout_constraintDimensionRatio="1:1"
+        android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:gravity="center">
+        app:layout_constraintTop_toTopOf="parent">
 
         <!-- Image View to display an image for the exercise -->
 
diff --git a/app/src/main/res/layout/card_workout.xml b/app/src/main/res/layout/card_workout.xml
index 3bfe75d..ca7a029 100644
--- a/app/src/main/res/layout/card_workout.xml
+++ b/app/src/main/res/layout/card_workout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 2/24/23, 11:21 PM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 2/24/23, 11:20 PM
+  ~  Last modified 4/22/23, 6:18 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,14 +9,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
-    
-        <!-- In the above cardview widget cardelevation property will give elevation to your card view
+
+    <!-- In the above cardview widget cardelevation property will give elevation to your card view
     card corner radius will provide radius to your card view card background color will give
     background color to your card view card max elevation will give the cardview maximum
     elevation card prevent corner overlap will add padding to CardView on v20 and before to
@@ -24,8 +23,8 @@
     will add padding in API v21+ as well to have the same measurements with previous versions -->
 
     <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <!-- Image View to display an image for the exercise -->
         <ImageView
@@ -42,27 +41,26 @@
 
         <!-- Text View to display Exercise Name -->
         <TextView
-        android:id="@+id/workoutNameTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_toEndOf="@id/workoutImage"
-        android:text="@string/PLACEHOLDER_TEXT"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold" />
+            android:id="@+id/workoutNameTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_toEndOf="@id/workoutImage"
+            android:text="@string/PLACEHOLDER_TEXT"
+            android:textSize="18sp"
+            android:textStyle="bold" />
 
         <!-- Text VIew to display Exercise Description -->
         <TextView
-        android:id="@+id/workoutRepsTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/workoutNameTextView"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="20dp"
-        android:layout_toEndOf="@id/workoutImage"
-        android:drawablePadding="2dp"
-        android:text="@string/PLACEHOLDER_TEXT" />
+            android:id="@+id/workoutRepsTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/workoutNameTextView"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_toEndOf="@id/workoutImage"
+            android:drawablePadding="2dp"
+            android:text="@string/PLACEHOLDER_TEXT" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_workout2.xml b/app/src/main/res/layout/card_workout2.xml
index d350700..c4685fe 100644
--- a/app/src/main/res/layout/card_workout2.xml
+++ b/app/src/main/res/layout/card_workout2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 4:23 AM
+  ~  Created by Team Symphony on 4/22/23, 6:21 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 4:20 AM
+  ~  Last modified 4/22/23, 6:18 AM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -9,7 +9,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="0dp"
-    app:cardBackgroundColor="@color/white"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardMaxElevation="5dp"
@@ -44,7 +43,7 @@ will add padding in API v21+ as well to have the same measurements with previous
         <!-- Text View to display Exercise Name -->
         <LinearLayout
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -55,7 +54,6 @@ will add padding in API v21+ as well to have the same measurements with previous
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
                 android:text="@string/PLACEHOLDER_TEXT"
-                android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/popup_date_and_time_picker.xml b/app/src/main/res/layout/popup_date_and_time_picker.xml
new file mode 100644
index 0000000..411274b
--- /dev/null
+++ b/app/src/main/res/layout/popup_date_and_time_picker.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~  Created by Team Symphony on 4/20/23, 7:03 PM
+  ~  Copyright (c) 2023 . All rights reserved.
+  ~  Last modified 4/20/23, 7:03 PM
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.applandeo.materialcalendarview.CalendarView
+            android:id="@+id/dialogDatePicker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TimePicker
+            android:id="@+id/dialogTimePicker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:timePickerMode="spinner" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_edit_goal.xml b/app/src/main/res/layout/popup_edit_goal.xml
index 45432c3..3a02d69 100644
--- a/app/src/main/res/layout/popup_edit_goal.xml
+++ b/app/src/main/res/layout/popup_edit_goal.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 10:42 PM
+  ~  Created by Team Symphony on 4/21/23, 10:43 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 10:21 PM
+  ~  Last modified 4/21/23, 10:39 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/border_thin"
     android:padding="5dp">
 
     <LinearLayout
@@ -48,7 +47,8 @@
                 android:layout_height="wrap_content"
                 android:digits="0123456789."
                 android:gravity="center"
-                android:inputType="number"
+                android:inputType="textShortMessage|number"
+                android:maxLength="5"
                 android:minEms="2" />
 
             <TextView
@@ -63,7 +63,8 @@
                 android:layout_height="wrap_content"
                 android:digits="0123456789."
                 android:gravity="center"
-                android:inputType="number"
+                android:inputType="textShortMessage|number"
+                android:maxLength="5"
                 android:minEms="2" />
 
             <Spinner
@@ -86,7 +87,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/cancelEditGoalButton"
diff --git a/app/src/main/res/layout/popup_new_exercise.xml b/app/src/main/res/layout/popup_new_exercise.xml
index 1e0fe79..6958cbc 100644
--- a/app/src/main/res/layout/popup_new_exercise.xml
+++ b/app/src/main/res/layout/popup_new_exercise.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 5:18 PM
+  ~  Created by Team Symphony on 4/21/23, 5:08 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 5:18 PM
+  ~  Last modified 4/21/23, 5:00 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/border_thin"
     android:focusable="false"
     android:padding="5dp">
 
@@ -55,7 +54,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_tags"
-                android:inputType="textMultiLine|text" />
+                android:inputType="textLongMessage|text" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -68,7 +67,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_description"
-                android:inputType="textLongMessage|textMultiLine|text" />
+                android:inputType="textLongMessage|text" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
@@ -123,31 +122,33 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:text="@string/reminder_message" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/cancelExerciseButton"
+                style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:enabled="true"
-                style="?android:attr/buttonBarButtonStyle"
                 android:text="@string/button_cancel" />
 
             <Button
                 android:id="@+id/saveExerciseButton"
+                style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:enabled="true"
-                style="?android:attr/buttonBarButtonStyle"
                 android:text="@string/button_save" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/popup_new_goal.xml b/app/src/main/res/layout/popup_new_goal.xml
index 2ad8760..498a144 100644
--- a/app/src/main/res/layout/popup_new_goal.xml
+++ b/app/src/main/res/layout/popup_new_goal.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/19/23, 4:10 PM
+  ~  Created by Team Symphony on 4/19/23, 11:58 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 4:07 PM
+  ~  Last modified 4/19/23, 11:57 PM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/border_thin"
     android:padding="5dp">
 
     <LinearLayout
@@ -44,8 +43,8 @@
                 android:id="@+id/goalNumber"
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
                 android:digits="0123456789."
+                android:gravity="center_vertical"
                 android:inputType="number" />
 
             <Spinner
@@ -68,7 +67,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/cancelGoalButton"
diff --git a/app/src/main/res/layout/popup_workout_history.xml b/app/src/main/res/layout/popup_workout_history.xml
index c5b6bbb..04970d3 100644
--- a/app/src/main/res/layout/popup_workout_history.xml
+++ b/app/src/main/res/layout/popup_workout_history.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~  Created by Team Symphony on 4/1/23, 11:17 PM
+  ~  Created by Team Symphony on 4/20/23, 12:13 AM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/1/23, 10:54 PM
+  ~  Last modified 4/20/23, 12:00 AM
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/border_thin"
     android:padding="5dp">
 
     <LinearLayout
@@ -44,7 +43,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <Button
                 android:id="@+id/openHistoryRoutineButton"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8945b58..0175af3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 3/30/23, 3:45 PM
+  ~  Created by Team Symphony on 4/21/23, 3:22 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 3/30/23, 3:38 PM
+  ~  Last modified 4/21/23, 2:58 PM
   -->
 
 <resources>
     <color name="garnet">#9A2A2A</color>
+    <color name="off_garnet">#FF0000</color>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d09eda9..732020f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <!--
-  ~  Created by Team Symphony on 4/19/23, 7:07 PM
+  ~  Created by Team Symphony on 4/21/23, 3:22 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/19/23, 6:58 PM
+  ~  Last modified 4/21/23, 3:17 PM
   -->
 
 <resources>
@@ -130,8 +130,8 @@
     <string name="other">other</string>
     <string name="hint_other">Other</string>
     <string name="history_title">Your History</string>
-    <string name="button_open_routine">Open this\nTemplate</string>
-    <string name="button_ok">OK</string>
+    <string name="button_open_routine">Open this Template</string>
+    <string name="button_ok">Okay</string>
     <string name="title_activity_workout_detail">WorkoutDetail</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
@@ -142,6 +142,7 @@
     <string name="hello_first_fragment">Hello first fragment</string>
     <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="exercises_title">Your Exercises</string>
-    <string name="button_update_goals">Update my\ngoals</string>
-    <string name="button_return_home">Return\nHome</string>
+    <string name="button_update_goals">Update my goals</string>
+    <string name="button_return_home">Return Home</string>
+    <string name="button_old_workout">Add an old Workout</string>
 </resources>
\ No newline at end of file