More buttons, changed some classes