[PDI-12188] - Implementing changes from ux review
Merge pull request #12 from brosander/PDI-12188-rework

[PDI-12188] - Implementing changes from ux review