Progress on form editor