Improve Spinner functionality