New Zoom to fit - working, but needs refinement