Renamed classes, added buttons.