Design

separate timetable
fix tweak