diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 69aafa87..797d0231 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -144,8 +144,18 @@ body {
 .nd_legendlabel {
   float: right;
   line-height: 1.2;
-  margin-top: 2px;
-  margin-right: 3px;
+}
+
+.nd_side_input {
+  width: 152px;
+}
+
+.nd_side_select {
+  width: 162px;
+}
+
+.sidebar .input-prepend {
+  margin-bottom: 0px;
 }
 
 /* nudge the port name/vlan filter over a little */
@@ -156,7 +166,6 @@ body {
 
 /* somewhere between span1 and span2 is desirable */
 #nd_days_select {
-  margin-left: -2px !important;
   margin-top: 4px;
   width: 56px;
 }
@@ -168,7 +177,11 @@ body {
 }
 
 /* sidebar submit button width and spacing from Node Props */
-#ports_submit {
+.sidebar button {
+  margin-top: 3px;
+  width: 160px;
+}
+.sidebar #ports_submit {
   margin-top: 3px;
   width: 152px;
 }
diff --git a/Netdisco/views/sidebar/search/device.tt b/Netdisco/views/sidebar/search/device.tt
index 88ed2d08..d4936d35 100644
--- a/Netdisco/views/sidebar/search/device.tt
+++ b/Netdisco/views/sidebar/search/device.tt
@@ -2,32 +2,32 @@
             <p><em>Device Search Options</em></p>
             <input name="q" value="[% params.q %]" type="hidden"/>
             <div class="clearfix">
-              <input class="span3" placeholder="System Name"
+              <input class="nd_side_input" placeholder="System Name"
                 type="text" name="name" value="[% params.name %]"
                 rel="tooltip" data-placement="left" data-offset="5" title="System Name"/>
             </div>
             <div class="clearfix">
-              <input class="span3" placeholder="Location"
+              <input class="nd_side_input" placeholder="Location"
                 type="text" name="location" value="[% params.location %]"
                 rel="tooltip" data-placement="left" data-offset="5" title="Location"/>
             </div>
             <div class="clearfix">
-              <input class="span3" placeholder="DNS"
+              <input class="nd_side_input" placeholder="DNS"
                 type="text" name="dns" value="[% params.dns %]"
                 rel="tooltip" data-placement="left" data-offset="5" title="DNS"/>
             </div>
             <div class="clearfix">
-              <input class="span3" placeholder="IP Address"
+              <input class="nd_side_input" placeholder="IP Address"
                 type="text" name="ip" value="[% params.ip %]"
                 rel="tooltip" data-placement="left" data-offset="5" title="IP Address"/>
             </div>
             <div class="clearfix">
-              <input class="span3" placeholder="Description"
+              <input class="nd_side_input" placeholder="Description"
                 type="text" name="description" value="[% params.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 %]"
+              <select class="nd_side_select" size="[% vars.model_list.size > 5 ? 5 : vars.model_list.size %]"
                 multiple="on" name="model"
                 rel="tooltip" data-placement="left" data-offset="5" title="Model"/>
                 [% FOREACH opt IN vars.model_list %]
@@ -36,7 +36,7 @@
               </select>
             </div>
             <div class="clearfix">
-              <select class="span3" size="[% vars.os_ver_list.size > 5 ? 5 : vars.os_ver_list.size %]"
+              <select class="nd_side_select" size="[% vars.os_ver_list.size > 5 ? 5 : vars.os_ver_list.size %]"
                 multiple="on" name="os_ver"
                 rel="tooltip" data-placement="left" data-offset="5" title="OS Release"/>
                 [% FOREACH opt IN vars.os_ver_list %]
@@ -45,7 +45,7 @@
               </select>
             </div>
             <div class="clearfix">
-              <select class="span3" size="[% vars.vendor_list.size > 5 ? 5 : vars.vendor_list.size %]"
+              <select class="nd_side_select" size="[% vars.vendor_list.size > 5 ? 5 : vars.vendor_list.size %]"
                 multiple="on" name="vendor"
                 rel="tooltip" data-placement="left" data-offset="5" title="Vendor"/>
                 [% FOREACH opt IN vars.vendor_list %]
@@ -55,10 +55,11 @@
             </div>
             <div class="clearfix input-prepend">
               <label class="add-on">
-                <input type="checkbox" id="matchall" name="matchall"[% ' checked="checked"' IF params.matchall %]/>
+                <input type="checkbox" id="matchall"
+                  name="matchall"[% ' checked="checked"' IF params.matchall %]/>
               </label>
               <label for="matchall">
                 <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
               </label>
             </div>
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info span3">Search Again</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>
diff --git a/Netdisco/views/sidebar/search/node.tt b/Netdisco/views/sidebar/search/node.tt
index e0efc631..76a907b8 100644
--- a/Netdisco/views/sidebar/search/node.tt
+++ b/Netdisco/views/sidebar/search/node.tt
@@ -3,7 +3,8 @@
             <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 %]/>
+                <input type="checkbox" id="stamps"
+                  name="stamps"[% ' checked="checked"' IF params.stamps %]/>
               </label>
               <label for="stamps">
                 <span class="nd_searchcheckbox uneditable-input">Time Stamps</span>
@@ -11,7 +12,8 @@
             </div>
             <div class="clearfix input-prepend">
               <label class="add-on">
-                <input type="checkbox" id="vendor" name="vendor"[% ' checked="checked"' IF params.vendor %]/>
+                <input type="checkbox" id="vendor"
+                  name="vendor"[% ' checked="checked"' IF params.vendor %]/>
               </label>
               <label for="vendor">
                 <span class="nd_searchcheckbox uneditable-input">Vendor</span>
@@ -19,21 +21,23 @@
             </div>
             <div class="clearfix input-prepend">
               <label class="add-on">
-                <input type="checkbox" id="archived" name="archived"[% ' checked="checked"' IF params.archived %]/>
+                <input type="checkbox" id="archived"
+                  name="archived"[% ' checked="checked"' IF params.archived %]/>
               </label>
               <label for="archived">
-                <span class="nd_searchcheckbox uneditable-input">Archived Data <span class="nd_legendlabel
-                  label label-warning">A</span></span>
+                <span class="nd_searchcheckbox uneditable-input">
+                  Archived Data <span class="nd_legendlabel label label-warning">A</span></span>
               </label>
             </div>
             [% IF vars.node_ip_has_dns_col %]
             <div class="clearfix input-prepend">
               <label class="add-on">
-                <input type="checkbox" id="partial" name="partial"[% ' checked="checked"' IF params.partial %]/>
+                <input type="checkbox" id="partial"
+                  name="partial"[% ' checked="checked"' IF params.partial %]/>
               </label>
               <label for="partial">
                 <span class="nd_searchcheckbox uneditable-input">Partial Name</span>
               </label>
             </div>
             [% END %]
-            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info span3">Search Again</button>
+            <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>