fix for #36 and refactored ListPicker controller