Master - navbar refactoring - aab