fixed some scrollview issues, changed back over to choosing between taking a photo or picking one from your camera roll, hopefully this is stable enough for Jacob to use