Added more reusable classes
spinner fix