fixing the form edit bugs