Cleaned up and fixed issues in Select Picker.