Added fixes for the form disabling when in edit mode