Add a spinner to display options
Fix some pre-iOS 8 rotation issues