entity edit form improve