Updated Workout UI
Merge Conflict