diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index a81648ae..4da002ad 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -45,7 +45,7 @@ function do_search (event, tab) {
 
   // in case of slow data load, let the user know
   $(target).html(
-    '<div class="span3 alert-message notice"><p>Waiting for results...</p></div>'
+    '<div class="span3 alert"><p>Waiting for results...</p></div>'
   );
 
   // submit the query and put results into the tab pane
@@ -53,14 +53,14 @@ function do_search (event, tab) {
     function(response, status, xhr) {
       if (status !== "success") {
         $(target).html(
-          '<div class="span6 alert-message error">' +
+          '<div class="span6 alert alert-error">' +
           '<p>Search failed! Please contact your site administrator.</p></div>'
         );
         return;
       }
       if (response === "") {
         $(target).html(
-          '<div class="span3 alert-message info"><p>No matching records.</p></div>'
+          '<div class="span3 alert alert-info"><p>No matching records.</p></div>'
         );
       }
 
diff --git a/Netdisco/views/index.tt b/Netdisco/views/index.tt
index abcbd99f..0223d054 100644
--- a/Netdisco/views/index.tt
+++ b/Netdisco/views/index.tt
@@ -1,40 +1,40 @@
 <div class="container">
   <div class="row nd_herorow">
-    <div class="span10 offset3">
+    <div class="span8 offset2">
       [% IF params.failed %]
-      <div class="alert-message error fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>Incorrect username or password, please try again.</p>
+      <div class="alert alert-error fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Incorrect username or password, please try again.
       </div>
       [% END %]
       [% IF params.logout %]
-      <div class="alert-message notice fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>You are now logged out.</p>
+      <div class="alert fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        You are now logged out.
       </div>
       [% END %]
       [% IF params.nosuchdevice %]
-      <div class="alert-message notice fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>Sorry, no such device is known.</p>
+      <div class="alert fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Sorry, no such device is known.
       </div>
       [% END %]
       [% IF vars.notfound %]
-      <div class="alert-message notice fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>Sorry, page not found.
-          <a href="http://sourceforge.net/tracker/?group_id=80033&atid=558508" target="_blank">Report a Bug?</a></p>
+      <div class="alert fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Sorry, page not found.
+          <a href="http://sourceforge.net/tracker/?group_id=80033&atid=558508" target="_blank">Report a Bug?</a>
       </div>
       [% END %]
       [% IF NOT session.user %]
-      <div class="alert-message success fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>Log in to the Demo with username &quot;demo&quot; and password &quot;demo&quot;.</p>
+      <div class="alert alert-success fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Log in to the Demo with username &quot;demo&quot; and password &quot;demo&quot;.
       </div>
       [% ELSE %]
-      <div class="alert-message success fade in" data-alert="on">
-        <a class="close" href="#">×</a>
-        <p>Hit <strong>Enter</strong> in the Search box to view the current Inventory (<em>temporary feature</em>).</p>
+      <div class="alert alert-success fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        Hit <strong>Enter</strong> in the Search box to view the current Inventory (<em>temporary feature</em>).
       </div>
       [% END %]
       <div class="hero-unit">