Updated buttons for whichclass