Added color picker and some other minor tweaks