Fixed Entity edit form layout