Started refactoring navigation and offcanvas