Almost fixed the nav