UI-2872 Incorrect UI Add/Edit View