new changes on pages and controllers