Renamed button classes, and minor bug fixes