Moved scroll of photo view to scrollview from pan

The return animation is still janky