Added color picker and tweaked styles