diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar
index 90d9cd1c..b2211645 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java
index 5a347c30..1b636a7a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java	
@@ -205,26 +205,29 @@ public class DrawingManager {
 			// Do not track the area if component is not invalidated and was
 			// drawn in the same state.
 			boolean trackArea = lastDrawnStateMap.get(component) != state;
-			g2dWrapper.startedDrawingComponent();
-			if (!trackArea) {
-				g2dWrapper.stopTracking();
-			}
-			// Draw locked components in a new composite.
-			if (lockedComponents.contains(component)) {
-				g2d.setComposite(lockedComposite);
-			}
-			// Draw the component through the g2dWrapper.
-			try {
-				component.draw(g2dWrapper, state, drawOptions.contains(DrawOption.OUTLINE_MODE),
-						project, g2dWrapper);
-			} catch (Exception e) {
-				LOG.error("Error drawing " + component.getName(), e);
-				failedComponents.add(component);
-			}
-			Area area = g2dWrapper.finishedDrawingComponent();
-			if (trackArea && area != null && !area.isEmpty()) {
-				componentAreaMap.put(component, area);
-				lastDrawnStateMap.put(component, state);
+			
+			synchronized (g2d) {
+				g2dWrapper.startedDrawingComponent();
+				if (!trackArea) {
+					g2dWrapper.stopTracking();
+				}
+				// Draw locked components in a new composite.
+				if (lockedComponents.contains(component)) {
+					g2d.setComposite(lockedComposite);
+				}
+				// Draw the component through the g2dWrapper.
+				try {
+					component.draw(g2dWrapper, state,
+							drawOptions.contains(DrawOption.OUTLINE_MODE), project, g2dWrapper);
+				} catch (Exception e) {
+					LOG.error("Error drawing " + component.getName(), e);
+					failedComponents.add(component);
+				}
+				Area area = g2dWrapper.finishedDrawingComponent();
+				if (trackArea && area != null && !area.isEmpty()) {
+					componentAreaMap.put(component, area);
+					lastDrawnStateMap.put(component, state);
+				}
 			}
 		}
 
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java
index 10e638f0..47c892b1 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java	
@@ -24,6 +24,7 @@ import java.awt.geom.Area;
 import java.awt.geom.CubicCurve2D;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Line2D;
+import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.awt.geom.QuadCurve2D;
@@ -64,6 +65,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 	private AffineTransform originalTx;
 	private Font originalFont;
 	private AffineTransform currentTx;
+	private AffineTransform initialTx;
 	private Area currentArea;
 	private Shape lastShape;
 
@@ -91,6 +93,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 		originalComposite = canvasGraphics.getComposite();
 		originalFont = canvasGraphics.getFont();
 		currentTx = new AffineTransform();
+		initialTx = canvasGraphics.getTransform(); 
 		lastShape = null;
 		startTracking();
 	}
@@ -179,7 +182,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 						width, thickness);
 				Area area = new Area(rect);
 				area.transform(AffineTransform.getRotateInstance(theta, midX, midY));
-//				area.transform(currentTx);
+				// area.transform(currentTx);
 				appendShape(area);
 				// Set the prev point to line end
 				prevPoint = nextPoint;
@@ -294,8 +297,11 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 		if (drawingComponent && trackingAllowed) {
 			FontMetrics fontMetrics = canvasGraphics.getFontMetrics();
 			Rectangle2D rect = fontMetrics.getStringBounds(str, canvasGraphics);
-			appendShape(new Rectangle2D.Double(rect.getX() + x, rect.getY() + y, rect.getWidth(),
-					rect.getHeight()));
+			Point2D point = new Point2D.Double(x, y);
+			//currentTx.transform(point, point);
+			Rectangle2D finalRec = new Rectangle2D.Double(rect.getX() + point.getX(), rect.getY() + point.getY(), rect
+					.getWidth(), rect.getHeight());
+			appendShape(finalRec);
 		}
 	}
 
@@ -434,7 +440,19 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 	@Override
 	public void setTransform(AffineTransform Tx) {
 		canvasGraphics.setTransform(Tx);
-		currentTx = Tx;
+		currentTx = new AffineTransform(Tx);
+		try {
+			// Invert the tx that was set before we started drawing the component.
+			// We're left only component tx.
+			AffineTransform inverseInitialTx = initialTx.createInverse();
+			Point2D p = new Point2D.Double(currentTx.getTranslateX(), currentTx.getTranslateY());
+			inverseInitialTx.transform(p, p);
+			currentTx.concatenate(inverseInitialTx);
+			double[] matrix = new double[6];
+			currentTx.getMatrix(matrix);
+			currentTx.setTransform(matrix[0], matrix[1], matrix[2], matrix[3], p.getX(), p.getY());
+		} catch (NoninvertibleTransformException e) {
+		}
 	}
 
 	@Override
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java
index e9e5b0de..4dfb8988 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
@@ -54,7 +54,7 @@ public class Presenter implements IPlugInPort {
 
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
-	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 0, 9);
+	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 1, 0);
 	public static final String DEFAULTS_KEY_PREFIX = "default.";
 
 	public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections.emptyList();