Merge pull request #245 from rfellows/develop

[PDI-11940] - Styling to align with UX guidelines
[PDI-11302] - Styling tweaks based on UX feedback