Update menu to navbar
Update the layout
Add navbars base override and clean