[PDI-12188] - UX revisions, code cleanup
Merge pull request #8 from brosander/PDI-12188

[PDI-12188] - UX revisions, code cleanup