diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index fe91d9e09..f50e4c4a5 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -532,7 +532,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 	margin:0;
 	white-space: nowrap;
 	overflow: auto;
-	height: 335px;
+	height: 365px;
 }
 #modules_list_container_tab #modules_list_container_content li{display:inline-block;}
 #modules_list_container_tab table tr th { height:40px;}
@@ -548,7 +548,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;}
 #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
 #modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; text-align: left;white-space: normal;}
-#modules_list_container_tab .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:2px 10px; display: inline-block; border-radius:3px;}
+#modules_list_container_tab .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; padding:0 10px; display: inline-block; border-radius:3px;}
 #modules_list_container_tab .row-actions-module {float: right;}
 #modules_list_container_tab .setup.non-install { background-color:#ec7000;}
 #modules_list_container_tab .setup.must-have { background-color: #ec7000;}
@@ -562,7 +562,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 #modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
 
 .default_modules_list_display_type #modules_list_container_content li table tr td{border: none}
-.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 140px;width: 100%;margin-bottom:15px}
+.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 100px;width: 100%;margin-bottom:15px}
 #modules_list_container_tab ul li {height:140px}
 
 		/******** ie7 ******/
diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
index 8c860d2e8..306a1df83 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -31,10 +31,10 @@
 				<td valign="top" width="32" align="center">
 					<img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
 				</td>
-				<td height="60" valign="top">
+				<td valign="top">
 					<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
 						<h3>
-							{$module->displayName|truncate:40:'…'} {$module->version}
+							{$module->displayName|truncate:36:'…'} {$module->version}
 							{if isset($module->id) && $module->id gt 0 }
 								{if $module->active}
 									<span class="setup">{l s='Enabled'}</span>
@@ -52,7 +52,7 @@
 						</h3>
 						<p class="desc">
 							{if isset($module->description) && $module->description ne ''}
-								{$module->description|truncate:100:'…'}
+								{$module->description|truncate:90:'…'}
 							{else}
 								&nbsp;
 							{/if}
diff --git a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
index cc33620e7..4ee0aac08 100644
--- a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
@@ -25,15 +25,12 @@
 
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
-{if !$shop_context}
-	<div class="warn">{l s='You have more than one shop and must select one to configure payment.'}</div>
-{else}
+	{if !$shop_context}
+		<div class="warn">{l s='You have more than one shop and must select one to configure payment.'}</div>
+	{else}
 		{if isset($modules_list)}
 			{$modules_list}
 		{/if}
-	
-		<br />
-	
 		{if $display_restrictions}
 			<br /><h2 class="space">{l s='Payment module restrictions'}</h2>
 			{foreach $lists as $list}
@@ -44,5 +41,5 @@
 			<br />
 			<div class='warn'>{l s='No payment module installed'}</div>
 		{/if}
-{/if}
+	{/if}
 {/block}
diff --git a/admin-dev/themes/default/template/helpers/modules_list/list.tpl b/admin-dev/themes/default/template/helpers/modules_list/list.tpl
index 7bf53702f..dbbc94ea0 100644
--- a/admin-dev/themes/default/template/helpers/modules_list/list.tpl
+++ b/admin-dev/themes/default/template/helpers/modules_list/list.tpl
@@ -31,7 +31,7 @@
 				{counter start=1  assign="count"}
 					{foreach from=$modules_list item=module}	
 						<div style="width:400px">{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",row alt"}}</div>
-						{if $count %2 == 0}
+						{if $count %3 == 0}
 			</li>
 			<li>
 						{/if}