Initial navbar reworking