rework navbar to fix a few things