Changed the spinner to be more dynamic and sorted