Improved zoom behavior