diff --git a/website/web/static/tree.js b/website/web/static/tree.js
index 2de326d..5d6f5ff 100644
--- a/website/web/static/tree.js
+++ b/website/web/static/tree.js
@@ -1,17 +1,20 @@
+"use strict";
 // From : https://bl.ocks.org/d3noob/43a860bc0024792f8803bba8ca0d5ecd
 
 // Set the dimensions and margins of the diagram
-var margin = {top: 20, right: 200, bottom: 30, left: 90},
-    width = 960 - margin.left - margin.right,
-    height = 1000 - margin.top - margin.bottom;
+let margin = {
+    top: 20,
+    right: 200,
+    bottom: 30,
+    left: 90
+};
+let width = 960 - margin.left - margin.right;
+let height = 1000 - margin.top - margin.bottom;
 
-var node_width = 0;
-var max_overlay_width = 1500;
-var default_max_overlay_height = 500;
-var node_height = 55;
-var t = d3.transition().duration(750);
+let node_width = 0;
+let node_height = 55;
 
-var main_svg = d3.select("body").append("svg")
+let main_svg = d3.select("body").append("svg")
             .attr("width", width + margin.right + margin.left)
             .attr("height", height + margin.top + margin.bottom)
 
@@ -22,23 +25,11 @@ d3.select('body')
     .attr('class', 'tooltip')
     .attr('style', 'position: absolute; opacity: 0;');
 
-main_svg.append("clipPath")
-    .attr("id", "textOverlay")
-    .append("rect")
-    .attr('width', max_overlay_width - 25)
-    .attr('height', node_height);
-
-main_svg.append("clipPath")
-    .attr("id", "overlayHeight")
-    .append("rect")
-    .attr('width', max_overlay_width)
-    .attr('height', default_max_overlay_height + 100);
-
-// Define stuff
-var defs = main_svg.append("defs");
+// Define SVGs
+let defs = main_svg.append("defs");
 
 // Add background pattern
-var pattern = defs.append('pattern')
+let pattern = defs.append('pattern')
     .attr('id', 'backstripes')
     .attr('x', margin.left)
     .attr("width", node_width * 2)
@@ -53,103 +44,87 @@ pattern.append('rect')
 // append the svg object to the body of the page
 // appends a 'group' element to 'svg'
 // moves the 'group' element to the top left margin
-var node_container = main_svg
-  .append("g")
-  .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-var i = 0,
-    duration = 750;
+let node_container = main_svg.append("g")
+                             .attr("transform", `translate(${margin.left},${margin.top})`);
 
 // Assigns parent, children, height, depth
-var root = d3.hierarchy(treeData);
+let root = d3.hierarchy(treeData);
 root.x0 = height / 2;  // middle of the page
 root.y0 = 0;
 
 // declares a tree layout
-var tree = d3.tree();
+let tree = d3.tree();
 update(root);
 
-// Collapse the node and all it's children
-function collapse(d) {
-  if(d.children) {
-    d._children = d.children
-    d._children.forEach(collapse)
-    d.children = null
-  }
-};
-
 function openTreeInNewTab(capture_uuid, hostnode_uuid=null) {
-    var url = '/tree/' + capture_uuid;
-    if (hostnode_uuid) {
-        url += '/' + hostnode_uuid;
-    };
-    var win = window.open(url, '_blank');
-    // FIXME: If win is None, the browser didn't allow opening a new tab, we need to inform the user.
+    let url = `/tree/${capture_uuid}`;
+    if (hostnode_uuid != null) {
+        url += `/${hostnode_uuid}`;
+    }
+    let win = window.open(url, '_blank');
+    if (win == null) {
+        alert("The browser didn't allow Lookyloo to open a new tab. There should be an icon on the right of your URL bar to allow it.");
+    }
     win.focus();
 }
 
-function urlnode_click(d) {
-    var url = "/tree/url/" + d.data.uuid;
-    d3.blob(url, {credentials: 'same-origin'}).then(data => {
-        var file = new File([data], "file.zip", {type: "application/zip"});
-        saveAs(file);
-    });
-};
+function open_hostnode_popup(d) {
+    let win = window.open(`/tree/${treeUUID}/hostname_popup/${d.data.uuid}`, '_blank', 'width=1024,height=768,left=200,top=100');
+    if (win == null) {
+        alert("The browser didn't allow Lookyloo to open a pop-up. There should be an icon on the right of your URL bar to allow it.");
+    }
+    win.focus();
+}
 
