Refactoring, Validation Form Helpers, Wizard clean up, search, pagination, sort