EZP-23678: Add edit and remove on view section