Refactor entity props editor
First fix of merge conflicts