Replaced contents of ZoomAndPanControl with the new controls