Zoom fixes & improvements