Converted to modal add and edit for all entities