Apply improvements in timetable.js