navbar refactored