diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 5de2e253..3c90b1b8 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -5,6 +5,7 @@ body {
   padding-top: 50px;
 }
 
+/* magnifying glass icon for search box */
 .navbar_icon {
   vertical-align: middle;
   cursor: pointer;
@@ -13,10 +14,6 @@ body {
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* various styles to adjust the hero box used for homepage + login */
 
-.nd_loginalert {
-  margin-top: -40px;
-}
-
 .nd_herorow {
   margin-top: 50px;
 }
@@ -26,7 +23,7 @@ body {
 }
 
 .nd_loginform {
-  margin-top: 30px;
+  margin-top: 15px;
   margin-bottom: 0px;
 }
 
diff --git a/Netdisco/views/index.tt b/Netdisco/views/index.tt
index 0223d054..8323b6d2 100644
--- a/Netdisco/views/index.tt
+++ b/Netdisco/views/index.tt
@@ -42,7 +42,7 @@
         <small>Netdisco is an Open Source web-based network management tool.</small>
         [% IF NOT session.user %]
         <form class="nd_loginform" method="post" action="[% uri_for('/login') %]">
-          <div class="inline-inputs">
+          <div class="form-horizontal">
             <input placeholder="Username" class="span2" name="username" type="text"/>
             <input placeholder="Password" class="span2" name="password" type="password"/>
             <button type="submit" class="btn info">Log In</button>