Updated navigation controller for consistency