Improved returning from target view to main view, position is not lost.