Entity edit form some improvements