UI Changes to add class