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 928c45a7..2f1febfa 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	
@@ -56,7 +56,7 @@ public class Presenter implements IPlugInPort {
 
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
-	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 7, 0);
+	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 8, 0);
 	public static final String DEFAULTS_KEY_PREFIX = "default.";
 
 	public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections.emptyList();
@@ -1034,13 +1034,18 @@ public class Presenter implements IPlugInPort {
 			int index = currentProject.getComponents().indexOf(component);
 			if (index < 0) {
 				LOG.warn("Component not found in the project: " + component.getName());
-			} else if (index > 0) {
-				IDIYComponent<?> componentBefore = currentProject.getComponents().get(index - 1);
-				ComponentType componentBeforeType = ComponentProcessor.getInstance()
-						.extractComponentTypeFrom(
-								(Class<? extends IDIYComponent<?>>) componentBefore.getClass());
-				Collections.swap(currentProject.getComponents(), index, index - 1);
-			}
+			} else
+				while (index > 0) {
+					IDIYComponent<?> componentBefore = currentProject.getComponents()
+							.get(index - 1);
+					ComponentType componentBeforeType = ComponentProcessor.getInstance()
+							.extractComponentTypeFrom(
+									(Class<? extends IDIYComponent<?>>) componentBefore.getClass());
+					if (componentBeforeType.getZOrder() < componentType.getZOrder())
+						break;
+					Collections.swap(currentProject.getComponents(), index, index - 1);
+					index--;
+				}
 		}
 		if (!oldProject.equals(currentProject)) {
 			messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
@@ -1061,13 +1066,17 @@ public class Presenter implements IPlugInPort {
 			int index = currentProject.getComponents().indexOf(component);
 			if (index < 0) {
 				LOG.warn("Component not found in the project: " + component.getName());
-			} else if (index < currentProject.getComponents().size() - 1) {
-				IDIYComponent<?> componentAfter = currentProject.getComponents().get(index + 1);
-				ComponentType componentAfterType = ComponentProcessor.getInstance()
-						.extractComponentTypeFrom(
-								(Class<? extends IDIYComponent<?>>) componentAfter.getClass());
-				Collections.swap(currentProject.getComponents(), index, index + 1);
-			}
+			} else
+				while (index < currentProject.getComponents().size() - 1) {
+					IDIYComponent<?> componentAfter = currentProject.getComponents().get(index + 1);
+					ComponentType componentAfterType = ComponentProcessor.getInstance()
+							.extractComponentTypeFrom(
+									(Class<? extends IDIYComponent<?>>) componentAfter.getClass());
+					if (componentAfterType.getZOrder() > componentType.getZOrder())
+						break;
+					Collections.swap(currentProject.getComponents(), index, index + 1);
+					index++;
+				}
 		}
 		if (!oldProject.equals(currentProject)) {
 			messageDispatcher.dispatchMessage(EventType.PROJECT_MODIFIED, oldProject, cloner
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar
index 24ab80a4..85399154 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/diylc-core.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
index d554d4e9..83187f54 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
@@ -593,5 +593,21 @@
 			</changes>
 			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>3</major>
+				<minor>8</minor>
+				<build>0</build>
+			</versionNumber>
+			<releaseDate>2012-03-27 20:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>		
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>More usable "Bring to Forward" and "Send to Backward"</description>
+				</org.diylc.appframework.update.Change>		
+			</changes>
+			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>
\ No newline at end of file