Colour fixes, layout changes