Completed further cleanup and refactor on navbar.