Redo navbar changes to remove inline-flex