more minor formatting, fix colorpicker