Picker and Camera modified