nav refactor
finish navbar