diff --git a/data/msfweb/app/controllers/payloads_controller.rb b/data/msfweb/app/controllers/payloads_controller.rb
index 7e141e6a31..b6668cb61a 100644
--- a/data/msfweb/app/controllers/payloads_controller.rb
+++ b/data/msfweb/app/controllers/payloads_controller.rb
@@ -15,11 +15,36 @@ class PayloadsController < ApplicationController
 	unless @tmod
 	 render_text "Unknown module specified."
 	end
+
+    @module_step = (params[:step] || 0).to_i
 	
-	if params[:step]
-	 @module_step = params[:step]
+	if @module_step == 1
+	  modinst = Payload.create(@tmod.refname)
+      badchars = params[:badchars]
+      pencoder = params[:encoder]
+      pformat  = params[:format]
+      max_size = (params[:max_size] || 0).to_i
+      payload_opts = ''
+      
+      params.each_pair { |k, v|
+        next if (v == nil or v.length == 0)
+        if (k =~ /^opt_(.*)$/)
+          payload_opts += "#{$1}=#{v} "
+        end
+      }
+      
+      begin
+        @generation = modinst.generate_simple(
+          'Encoder'   => (pencoder == '__default') ? nil : pencoder,
+          'BadChars'  => badchars,
+          'Format'    => pformat || 'c',
+          'OptionStr' => payload_opts,
+          'MaxSize'   => (max_size == 0) ? nil : max_size)
+      rescue
+        @generation = $!
+      end
 	end
-	
+  # end of view method
   end
 
   def generate
diff --git a/data/msfweb/app/models/payload.rb b/data/msfweb/app/models/payload.rb
index ccc6eb9c25..eb58ace958 100644
--- a/data/msfweb/app/models/payload.rb
+++ b/data/msfweb/app/models/payload.rb
@@ -4,4 +4,9 @@ class Payload
 		$msframework.payloads.each_module { |n,m| mods << m.new }
 		mods
 	end
+	
+	def self.create(refname)
+	    modinst = $msframework.payloads.create(refname)
+        modinst
+	end
 end
diff --git a/data/msfweb/app/views/payloads/view.rhtml b/data/msfweb/app/views/payloads/view.rhtml
index 6671547f9c..299a5473f6 100644
--- a/data/msfweb/app/views/payloads/view.rhtml
+++ b/data/msfweb/app/views/payloads/view.rhtml
@@ -1,5 +1,5 @@
 <table align="center" width="100%" cellspacing="0" cellpadding="2" border="0" class="moduleInfo">
-    
+
 	<tr>
         <p class="moduleName">
             <span class="moduleIcons">
@@ -44,40 +44,86 @@
 		<td>Operating system:</td>
 		<td><%= @tmod.platform_to_s %></td>
     </tr>
-    </div>
-    
-    <%= start_form_tag %>
+
+    <tr>
+        <th colspan="2"></th>
+    </tr>
+
+<% if @module_step == 0 %>
+
+    <tr>
+        <th colspan="2" class="moduleOptionsHeader">Options</th>
+    </tr>
+
+<form action="/payloads/view" method="post">
     
+    <%= hidden_field_tag "id", h(params[:id]) %>
+    <%= hidden_field_tag "step", "1" %>
     <% @tmod.options.each { |name, option|
         next if (option.advanced?)
         next if (option.evasion?) %>
-            <%= name %>
-            <%= (option.required?) ? "Required" : "Optional" %>
-            <%= option.type %>
-            <input type='text' name="opt_<%= html_escape(name) %>" value="<%= html_escape(option.default || '') %>"/>
-            <%= html_escape(option.desc) %>
+        <tr>
+            <td><strong><%= name %></strong></td>
+            <td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
+        </tr>
+        <tr>
+            <td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
+            <td>
+                <input type="text" name="opt_<%= h(name) %>" value="<%= h(option.default || '') %>"/>
+            </td>
+        </tr>
         <% } %>
+    
+    <tr>
+        <td>Max Size:</td>
+        <td><input type="text" name="max_size" size="10"/></td>
+    </tr>
+    
+    <tr>
+        <td>Restricted Characters (format: 0x00 0x01):</td>
+        <td><input type="text" name="badchars" size="25" value="0x00 "/></td>
+    </tr>
+    
+    <tr>
+        <td>Selected Encoder:</td>
+        <td>
+            <select name="encoder" size="1">
+                <option value="__default">Default
+                <% @tmod.compatible_encoders.each { |encname, mod| %>
+                    <option><%= encname %></option>
+                <% } %>
+            </select>
+        </td>
+    </tr>
 
-    Max Size:
-    <input type="text" name="max_size" size="10"/>
-    Restricted Characters (format: 0x00 0x01):
-    <input type="text" name='badchars' size='45' value='0x00 '/>
-    Selected Encoder:<br/>
-    <select name="encoder" size='1'>
-        <option value='__default'>Default
-        <% @tmod.compatible_encoders.each { |encname, mod| %>
-            <option><%= encname %>
-        <% } %>
-    </select>
-            
-    Format:<br/>
-    <select name='format' size='1'>
-        <option value='c'>C
-        <option value='ruby'>Ruby
-        <option value='perl'>Perl
-        <option value='raw'>Raw
-    </select>
-             
-    <%= submit_tag %>
-    <%= end_form_tag %>
-</table>
+    <tr>       
+        <td>Format:</td>
+        <td>
+            <select name="format" size="1">
+                <option value="c">C</option>
+                <option value="ruby">Ruby</option>
+                <option value="perl">Perl</option>
+                <option value="raw">Raw</option>
+            </select>
+        </td>
+    </tr>
+
+    <tr>
+        <td><%= submit_tag "Generate" %></td>
+    </tr>
+
+</form>
+<% else %>
+
+    <tr>
+        <th colspan="2" class="moduleOptionsHeader">
+            Payload code
+            (<%= link_to "back", :action => "view", :id => h(params[:id]) %>)
+        </th>
+    </tr>
+
+    <tr>
+        <td><pre><%=@generation%></pre></td>
+    </tr>
+<% end %>
+</table>
\ No newline at end of file
diff --git a/data/msfweb/public/stylesheets/windows.css b/data/msfweb/public/stylesheets/windows.css
index df78e95854..81ad3f0655 100644
--- a/data/msfweb/public/stylesheets/windows.css
+++ b/data/msfweb/public/stylesheets/windows.css
@@ -75,3 +75,8 @@ p.moduleDesc {
     color: #333333;
     text-align: justify;
 }
+
+th.moduleOptionsHeader {
+    background: #ddd;
+    text-transform: uppercase;
+}
\ No newline at end of file