Spinner style and code refactoring