For the most part everything seems to be workingish

Sorry for the vague description, just look at the code changes. The
display is working properly now, I have to add a few elements next and
handle the timetable generation in a2.sql