Create a new base class for buttons
Fix build in OS X