diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 4da002ad..098caa8b 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -122,7 +122,7 @@ if (window.History && window.History.enabled) {
 
 $(document).ready(function() {
   // activate tooltips
-  $("[rel=twipsy]").twipsy({live: true});
+  $("[rel=tooltip]").tooltip({live: true});
 
   // bind submission to the navbar go icon
   $('#navsearchgo').click(function() {
@@ -168,7 +168,7 @@ $(document).ready(function() {
   // but warning! will probably not work for dropdowns in tabs
   $('#search_results li').delegate('a', 'click', function(event) {
     event.preventDefault();
-    var from_li = $('.tabs').find('> .active').first();
+    var from_li = $('.nav-tabs').find('> .active').first();
     var to_li = $(this).parent('li')
 
     from_li.toggleClass('active');
diff --git a/Netdisco/views/ajax/device/details.tt b/Netdisco/views/ajax/device/details.tt
index 3ecfc697..fc1122dc 100644
--- a/Netdisco/views/ajax/device/details.tt
+++ b/Netdisco/views/ajax/device/details.tt
@@ -7,7 +7,7 @@
     <tr>
       <td>Location</td>
       <td>
-        <a rel="twipsy" data-placement="above" data-offset="5" title="Find Similar Devices"
+        <a rel="tooltip" data-placement="top" data-offset="5" title="Find Similar Devices"
         href="[% uri_for('/search') %]?[% vars.query_defaults.device %]&q=[% d.dns | uri %]&location=[% d.location | uri %]">[% d.location %]</a>
       </td>
     </tr>
@@ -18,17 +18,17 @@
     <tr>
       <td>Vendor / Model</td>
       <td>
-        <a rel="twipsy" data-placement="above" data-offset="5" title="Find Similar Devices"
+        <a rel="tooltip" data-placement="top" data-offset="5" title="Find Similar Devices"
         href="[% uri_for('/search') %]?[% vars.query_defaults.device %]&q=[% d.dns | uri %]&vendor=[% d.vendor | uri %]">[% d.vendor %]</a>
         /
-        <a rel="twipsy" data-placement="above" data-offset="5" title="Find Similar Devices"
+        <a rel="tooltip" data-placement="top" data-offset="5" title="Find Similar Devices"
         href="[% uri_for('/search') %]?[% vars.query_defaults.device %]&q=[% d.dns | uri %]&model=[% d.model | uri %]">[% d.model %]</a>
       </td>
     </tr>
     <tr>
       <td>OS / Version</td>
       <td>[% d.os %] /
-        <a rel="twipsy" data-placement="above" data-offset="5"
+        <a rel="tooltip" data-placement="top" data-offset="5"
         title="Find Similar Devices"
           href="[% uri_for('/search') %]?[% vars.query_defaults.device %]&q=[% d.dns | uri %]&os_ver=[% d.os_ver | uri %]">[% d.os_ver %]</a>
       </td>
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index b6b68ab5..3c7ed189 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
   src="[% uri_base %]/images/diagona_settings.png"
-  rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/>
+  rel="tooltip" data-placement="left" data-offset="5" title="Show Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <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"/>
+        rel="tooltip" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <div id="sidebar_pin_box" class="well">
         <img id="sidebar_pin" src="[% uri_base %]/images/matte_basic_pin.png"/>
       </div>
@@ -32,7 +32,7 @@
   </div>
 
   <div class="content">
-    <ul id="search_results" class="tabs" data-tabs="on">
+    <ul id="search_results" class="nav nav-tabs">
       [% FOREACH tab IN vars.tabs %]
       <li[% ' class="active"' IF params.tab == tab.id %]><a id="[% tab.id %]_link" href="#[% tab.id %]_pane">[% tab.label %]</a></li>
       [% END %]
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index cd3e7c36..fcd4fb48 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
   src="[% uri_base %]/images/diagona_settings.png"
-  rel="twipsy" data-placement="left" data-offset="5" title="Show Search Options"/>
+  rel="tooltip" data-placement="left" data-offset="5" title="Show Search Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <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"/>
+        rel="tooltip" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <div id="sidebar_pin_box" class="well">
         <img id="sidebar_pin" src="[% uri_base %]/images/matte_basic_pin.png"/>
       </div>
@@ -31,7 +31,7 @@
   </div>
 
   <div class="content">
-    <ul id="search_results" class="tabs" data-tabs="on">
+    <ul id="search_results" class="nav nav-tabs">
       [% FOREACH tab IN vars.tabs %]
       <li[% ' class="active"' IF params.tab == tab.id %]><a id="[% tab.id %]_link" href="#[% tab.id %]_pane">[% tab.label %]</a></li>
       [% END %]
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index e96e471f..12ba6763 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -3,11 +3,11 @@
             <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
-                rel="twipsy" data-placement="above" data-offset="3" title="Show all Ports">
+                rel="tooltip" data-placement="top" 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="f" value="[% params.f %]" type="text"
-                rel="twipsy" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="Filter by Port, Name or VLAN"/>
             </div>
             <div class="clearfix">
               <a href="#" id="nd_collapse_legend"><label>Legend</label></a>
@@ -62,7 +62,7 @@
                   </li>
                   <p></p>
                   <li>
-                    <span rel="twipsy" data-placement="left" data-offset="5" title="Free if Down for this period of time">
+                    <span rel="tooltip" data-placement="left" data-offset="5" title="Free if Down for this period of time">
                     <select class="nd_days_select" name="age_num"/>
                       [% SET count = 1 %]
                       [% WHILE count < 32 %]
diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt
index 0e3ce656..5d92e454 100644
--- a/Netdisco/views/sidebar/search/device.tt
+++ b/Netdisco/views/sidebar/search/device.tt
@@ -4,32 +4,32 @@
             <div class="clearfix">
               <input class="span3" placeholder="System Name"
                 type="text" name="name" value="[% params.name %]"
-                rel="twipsy" data-placement="left" data-offset="5" title="System Name"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="System Name"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Location"
                 type="text" name="location" value="[% params.location %]"
-                rel="twipsy" data-placement="left" data-offset="5" title="Location"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="Location"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="DNS"
                 type="text" name="dns" value="[% params.dns %]"
-                rel="twipsy" data-placement="left" data-offset="5" title="DNS"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="DNS"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="IP Address"
                 type="text" name="ip" value="[% params.ip %]"
-                rel="twipsy" data-placement="left" data-offset="5" title="IP Address"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="IP Address"/>
             </div>
             <div class="clearfix">
               <input class="span3" placeholder="Description"
                 type="text" name="description" value="[% params.description %]"
-                rel="twipsy" data-placement="left" data-offset="5" title="Description"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="Description"/>
             </div>
             <div class="clearfix">
               <select class="span3" size="[% vars.model_list.size > 5 ? 5 : vars.model_list.size %]"
                 multiple="on" name="model"
-                rel="twipsy" data-placement="left" data-offset="5" title="Model"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="Model"/>
                 [% FOREACH opt IN vars.model_list %]
                 <option[% ' selected="selected"' IF vars.model_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]
@@ -38,7 +38,7 @@
             <div class="clearfix">
               <select class="span3" size="[% vars.os_ver_list.size > 5 ? 5 : vars.os_ver_list.size %]"
                 multiple="on" name="os_ver"
-                rel="twipsy" data-placement="left" data-offset="5" title="OS Release"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="OS Release"/>
                 [% FOREACH opt IN vars.os_ver_list %]
                 <option[% ' selected="selected"' IF vars.os_ver_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]
@@ -47,7 +47,7 @@
             <div class="clearfix">
               <select class="span3" size="[% vars.vendor_list.size > 5 ? 5 : vars.vendor_list.size %]"
                 multiple="on" name="vendor"
-                rel="twipsy" data-placement="left" data-offset="5" title="Vendor"/>
+                rel="tooltip" data-placement="left" data-offset="5" title="Vendor"/>
                 [% FOREACH opt IN vars.vendor_list %]
                 <option[% ' selected="selected"' IF vars.vendor_lkp.exists(opt) %]>[% opt %]</option>
                 [% END %]