Scrapped the new nav stuff