Moved the navigation data to controller