fixed styles for edit entity
merge