Fixing the Workout and Exercise components