Layout and colour improvements