DEVIDM-136: Improved the create & edit views.