Added return to top navigation and fixed navigation breakpoints