Navbar tweaks

Integrates changes to CodeSampleFull