Add colorpicker + some corrections