diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index 8f5724e3..6bf66198 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -1413,7 +1413,8 @@ public class Presenter implements IPlugInPort {
           ComponentType componentBeforeType =
               ComponentProcessor.getInstance().extractComponentTypeFrom(
                   (Class<? extends IDIYComponent<?>>) componentBefore.getClass());
-          if (!componentType.isFlexibleZOrder() && componentBeforeType.getZOrder() < componentType.getZOrder())
+          if (!componentType.isFlexibleZOrder()
+              && Math.round(componentBeforeType.getZOrder()) < Math.round(componentType.getZOrder()))
             break;
           Collections.swap(currentProject.getComponents(), index, index - 1);
           index--;
@@ -1444,7 +1445,8 @@ public class Presenter implements IPlugInPort {
           ComponentType componentAfterType =
               ComponentProcessor.getInstance().extractComponentTypeFrom(
                   (Class<? extends IDIYComponent<?>>) componentAfter.getClass());
-          if (!componentType.isFlexibleZOrder() && componentAfterType.getZOrder() > componentType.getZOrder())
+          if (!componentType.isFlexibleZOrder()
+              && Math.round(componentAfterType.getZOrder()) > Math.round(componentType.getZOrder()))
             break;
           Collections.swap(currentProject.getComponents(), index, index + 1);
           index++;
@@ -2014,7 +2016,8 @@ public class Presenter implements IPlugInPort {
   @SuppressWarnings("unchecked")
   @Override
   public void setTemplateDefault(String categoryName, String componentTypeName, String templateName, boolean defaultFlag) {
-    LOG.debug(String.format("setTemplateDefault(%s, %s, %s, %s)", categoryName, componentTypeName, templateName, defaultFlag));
+    LOG.debug(String.format("setTemplateDefault(%s, %s, %s, %s)", categoryName, componentTypeName, templateName,
+        defaultFlag));
     Map<String, List<Template>> templateMap =
         (Map<String, List<Template>>) ConfigurationManager.getInstance().readObject(TEMPLATES_KEY, null);
     if (templateMap != null) {
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 94cf2f19..06e9aba4 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 94cf2f19..06e9aba4 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/update.xml b/diylc/diylc-swing/update.xml
index 0eec600f..92f0301a 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -1653,6 +1653,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Hookup wire can be sent to back behind boards</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Solder pads can be sent behind copper traces to allow creating white border around traces on top of a ground plane</description>
 				</org.diylc.appframework.update.Change>					
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>