improved datastore

improved DataStore and relevant Components: ComboBox and List