Completed UI Changes.