Added color picker and simplified UI