Week starting label changed to button
Refactored workout query