Timetable Fixed

Now adding Current class