Added Cancel button for Color Dialog
Fixed Color Dialog on item click logic, fixes #46