top nav stuff
Merge branch 'add_top_nav'