QOL: Make up options shown for selected date ONLY

When booking a make up, you select a date for the replacement but there is a long list of ALL the classes available for the season. It doesn't make sense and it's super confusing especially when you have several centres.
It should show ONLY the classes that are running on the selected make up date.
ALSO, the class should be shown by Centre. Either a drop down to select the branch OR to tag the class name with the centre name
BRANCH - Grade 1 Ballet - Day & Time - Teacher