Style/markup changes to etmplates so that header matches across all pages