-function hostnode_click_popup(d) {
-    window.open('/tree/' + treeUUID + '/hostname_popup/' + d.data.uuid, '_blank', 'width=1024,height=768,left=200,top=100');
-};
-
-function LocateNode(urlnode_uuid) {
-    var element = document.getElementById("node_" + urlnode_uuid);
+function LocateNode(hostnode_uuid) {
+    let element = document.getElementById(`node_${hostnode_uuid}`);
     element.scrollIntoView({behavior: "smooth", block: "center", inline: "center"});
 
-    var line_arrow = d3.select("#node_" + urlnode_uuid)
-                        .append('g')
-                            .attr('cursor', 'pointer')
-                            .on('click', function() {
-                                this.remove();
-                            });
+    let line_arrow = d3.select(`#node_${hostnode_uuid}`)
+                       .append('g')
+                        .attr('cursor', 'pointer')
+                        .on('click', function() {
+                            this.remove();
+                        });
 
-    function lineData(d){
-        var points = [
-            {lx: d.source.x, ly: d.source.y},
-            {lx: d.target.x, ly: d.source.y},
-            {lx: d.target.x, ly: d.target.y}
-        ];
-        return line(points);
-    };
-
-    var line = d3.line()
+    let line = d3.line()
                     // Other options: http://bl.ocks.org/d3indepth/raw/b6d4845973089bc1012dec1674d3aff8/
                     //.curve(d3.curveCardinal)
                     .curve(d3.curveBundle)
-                    .x( function(point) { return point.lx; })
-                    .y( function(point) { return point.ly; });
+                    .x(point => point.lx)
+                    .y(point => point.ly);
 
-    var line_tip = d3.symbol()
+    let line_tip = d3.symbol()
                     .type(d3.symbolTriangle)
                     .size(200);
 
 
-    var path = line_arrow
+    let path = line_arrow
         .append("path")
         .attr("stroke-width", "3")
         .attr("stroke", "black")
         .attr("fill", "none")
-        .data([{source: {x : node_width/2, y : -100}, target: {x : node_width/4, y : -node_height/2}}])
+        .data([{
+            source: {x: node_width/2, y: -100},
+            target: {x: node_width/4, y: -node_height/2}
+        }])
         .attr("class", "line")
-        .attr("d", lineData);
+        .attr("d", d => line(
+            [{lx: d.source.x, ly: d.source.y},
+             {lx: d.target.x, ly: d.source.y},
+             {lx: d.target.x, ly: d.target.y}
+            ])
+        );
 
-    var arrow = line_arrow
+    let arrow = line_arrow
         .append("path")
         .attr("d", line_tip)
         .attr("stroke", 'black')
         .style('stroke-width', '3')
         .attr("fill", 'white')
-        .attr("transform", function(d) { return "translate(" + node_width/4 + "," + -node_height/1.5 + ") rotate(60)"; });;
+        .attr("transform", `translate(${node_width / 4}, ${-node_height / 1.5}) rotate(60)`);
 
-    function glow() {
+    let glow = () => {
         line_arrow.selectAll('path')
             .transition().duration(1000)  //Set transition
             .style('stroke-width', '7')
@@ -157,13 +132,16 @@ function LocateNode(urlnode_uuid) {
             .transition().duration(1000)  //Set transition
             .style('stroke-width', '3')
             .style('stroke', 'black')
-            .on("end", function() {
-                if (++i > 15) line_arrow.remove();
-                glow();
+            .on("end", () => {
+                if (++i > 15) {
+                    line_arrow.remove();
+                } else {
+                    glow();
+                }
             });
     };
 
-    var i = 0;
+    let i = 0;
     glow();
 };
 
@@ -172,127 +150,55 @@ function UnflagAllNodes() {
     d3.selectAll('.node_data').select('text').style('fill', 'black');
     d3.selectAll('.node_data').select("#flag")
         .text("🏁")
-        .on('click', function(d) {
-            PermanentNodeHighlight(d.data.uuid);
-        })
-        .on('mouseover', d => {
+        .on('click', d => NodeHighlight(d.data.uuid))
+        .on('mouseover',() => {
             d3.select('#tooltip')
                 .style('opacity', 1)
-                .style('left', (d3.event.pageX+10) + 'px')
-                .style('top', (d3.event.pageY+10) + 'px')
-                .text('Flag this node for further analysis');
+                .style('left', `${d3.event.pageX + 10}px`)
+                .style('top', `${d3.event.pageY + 10}px`)
+                .text('Flag this node');
         })
-        .on('mouseout', function() {
-            d3.select('#tooltip')
-                .style('opacity', 0);
-        });
+        .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
 };
 
 function UnflagHostNode(hostnode_uuid) {
-    d3.select("#node_" + hostnode_uuid).select('rect').style('fill', 'white');
-    d3.select("#node_" + hostnode_uuid).select('text').style('fill', 'black');
-    d3.select("#node_" + hostnode_uuid).select("#flag")
+    d3.select(`#node_${hostnode_uuid}`).select('rect').style('fill', 'white');
+    d3.select(`#node_${hostnode_uuid}`).select('text').style('fill', 'black');
+    d3.select(`#node_${hostnode_uuid}`).select("#flag")
         .text("🏁")
-        .on('click', function(d) {
-            PermanentNodeHighlight(d.data.uuid);
-        })
-        .on('mouseover', d => {
+        .on('click', d => NodeHighlight(d.data.uuid))
+        .on('mouseover', () => {
             d3.select('#tooltip')
                 .style('opacity', 1)
-                .style('left', (d3.event.pageX+10) + 'px')
-                .style('top', (d3.event.pageY+10) + 'px')
-                .text('Flag this node for further analysis');
+                .style('left', `${d3.event.pageX + 10}px`)
+                .style('top', `${d3.event.pageY + 10}px`)
+                .text('Flag this node');
         })
-        .on('mouseout', function() {
-            d3.select('#tooltip')
-                .style('opacity', 0);
-        });
+        .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
 };
 
-function PermanentNodeHighlight(hostnode_uuid) {
-    var element = document.getElementById("node_" + hostnode_uuid);
+function NodeHighlight(hostnode_uuid) {
+    let element = document.getElementById(`node_${hostnode_uuid}`);
     element.scrollIntoView({behavior: "smooth", block: "center", inline: "nearest"});
 
-    d3.select("#node_" + hostnode_uuid).select('rect').style('fill', 'black');
-    d3.select("#node_" + hostnode_uuid).select('text').style('fill', 'white');
-    d3.select("#node_" + hostnode_uuid).select("#flag")
+    d3.select(`#node_${hostnode_uuid}`).select('rect').style('fill', 'black');
+    d3.select(`#node_${hostnode_uuid}`).select('text').style('fill', 'white');
+    d3.select(`#node_${hostnode_uuid}`).select("#flag")
         .text('❌')
-        .on('click', function(d) {
-            UnflagHostNode(d.data.uuid);
-        })
-        .on('mouseover', d => {
+        .on('click', d => UnflagHostNode(d.data.uuid))
+        .on('mouseover', () => {
             d3.select('#tooltip')
                 .style('opacity', 1)
-                .style('left', (d3.event.pageX+10) + 'px')
-                .style('top', (d3.event.pageY+10) + 'px')
+                .style('left', `${d3.event.pageX + 10}px`)
+                .style('top', `${d3.event.pageY + 10}px`)
                 .text('Remove flag on this node');
         })
-        .on('mouseout', function() {
-            d3.select('#tooltip')
-                .style('opacity', 0);
-        });
+        .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
 };
 
-function icon(key, icon_path, d, icon_size){
-    var iconContent = d3.create("svg") // WARNING: svg is required there, "g" doesn't have getBBox
-                        .attr('class', 'icon');
-    var has_icon = false;
-
-    iconContent.datum(d);
-    iconContent.filter(d => {
-            if (['cookies_sent', 'cookies_received'].includes(key)) {
-                return false;
-            }
-            if (typeof d.data[key] === 'boolean') {
-                has_icon = d.data[key];
-            } else if (typeof d.data[key] === 'number') {
-                has_icon = d.data[key] > 0;
-            } else if (d.data[key] instanceof Array) {
-                has_icon = d.data[key].length > 0;
-            }
-            return has_icon;
-        }).append('image')
-            .attr("width", icon_size)
-            .attr("height", icon_size)
-            .attr("xlink:href", icon_path);
-
-
-    iconContent.filter(d => {
-            if (['cookies_sent', 'cookies_received'].includes(key)) {
-                return false;
-            }
-            if (typeof d.data[key] === 'boolean') {
-                return false;
-                // return d.data[key];
-            } else if (typeof d.data[key] === 'number') {
-                d.to_print = d.data[key]
-                return d.data[key] > 0;
-            } else if (d.data[key] instanceof Array) {
-                d.to_print = d.data[key].length
-                return d.data[key].length > 0;
-            }
-            return false;
-        }).append('text')
-          .attr("dy", 8)
-          .style("font-size", "10px")
-          .attr('x', icon_size + 1)
-          .text(d => d.to_print);
-
-    if (has_icon) {
-        return iconContent.node();
-    }
-    return false;
-};
-
-function icon_list(relative_x_pos, relative_y_pos, d, url_view=false) {
-    var icon_size = 16;
-
-    // Put all the icone in one sub svg document
-    var icons = d3.create("svg")  // WARNING: svg is required there, "g" doesn't have getBBox
-          .attr('x', relative_x_pos)
-          .attr('y', relative_y_pos)
-          .datum(d);
-    icon_options = [
+function icon_list(relative_x_pos, relative_y_pos, d) {
+    const icon_size = 16;
+    let icon_options = new Map([
         ['js', "/static/javascript.png"],
         ['exe', "/static/exe.png"],
         ['css', "/static/css.png"],
@@ -304,33 +210,71 @@ function icon_list(relative_x_pos, relative_y_pos, d, url_view=false) {
         ['unknown_mimetype', "/static/wtf.png"],
         ['video', "/static/video.png"],
         ['request_cookie', "/static/cookie_read.png"],
-        ['cookies_sent', "/static/cookie_read.png"],
         ['response_cookie', "/static/cookie_received.png"],
-        ['cookies_received', "/static/cookie_received.png"],
         ['redirect', "/static/redirect.png"],
         ['redirect_to_nothing', "/static/cookie_in_url.png"]
-    ];
+    ]);
 
-    icon_options.forEach(entry => {
-        bloc = icon(entry[0], entry[1], d, icon_size, url_view);
-        if (bloc){
-            icons.append(() => bloc);
-        };
-    })
+    // Put all the icone in one sub svg document
+    let icons = d3.create("svg")
+          .attr('x', relative_x_pos)
+          .attr('y', relative_y_pos);
+
+    icon_options.forEach(function(value, key) {
+        icons
+          .datum(d)
+          .filter(d => {
+            let has_icon = false;
+            if (typeof d.data[key] === 'boolean') {
+                has_icon = d.data[key];
+            } else if (typeof d.data[key] === 'number') {
+                has_icon = d.data[key] > 0;
+            } else if (d.data[key] instanceof Array) {
+                has_icon = d.data[key].length > 0;
+            }
+            return has_icon;
+          })
+            .append("svg")
+            .attr('class', 'icon')
+            .attr('id', key)
+            .append('image')
+            .attr("width", icon_size)
+            .attr("height", icon_size)
+            .attr("xlink:href", value);
+    });
+
+    icons.selectAll('.icon')
+            .datum(d)
+            .filter(function(d) {
+                if (typeof d.data[this.id] === 'boolean') {
+                    return false;
+                } else if (typeof d.data[this.id] === 'number') {
+                    d.to_print = d.data[this.id]
+                    return d.data[this.id] > 0;
+                } else if (d.data[this.id] instanceof Array) {
+                    d.to_print = d.data[this.id].length
+                    return d.data[this.id].length > 0;
+                }
+                return false;
+            }).append('text')
+              .attr("dy", 8)
+              .style("font-size", "10px")
+              .attr('x', icon_size + 1)
+              .text(d => d.to_print);
 
     return icons.node();
 }
 
 function text_entry(relative_x_pos, relative_y_pos, onclick_callback, d) {
     // Avoid hiding the content after the circle
-    var nodeContent = d3.create("svg")  // WARNING: svg is required there, "g" doesn't have getBBox
+    let nodeContent = d3.create("svg")  // WARNING: svg is required there, "g" doesn't have getBBox
           .attr('height', node_height)
           .attr('x', relative_x_pos)
           .attr('y', relative_y_pos)
           .datum(d);
 
     // Add labels for the nodes
-    var text_nodes = nodeContent.append("text")
+    let text_nodes = nodeContent.append("text")
           .attr('dy', '.9em')
           .attr("stroke", "white")
           .style("font-size", "16px")
@@ -338,10 +282,17 @@ function text_entry(relative_x_pos, relative_y_pos, onclick_callback, d) {
           .style("opacity", .9)
           .attr("clip-path", "url(#textOverlay)")
           .text(d => {
-            if (d.data.urls_count) {
-              return d.data.name + ' (' + d.data.urls_count + ')'
+            let to_print;
+            if (d.data.name.length > 50) {
+                to_print = `[...] ${d.data.name.substring(d.data.name.length - 50, d.data.name.length)}`;
+            } else {
+                to_print = d.data.name
+            };
+
+            if (d.data.urls_count > 1) {
+              return `${to_print} (${d.data.urls_count})`;
             }
-            return d.data.name
+            return to_print;
           });
 
     text_nodes
@@ -350,14 +301,11 @@ function text_entry(relative_x_pos, relative_y_pos, onclick_callback, d) {
         .on('mouseover', d => {
             d3.select('#tooltip')
                 .style('opacity', 1)
-                .style('left', (d3.event.pageX+10) + 'px')
-                .style('top', (d3.event.pageY+10) + 'px')
+                .style('left', `${d3.event.pageX + 10}px`)
+                .style('top', `${d3.event.pageY + 10}px`)
                 .text('Open investigation pop-up.');
         })
-        .on('mouseout', function() {
-            d3.select('#tooltip')
-                .style('opacity', 0);
-        });
+        .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
     return nodeContent.node();
 }
 
@@ -365,7 +313,7 @@ function text_entry(relative_x_pos, relative_y_pos, onclick_callback, d) {
 function update(root, computed_node_width=0) {
 
   // Current height of the tree (cannot use height because it isn't recomputed when we rename children -> _children)
-  var max_depth = 1
+  let max_depth = 1
   root.each(d => {
     if (d.children){
       max_depth = d.depth > max_depth ? d.depth : max_depth;
@@ -375,14 +323,14 @@ function update(root, computed_node_width=0) {
   if (computed_node_width != 0) {
     computed_node_width += 30;
     // Re-compute SVG size depending on the generated tree
-    var newWidth = Math.max((max_depth + 1) * computed_node_width, node_width);
+    let newWidth = Math.max((max_depth + 1) * computed_node_width, node_width);
     // Update height
     // node_height is the height of a node, node_height * 25 is the minimum so the root node isn't behind the menu
-    var newHeight = Math.max(root.descendants().reverse().length * node_height, 25 * node_height);
+    let newHeight = Math.max(root.descendants().reverse().length * node_height, 25 * node_height);
     tree.size([newHeight, newWidth])
 
     // Set background based on the computed width and height
-    var background = main_svg.insert('rect', ':first-child')
+    let background = main_svg.insert('rect', ':first-child')
       .attr('y', 0)
       // FIXME: + 200 doesn't make much sense...
       .attr('width', newWidth + margin.right + margin.left + 200)
@@ -404,14 +352,28 @@ function update(root, computed_node_width=0) {
   }
 
   // Assigns the x and y position for the nodes
-  var treemap = tree(root);
+  let treemap = tree(root);
 
   // Compute the new tree layout. => Note: Need d.x & d.y
-  var nodes = treemap.descendants(),
+  let nodes = treemap.descendants(),
       links = treemap.descendants().slice(1);
 
   // ****************** Nodes section ***************************
 
+  // Toggle children on click.
+  let toggle_children_collapse = (d) => {
+    if (d.children) {
+        d._children = d.children;
+        d.children = null;
+    }
+    else {
+        d.children = d._children;
+        d._children = null;
+    }
+    // Call update on the whole Tree
+    update(d.ancestors().reverse()[0]);
+  };
+
   // Update the nodes...
   const tree_nodes = node_container.selectAll('g.node')
       .data(nodes, node => node.data.uuid);
@@ -419,10 +381,10 @@ function update(root, computed_node_width=0) {
   tree_nodes.join(
         // Enter any new modes at the parent's previous position.
         enter => {
-            var node_group = enter.append('g')
+            let node_group = enter.append('g')
                 .attr('class', 'node')
-                .attr("id", d => 'node_' + d.data.uuid)
-                .attr("transform", "translate(" + root.y0 + "," + root.x0 + ")")
+                .attr("id", d => `node_${d.data.uuid}`)
+                .attr("transform", `translate(${root.y0}, ${root.x0})`);
 
             node_group
                 // Add Circle for the nodes
@@ -430,9 +392,9 @@ function update(root, computed_node_width=0) {
                 .attr('class', 'node')
                 .attr('r', 1e-6)
                 .style("fill", d => d._children ? "lightsteelblue" : "#fff")
-                .on('click', click);
+                .on('click', toggle_children_collapse);
 
-            var node_data = node_group
+            let node_data = node_group
               .append('svg')
               .attr('class', 'node_data')
               .attr('x', 0)
@@ -452,29 +414,29 @@ function update(root, computed_node_width=0) {
 
             // Set Hostname text
             node_data
-              .append(d => text_entry(15, 5, hostnode_click_popup, d));  // Popup
+              .append(d => text_entry(15, 5, open_hostnode_popup, d));  // Popup
             // Set list of icons
             node_data
               .append(d => icon_list(17, 35, d));
 
 
-            node_group.select('.node_data').each(function(p, j){
+            node_group.select('.node_data').each(function(d){
                 // set position of icons based of their length
-                var cur_icon_list_len = 0;
-                d3.select(this).selectAll('.icon').each(function(p, j){
+                let cur_icon_list_len = 0;
+                d3.select(this).selectAll('.icon').each(function(){
                     d3.select(this).attr('x', cur_icon_list_len);
                     cur_icon_list_len += d3.select(this).node().getBBox().width;
                 });
 
 
                 // Rectangle around the domain name & icons
-                var selected_node_bbox = d3.select(this).node().getBBox();
+                let selected_node_bbox_init = d3.select(this).node().getBBox();
                 d3.select(this).select('rect')
-                  .attr('height', selected_node_bbox.height + 15)
-                  .attr('width', selected_node_bbox.width + 50);
+                  .attr('height', selected_node_bbox_init.height + 15)
+                  .attr('width', selected_node_bbox_init.width + 50);
 
                 // Set the width for all the nodes
-                var selected_node_bbox = d3.select(this).node().getBBox();  // Required, as the node width need to include the rectangle
+                let selected_node_bbox = d3.select(this).node().getBBox();  // Required, as the node width need to include the rectangle
                 node_width = node_width > selected_node_bbox.width ? node_width : selected_node_bbox.width;
 
                 // Set Flag
@@ -485,23 +447,18 @@ function update(root, computed_node_width=0) {
                     .attr("id", "flag")
                     .text("🏁")
                     .attr('cursor', 'pointer')
-                    .on('click', function(d) {
-                        PermanentNodeHighlight(d.data.uuid);
-                    })
+                    .on('click', d => NodeHighlight(d.data.uuid))
                     .on('mouseover', d => {
                         d3.select('#tooltip')
                             .style('opacity', 1)
-                            .style('left', (d3.event.pageX+10) + 'px')
-                            .style('top', (d3.event.pageY+10) + 'px')
-                            .text('Flag this node for further analysis');
+                            .style('left', `${d3.event.pageX + 10}px`)
+                            .style('top', `${d3.event.pageY + 10}px`)
+                            .text('Flag this node');
                     })
-                    .on('mouseout', function() {
-                        d3.select('#tooltip')
-                            .style('opacity', 0);
-                    });
+                    .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
 
-                var icon_size = 24;
-                if (p.data.http_content) {
+                if (d.data.http_content) {
+                    const icon_size = 24;
                     // set lock insecure connection
                     d3.select(this).append("svg").append('rect')
                         .attr('x', selected_node_bbox.width - 22)
@@ -510,26 +467,22 @@ function update(root, computed_node_width=0) {
                         .attr('height', icon_size)
                         .attr('fill', 'white')
                         .attr('stroke', 'black');
-                    // Source: https://icons.getbootstrap.com/icons/lock/
+
                     d3.select(this).append('image')
                         .attr('x', selected_node_bbox.width - 22)
                         .attr('y', selected_node_bbox.height - 13)
                         .attr('id', 'insecure_image')
                         .attr("width", icon_size)
                         .attr("height", icon_size)
-                        .attr("title", 'This node contents insecure requests')
                         .attr("xlink:href", '/static/insecure.svg')
                         .on('mouseover', d => {
                             d3.select('#tooltip')
                                 .style('opacity', 1)
-                                .style('left', (d3.event.pageX+10) + 'px')
-                                .style('top', (d3.event.pageY+10) + 'px')
+                                .style('left', `${d3.event.pageX + 10}px`)
+                                .style('top', `${d3.event.pageY + 10}px`)
                                 .text('This node containts insecure requests');
                         })
-                        .on('mouseout', function() {
-                            d3.select('#tooltip')
-                                .style('opacity', 0);
-                        });
+                        .on('mouseout', () => d3.select('#tooltip').style('opacity', 0));
                 };
             });
 
@@ -537,9 +490,9 @@ function update(root, computed_node_width=0) {
         },
         update =>  update,
         exit => exit
-            .transition(t)
+            .transition()
               // Remove any exiting nodes
-              .attr("transform", node => "translate(" + node.y0 + "," + node.x0 + ")")
+              .attr("transform", node => `translate(${node.y0}, ${node.x0})`)
               // On exit reduce the node circles size to 0
               .attr('r', 1e-6)
               // On exit reduce the opacity of text labels
@@ -548,7 +501,7 @@ function update(root, computed_node_width=0) {
     ).call(node => {
       node
         // Transition to the proper position for the node
-        .attr("transform", node => "translate(" + node.y + "," + node.x + ")")
+        .attr("transform", node => `translate(${node.y}, ${node.x})`)
         // Update the node attributes and style
         .select('circle.node')
           .attr('r', 10)
@@ -568,8 +521,15 @@ function update(root, computed_node_width=0) {
   // ****************** links section ***************************
 
   // Update the links...
-  const link = node_container.selectAll('path.link')
-      .data(links, d => d.id);
+  const link = node_container.selectAll('path.link').data(links, d => d.id);
+
+  // Creates a curved (diagonal) path from parent to the child nodes
+  let diagonal = (s, d) => {
+    return `M ${s.y} ${s.x}
+            C ${(s.y + d.y) / 2} ${s.x},
+              ${(s.y + d.y) / 2} ${d.x},
+              ${d.y} ${d.x}`
+  };
 
   link.join(
     enter => enter
@@ -577,14 +537,20 @@ function update(root, computed_node_width=0) {
         .insert('path', "g")
         .attr("class", "link")
         .attr('d', d => {
-          var o = {x: d.x0, y: d.y0}
+          let o = {
+              x: d.x0,
+              y: d.y0
+          };
           return diagonal(o, o)
         }),
     update => update,
     exit => exit
       .call(exit => exit
                 .attr('d', d => {
-                    var o = {x: d.x0, y: d.y0}
+                    let o = {
+                        x: d.x0,
+                        y: d.y0
+                    };
                     return diagonal(o, o)
                 })
       .remove()
@@ -593,31 +559,6 @@ function update(root, computed_node_width=0) {
     .attr('d', d => diagonal(d, d.parent))
   );
 
-  // Creates a curved (diagonal) path from parent to the child nodes
-  function diagonal(s, d) {
-
-    path = `M ${s.y} ${s.x}
-            C ${(s.y + d.y) / 2} ${s.x},
-              ${(s.y + d.y) / 2} ${d.x},
-              ${d.y} ${d.x}`
-
-    return path
-  }
-
-  // Toggle children on click.
-  function click(d) {
-    if (d.children) {
-        d._children = d.children;
-        d.children = null;
-    }
-    else {
-        d.children = d._children;
-        d._children = null;
-    }
-    // Call update on the whole Tree
-    update(d.ancestors().reverse()[0]);
-  }
-
   if (computed_node_width === 0) {
     update(root, node_width)
   }
diff --git a/website/web/templates/hostname_popup.html b/website/web/templates/hostname_popup.html
index 187966e..c3e836e 100644
--- a/website/web/templates/hostname_popup.html
+++ b/website/web/templates/hostname_popup.html
@@ -16,9 +16,10 @@
 {% block scripts %}
   {{ super() }}
   <script src='{{ url_for('static', filename='datatables.min.js') }}'></script>
+  <script src='{{ url_for('static', filename='generic.js') }}'></script>
   <script type="text/javascript">
-  $(document).ready(function () {
-    $('#table_other_captures').DataTable( {
+  $(document).ready(() => {
+    $('table.table').DataTable( {
     "order": [[ 1, "desc" ]],
     "paging": false,
     "info": false,
@@ -29,8 +30,8 @@
     ],
     "columnDefs": [{
         "targets": 1,
-        "render": function ( data, type, row, meta ) {
-            let date = new Date(data);
+        "render": (data) => {
+            const date = new Date(data);
             return date.getFullYear() + '-' + (date.getMonth() + 1).toString().padStart(2, "0") + '-' + date.getDate().toString().padStart(2, "0") + ' ' + date.toTimeString();
         }
     }]
@@ -38,44 +39,20 @@
   });
   </script>
   <script>
-      function whereAmI(hostname_uuid) {
-          window.opener.LocateNode(hostname_uuid);
-      };
-      function flag(hostname_uuid) {
-          window.opener.PermanentNodeHighlight(hostname_uuid);
-      };
-      function openTreeInNewTab(capture_uuid, hostnode_uuid=Null) {
-          window.opener.openTreeInNewTab(capture_uuid, hostnode_uuid);
-      }
+      let whereAmI = (hostnode_uuid) => window.opener.LocateNode(hostnode_uuid);
+      let flag = (hostnode_uuid) => window.opener.NodeHighlight(hostnode_uuid);
+      let openTreeInNewTab = (capture_uuid, hostnode_uuid=Null) => window.opener.openTreeInNewTab(capture_uuid, hostnode_uuid);
   </script>
   <script>
-    // Source: https://codepen.io/nathanlong/pen/ZpAmjv
-    function copyToClipboard(text, el) {
-      var elOriginalText = el.attr('data-original-title');
-
-      var copyTextArea = document.createElement("textarea");
-      copyTextArea.value = text;
-      document.body.appendChild(copyTextArea);
-      copyTextArea.select();
-
-      var successful = document.execCommand('copy');
-      var msg = successful ? 'Copied!' : 'Whoops, not copied!';
-      el.attr('data-original-title', msg).tooltip('show');
-
-      document.body.removeChild(copyTextArea);
-      el.attr('data-original-title', elOriginalText);
-    }
-
-    $(document).ready(function() {
-      // Copy to clipboard
-      // Grab any text in the attribute 'data-copy' and pass it to the copy function
-      $('.js-copy').tooltip();
-      $('.js-copy').click(function() {
-        var text = $(this).attr('data-copy');
-        var el = $(this);
-        copyToClipboard(text, el);
-      });
+  $(document).ready(() => {
+    // Grab any text in the attribute 'data-copy' and pass it to the copy function
+    $('.js-copy').tooltip();
+    $('.js-copy').click(function() {
+      const text = $(this).attr('data-copy');
+      const el = $(this);
+      copyToClipboard(text, el);
     });
+  });
   </script>
 
 {% endblock %}
@@ -92,7 +69,7 @@
     {% for url in urls %}
     {# URL Display #}
     <li class="list-group-item">
-      <div class="h3" title={{ url['url_path'] }}>
+      <div class="h3" title={{ url['url_object'].name }}>
         {# HTTPs or not  #}
         {% if url['encrypted'] %}
         <img src="/static/secure.svg" title="Encrypted request" width="21" height="21"/>
diff --git a/website/web/templates/macros.html b/website/web/templates/macros.html
index 2f275fa..3e1549c 100644
--- a/website/web/templates/macros.html
+++ b/website/web/templates/macros.html
@@ -92,7 +92,6 @@
         </br>
         {{ button_text }}
         <button type="button" class="btn btn-info" onclick="whereAmI('{{ detail[1] }}')">Locate</button>
-        <button type="button" class="btn btn-info" onclick="flag('{{ detail[1] }}')">Flag</button>
     </li>
     {% endif %}
   {% endfor %}