#905 Independent header and footer
#905 And use those files now too