Work towards #5 - Header and footer currently partly broken due to this