Fixed up the navigation