Initial work on restoring zoom and scroll position (still buggy)