Refactored UIPickerView and some minor changes