diff --git a/admin-dev/themes/template/cart_rules/form.tpl b/admin-dev/themes/template/cart_rules/form.tpl
index 6d3b7d318..05fc3b5d0 100644
--- a/admin-dev/themes/template/cart_rules/form.tpl
+++ b/admin-dev/themes/template/cart_rules/form.tpl
@@ -1,3 +1,19 @@
+{if $show_toolbar}
+	<div class="toolbar-placeholder">
+		<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
+				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+				<div class="pageTitle">
+				<h3>
+					{block name=pageTitle}
+						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+					{/block}
+				</h3>
+				</div>
+		</div>
+	</div>
+	<div class="leadin">{block name="leadin"}{/block}</div>
+{/if}
+
 <div>
  	<div class="productTabs">
 		<ul class="tab">
@@ -33,8 +49,8 @@
 	</div>
 	<div class="separation"></div>
 	<div style="text-align:center">
-		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" />
-		<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" />
+		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" id="{$table}_form_submit_btn" />
+		<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 	</div>
 </form>
 <script type="text/javascript">
diff --git a/admin-dev/themes/template/toolbar.tpl b/admin-dev/themes/template/toolbar.tpl
index 9362e60f3..85533cfb1 100644
--- a/admin-dev/themes/template/toolbar.tpl
+++ b/admin-dev/themes/template/toolbar.tpl
@@ -78,24 +78,24 @@
 
 				//submit the form
 				{block name=formSubmit}
-				btn_save.click(function() {
-					//add hidden input to emulate submit button click when posting the form -> field name posted
-					btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
-
-					$('#{$table}_form').submit();
-					return false;
-				});
-
-				if (btn_save_and_stay)
-				{
-					btn_save_and_stay.click(function() {
+					btn_save.click(function() {
 						//add hidden input to emulate submit button click when posting the form -> field name posted
-						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
-
+						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+	
 						$('#{$table}_form').submit();
 						return false;
 					});
-				}
+	
+					if (btn_save_and_stay)
+					{
+						btn_save_and_stay.click(function() {
+							//add hidden input to emulate submit button click when posting the form -> field name posted
+							btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
+	
+							$('#{$table}_form').submit();
+							return false;
+						});
+					}
 				{/block}
 			}
 		});
diff --git a/classes/Category.php b/classes/Category.php
index 837e2ce20..bcff2b999 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -242,7 +242,8 @@ class CategoryCore extends ObjectModel
 			$id_lang = _USER_ID_LANG_;
 
 		$children = array();
-		if (($max_depth == 0 || $current_depth < $max_depth) && $subcats = $this->getSubCategories($id_lang, true) && count($subcats))
+		$subcats = $this->getSubCategories($id_lang, true);
+		if (($max_depth == 0 || $current_depth < $max_depth) && $subcats && count($subcats))
 			foreach ($subcats as &$subcat)
 			{
 				if (!$subcat['id_category'])
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index b8224157e..bcc1f5763 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -274,9 +274,9 @@ class AdminCartRulesControllerCore extends AdminController
 		if (empty($back))
 			$back = self::$currentIndex.'&token='.$this->token;
 
-		$this->toolbar_btn['cancel'] = array(
-			'href' => $back,
-			'desc' => $this->l('Cancel')
+		$this->toolbar_btn['save-and-stay'] = array(
+			'href' => '#',
+			'desc' => $this->l('Save and Stay')
 		);
 
 		// Todo: change for "Media" version
@@ -312,6 +312,7 @@ class AdminCartRulesControllerCore extends AdminController
 			array(
 				'show_toolbar' => true,
 				'toolbar_btn' => $this->toolbar_btn,
+				'toolbar_fix' => $this->toolbar_fix,
 				'title' => $this->l('Payment : Cart Rules '),
 				'languages' => Language::getLanguages(),
 				'defaultDateFrom' => date('Y-m-d H:00:00'),