Nav bar and adjusted breakpoints
New layout bug fixes