diff --git a/data/msfweb/app/views/auxiliaries/view.rhtml b/data/msfweb/app/views/auxiliaries/view.rhtml
index 9fe2bd3b9b..f9eedc5eec 100644
--- a/data/msfweb/app/views/auxiliaries/view.rhtml
+++ b/data/msfweb/app/views/auxiliaries/view.rhtml
@@ -1,57 +1,46 @@
-<table align="center" width="100%" cellspacing="0" cellpadding="2" border="0" class="moduleInfo">
-
-	<tr>
+<table align="center" width="100%" cellspacing="0" cellpadding="15" border="0">
+    
+	<tr width="100%" align="center">
         <p class="moduleName">
-            <span class="moduleIcons">
-                <%= module_platform_icons(@tmod.platform) %>
-            </span>
-            <%= html_escape(@tmod.name) %>
+            <%= h(@tmod.name) %> <br />
         </p>
     </tr>
 	
-    <tr>
-	   <blockquote>
-		  <p class="moduleDesc">
-		          <%= html_escape(@tmod.description) %>
-		  </p>
-	   </blockquote>
-    </tr>
-
-    <tr>
+    <tr width="100%" align="center">
 		<blockquote>
-		  <p class="moduleDesc">
-		      This module was provided by <%= @tmod.author.join(' and ') %>.
+		  <p class="moduleDescription">
+		      <%= h(@tmod.description) %>
 		  </p>
 		</blockquote>   
     </tr>
 
-    <tr>
-		<td>Version:</td>
-		<td><%= @tmod.version %></td>
-    </tr>
-
-    <tr>
-		<td>License:</td>
-		<td><%= @tmod.license %></td>
-    </tr>
-
-    <% if @tmod.references.size > 0 %>
-    <tr>
+	
+    <tr width="100%" align="center">
 		<blockquote>
-		<p class="moduleDesc">
+		  <p class="moduleDescription">
+		      This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>.
+		  </p>
+		</blockquote>   
+    </tr>
+    
+	<% if (@tmod.references.length > 0) %>
+    <tr width="100%" align="center">
+		<blockquote>
+		<p class="moduleDescription">
 		External references:
-		<ul>
+		<ul class="moduleReferences">
 			<% @tmod.references.each { |ref| %>
 					<% if (ref.kind_of?(Msf::Module::SiteReference)) %>
 					<li><a href="<%= ref.site %>" target="_blank">
-					<%= html_escape(ref.to_s) %></a></li>
+					<%= h(ref.to_s) %></a></li>
 			<% 	else %>
-					<li><%= html_escape(ref.to_s) %></li>
+					<li><%= h(ref.to_s) %></li>
 			<% 	end %>
 			<% } %>
+		</ul>
 		</p>
 		</blockquote>   
     </tr>
-    <% end %>
+	<% end %>
 
-</table>
\ No newline at end of file
+</table>
diff --git a/data/msfweb/app/views/encoders/view.rhtml b/data/msfweb/app/views/encoders/view.rhtml
index 72205fa6a3..f9eedc5eec 100644
--- a/data/msfweb/app/views/encoders/view.rhtml
+++ b/data/msfweb/app/views/encoders/view.rhtml
@@ -1,40 +1,46 @@
-<table align="center" width="100%" cellspacing="0" cellpadding="2" border="0" class="moduleInfo">
-
-	<tr>
+<table align="center" width="100%" cellspacing="0" cellpadding="15" border="0">
+    
+	<tr width="100%" align="center">
         <p class="moduleName">
-            <%= html_escape(@tmod.name) %>
+            <%= h(@tmod.name) %> <br />
         </p>
     </tr>
 	
-    <tr>
-	   <blockquote>
-		  <p class="moduleDesc">
-		          <%= html_escape(@tmod.description) %>
-		  </p>
-	   </blockquote>
-    </tr>
-
-    <tr>
+    <tr width="100%" align="center">
 		<blockquote>
-		  <p class="moduleDesc">
-		      This module was provided by <%= @tmod.author.join(' and ') %>.
+		  <p class="moduleDescription">
+		      <%= h(@tmod.description) %>
 		  </p>
 		</blockquote>   
     </tr>
 
-    <tr>
-		<td>Version:</td>
-		<td><%= @tmod.version %></td>
+	
+    <tr width="100%" align="center">
+		<blockquote>
+		  <p class="moduleDescription">
+		      This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>.
+		  </p>
+		</blockquote>   
     </tr>
-
-    <tr>
-		<td>License:</td>
-		<td><%= @tmod.license %></td>
+    
+	<% if (@tmod.references.length > 0) %>
+    <tr width="100%" align="center">
+		<blockquote>
+		<p class="moduleDescription">
+		External references:
+		<ul class="moduleReferences">
+			<% @tmod.references.each { |ref| %>
+					<% if (ref.kind_of?(Msf::Module::SiteReference)) %>
+					<li><a href="<%= ref.site %>" target="_blank">
+					<%= h(ref.to_s) %></a></li>
+			<% 	else %>
+					<li><%= h(ref.to_s) %></li>
+			<% 	end %>
+			<% } %>
+		</ul>
+		</p>
+		</blockquote>   
     </tr>
+	<% end %>
 
-    <tr>
-		<td>Architecture:</td>
-		<td><%= @tmod.arch %></td>
-    </tr>
-
-</table>
\ No newline at end of file
+</table>
diff --git a/data/msfweb/app/views/exploits/view.rhtml b/data/msfweb/app/views/exploits/view.rhtml
index de68ed0e92..a10ee913e7 100644
--- a/data/msfweb/app/views/exploits/view.rhtml
+++ b/data/msfweb/app/views/exploits/view.rhtml
@@ -23,6 +23,7 @@
 		</blockquote>   
     </tr>
     
