Feedback round 5

Styling tweaks based on feedback