Tidy-up Button spinner classes