diff --git a/html/includes/table/devices.inc.php b/html/includes/table/devices.inc.php
index ed57e6c166..55084b97e1 100644
--- a/html/includes/table/devices.inc.php
+++ b/html/includes/table/devices.inc.php
@@ -166,7 +166,7 @@ foreach (dbFetchRows($sql, $param) as $device) {
     $port_count        = dbFetchCell('SELECT COUNT(*) FROM `ports` WHERE `device_id` = ?', array($device['device_id']));
     $sensor_count      = dbFetchCell('SELECT COUNT(*) FROM `sensors` WHERE `device_id` = ?', array($device['device_id']));
 
-    $actions  = ('<div class="row">
+    $actions  = ('<div class="container-fluid"><div class="row">
         <div class="col-xs-1">');
     $actions .= '<a href="'.generate_device_url($device).'"> <img src="images/16/server.png" border="0" align="absmiddle" alt="View device" title="View device" /></a> ';
     $actions .= ('</div>
@@ -190,7 +190,7 @@ foreach (dbFetchRows($sql, $param) as $device) {
         <div class="col-xs-1">
         <a href="https://'.$device['hostname'].'"><img src="images/16/http.png" alt="https" title="Launch browser https://'.$device['hostname'].'" border="0" width="16" height="16" target="_blank"></a>
         </div>
-        </div>');
+        </div></div>');
 
     $hostname = generate_device_link($device);
     $platform = $device['hardware'].'<br />'.$device['features'];
diff --git a/html/pages/logon.inc.php b/html/pages/logon.inc.php
index 05e4508c35..c56115db5a 100644
--- a/html/pages/logon.inc.php
+++ b/html/pages/logon.inc.php
@@ -5,37 +5,41 @@ if( $config['twofactor'] && isset($twofactorform) ) {
 else {
 ?>
       <div class="row">
-        <div class="col-md-4"></div>
-        <div class="col-md-4">
+        <div class="col-md-offset-4 col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">
                 <center>
                   <img src="images/librenms_logo_light.png">
-                </center></h3>
+                </center>
+              </h3>
             </div>
             <div class="panel-body">
               <div class="container-fluid">
                 <form class="form-horizontal" role="form" action="" method="post" name="logonform">
                     <div class="form-group">
-                      
-                        <input type="text" name="username" id="username" class="form-control" placeholder="Username" required autofocus />
-                      
+                        <div class="col-md-12">
+                            <input type="text" name="username" id="username" class="form-control" placeholder="Username" required autofocus />
+                        </div>
                     </div>
                     <div class="form-group">
-                      
-                        <input type="password" name="password" id="password" class="form-control" placeholder="Password" />
-                      
+                        <div class="col-md-12">
+                            <input type="password" name="password" id="password" class="form-control" placeholder="Password" />
+                        </div>
                     </div>
                     <div class="form-group">
-                      
-                        <label class="checkbox">
-                          <input type="checkbox" name="remember" id="remember" /> Remember me.
-                        </label>
-                      
+                        <div class="col-md-12">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="remember" id="remember" /> Remember me.
+                                </label>
+                            </div>
+                        </div>
                     </div>
                     <div class="form-group">
-                      <button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
+                        <div class="col-md-12">
+                            <button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
+                        </div>
                     </div>
                     <?php
                     if (isset($auth_message)) {