Fixed Photo Picker issues