Tweak header and nav
First rough pass at adding subnavigation