Fixed up the route navigation