New changes to classes and buttons