+	<% if (@tmod.references.length > 0) %>
     <tr width="100%" align="center">
 		<blockquote>
 		<p class="moduleDescription">
@@ -40,6 +41,7 @@
 		</p>
 		</blockquote>   
     </tr>
+	<% end %>
 	
     <tr width="100%" align="center">
 		<blockquote>
diff --git a/data/msfweb/app/views/nops/view.rhtml b/data/msfweb/app/views/nops/view.rhtml
index 72205fa6a3..f9eedc5eec 100644
--- a/data/msfweb/app/views/nops/view.rhtml
+++ b/data/msfweb/app/views/nops/view.rhtml
@@ -1,40 +1,46 @@
-<table align="center" width="100%" cellspacing="0" cellpadding="2" border="0" class="moduleInfo">
-
-	<tr>
+<table align="center" width="100%" cellspacing="0" cellpadding="15" border="0">
+    
+	<tr width="100%" align="center">
         <p class="moduleName">
-            <%= html_escape(@tmod.name) %>
+            <%= h(@tmod.name) %> <br />
         </p>
     </tr>
 	
-    <tr>
-	   <blockquote>
-		  <p class="moduleDesc">
-		          <%= html_escape(@tmod.description) %>
-		  </p>
-	   </blockquote>
-    </tr>
-
-    <tr>
+    <tr width="100%" align="center">
 		<blockquote>
-		  <p class="moduleDesc">
-		      This module was provided by <%= @tmod.author.join(' and ') %>.
+		  <p class="moduleDescription">
+		      <%= h(@tmod.description) %>
 		  </p>
 		</blockquote>   
     </tr>
 
-    <tr>
-		<td>Version:</td>
-		<td><%= @tmod.version %></td>
+	
+    <tr width="100%" align="center">
+		<blockquote>
+		  <p class="moduleDescription">
+		      This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>.
+		  </p>
+		</blockquote>   
     </tr>
-
-    <tr>
-		<td>License:</td>
-		<td><%= @tmod.license %></td>
+    
+	<% if (@tmod.references.length > 0) %>
+    <tr width="100%" align="center">
+		<blockquote>
+		<p class="moduleDescription">
+		External references:
+		<ul class="moduleReferences">
+			<% @tmod.references.each { |ref| %>
+					<% if (ref.kind_of?(Msf::Module::SiteReference)) %>
+					<li><a href="<%= ref.site %>" target="_blank">
+					<%= h(ref.to_s) %></a></li>
+			<% 	else %>
+					<li><%= h(ref.to_s) %></li>
+			<% 	end %>
+			<% } %>
+		</ul>
+		</p>
+		</blockquote>   
     </tr>
+	<% end %>
 
-    <tr>
-		<td>Architecture:</td>
-		<td><%= @tmod.arch %></td>
-    </tr>
-
-</table>
\ No newline at end of file
+</table>
diff --git a/data/msfweb/app/views/payloads/view.rhtml b/data/msfweb/app/views/payloads/view.rhtml
index 6e11439ece..cc2326b670 100644
--- a/data/msfweb/app/views/payloads/view.rhtml
+++ b/data/msfweb/app/views/payloads/view.rhtml
@@ -1,40 +1,48 @@
 <table align="center" width="100%" cellspacing="0" cellpadding="2" border="0" class="moduleInfo">
 
-	<tr>
+	<tr width="100%" align="center">
         <p class="moduleName">
-            <span class="moduleIcons">
-                <%= module_platform_icons(@tmod.platform) %>
-            </span>
-            <%= html_escape(@tmod.name) %>
+            <%= h(@tmod.name) %> <br />
         </p>
     </tr>
 	
-    <tr>
-	   <blockquote>
-		  <p class="moduleDesc">
-		          <%= html_escape(@tmod.description) %>
-		  </p>
-	   </blockquote>
-    </tr>
-
-    <tr>
+    <tr width="100%" align="center">
 		<blockquote>
-		  <p class="moduleDesc">
-		      This module was provided by <%= @tmod.author.join(' and ') %>.
+		  <p class="moduleDescription">
+		      <%= h(@tmod.description) %>
 		  </p>
 		</blockquote>   
     </tr>
 
-    <tr>
-		<td>Version:</td>
-		<td><%= @tmod.version %></td>
+	
+    <tr width="100%" align="center">
+		<blockquote>
+		  <p class="moduleDescription">
+		      This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>.
+		  </p>
+		</blockquote>   
     </tr>
-
-    <tr>
-		<td>License:</td>
-		<td><%= @tmod.license %></td>
+    
+	<% if (@tmod.references.length > 0) %>
+    <tr width="100%" align="center">
+		<blockquote>
+		<p class="moduleDescription">
+		External references:
+		<ul class="moduleReferences">
+			<% @tmod.references.each { |ref| %>
+					<% if (ref.kind_of?(Msf::Module::SiteReference)) %>
+					<li><a href="<%= ref.site %>" target="_blank">
+					<%= h(ref.to_s) %></a></li>
+			<% 	else %>
+					<li><%= h(ref.to_s) %></li>
+			<% 	end %>
+			<% } %>
+		</ul>
+		</p>
+		</blockquote>   
     </tr>
-
+	<% end %>
+	
     <tr>
 		<td>Size:</td>
 		<td><%= @tmod.generate.length %></td>
@@ -133,4 +141,4 @@
         </td>
     </tr>
 <% end %>
-</table>
\ No newline at end of file
+</table>