Fix layout if no address
Hack to detect staff users at Merthyr; need to merge with option
Hacks to get timetables working on Merthyr's EBS - need to config out these changes before merge
More hacks for timetables @ Merthyr