Refactor the web forms with MVP