Cleaned up nav controller.