updated page and controller