Timetable hotfixes & improvements.
Merge branch 'feature/267-timetable-fixes' into staging