PDI-10342 UI work