updated with new header
Merge branch 'alternate_navbar'