tidied up header footer includes