changes to pickers behavior, clean project