rework navbar to remove css hacks