Update to Page selector and its model