nav-bar refactored