Created timetable dropdowns and tweaked logic