Timetable arrows shifted when less than 20 mins
Code simplification and visual improvements