Changed the pages and controllers