diff --git a/Netdisco/lib/Netdisco.pm b/Netdisco/lib/Netdisco.pm
index a45a9c35..c52bd2fa 100644
--- a/Netdisco/lib/Netdisco.pm
+++ b/Netdisco/lib/Netdisco.pm
@@ -50,6 +50,7 @@ get '/search' => sub {
         { id => 'node',   label => 'Node'   },
         { id => 'vlan',   label => 'VLAN'   },
         { id => 'port',   label => 'Port'   },
+        { id => 'quux',   label => 'Frobnitz'   },
     ]);
 
     template 'search';
diff --git a/Netdisco/views/inc/search/device.tt b/Netdisco/views/inc/search/device.tt
deleted file mode 100644
index dd156384..00000000
--- a/Netdisco/views/inc/search/device.tt
+++ /dev/null
@@ -1,8 +0,0 @@
-        <div id="device_search" class="tab-pane [% 'active' IF params.tab == 'device' %]">
-          <form id="device_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            [%+ INCLUDE inc/search/box.tt %]
-            <p><em>Device Search Options</em></p>
-            <input name="tab" value="device" type="hidden"/>
-            [%+ INCLUDE inc/search/submit.tt %]
-          </form>
-        </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/node.tt b/Netdisco/views/inc/search/node.tt
index 7e577fe4..5d6148e9 100644
--- a/Netdisco/views/inc/search/node.tt
+++ b/Netdisco/views/inc/search/node.tt
@@ -1,6 +1,4 @@
-        <div id="node_search" class="tab-pane [% 'active' IF params.tab == 'node' %]">
-          <form id="node_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            [%+ INCLUDE inc/search/box.tt %]
+
             <p><em>Node Search Options</em></p>
             <input name="tab" value="node" type="hidden"/>
             <div class="clearfix input-prepend">
@@ -27,6 +25,3 @@
                 <span class="nd_searchcheckbox uneditable-input">Archived Data</span>
               </label>
             </div>
-            [%+ INCLUDE inc/search/submit.tt %]
-          </form>
-        </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/port.tt b/Netdisco/views/inc/search/port.tt
deleted file mode 100644
index 140b8fb9..00000000
--- a/Netdisco/views/inc/search/port.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-        <div id="port_search" class="tab-pane [% 'active' IF params.tab == 'port' %]">
-          <form id="port_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            [%+ INCLUDE inc/search/box.tt %]
-            <input name="tab" value="vlan" type="hidden"/>
-            [%+ INCLUDE inc/search/submit.tt %]
-          </form>
-        </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/inc/search/vlan.tt b/Netdisco/views/inc/search/vlan.tt
deleted file mode 100644
index a26f59ee..00000000
--- a/Netdisco/views/inc/search/vlan.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-        <div id="vlan_search" class="tab-pane [% 'active' IF params.tab == 'vlan' %]">
-          <form id="vlan_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
-            [%+ INCLUDE inc/search/box.tt %]
-            <input name="tab" value="vlan" type="hidden"/>
-            [%+ INCLUDE inc/search/submit.tt %]
-          </form>
-        </div> <!-- /tab-pane -->
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index a5d1628a..2c78e7e4 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -3,8 +3,19 @@
     <div class="well">
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
-
-          [% INCLUDE "inc/search/${tab.id}.tt" %]
+        <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
+          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="/search">
+            <div class="clearfix">
+              <input class="span3" name="q" value="[% params.q %]" type="text"/>
+            </div>
+            [%+ TRY %][% INCLUDE "inc/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
+            <input name="tab" value="[% tab.id %]" type="hidden"/>
+            <div class="nd_search clearfix">
+              <button id="[% tab.id %]_submit" type="submit" class="btn info">Search Again</button>
+              <a id="[% tab.id %]_bookmark" href="#"><img class="nd_bookmark" src="/images/glyphicons_072_bookmark.png"></a>
+            </div>
+          </form>
+        </div> <!-- /tab-pane -->
         [% END %]
       </div> <!-- /tab-content -->
     </div>