diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index 353dedab5..b8b71bb86 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -37,24 +37,26 @@
 
 <div class="defaultForm">
 	<div class="panel">
-		{l s='Carrier name:'} <strong id="summary_name"></strong>
-		<div id="summary_meta_informations"></div>
-		<div id="summary_shipping_cost"></div>
-		<div id="summary_range"></div>
-		<div>
+		<div class="panel-heading">{l s='Carrier name:'} <strong id="summary_name"></strong></div>
+		<div class="panel-body">
+			<p id="summary_meta_informations"></p>
+			<p id="summary_shipping_cost"></p>
+			<p id="summary_range"></p>
+			<div>
 			{l s='This carrier will be proposed for those delivery zones:'}
-			<ul id="summary_zones"></ul>
+				<ul id="summary_zones"></ul>
+			</div>
+			<div>
+				{l s='And it will be proposed for those client groups:'}
+				<ul id="summary_groups"></ul>
+			</div>
+			{if $is_multishop}
+			<div>
+				{l s='Finally, this carrier will be proposed in those shops:'}
+				<ul id="summary_shops"></ul>
+			</div>
+			{/if}
 		</div>
-		<div>
-			{l s='And it will be proposed for those client groups:'}
-			<ul id="summary_groups"></ul>
-		</div>
-		{if $is_multishop}
-		<div>
-			{l s='Finally, this carrier will be proposed in those shops:'}
-			<ul id="summary_shops"></ul>
-		</div>
-		{/if}
-		{$active_form}
 	</div>
+	{$active_form}
 </div>
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 3edfbc8aa..b762d488e 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -175,14 +175,14 @@ function displaySummary()
 	$('#summary_zones').html('');
 	$('.input_zone').each(function(){
 		if ($(this).attr('checked'))
-			$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest().prev().text() + '</strong></li>');
+			$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest('tr').find('label').text() + '</strong></li>');
 	});
 	
 	// Group restrictions
 	$('#summary_groups').html('');
 	$('input[name$="groupBox[]"]').each(function(){
 		if ($(this).attr('checked'))
-			$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest().next().next().text() + '</strong></li>');
+			$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest('tr').find('td:eq(2)').text() + '</strong></li>');
 	});
 	
 	// shop restrictions