fixed timetable funny scroll
merge & update