Some upstyling work

Colour & Styling