Fixed zooming issues