Edit Form fixes