Moving per page to controllers