Changed UI and logic in Choose Color