Work on form editor
Form editor upgrades