Minor colour and layout changes