diff --git a/html/pages/authlog.inc.php b/html/pages/authlog.inc.php
index 6b5b1b562d..2efd350fa8 100644
--- a/html/pages/authlog.inc.php
+++ b/html/pages/authlog.inc.php
@@ -1,8 +1,8 @@
 <?php
 echo "<h3>Authlog</h3>";
 if ($_SESSION['userlevel'] >= '10') {
-    echo '<table class="table table-hover table-condensed">';
-    echo "<th>Timestamp</th><th>User</th><th>IP Address</th><th>Result</th>";
+    echo '<table id="authlogtable" class="table table-hover table-condensed">';
+    echo "<thead><th data-column-id='timestamp'>Timestamp</th><th data-column-id='user'>User</th><th data-column-id='ip'>IP Address</th><th data-column-id='authres'>Result</th></thead><tbody>";
     foreach (dbFetchRows("SELECT *,DATE_FORMAT(datetime, '".$config['dateformat']['mysql']['compact']."') as humandate  FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250") as $entry) {
         if ($bg == $list_colour_a) {
             $bg = $list_colour_b;
@@ -28,7 +28,14 @@ if ($_SESSION['userlevel'] >= '10') {
 
     $pagetitle[] = 'Authlog';
 
-    echo '</table>';
+    echo '</tbody></table>';
 } else {
     include 'includes/error-no-perm.inc.php';
 }//end if
+?>
+<script>
+    $('#authlogtable').bootgrid({
+        rowCount: [50, 100, 250, -1],
+        columnSelection: true,
+    });
+</script>
diff --git a/html/pages/poll-log.inc.php b/html/pages/poll-log.inc.php
index 3c8da4528a..138aaf16b9 100644
--- a/html/pages/poll-log.inc.php
+++ b/html/pages/poll-log.inc.php
@@ -19,10 +19,10 @@ if (isset($vars['filter'])) {
 <script>
 
 searchbar = "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
-            "<div class=\"col-sm-9 actionBar\"><span class=\"pull-left\">"+
+            "<div class=\"col-sm-8 actionBar\"><span class=\"pull-left\">"+
             "<a href='<?php echo generate_url(array('page' => 'poll-log')); ?>' class='btn btn-primary btn-sm'>All devices</a> "+
             "<a href='<?php echo generate_url(array('page' => 'poll-log', 'filter' => 'unpolled')); ?>' class='btn btn-danger btn-sm'>Unpolled devices</a>"+
-            "</div><div class=\"col-sm-3 actionBar\"><p class=\"{{css.search}}\"></p><p class=\"{{css.actions}}\"></p></div>";
+            "</div><div class=\"col-sm-4 actionBar\"><p class=\"{{css.search}}\"></p><p class=\"{{css.actions}}\"></p></div>";
 
 var grid = $("#poll-log").bootgrid({
     ajax: true,