Fixed some bugs. Enhenced Picker class