Added Photo Picking and other misc changes