diff --git a/data/msfweb/app/helpers/application_helper.rb b/data/msfweb/app/helpers/application_helper.rb
index 22a7940eb2..a72313d9c7 100644
--- a/data/msfweb/app/helpers/application_helper.rb
+++ b/data/msfweb/app/helpers/application_helper.rb
@@ -1,3 +1,13 @@
+# Copyright (c) 2006 L.M.H <lmh@info-pull.com>
+# All Rights Reserved.
+
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
+
+  # Updates a node (ex. div container) by it's ID with content from
+  # specified URL.
+  def dojo_node_update(node_id, target_url)
+   return "dojo.io.updateNode('"+ node_id +"',{url:'"+ target_url +"'}"
+  end
+  
 end
diff --git a/data/msfweb/app/views/layouts/msfweb.rhtml b/data/msfweb/app/views/layouts/msfweb.rhtml
index 230c74d05a..e0f4197206 100644
--- a/data/msfweb/app/views/layouts/msfweb.rhtml
+++ b/data/msfweb/app/views/layouts/msfweb.rhtml
@@ -12,12 +12,20 @@
         <%= javascript_include_tag "application" %>
         <script type="text/javascript">
             dojo.require("dojo.widget.*");
+            dojo.require("dojo.lang.*");
             dojo.require("dojo.widget.Menu2");
             dojo.require("dojo.widget.TaskBar");
             dojo.require("dojo.widget.LayoutContainer");
             dojo.require("dojo.widget.FloatingPane");
             dojo.require("dojo.widget.ResizeHandle");
             dojo.require("dojo.widget.Dialog");
+            dojo.require("dojo.widget.Tooltip");
+            dojo.require("dojo.widget.ContentPane");
+	        dojo.require("dojo.widget.Tree");
+	        dojo.require("dojo.widget.TreeRPCController");
+            dojo.require("dojo.widget.TreeSelector");
+            dojo.require("dojo.widget.TreeNode");
+            dojo.require("dojo.widget.TreeContextMenu");
             dojo.hostenv.writeIncludes();
         </script>
     </head>
@@ -25,7 +33,7 @@
     <body>
         <div dojoType="PopupMenu2" widgetId="PayloadsMenu">
             <div dojoType="MenuItem2" caption="Search"></div>
-            <div dojoType="MenuItem2" caption="List"></div>
+            <div dojoType="MenuItem2" caption="List" onClick="dojo.widget.byId('maincontent').setUrl('/payloads/list')"></div>
             <div dojoType="MenuItem2" caption="Generate"></div>
         </div>
         
@@ -78,7 +86,7 @@
             <input type="button" value="Close" id="hidedialog"/>
         </div>
         
-        <div id="maincontent">
+        <div dojoType="ContentPane" id="maincontent" executeScripts="true">
             <%= @content_for_layout %>
         </div>
         
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml
index cbc08f15b1..71ccf2b999 100644
--- a/data/msfweb/app/views/payloads/list.rhtml
+++ b/data/msfweb/app/views/payloads/list.rhtml
@@ -1,10 +1,15 @@
-               <div class="menu1">
-                    <div class="menutitle">Module - Title</div>
-                    <ul>
-                        <% $framework.payloads.each_module do |path, pcls| 
- 	                      m = pcls.new
-                        %>
-                        <li><%= link_to_remote path, :url => {:controller => "payloads", :action => "view", :id => path}, :update => 'mainmenu' %> - <%= m.name %></li>
-                        <% end %>
-                    </ul>
-                </div>
\ No newline at end of file
+<div dojoType="FloatingPane"
+		id="pane2"
+		title="window #2 w/shadow"
+		constrainToContainer="true"
+		hasShadow="true"
+		resizable="true"
+		taskBarId="maintaskbar"
+		windowState="minimized"
+		displayMinimizeAction="true"
+		toggle="explode"
+		style="width: 200px; height: 150px; position: relative; left: 100px; top: 35px; display:none"
+	>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+</div>
\ No newline at end of file
diff --git a/data/msfweb/public/javascripts/application.js b/data/msfweb/public/javascripts/application.js
index 1d74703fca..449e6e75e2 100644
--- a/data/msfweb/public/javascripts/application.js
+++ b/data/msfweb/public/javascripts/application.js
@@ -4,6 +4,7 @@
  */
 
 var about_dlg;
+var main_Pane = dojo.widget.byId("maincontent");
 
 function help_functions(e) {
 	about_dlg = dojo.widget.byId("AboutDialog");
diff --git a/data/msfweb/public/stylesheets/msfweb.css b/data/msfweb/public/stylesheets/msfweb.css
index 33206b938a..0a9dea0f9c 100644
--- a/data/msfweb/public/stylesheets/msfweb.css
+++ b/data/msfweb/public/stylesheets/msfweb.css
@@ -13,6 +13,7 @@ body {
 }
 
 #maincontent {
+    margin-top: 2em;
     position: relative;
     min-height: 100%;
     height: 100%;
@@ -20,10 +21,12 @@ body {
 
 #maintaskbar {
     bottom: 0;
-    position: absolute;
     height: 32px;
     overflow: hidden;
-    width: 101%;
+    width: 600px;
+	text-align: center;
+	left: 50%;
+	margin-left: -300px;	
 }
 
 .dojoDialog {
