CSS colour and layout changes to spec