diff --git a/api/get_active_leases.js b/api/get_active_leases.js
index 36e5766..1a0906d 100644
--- a/api/get_active_leases.js
+++ b/api/get_active_leases.js
@@ -9,6 +9,37 @@ router.get('/', function(req, res, next) {
 	var lease_parser = require('../lib/lease_parser.js');
 	lease_parser.clean();
 
+	var dhcp_lease_data_return_buffer = {};
+
+	var search_string = req.query.search;
+	if (typeof search_string !== "undefined"){
+
+        for (var key in dhcp_lease_data) {
+
+            var matcher = new RegExp(search_string, "i");
+
+            if(
+                !matcher.test(dhcp_lease_data[key].mac_oui_vendor)
+                && !matcher.test(dhcp_lease_data[key].host)
+                && !matcher.test(key)
+                && !matcher.test(dhcp_lease_data[key].mac)
+            )
+                continue;
+
+
+            if(typeof dhcp_lease_data_return_buffer[key] !== "undefined")
+                dhcp_lease_data_return_buffer[key] = {};
+
+            dhcp_lease_data_return_buffer[key] = dhcp_lease_data[key];
+
+        }
+
+        res.setHeader('Content-Type', 'application/json');
+        res.send(JSON.stringify(dhcp_lease_data_return_buffer));
+
+        return true;
+	}
+
 	res.setHeader('Content-Type', 'application/json');
 	res.send(JSON.stringify(dhcp_lease_data));
 });
diff --git a/public/assets/css/glass.css b/public/assets/css/glass.css
index 2ff2d0c..dace32b 100644
--- a/public/assets/css/glass.css
+++ b/public/assets/css/glass.css
@@ -2,7 +2,7 @@
     margin-top: 5px !important;
 }
 
-@media all and (max-width: 1400px) and (min-width: 1000px){
+@media all and (max-width: 1600px) and (min-width: 1000px){
     .hide_col {
         display: none;
         width: 0;
diff --git a/public/templates/glass_alerts.html b/public/templates/glass_alerts.html
index 856ff21..3f3bf32 100644
--- a/public/templates/glass_alerts.html
+++ b/public/templates/glass_alerts.html
@@ -4,7 +4,7 @@
             <div class="card">
                 <div class="header">
                     <h2>
-                        Glass Alerts
+                        Glass Alerting
                     </h2>
                 </div>
                 <div class="body">
@@ -19,8 +19,7 @@
             <div class="card">
                 <div class="header">
                     <h2>
-                        Notification Settings
-
+                        Alerting Notification Settings
                     </h2>
                 </div>
                 <div class="body">