Scrap nav controller, restart design of first screen