Fix buttons and add class