refactored color choicer minor changes in model