began on nav bar refactor
everything aligned