[PDI-12188] - More ux finishing touches
Merge pull request #13 from brosander/PDI-12188-rework-2

[PDI-12188] - More ux finishing touches