Refactoring navbar
New navbar without dynamic changed layout