diff --git a/data/msfweb/app/views/auxiliaries/list.rhtml b/data/msfweb/app/views/auxiliaries/list.rhtml
index 9b0587454c..6d634d61a0 100644
--- a/data/msfweb/app/views/auxiliaries/list.rhtml
+++ b/data/msfweb/app/views/auxiliaries/list.rhtml
@@ -1,18 +1,22 @@
 <table>
 	<thead>
 		<tr>
-			<th>Name</th>
-			<th>Description</th>
+			<th>Modules</th>
 		</tr>
 	</thead>
 	<tbody>
 	    <% @auxiliaries.each do |m| %>
-		<tr>
+		
+		<tr class="itemTitle">
 			<td class="itemTitle">
 			    <a onClick="window.parent.openModuleWindow('auxiliaries', '<%= m.refname.gsub('/', ':') %>', '<%= m.name %>')" href="#"><%= m.name %></a>
 			</td>
+		</tr>
+		
+		<tr class="itemDescription">
 			<td class="itemDescription"><%= m.description %></td>
 		</tr>
+		
 		<% end %>
 	</tbody>
 </table>
diff --git a/data/msfweb/app/views/encoders/list.rhtml b/data/msfweb/app/views/encoders/list.rhtml
index bf6de35d80..0b41eafd48 100644
--- a/data/msfweb/app/views/encoders/list.rhtml
+++ b/data/msfweb/app/views/encoders/list.rhtml
@@ -1,20 +1,24 @@
 <table>
 	<thead>
 		<tr>
-			<th>Name</th>
-			<th>Description</th>
+			<th>Modules</th>
 		</tr>
 	</thead>
 	<tbody>
 	    <% @encoders.each_index do |i| 
 				m = @encoders[i]
 		%>
-		<tr>
+		
+		<tr class="itemTitle">
 			<td class="itemTitle">
-			   <a onClick="window.parent.openModuleWindow('encoders', '<%= i %>', '<%= m.name %>')" href="#"><%= m.name %></a>
+			    <a onClick="window.parent.openModuleWindow('encoders', '<%= m.refname.gsub('/', ':') %>', '<%= m.name %>')" href="#"><%= m.name %></a>
 			</td>
+		</tr>
+		
+		<tr class="itemDescription">
 			<td class="itemDescription"><%= m.description %></td>
 		</tr>
+		
 		<% end %>
 	</tbody>
 </table>
diff --git a/data/msfweb/app/views/exploits/list.rhtml b/data/msfweb/app/views/exploits/list.rhtml
index daaf2d79c0..cbc93312ec 100644
--- a/data/msfweb/app/views/exploits/list.rhtml
+++ b/data/msfweb/app/views/exploits/list.rhtml
@@ -1,20 +1,24 @@
 <table>
 	<thead>
 		<tr>
-			<th>Name</th>
-			<th>Description</th>
+			<th>Modules</th>
 		</tr>
 	</thead>
 	<tbody>
 	    <% @exploits.each_index do |i| 
 				m = @exploits[i]
 		%>
-		<tr>
+		
+		<tr class="itemTitle">
 			<td class="itemTitle">
-			   <a onClick="window.parent.openModuleWindow('exploits', '<%= i %>', '<%= m.name %>')" href="#"><%= m.name %></a>
+			    <a onClick="window.parent.openModuleWindow('exploits', '<%= m.refname.gsub('/', ':') %>', '<%= m.name %>')" href="#"><%= m.name %></a>
 			</td>
+		</tr>
+		
+		<tr class="itemDescription">
 			<td class="itemDescription"><%= m.description %></td>
 		</tr>
+		
 		<% end %>
 	</tbody>
 </table>
diff --git a/data/msfweb/app/views/nops/list.rhtml b/data/msfweb/app/views/nops/list.rhtml
index 004f81a7c8..5ea8111b43 100644
--- a/data/msfweb/app/views/nops/list.rhtml
+++ b/data/msfweb/app/views/nops/list.rhtml
@@ -1,20 +1,24 @@
 <table>
 	<thead>
 		<tr>
-			<th>Name</th>
-			<th>Description</th>
+			<th>Modules</th>
 		</tr>
 	</thead>
 	<tbody>
 	    <% @nops.each_index do |i| 
 				m = @nops[i]
 		%>
-		<tr>
+		
+		<tr class="itemTitle">
 			<td class="itemTitle">
-			   <a onClick="window.parent.openModuleWindow('nops', '<%= i %>', '<%= m.name %>')" href="#"><%= m.name %></a>
+			    <a onClick="window.parent.openModuleWindow('nops', '<%= m.refname.gsub('/', ':') %>', '<%= m.name %>')" href="#"><%= m.name %></a>
 			</td>
+		</tr>
+		
+		<tr class="itemDescription">
 			<td class="itemDescription"><%= m.description %></td>
 		</tr>
+		
 		<% end %>
 	</tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml
index 5ac0720d86..5dca371d7a 100644
--- a/data/msfweb/app/views/payloads/list.rhtml
+++ b/data/msfweb/app/views/payloads/list.rhtml
@@ -1,20 +1,24 @@
 <table cellpadding="0" cellspacing="0" border="0">
 	<thead>
 		<tr>
-			<th>Name</th>
-			<th>Description</th>
+			<th>Modules</th>
 		</tr>
 	</thead>
 	<tbody>
 	    <% @payloads.each_index do |i| 
 				m = @payloads[i]
 		%>
-		<tr>
+		
+		<tr class="itemTitle">
 			<td class="itemTitle">
-			    <a onClick="window.parent.openModuleWindow('payloads', '<%= i %>', '<%= m.name %>')" href="#"><%= m.name %></a>
+			    <a onClick="window.parent.openModuleWindow('payloads', '<%= m.refname.gsub('/', ':') %>', '<%= m.name %>')" href="#"><%= m.name %></a>
 			</td>
+		</tr>
+		
+		<tr class="itemDescription">
 			<td class="itemDescription"><%= m.description %></td>
 		</tr>
+		
 		<% end %>
 	</tbody>
 </table>
diff --git a/data/msfweb/public/stylesheets/windows.css b/data/msfweb/public/stylesheets/windows.css
index c697854bf5..04dd613d0d 100644
--- a/data/msfweb/public/stylesheets/windows.css
+++ b/data/msfweb/public/stylesheets/windows.css
@@ -47,4 +47,4 @@ table .itemDescription {
 
 table .itemDescription:hover {
     background: #CAE1FF;
-}
\ No newline at end of file
+}