replace class -> type, avoid confusing with css class
add ui_button class
remove unnecessary space
cleanup
span.ui_data misplaced
fix for span.ui_data