diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
index 38a2dd573..a02902f31 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -26,13 +26,26 @@
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 <script>
+cleanClasses = function cleanClasses()
+{
+	$('.anchor li a').each( function () {
+		$(this).parent('li').addClass($(this).attr('class'));
+	});
+}
+
 $(document).ready(function () {
 	$("#carrier_wizard").smartWizard({
 		'labelNext' : '{$labels.next}',
 		'labelPrevious' : '{$labels.previous}',
-		'labelFinish' : '{$labels.finish}'
+		'labelFinish' : '{$labels.finish}',
+		'fixHeight' : true,
+		'onShowStep' : cleanClasses
 	});
+	$("#carrier_wizard").smartWizard('fixHeight');
 });
+
+
+
 </script>
 <div id="carrier_wizard" class="swMain">
 	<ul>
@@ -49,7 +62,7 @@ $(document).ready(function () {
 	{/foreach}
 	</ul>
 	{foreach from=$wizard_contents.contents key=step_nbr item=content}
-		<div id="step-{$step_nbr + 1}"> 	
+		<div id="step-{$step_nbr + 1}" style="padding-bottom:10px"> 	
 			{$content}
 		</div>
 	{/foreach}
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 7de2276a1..64ca3695c 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -116,12 +116,6 @@ class AdminCarrierWizardControllerCore extends AdminController
 						$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name.')
 					)
 				),
-				array(
-					'type' => 'file',
-					'label' => $this->l('Logo:'),
-					'name' => 'logo',
-					'desc' => $this->l('Upload a logo from your computer.').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
-				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Transit time:'),
@@ -140,6 +134,12 @@ class AdminCarrierWizardControllerCore extends AdminController
 					'size' => 1,
 					'desc' => $this->l('Enter "0" for a longest shipping delay, or "9" for the shortest shipping delay.')
 				),
+				array(
+					'type' => 'file',
+					'label' => $this->l('Logo:'),
+					'name' => 'logo',
+					'desc' => $this->l('Upload a logo from your computer.').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
+				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('URL:'),
@@ -168,9 +168,9 @@ class AdminCarrierWizardControllerCore extends AdminController
 	{
 		return array(
 			'name' => $this->getFieldsValue($carrier, 'name'),
-			'logo' => '',
 			'delay' => $this->getFieldsValue($carrier, 'delay'),
 			'grade' => $this->getFieldsValue($carrier, 'grade'),
+			'logo' => '',
 			'url' => $this->getFieldsValue($carrier, 'url'),
 			);