refactor collection editing forms