ECMS-4726 Incorrect UI Add/Edit View
Revert "ECMS-4726 Incorrect UI Add/Edit View"

This reverts commit 9dbf37f755b45f919f2dc8f7a80700a39f0b1997.
ECMS-4726 Incorrect UI Add/Edit View