diff --git a/data/msfweb/app/views/auxiliaries/list.rhtml b/data/msfweb/app/views/auxiliaries/list.rhtml
index 6d634d61a0..1ce5b46c8a 100644
--- a/data/msfweb/app/views/auxiliaries/list.rhtml
+++ b/data/msfweb/app/views/auxiliaries/list.rhtml
@@ -1,22 +1,10 @@
-<table>
-	<thead>
-		<tr>
-			<th>Modules</th>
-		</tr>
-	</thead>
-	<tbody>
-	    <% @auxiliaries.each do |m| %>
-		
-		<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>
+    <div id="module-search-box">
+        Search auxiliary modules:
+        <input id="auxiliary_search" name="terms" type="text" size="40" value=""/>
+        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+        <div id="search_results"></div>
+    </div>
+    
+    <script type="text/javascript">
+        generic_live_search('auxiliary_search', 'auxiliaries', 'search_spinner');
+    </script>
\ No newline at end of file
diff --git a/data/msfweb/app/views/encoders/list.rhtml b/data/msfweb/app/views/encoders/list.rhtml
index 0b41eafd48..3d42c68589 100644
--- a/data/msfweb/app/views/encoders/list.rhtml
+++ b/data/msfweb/app/views/encoders/list.rhtml
@@ -1,24 +1,10 @@
-<table>
-	<thead>
-		<tr>
-			<th>Modules</th>
-		</tr>
-	</thead>
-	<tbody>
-	    <% @encoders.each_index do |i| 
-				m = @encoders[i]
-		%>
-		
-		<tr class="itemTitle">
-			<td class="itemTitle">
-			    <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>
+    <div id="module-search-box">
+        Search encoder modules:
+        <input id="encoder_search" name="terms" type="text" size="40" value=""/>
+        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+        <div id="search_results"></div>
+    </div>
+    
+    <script type="text/javascript">
+        generic_live_search('encoder_search', 'encoders', 'search_spinner');
+    </script>
\ No newline at end of file
diff --git a/data/msfweb/app/views/nops/list.rhtml b/data/msfweb/app/views/nops/list.rhtml
index 5ea8111b43..0a606dd62f 100644
--- a/data/msfweb/app/views/nops/list.rhtml
+++ b/data/msfweb/app/views/nops/list.rhtml
@@ -1,24 +1,10 @@
-<table>
-	<thead>
-		<tr>
-			<th>Modules</th>
-		</tr>
-	</thead>
-	<tbody>
-	    <% @nops.each_index do |i| 
-				m = @nops[i]
-		%>
-		
-		<tr class="itemTitle">
-			<td class="itemTitle">
-			    <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>
+    <div id="module-search-box">
+        Search NOP (No-Op) modules:
+        <input id="nop_search" name="terms" type="text" size="40" value=""/>
+        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+        <div id="search_results"></div>
+    </div>
+    
+    <script type="text/javascript">
+        generic_live_search('nop_search', 'nops', 'search_spinner');
+    </script>
\ No newline at end of file
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml
index 5dca371d7a..c51235996c 100644
--- a/data/msfweb/app/views/payloads/list.rhtml
+++ b/data/msfweb/app/views/payloads/list.rhtml
@@ -1,24 +1,10 @@
-<table cellpadding="0" cellspacing="0" border="0">
-	<thead>
-		<tr>
-			<th>Modules</th>
-		</tr>
-	</thead>
-	<tbody>
-	    <% @payloads.each_index do |i| 
-				m = @payloads[i]
-		%>
-		
-		<tr class="itemTitle">
-			<td class="itemTitle">
-			    <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>
+    <div id="module-search-box">
+        Search payload modules:
+        <input id="payload_search" name="terms" type="text" size="40" value=""/>
+        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+        <div id="search_results"></div>
+    </div>
+    
+    <script type="text/javascript">
+        generic_live_search('payload_search', 'payloads', 'search_spinner');
+    </script>
\ No newline at end of file