diff --git a/Netdisco/Changes b/Netdisco/Changes
index 96f9204e..680aa8fd 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -25,6 +25,7 @@
   * Partial Name in Port search now working
   * Add unique constraints to topology table
   * Handle whitespace ahead of OUI data
+  * Wasn't using Bootstrap table class properly
 
 2.007000_001 - 2013-03-17
 
diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index 5852c519..81157113 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -87,15 +87,18 @@ body {
 .nd_editable-cell > .nd_editable-cell-content {
   margin-left: 18px;
 }
+.table .nd_nudge-for-icon {
+  padding-left: 25px;
+}
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* styles to position table cell content */
 
-td {
+.table td {
   vertical-align: baseline;
 }
 
-.nd_center-cell {
+.table .nd_center-cell {
   text-align: center;
 }
 
@@ -418,7 +421,7 @@ form .clearfix.success input {
 #nd_legend i {
   width: 9px;
 }
-.table-bordered i {
+.table i {
   width: 9px;
 }
 
diff --git a/Netdisco/share/views/ajax/admintask/jobqueue.tt b/Netdisco/share/views/ajax/admintask/jobqueue.tt
index f86e2443..9a818ef0 100644
--- a/Netdisco/share/views/ajax/admintask/jobqueue.tt
+++ b/Netdisco/share/views/ajax/admintask/jobqueue.tt
@@ -1,4 +1,4 @@
-<table class="table table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th class="nd_center-cell">Entered</th>
diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
index c550ebfb..900ecf8a 100644
--- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt
+++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-striped">
   <thead>
     <tr>
       <th class="nd_center-cell">Device Name</th>
diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt
index 2b79ee5e..ab180fbb 100644
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-striped">
   <thead>
     <tr>
       <th class="nd_center-cell">Left Device</th>
diff --git a/Netdisco/share/views/ajax/device/addresses.tt b/Netdisco/share/views/ajax/device/addresses.tt
index 6bb5b331..30805b23 100644
--- a/Netdisco/share/views/ajax/device/addresses.tt
+++ b/Netdisco/share/views/ajax/device/addresses.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed table-striped">
   <thead>
     <tr>
       <th>Address</th>
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index d00d3ae6..3f1da1ea 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -1,4 +1,4 @@
-<table class="table-condensed table-striped">
+<table class="table table-condensed table-striped">
   </tbody>
     <tr>
       <td>System Name</td>
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 1d54ea2e..d37e7a4d 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-striped">
   <thead>
     <tr>
       <th></th>
@@ -6,7 +6,10 @@
       [% NEXT IF item.name == 'c_admin' %]
       [% NEXT IF item.name == 'c_nodes' AND params.c_nodes AND params.c_neighbors %]
         [% NEXT UNLESS params.${item.name} %]
-        <th[% ' class="nd_center-cell"' IF NOT loop.first %]>[% item.label | html_entity %]</th>
+        <th[% ' class="nd_nudge-for-icon"' IF
+          (vars.user.port_control AND params.c_admin AND (item.name == 'c_port' OR item.name == 'c_name')) %]>
+          [% item.label | html_entity %]
+        </th>
       [% END %]
     </tr>
   </thead>
@@ -50,32 +53,32 @@
       [% END %]
 
       [% IF params.c_descr %]
-      <td nowrap class="nd_center-cell">[% row.descr | html_entity %]</td>
+      <td nowrap>[% row.descr | html_entity %]</td>
       [% END %]
 
       [% IF params.c_type %]
-      <td class="nd_center-cell">[% row.type | html_entity %]</td>
+      <td>[% row.type | html_entity %]</td>
       [% END %]
 
       [% IF params.c_duplex %]
-      <td class="nd_center-cell">
+      <td>
         [% IF row.up == 'up' AND row.duplex %]
-        [% row.duplex_admin | html_entity %] / [% row.duplex | html_entity %]
+        [% row.duplex_admin.ucfirst | html_entity %] / [% row.duplex.ucfirst | html_entity %]
         [% END %]
       </td>
       [% END %]
 
       [% IF params.c_lastchange %]
-      <td class="nd_center-cell">[% row.lastchange_stamp | html_entity %]</td>
+      <td>[% row.lastchange_stamp | html_entity %]</td>
       [% END %]
 
       [% IF params.c_name %]
       [% IF vars.user.port_control AND params.c_admin %]
-      <td nowrap class="nd_center-cell nd_editable-cell" contenteditable="true"
+      <td nowrap class="nd_editable-cell" contenteditable="true"
           data-field="c_name" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
       <i class="icon-edit nd_edit-icon"></i>
       [% ELSE %]
-      <td nowrap class="nd_center-cell">
+      <td nowrap>
       [% END %]
       <div class="nd_editable-cell-content">
         [% row.name | html_entity %]
@@ -84,20 +87,20 @@
       [% END %]
 
       [% IF params.c_speed %]
-      <td class="nd_center-cell">[% row.speed | html_entity %]</td>
+      <td>[% row.speed | html_entity %]</td>
       [% END %]
 
       [% IF params.c_mac %]
-      <td class="nd_center-cell">[% row.mac | html_entity %]</td>
+      <td>[% row.mac | html_entity %]</td>
       [% END %]
 
       [% IF params.c_mtu %]
-      <td class="nd_center-cell">[% row.mtu | html_entity %]</td>
+      <td>[% row.mtu | html_entity %]</td>
       [% END %]
 
       [% IF params.c_vlan %]
       [% IF vars.user.port_control AND params.c_admin %]
-      <td class="nd_center-cell nd_editable-cell" contenteditable="true"
+      <td class="nd_editable-cell" contenteditable="true"
         data-field="c_vlan" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
       <i class="icon-edit nd_edit-icon"></i>
       <div class="nd_editable-cell-content">
@@ -105,7 +108,7 @@
       </div>
       </td>
       [% ELSE %]
-      <td class="nd_center-cell">
+      <td>
         <a class="nd_linkcell"
           href="[% uri_for('/search') %]?tab=vlan&q=[% row.vlan | uri %]">
             [% row.vlan | html_entity %]</a>
@@ -215,12 +218,12 @@
       [% END %]
 
       [% IF params.c_stp %]
-      <td class="nd_center-cell">[% row.stp | html_entity %]</td>
+      <td>[% row.stp | html_entity %]</td>
       [% END %]
 
       [% IF params.c_up %]
-      <td class="nd_center-cell">
-        [% row.up_admin | html_entity %] / [% row.up | html_entity %]
+      <td>
+        [% row.up_admin.ucfirst | html_entity %] / [% row.up.ucfirst | html_entity %]
       </td>
       [% END %]
     </tr>
diff --git a/Netdisco/share/views/ajax/report/duplexmismatch.tt b/Netdisco/share/views/ajax/report/duplexmismatch.tt
index 546a2338..a13f40be 100644
--- a/Netdisco/share/views/ajax/report/duplexmismatch.tt
+++ b/Netdisco/share/views/ajax/report/duplexmismatch.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed table-striped">
   <thead>
     <tr>
       <th class="nd_center-cell">Left Device</th>
diff --git a/Netdisco/share/views/ajax/search/device.tt b/Netdisco/share/views/ajax/search/device.tt
index 10e3f560..dd24dc64 100644
--- a/Netdisco/share/views/ajax/search/device.tt
+++ b/Netdisco/share/views/ajax/search/device.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed table-striped">
   <thead>
     <tr>
       <th>Device</th>
diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt
index 6a994705..28ba2680 100644
--- a/Netdisco/share/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/share/views/ajax/search/node_by_ip.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-hover">
   <thead>
     <tr>
       <th>MAC</th>
diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt
index 34e445b9..adefc4c8 100644
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-hover">
   <thead>
     <tr>
       <th>MAC</th>
diff --git a/Netdisco/share/views/ajax/search/port.tt b/Netdisco/share/views/ajax/search/port.tt
index 5d0acef7..4bded247 100644
--- a/Netdisco/share/views/ajax/search/port.tt
+++ b/Netdisco/share/views/ajax/search/port.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed table-striped">
   <thead>
     <tr>
       <th>Description</th>
diff --git a/Netdisco/share/views/ajax/search/vlan.tt b/Netdisco/share/views/ajax/search/vlan.tt
index d6e30e2b..38056085 100644
--- a/Netdisco/share/views/ajax/search/vlan.tt
+++ b/Netdisco/share/views/ajax/search/vlan.tt
@@ -1,4 +1,4 @@
-<table class="table-bordered table-condensed table-striped">
+<table class="table table-bordered table-condensed table-striped">
   <thead>
     <tr>
       <th>Vlan</th>
diff --git a/Netdisco/share/views/inventory.tt b/Netdisco/share/views/inventory.tt
index c5688971..c8627538 100644
--- a/Netdisco/share/views/inventory.tt
+++ b/Netdisco/share/views/inventory.tt
@@ -3,7 +3,7 @@
   <div class="row">
     <div class="span6">
       <h3 class="nd_inventory-table-head">By Platform</h3>
-      <table class="table table-condensed">
+      <table class="table table-condensed table-hover">
         <thead>
           <tr>
             <th>Vendor</th>
@@ -33,7 +33,7 @@
     </div>
     <div class="span6">
       <h3 class="nd_inventory-table-head">By Software Release</h3>
-      <table class="table table-condensed">
+      <table class="table table-condensed table-hover">
         <thead>
           <tr>
             <th>OS</th>
diff --git a/TODO b/TODO
index 111830ea..0f82b4ab 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 FRONTEND
 ========
 
-* view job queue
 * view logs with colour
 * moar reports