add span elements for buttons and make css classes configurable