Major updates to editing forms