diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index eef01bbb..c17e5f4b 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -39,6 +39,9 @@ function create_log_table(obj_json) {
     else if ( chansplit[1] == "WARNING" ){
         tr.className = "warning";
     }
+    else if ( chansplit[1] == "CRITICAL"){
+        tr.className = "critical"
+    }
 
     source_link = document.createElement("A");
     if (parsedmess[1] == "slexy.org"){
@@ -70,8 +73,17 @@ function create_log_table(obj_json) {
     tr.appendChild(nam);
     tr.appendChild(msage);
 
+    if (tr.className == document.getElementById("checkbox_log_info").value && document.getElementById("checkbox_log_info").checked  == true) {
+           tableBody.appendChild(tr); 
+       }
+    if (tr.className == document.getElementById("checkbox_log_warning").value && document.getElementById("checkbox_log_warning").checked == true) {
+        tableBody.appendChild(tr);
+    }
+    if (tr.className == document.getElementById("checkbox_log_critical").value && document.getElementById("checkbox_log_critical").checked == true) {
+        tableBody.appendChild(tr);
+    };
+
     var sel = document.getElementById("log_select")
-    tableBody.appendChild(tr);
     if (tableBody.rows.length > sel.options[sel.options.selectedIndex].value){
         while (tableBody.rows.length != sel.options[sel.options.selectedIndex].value){
             tableBody.deleteRow(0);
diff --git a/var/www/templates/index.html b/var/www/templates/index.html
index 4c732d60..ac06d919 100644
--- a/var/www/templates/index.html
+++ b/var/www/templates/index.html
@@ -82,24 +82,24 @@
         <div class="panel panel-default">
         <div class="panel-heading">
             <i class="fa fa-tasks fa-fw"></i> Logs
+            <div class="pull-right">
+                <label style="padding-bottom:2px;">
+		<select class="form-control input-sm" id="log_select">
+		<option value="10">10</option>
+		<option value="25">25</option>
+		<option value="50">50</option>
+		<option value="100">100</option>
+		</select>
+                </label>
+		<input id="checkbox_log_info" type="checkbox" value="info"> INFO
+		<input id="checkbox_log_warning" type="checkbox" value="warning"> WARNING
+		<input id="checkbox_log_critical" type="checkbox" value="critical"> CRITICAL
+ 
+            </div>
         </div>
         <div class="panel-body">
                 <div class="table-responsive", id="logger">
                     <div class="row">
-                    <div class="col-sm-6">
-                        <div id="dataTables-example_length" class="dataTables_length">
-                        <label>
-                        <select class="form-control input-sm" name="dataTables-example_length" aria-controls="dataTables-example" id="log_select">
-                        <option value="10">10</option>
-                        <option value="25">25</option>
-                        <option value="50">50</option>
-                        <option value="100">100</option>
-                        </select>
-                        </label>
-                        </div>
-                        <input type="checkbox">
-                    </div>
-                    </div>
                     <table class="table table-bordered table-hover table-striped" id="table_log">
                         <thead>
                         <tr>