diff --git a/app/assets/stylesheets/bootstrap-complete.css.scss b/app/assets/stylesheets/bootstrap-complete.css.scss
index 2f2aa37262ae186e91f76e5aa50787981786d14d..53d179ba3ce2d3c3e51a9819e18cf6fed40a7583 100644
--- a/app/assets/stylesheets/bootstrap-complete.css.scss
+++ b/app/assets/stylesheets/bootstrap-complete.css.scss
@@ -1,8 +1,3 @@
 // Calling this file bootstrap would cause an infinite recursion during asset compilation.
 @import 'bootstrap';
-
-// Add padding to the top of the page to prevent navbar overlap (see Bootstrap docs).
-// Adjust as needed, minimum 40px
-body { padding-top: 60px; }
-
 @import 'bootstrap-responsive';
\ No newline at end of file
diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css
index 2ccffdf09ed1cbee8b4be1bed68206e2dd32130b..b4c66656d236b76672987a165840bf5a644bd5e0 100644
--- a/app/assets/stylesheets/default.css
+++ b/app/assets/stylesheets/default.css
@@ -7,7 +7,7 @@
 *= require tags
 *= require hovercard
 
-*= require bootstrap-complete
+*= require vendor/interim-bootstrap
 *= require vendor/facebox
 *= require vendor/fileuploader
 *= require vendor/autoSuggest
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index a985034235fd1b8c1a8430e8de8c8f899ed1d88c..66d4d877fe328b355c2229725413b9dfce6351ac 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -1,10 +1,6 @@
 @import "_new_mixins";
 
-/* bootstrap extentions and overrides for asset pipeline
- * The glyphicons-halflings and glyphicons-halflings-white sprites are included in
- * bootstrap-sass.
- */
-.icon-black { background-image: image_url("glyphicons-halflings.png") }
+/* bootstrap extentions */
 .icon-red   { background-image: image_url("img/glyphicons-halflings-red.png");   }
 .icon-green { background-image: image_url("img/glyphicons-halflings-green.png"); }
 .icon-blue  { background-image: image_url("img/glyphicons-halflings-blue.png");  }
diff --git a/app/assets/stylesheets/vendor/interim-bootstrap.css b/app/assets/stylesheets/vendor/interim-bootstrap.css
deleted file mode 100644
index f167b079babef1f65381545c48bd040388c5e37c..0000000000000000000000000000000000000000
--- a/app/assets/stylesheets/vendor/interim-bootstrap.css
+++ /dev/null
@@ -1,163 +0,0 @@
-.twipsy {
-  display: block;
-  position: absolute;
-  visibility: visible;
-  padding: 5px;
-  font-size: 11px;
-  z-index: 1000;
-  filter: alpha(opacity=80);
-  -khtml-opacity: 0.8;
-  -moz-opacity: 0.8;
-  opacity: 0.8;
-}
-.twipsy.fade.in {
-  filter: alpha(opacity=80);
-  -khtml-opacity: 0.8;
-  -moz-opacity: 0.8;
-  opacity: 0.8;
-}
-.twipsy.above .twipsy-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.twipsy.left .twipsy-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.twipsy.below .twipsy-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.twipsy.right .twipsy-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.twipsy-inner {
-  padding: 3px 8px;
-  background-color: #000000;
-  color: white;
-  text-align: center;
-  max-width: 200px;
-  text-decoration: none;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.twipsy-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  padding: 5px;
-  display: none;
-}
-.popover.above .arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #000000;
-}
-.popover.right .arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-right: 5px solid #000000;
-}
-.popover.below .arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-}
-.popover.left .arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
-}
-.popover .arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-}
-.popover .inner {
-  background-color: #000000;
-  background-color: rgba(0, 0, 0, 0.8);
-  padding: 3px;
-  overflow: hidden;
-  width: 280px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-}
-.popover .title {
-  background-color: #f5f5f5;
-  padding: 9px 15px;
-  line-height: 1;
-  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 3px 3px 0 0;
-  border-bottom: 1px solid #eee;
-}
-.popover .content {
-  background-color: #ffffff;
-  padding: 14px;
-  -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
-  border-radius: 0 0 3px 3px;
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.popover .content p, .popover .content ul, .popover .content ol {
-  margin-bottom: 0;
-}
-.fade {
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -ms-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
-  opacity: 0;
-}
-.fade.in {
-  opacity: 1;
-}
-
-/* hacks */
-.popover h3 {
-  margin-bottom: 0;
-  font-weight: bold;
-}
diff --git a/app/assets/stylesheets/vendor/interim-bootstrap.css.scss b/app/assets/stylesheets/vendor/interim-bootstrap.css.scss
new file mode 100644
index 0000000000000000000000000000000000000000..531710600b1486289d1d1b4b6df1e16a152b6390
--- /dev/null
+++ b/app/assets/stylesheets/vendor/interim-bootstrap.css.scss
@@ -0,0 +1,13 @@
+// Load the necessary styles from the bootstrap-sass partials to keep this file
+// up to date with the version of Bootstrap we're using.
+@import "bootstrap/mixins";
+@import "bootstrap/variables";
+@import "bootstrap/tooltip";
+@import "bootstrap/popovers";
+@import "bootstrap/component-animations";
+
+/* hacks */
+.popover h3 {
+  margin-bottom: 0;
+  font-weight: bold;
+}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f42ed8410233f8efec5a812dac8790c1c58c7376..22984d4aaac6a031ac8a6135457e3c18bd756ab3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -54,7 +54,7 @@
       - if @aspect == :getting_started || @page == :logged_out
         = yield
       - else
-        .row
+        .span-24.last
           = yield
 
     - unless @landing_page