Fixing somewhat displing of timetable.
Some fixes.