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 e81a7f1..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,7 +1,7 @@
 /*
- *  Created by Team Symphony on 4/20/23, 2:11 AM
+ *  Created by Team Symphony on 4/21/23, 10:36 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/20/23, 2:11 AM
+ *  Last modified 4/21/23, 10:36 PM
  */
 
 package com.symphony.mrfit.ui
@@ -134,16 +134,15 @@ class CurrentWorkoutActivity : AppCompatActivity() {
                 .inflate(R.layout.activity_post_workout, null, false)
 
             materialDialog.setView(dialogView)
-                .setTitle("Post Exercise")
 
             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())
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 51fd8bb..f879436 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/21/23, 10:18 PM
+ *  Created by Team Symphony on 4/21/23, 10:36 PM
  *  Copyright (c) 2023 . All rights reserved.
- *  Last modified 4/21/23, 9:57 PM
+ *  Last modified 4/21/23, 10:26 PM
  */
 
 package com.symphony.mrfit.ui
@@ -108,11 +108,13 @@ class WorkoutRoutineActivity : AppCompatActivity() {
                 routinePlaylist.setText(BLANK)
             }
             if (routine.workoutList != null) {
-                spinner.visibility = View.VISIBLE
-                placeholderText.visibility = View.GONE
-                workoutList.visibility = View.VISIBLE
-                passedList = routine.workoutList
-                exerciseViewModel.getWorkouts(routine.workoutList)
+                if (routine.workoutList.isNotEmpty()) {
+                    spinner.visibility = View.VISIBLE
+                    placeholderText.visibility = View.GONE
+                    workoutList.visibility = View.VISIBLE
+                    passedList = routine.workoutList
+                    exerciseViewModel.getWorkouts(routine.workoutList)
+                }
             }
         })
         exerciseViewModel.workoutList.observe(this, Observer {
diff --git a/app/src/main/res/layout/activity_post_workout.xml b/app/src/main/res/layout/activity_post_workout.xml
index d34401a..a1f27bd 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/20/23, 2:11 AM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/20/23, 2:11 AM
+  ~  Last modified 4/21/23, 10:36 PM
   -->
 
 <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
diff --git a/app/src/main/res/layout/activity_workout_routine.xml b/app/src/main/res/layout/activity_workout_routine.xml
index a16f4d9..54c7e7a 100644
--- a/app/src/main/res/layout/activity_workout_routine.xml
+++ b/app/src/main/res/layout/activity_workout_routine.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~  Created by Team Symphony on 4/21/23, 10:18 PM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 9:24 PM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -42,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"
@@ -56,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"
@@ -64,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/card_history.xml b/app/src/main/res/layout/card_history.xml
index 96d8a85..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/21/23, 5:28 PM
+  ~  Created by Team Symphony on 4/21/23, 10:36 PM
   ~  Copyright (c) 2023 . All rights reserved.
-  ~  Last modified 4/21/23, 5:17 PM
+  ~  Last modified 4/21/23, 10:27 PM
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -26,7 +26,6 @@ will add padding in API v21+ as well to have the same measurements with previous
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/border_thick"
         android:gravity="center">
 
         <TextView
@@ -36,7 +35,6 @@ 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" />