Added zooming and moving separately