[PDI-11940] - Styling to align with UX guidelines