diff --git a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
index b7164021..af12ae76 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
@@ -67,7 +67,7 @@ public class DrawingManager {
   private static final Logger LOG = Logger.getLogger(DrawingManager.class);
 
   public static int CONTROL_POINT_SIZE = 7;
-  public static double EXTRA_SPACE = 0.2;
+  public static double EXTRA_SPACE = 0.25;
 
   public static final String ZOOM_KEY = "zoom";
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index b3edf3f6..85a56bb7 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -927,6 +927,15 @@ public class Presenter implements IPlugInPort {
 			LOG.debug("Area is null for " + c.getName() + " of type "
 					+ c.getClass().getName());
 	}
+	
+	if (ConfigurationManager.getInstance().readBoolean(EXTRA_SPACE_KEY, true)) {
+	  double extraSpace = drawingManager.getExtraSpace(currentProject);
+	  minX += extraSpace;
+	  maxX += extraSpace;
+	  minY += extraSpace;
+	  maxY += extraSpace;
+	}
+	
 	if (drawingManager.getZoomLevel() != 1 && applyZoom) {
 		minX *= drawingManager.getZoomLevel();
 		maxX *= drawingManager.getZoomLevel();
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 9cae64f9..078c8ab3 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 9cae64f9..078c8ab3 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index 227e7ecf..7c7c9d83 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
@@ -109,8 +109,6 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 
   private double zoomLevel = 1;
 
-
-
   public CanvasPlugin(ISwingUI swingUI) {
     this.swingUI = swingUI;
     clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();