Added Zooming
Manually merged conflicts