Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -rfb4ad486a3c3509edb3c68e6dbde03c3a3003531 -r6dd2fa9ca7d2c786245b25d61f6f28a90c5bce9f
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision fb4ad486a3c3509edb3c68e6dbde03c3a3003531)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 6dd2fa9ca7d2c786245b25d61f6f28a90c5bce9f)
@@ -61,6 +61,9 @@
         private MapDataCollection data;
         private ImageBasedMapData backgroundMapData;
         private Timer updateTimer;
+        private bool isPanningEnabled;
+        private bool isRectangleZoomingEnabled;
+        private bool isMouseCoordinatesVisible;
         private bool handlingToggleButtonClicked;
         private bool handlingZoomToExtentsButtonClicked;
 
@@ -461,10 +464,21 @@
 
         #region Map Interaction
 
-        public bool IsPanningEnabled { get; private set; }
-        public bool IsRectangleZoomingEnabled { get; private set; }
+        public void ZoomToAllVisibleLayers()
+        {
+            ZoomToAllVisibleLayers(Data);
+        }
 
-        public bool IsMouseCoordinatesVisible { get; private set; }
+        public void ZoomToAllVisibleLayers(MapData layerData)
+        {
+            Envelope envelope = CreateEnvelopeForAllVisibleLayers(layerData);
+            if (!envelope.IsNull)
+            {
+                var extent = envelope.ToExtent();
+                AddPadding(extent);
+                map.ViewExtents = extent;
+            }
+        }
 
         private static void AddPadding(Extent extent)
         {
@@ -475,54 +489,38 @@
             }
         }
 
-        public void TogglePanning()
+        private void TogglePanning()
         {
             ResetDefaultInteraction();
 
-            IsPanningEnabled = true;
+            isPanningEnabled = true;
 
             map.FunctionMode = FunctionMode.Pan;
         }
 
-        public void ToggleRectangleZooming()
+        private void ToggleRectangleZooming()
         {
             ResetDefaultInteraction();
 
-            IsRectangleZoomingEnabled = true;
+            isRectangleZoomingEnabled = true;
 
             map.ActivateMapFunction(mapFunctionSelectionZoom);
         }
 
-        public void ToggleMouseCoordinatesVisibility()
+        private void ToggleMouseCoordinatesVisibility()
         {
-            if (!IsMouseCoordinatesVisible)
+            if (!isMouseCoordinatesVisible)
             {
                 mouseCoordinatesMapExtension.Activate();
-                IsMouseCoordinatesVisible = true;
+                isMouseCoordinatesVisible = true;
             }
             else
             {
                 mouseCoordinatesMapExtension.Deactivate();
-                IsMouseCoordinatesVisible = false;
+                isMouseCoordinatesVisible = false;
             }
         }
 
-        public void ZoomToAllVisibleLayers()
-        {
-            ZoomToAllVisibleLayers(Data);
-        }
-
-        public void ZoomToAllVisibleLayers(MapData layerData)
-        {
-            Envelope envelope = CreateEnvelopeForAllVisibleLayers(layerData);
-            if (!envelope.IsNull)
-            {
-                Extent extent = envelope.ToExtent();
-                AddPadding(extent);
-                map.ViewExtents = extent;
-            }
-        }
-
         /// <summary>
         /// Defines the area taken up by the visible map-data based on the provided map-data.
         /// </summary>
@@ -579,8 +577,8 @@
 
         private void ResetDefaultInteraction()
         {
-            IsPanningEnabled = false;
-            IsRectangleZoomingEnabled = false;
+            isPanningEnabled = false;
+            isRectangleZoomingEnabled = false;
 
             map.FunctionMode = FunctionMode.None;
         }
@@ -622,7 +620,7 @@
                 return;
             }
 
-            if (IsPanningEnabled)
+            if (isPanningEnabled)
             {
                 panningToggleButton.CheckState = CheckState.Checked;
 
@@ -647,7 +645,7 @@
                 return;
             }
 
-            if (IsRectangleZoomingEnabled)
+            if (isRectangleZoomingEnabled)
             {
                 zoomToRectangleToggleButton.CheckState = CheckState.Checked;