[PDI-12188] - UX revisions, code cleanup