Use better class names for buttons