Tidied up classes and timetable pages