Moved colour selection back to view