updated pages and controllers