Added proper map scrolling and zooming