Added ColorDialog + UI improvements