updated forms, pages and action