diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html
index acbca9bae..74c25c692 100644
--- a/puppetboard/templates/_macros.html
+++ b/puppetboard/templates/_macros.html
@@ -56,7 +56,19 @@
     "search": {"regex": true},
     // Default sort
     "order": [[ 0, "desc" ]],
-    // Custom options
+    // Rendering - add rendering options for columns
+    "columnDefs": [ {
+      "targets": -1,
+      "data:": null,
+      "render": function (data, type, full, meta) {
+       shorta = data.replace(/[{},]/g, "<br />");
+       shortb = shorta.replace(/u'/g, " "); 
+       shortc = shortb.replace(/'/g, " "); 
+       return shortc;
+       }}],
+      // Custom options
+      {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
+    });
     {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
   });
 
diff --git a/puppetboard/templates/favicon.ico b/puppetboard/templates/favicon.ico
new file mode 100644
index 000000000..b502e6748
Binary files /dev/null and b/puppetboard/templates/favicon.ico differ
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 5c740a2ba..308a5dc7e 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -3,6 +3,7 @@
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{config.PAGE_TITLE}}</title>
+    <button id="export_data_button" style="clear: right;width:127px;height:50px;color:#0a214a;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -56,6 +57,64 @@
           $.getScript('{{url_for('static', filename='js/tables.js')}}')
           {% block onload_script %} {% endblock onload_script %}
         })
+       
+      $('#export_data_button').click(function() {
+        var titles = [];
+        var data = [];
+
+        $('.dataTable th').each(function() {
+          titles.push($(this).text());
+          });
+
+        $('.dataTable td').each(function() {
+          data.push($(this).text());
+          });
+  
+        var CSVString = prepCSVRow(titles, titles.length, '');
+        CSVString = prepCSVRow(data, titles.length, CSVString);
+
+        var downloadLink = document.createElement("a");
+        var blob = new Blob(["\ufeff", CSVString]);
+        var url = URL.createObjectURL(blob);
+        downloadLink.href = url;
+        downloadLink.download = "puppetboard_data.csv";
+
+        document.body.appendChild(downloadLink);
+        downloadLink.click();
+        document.body.removeChild(downloadLink);
+        });
+
+      function prepCSVRow(arr, columnCount, initial) {
+        var row = ''; 
+        var delimeter = ','; 
+        var newLine = '\r\n'; 
+
+        function splitArray(_arr, _count) {
+          var splitted = [];
+          var result = [];
+          _arr.forEach(function(item, idx) {
+            if ((idx + 1) % _count === 0) {
+              splitted.push(item);
+              result.push(splitted);
+              splitted = [];
+              } else {
+              splitted.push(item);
+              }
+            });
+            return result;
+            }
+      
+          var plainArr = splitArray(arr, columnCount);
+
+         plainArr.forEach(function(arrItem) {
+           arrItem.forEach(function(item, idx) {
+            row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
+            });
+          row += newLine;
+          });
+            return initial + row;
+        };
+
     </script>
     {% block head %} {% endblock head %}
   </head>
