UI Changes From CC