Remove custom classes to make it more SUI
Fix buttons size a bit