[Upg] refactoring navbar