Rework of the nav bar