Reworked navbar