Make form editable/various bug fixes