Fix button CSS classes and associated code