Add listener
Merge WorkoutActivity