Added dedicated color view class. Cleaned up excess code.