Zoom Mode improvements