Layout fixes
Colour change