diff --git a/Netdisco/bin/netdisco-web.pl b/Netdisco/bin/netdisco-web.pl
index 114ae861..68be4634 100755
--- a/Netdisco/bin/netdisco-web.pl
+++ b/Netdisco/bin/netdisco-web.pl
@@ -1,4 +1,9 @@
 #!/usr/bin/env perl
+
+# use lib '/root/perl-profiles/netdisco-web/lib/perl5';
+use local::lib '/srv/www/vhosts/netdisco.ecmwf.int/perl-profiles/netdisco-web';
+use lib '/srv/www/vhosts/netdisco.ecmwf.int/Netdisco/lib';
+
 use Dancer;
 use Netdisco::Web;
 dance;
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index 34c3fa0d..fa91beb9 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -7,20 +7,21 @@
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
         rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
-      <h3 class="device_label">[% d.ip %]</h3>
-      [% IF d.dns %]
-      <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
-      [% END %]
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">
-          [% TRY %]
-          [% INCLUDE "sidebar/device/${tab.id}.tt" %]
-          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
-          [% CATCH %]
-          <!-- no "[% tab.id %]" search options -->
-          <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
-          [% END %]
+          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
+            <input name="tab" value="[% tab.id %]" type="hidden"/>
+            [% TRY %]
+            [% INCLUDE "sidebar/device/${tab.id}.tt" %]
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
+            [% CATCH %]
+            <!-- no "[% tab.id %]" search options -->
+            <input name="ip" value="[% params.ip %]" type="hidden"/>
+            <input name="q" value="[% params.q %]" type="hidden"/>
+            <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
+            [% END %]
+          </form>
         </div> <!-- /tab-pane -->
         [% END %]
       </div> <!-- /tab-content -->
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 05d76b55..86837e1a 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -11,14 +11,13 @@
         [% FOREACH tab IN vars.tabs %]
         <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="[% uri_for('/search') %]">
-            <input name="q" value="[% params.q %]" type="hidden"/>
             <input name="tab" value="[% tab.id %]" type="hidden"/>
             [% TRY %]
             [% INCLUDE "sidebar/search/${tab.id}.tt" %]
-            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 1;</script>
             [% CATCH %]
             <!-- no "[% tab.id %]" search options -->
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <script type="text/javascript">has_sidebar["[% tab.id %]"] = 0;</script>
             [% END %]
           </form>
diff --git a/Netdisco/views/sidebar/device/addresses.tt b/Netdisco/views/sidebar/device/addresses.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/addresses.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/details.tt b/Netdisco/views/sidebar/device/details.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/details.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/modules.tt b/Netdisco/views/sidebar/device/modules.tt
deleted file mode 100644
index c63fb507..00000000
--- a/Netdisco/views/sidebar/device/modules.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
-            <input name="ip" value="[% params.ip %]" type="hidden"/>
-            <input name="q" value="[% params.q %]" type="hidden"/>
-          </form>
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index e043b191..080a4533 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -1,10 +1,9 @@
 
-          <form id="[% tab.id %]_form" class="nd_sidesearchform form-stacked" method="get" action="[% uri_for('/device') %]">
-            <input name="tab" value="[% tab.id %]" type="hidden"/>
+            <p><em>Port Filter Options</em></p>
             <input name="ip" value="[% params.ip %]" type="hidden"/>
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
-                rel="twipsy" data-placement="left" data-offset="3" title="Show all Ports">
+                rel="twipsy" data-placement="above" data-offset="3" title="Show all Ports">
                 <img src="[% uri_base %]/images/tango_sweep.png"/></a>
               <input class="nd_port_query span3" placeholder="Port, Name or VLAN"
                 name="q" value="[% params.q %]" type="text"
@@ -96,10 +95,4 @@
                 </ul>
               </div>
             </div>
-            <div class="nd_search clearfix">
-              <button id="[% tab.id %]_submit" type="submit" class="btn info">Update View</button>
-              <a id="[% tab.id %]_bookmark" href="#"
-                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark these Settings">
-                <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png"></a>
-            </div>
-          </form>
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Update View</button>
diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt
index cf636208..0e3ce656 100644
--- a/Netdisco/views/sidebar/search/device.tt
+++ b/Netdisco/views/sidebar/search/device.tt
@@ -1,5 +1,6 @@
 
             <p><em>Device Search Options</em></p>
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix">
               <input class="span3" placeholder="System Name"
                 type="text" name="name" value="[% params.name %]"
@@ -60,3 +61,4 @@
                 <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
               </label>
             </div>
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
diff --git a/Netdisco/views/sidebar/search/node.tt b/Netdisco/views/sidebar/search/node.tt
index dcb6d857..2247e934 100644
--- a/Netdisco/views/sidebar/search/node.tt
+++ b/Netdisco/views/sidebar/search/node.tt
@@ -1,5 +1,6 @@
 
             <p><em>Node Search Options</em></p>
+            <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix input-prepend">
               <label class="add-on">
                 <input type="checkbox" id="stamps" name="stamps"[% ' checked="checked"' IF params.stamps %]/>
@@ -34,3 +35,4 @@
               </label>
             </div>
             [% END %]
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>