Fix navbar to match the reference implementation
Fix tests to match the new navbar too
Merge pull request #666 from ressu/navbar-fixes

Fix navbar to match the reference implementation