updated match new buttons and classes