Bugfix for colorpicker and layout