Fix layout and colours