adding the local picker and redesign pickers for more modularity