diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index f7e527dc..0bfe1db0 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -25,16 +25,6 @@ body {
   margin-bottom: 0px;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* change highlighting for form fields which are being used in a search */
-
-form .clearfix.success select {
-  background-color: #A9DBA9;
-}
-form .clearfix.success input {
-  background-color: #A9DBA9;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* results table links */
 
@@ -120,6 +110,25 @@ form .clearfix.success input {
   text-align: center;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* tabs */
+
+#search_results {
+    margin-bottom: 10px;
+}
+
+/* right hand side device label */
+.device_label_right {
+  float: right !important;
+  margin-bottom: -7px !important;
+  display: none;
+}
+
+/* take a block element and force it inline */
+.inline {
+  display: inline !important;
+}
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* style customization for many items which appear in the sidebar */
 
@@ -144,16 +153,6 @@ form .clearfix.success input {
   margin-left: -2px !important;
 }
 
-/* search/filter button placement */
-.nd_search {
-  margin-top: 15px;
-}
-
-/* placement of the search/filter bookmark link icon */
-.nd_bookmark {
-  vertical-align: top;
-}
-
 /* nudge the port name/vlan filter over a little */
 .nd_port_query {
   margin-left: -2px !important;
@@ -172,6 +171,14 @@ so that its tooltip takes prescedence over the field tooltip */
   padding: 6px;
 }
 
+/* change highlighting for form fields which are being used in a search */
+form .clearfix.success select {
+  background-color: #A9DBA9;
+}
+form .clearfix.success input {
+  background-color: #A9DBA9;
+}
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* device and ip label in sidebar */
 
@@ -186,27 +193,13 @@ h3.device_label {
   color: #660033;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* right hand side device label */
-
-.device_label_right {
-  float: right !important;
-  margin-bottom: -7px !important;
-  display: none;
-}
-
-/* take a block element and force it inline */
-.inline {
-  display: inline !important;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* sidebar collapser */
 
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
   float: left;
-  margin-top: -6px;
+  margin-top: -9px;
   margin-left: -18px;
   cursor: pointer;
 }
@@ -241,7 +234,7 @@ h3.device_label {
 /* nudge content in the sidebar closer to the left */
 .nd_sidesearchform {
   padding-left: 0px;
-  margin-top: -7px;
+  margin-top: -9px;
   margin-bottom: 0px;
 }
 
diff --git a/Netdisco/public/images/crystalclear_mag.png b/Netdisco/public/images/crystalclear_mag.png
new file mode 100644
index 00000000..0773220b
Binary files /dev/null and b/Netdisco/public/images/crystalclear_mag.png differ
diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 95b2dee9..3840d64a 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -3,7 +3,6 @@
 function do_search (event, tab) {
   var form = '#' + tab + '_form';
   var target = '#' + tab + '_pane';
-  var mark = '#' + tab + '_bookmark';
 
   // stop form from submitting normally
   event.preventDefault();
@@ -48,8 +47,6 @@ function do_search (event, tab) {
           '<div class="span3 alert-message info"><p>No matching records.</p></div>'
         );
       }
-      // looks good, update the bookmark for this search
-      $(mark).attr('href', uri_base + '/' + path + '?' + query);
 
       inner_view_processing();
     }
@@ -146,22 +143,22 @@ $(document).ready(function() {
     var from_li = $('.tabs').find('> .active').first();
     var to_li = $(this).parent('li')
 
-    from_li.removeClass('active');
-    to_li.addClass('active');
+    from_li.toggleClass('active');
+    to_li.toggleClass('active');
 
-    var from = from_li.find('a').attr('href');
-    var to = $(this).attr('href');
+    var from_id = from_li.find('a').attr('href');
+    var to_id = $(this).attr('href');
 
-    if (from == to) {
+    if (from_id == to_id) {
       return;
     }
 
-    $(from).toggleClass('active');
-    $(to).toggleClass('active');
+    $(from_id).toggleClass('active');
+    $(to_id).toggleClass('active');
 
     update_content(
-      from.replace(/^#/,"").replace(/_pane$/,""),
-      to.replace(/^#/,"").replace(/_pane$/,"")
+      from_id.replace(/^#/,"").replace(/_pane$/,""),
+      to_id.replace(/^#/,"").replace(/_pane$/,"")
     );
   });
 });
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 4042d346..7e424211 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -11,16 +11,14 @@
         [% 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') %]">
-            [%+ TRY %][% INCLUDE "sidebar/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
             <input name="q" value="[% params.q %]" type="hidden"/>
             <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="#"
-                rel="twipsy" data-placement="left" data-offset="5" title="Bookmark this Search">
-                <img class="nd_bookmark" src="[% uri_base %]/images/glyphicons_072_bookmark.png">
-              </a>
-            </div>
+            [% TRY %]
+            [% INCLUDE "sidebar/search/${tab.id}.tt" %]
+            <button id="[% tab.id %]_submit" type="submit" class="btn info span3">Search Again</button>
+            [% CATCH %]
+            <!-- no "[% tab.id %]" search options -->
+            [% END %]
           </form>
         </div> <!-- /tab-pane -->
         [% END %]