#758 Zoom to fit should be dynamic