Issue 866 refactor forms