diff --git a/modules/admin/tpl/js/menu_setup.js b/modules/admin/tpl/js/menu_setup.js
index b29c97e33..26fef91e6 100644
--- a/modules/admin/tpl/js/menu_setup.js
+++ b/modules/admin/tpl/js/menu_setup.js
@@ -40,7 +40,7 @@ jQuery(function($){
 	});
 
 	$('a._child_delete').click(function() {
-		var menu_item_srl = $(this).parents('li').prevAll('._child_key').val();
+		var menu_item_srl = $(this).parents('li').find('._child_key').val();
 		listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
 		listForm.submit();
 	});
diff --git a/modules/admin/tpl/menu_setup.html b/modules/admin/tpl/menu_setup.html
index 69daced0a..f73c9339c 100644
--- a/modules/admin/tpl/menu_setup.html
+++ b/modules/admin/tpl/menu_setup.html
@@ -4,7 +4,7 @@
 	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
-	<form id="listForm" action="./" class="siteMap">
+	<form id="listForm" action="./" class="siteMap" method="post">
 	<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
 	<input type="hidden" name="menu_srl" value="{$menu_srl}" />
 	<input type="hidden" name="menu_item_srl" value="" />
@@ -13,21 +13,16 @@
 		<div class="adminMenu portlet">
 			<h2 class="h2"><input value="Admin Menu" disabled /></h2>
 			<ul class="lined">
-				<!--@foreach($gnbUrlList AS $key=>$value)-->
-				<li class="parent">
-					<input type="hidden" value="{$key}" class="_parent_key" />
+				<li class="parent" loop="$gnbUrlList=>$key,$value">
+					<input type="hidden" name="parent_key[]" value="{$key}" class="_parent_key" />
+					<input type="hidden" name="child_key[]" value="BEGIN_{$key}" />
 					<span>{$value['text']}</span> <span class="side"><a href="#editMenu" class="modalAnchor _add">Add</a></span>
-					<!--@if(is_array($value['list']) && count($value['list'])>0)-->
-					<ul>
-						<!--@foreach($value['list'] AS $key2=>$value2)-->
-						<input type="hidden" value="{$key2}" class="_child_key" />
-						<li><span>{$value2['text']}</span><span class="side"><a href="#delete" class="_child_delete">Delete</a></span></li>
-						<!--@end-->
+					<ul cond="is_array($value['list']) && count($value['list'])>0">
+						<li loop="$value['list']=>$key2,$value2"><span>{$value2['text']}</span><span class="side"><a href="#delete" class="_child_delete">Delete</a></span><input type="hidden" name="child_key[]" value="{$key2}" class="_child_key" /></li>
 					</ul>
-					<!--@end-->
 				</li>
-				<!--@end-->
 			</ul>
+			<p class="btnArea"><span class="btn small"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span></p>
 		</div>
 	</form>
 
diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml
index 5b89b8f74..a52b596e6 100644
--- a/modules/menu/conf/module.xml
+++ b/modules/menu/conf/module.xml
@@ -18,6 +18,7 @@
         <action name="procMenuAdminDeleteItem" type="controller" standalone="true" />
         <action name="procMenuAdminMakeXmlFile" type="controller" standalone="true" />
         <action name="procMenuAdminMoveItem" type="controller" standalone="true" />
+        <action name="procMenuAdminArrangeItem" type="controller" standalone="true" />
 
         <action name="procMenuAdminUploadButton" type="controller" standalone="true" />
         <action name="procMenuAdminDeleteButton" type="controller" standalone="true" />
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 2c7aeb49f..f98e4965a 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -224,6 +224,43 @@
             $this->moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode);
         }
 
+        /**
+         * @brief Arrange menu items
+         **/
+		function procMenuAdminArrangeItem()
+		{
+			$menuSrl = Context::get('menu_srl');
+			$childKeyList = Context::get('child_key');
+
+			if(is_array($childKeyList))
+			{
+				$menuList = array();
+				foreach($childKeyList AS $key=>$value)
+				{
+					preg_match('/BEGIN_([0-9]*.)/is', $value, $m);
+					if($m)
+					{
+						$menuList[$m[1]] = array();
+						$parentSrl = $m[1];
+					}
+					else $menuList[$parentSrl][$value] = true;
+				}
+
+				foreach($menuList AS $key=>$value)
+				{
+					if(count($value) > 0)
+					{
+						$sourceSrl = 0;
+						foreach($value AS $key2=>$value2)
+						{
+							$this->moveMenuItem($menuSrl, $key, $sourceSrl, $key2, 'move');
+							$sourceSrl = $key2;
+						}
+					}
+				}
+			}
+		}
+
         function moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode){
             // Get the original menus
             $oMenuAdminModel = &getAdminModel('menu');