Rework navbar