diff --git a/data/msfweb/app/controllers/payloads_controller.rb b/data/msfweb/app/controllers/payloads_controller.rb
index 8979848238..86ed437021 100644
--- a/data/msfweb/app/controllers/payloads_controller.rb
+++ b/data/msfweb/app/controllers/payloads_controller.rb
@@ -1,5 +1,12 @@
 class PayloadsController < ApplicationController
-  layout 'msfweb'
+  layout 'msfweb', :except => [:list, :view, :generate]
+  
+  # shouldn have one but until we place a main controller, this suffices
+  # why? we need a controller that holds the layout, and all others are simply
+  # rendered and retrieved via AJAX requests updating the proper elements.
+  # problem: old browsers won't see a flippin' thing
+  def index
+  end
   
   def list
   end
diff --git a/data/msfweb/app/views/layouts/msfweb.rhtml b/data/msfweb/app/views/layouts/msfweb.rhtml
index 9be85a581e..d6d39c47d3 100644
--- a/data/msfweb/app/views/layouts/msfweb.rhtml
+++ b/data/msfweb/app/views/layouts/msfweb.rhtml
@@ -23,7 +23,7 @@
             <ul id="nav">
                 <li><%= link_to "Exploits",     :controller => "exploits" %></li>
                 <li><%= link_to "Auxiliaries",  :controller => "auxiliaries" %></li>
-                <li><%= link_to "Payloads",     :controller => "payloads" %></li>
+                <li><%= link_to_remote "Payloads", :url => {:controller => "payloads", :action => "list"}, :update => 'mainmenu', :complete => visual_effect(:appear, "mainmenu", :duration => 1.5) %></li>
                 <li><%= link_to "Encoders",     :controller => "encoders" %></li>
                 <li><%= link_to "Sessions",     :controller => "sessions" %></li>
                 <li><%= link_to "Jobs",         :controller => "jobs" %></li>
@@ -34,14 +34,7 @@
                 <span class="navbartitle">You are at:</span> <a href="index.html">Blue Style 1</a>
             </div>
     
-            <div id="mainmenu">
-               <div class="menu1">
-                    <div class="menutitle">Sub Menu 2</div>
-                    <ul>
-                        <li><a href="index.html" >sub menu link</a></li>
-                        <li><a href="index.html">sub menu link</a></li>
-                    </ul>
-                </div>
+            <div id="mainmenu" style="display: none;">
             </div>
     
             <div id="main">
@@ -49,7 +42,7 @@
             </div>
     
             <div id="footer">
-                <a href="index.html">Bottom Link</a>
+                <a href="index.html">FIXME - make me a smooth javascript "scroll up" effect</a>
             </div>
             <div id="end"><a href="Metasploit.com">Metasploit&trade;.com</a> | &copy; 2003-2006</div>
 
diff --git a/data/msfweb/app/views/payloads/index.rhtml b/data/msfweb/app/views/payloads/index.rhtml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml
index 8c48cef2a8..0898cff117 100644
--- a/data/msfweb/app/views/payloads/list.rhtml
+++ b/data/msfweb/app/views/payloads/list.rhtml
@@ -1,16 +1,10 @@
-<h2>Payloads</h2>
-<table border="0">
- <tr>
-  <td><p align="center"><i><b>Module</b></i></td>
-  <td><p align="center"><i><b>Title</b></i></td>
- </tr>
-
- <% $framework.payloads.each_module do |path, pcls| 
- 	m = pcls.new
- %>
-  <tr>
-   <td><%= link_to path, :controller => "payloads" %></td>
-   <td><%= m.name %></td>
-  </tr>
- <% end %>
-</table>
+               <div class="menu1">
+                    <div class="menutitle">Module - Title</div>
+                    <ul>
+                        <% $framework.payloads.each_module do |path, pcls| 
+ 	                      m = pcls.new
+                        %>
+                        <li><%= link_to path, :controller => "payloads" %> - <%= m.name %></li>
+                        <% end %>
+                    </ul>
+                </div>
\ No newline at end of file
diff --git a/data/msfweb/public/images/haxor-bg.png b/data/msfweb/public/images/haxor-bg.png
index 5de892d856..451e4edd00 100644
Binary files a/data/msfweb/public/images/haxor-bg.png and b/data/msfweb/public/images/haxor-bg.png differ
diff --git a/data/msfweb/public/stylesheets/msfweb.css b/data/msfweb/public/stylesheets/msfweb.css
index e7af997159..f06571c78a 100644
--- a/data/msfweb/public/stylesheets/msfweb.css
+++ b/data/msfweb/public/stylesheets/msfweb.css
@@ -25,7 +25,7 @@ h2, h3, h4, h5 {
 }
 
 #content { margin: 4px auto 20px auto; width: 96%;}
-#header { background: url(/images/haxor-bg.png) no-repeat; color: #000; height: 152px; padding: 2px 0 4px 0; margin:0;}
+#header { background: url(/images/haxor-bg.png) no-repeat; color: #000; height: 112px; padding: 2px 0 4px 0; margin:0;}
 #header h1 { background: #444444; color:#ffffff; float: right; text-transform: none; }