Second stab at navbar.
Resolves nav conflicts.