diff --git a/templates/cards.xsl b/templates/cards.xsl
index 3873e0b..73c71b2 100755
--- a/templates/cards.xsl
+++ b/templates/cards.xsl
@@ -5,7 +5,7 @@
     version="1.1">
 
     <xsl:import href="lib/head.xsl"/>
-    <xsl:import href="lib/parseCommand.xsl"/>
+    <xsl:import href="lib/nav.xsl"/>
     <xsl:import href="lib/serviceLabel.xsl"/>
     <xsl:import href="lib/toast.xsl"/>
 
@@ -70,33 +70,6 @@
                 <script>
 $('.ui.dropdown').dropdown()
 
-hiddenButton.onclick = function(event) {
-    if (lanScanForm.checkValidity()) {
-        targetsInputDiv.classList.add('loading')
-        $.toast({
-            title      : 'Scan en cours...',
-            message    : 'Merci de patienter',
-            class      : 'info',
-            showIcon   : 'satellite dish',
-            displayTime: 0,
-            closeIcon  : true,
-            position   : 'bottom right',
-        })
-    }
-}
-refreshButton.onclick = function(event) {
-    refreshButton.getElementsByTagName('i')[0].className = 'loading spinner icon'
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
-}
-
 function hostScanning(link) {
     link.parentElement.parentElement.classList.add("loading")
     $.toast({
diff --git a/templates/compact.xsl b/templates/compact.xsl
index 64dd36d..8d96aef 100755
--- a/templates/compact.xsl
+++ b/templates/compact.xsl
@@ -5,7 +5,7 @@
     version="1.1">
 
     <xsl:import href="lib/head.xsl"/>
-    <xsl:import href="lib/parseCommand.xsl"/>
+    <xsl:import href="lib/nav.xsl"/>
     <xsl:import href="lib/toast.xsl"/> 
 
     <xsl:output method="html" encoding="UTF-8"/>
@@ -63,71 +63,7 @@
                 </footer>
 
                 <script>
-DataTable.ext.type.detect.unshift(function (d) {
-    return /[\d]+\.[\d]+\.[\d]+\.[\d]+/.test(d)
-        ? 'ipv4-address'
-        : null;
-});
-    
-DataTable.ext.type.order['ipv4-address-pre'] = function (ipAddress) {
-    [a, b, c, d] = ipAddress.split(".").map(Number)
-    return 16777216*a + 65536*b + 256*c + d;
-};
-
-var table = $('#scanResultsTable').DataTable({
-    buttons    : ['copy', 'excel', 'pdf'],
-    fixedHeader: true,
-    lengthMenu : [
-        [256, 512, 1024, 2048, -1],
-        [256, 512, 1024, 2048, "All"]
-    ],
-    responsive: true,
-    colReorder: true,
-    buttons   : ['copy', 'excel', 'pdf']
-})
-table.order([1, 'asc']).draw()
-
 $('.ui.dropdown').dropdown()
-
-hiddenButton.onclick = function(event) {
-    if (lanScanForm.checkValidity()) {
-        targetsInputDiv.classList.add('loading')
-        $.toast({
-            title      : 'Scan en cours...',
-            message    : 'Merci de patienter',
-            class      : 'info',
-            showIcon   : 'satellite dish',
-            displayTime: 0,
-            closeIcon  : true,
-            position   : 'bottom right',
-        })
-    }
-}
-refreshButton.onclick = function(event) {
-    refreshButton.getElementsByTagName('i')[0].className = 'loading spinner icon'
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
-}
-
-function hostScanning(link) {
-    link.getElementsByTagName('i')[0].className = 'loading spinner icon'
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
-}
                 </script>
 
                 <xsl:apply-templates select="runstats">
diff --git a/templates/hostsTable.xsl b/templates/hostsTable.xsl
index 5f48945..412f1d2 100755
--- a/templates/hostsTable.xsl
+++ b/templates/hostsTable.xsl
@@ -6,7 +6,6 @@
 
     <xsl:import href="lib/head.xsl"/>
     <xsl:import href="lib/nav.xsl"/>
-    <xsl:import href="lib/parseCommand.xsl"/>
     <xsl:import href="lib/serviceLabel.xsl"/>
     <xsl:import href="lib/toast.xsl"/>
 
diff --git a/templates/lib/head.xsl b/templates/lib/head.xsl
index dd755b1..a6d547a 100644
--- a/templates/lib/head.xsl
+++ b/templates/lib/head.xsl
@@ -4,6 +4,8 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     version="1.1">
 
+    <xsl:import href="parseCommand.xsl"/>
+
     <xsl:template match="nmaprun" mode="head">
         <xsl:param name="basedir"/>
         <xsl:param name="targets"/>
diff --git a/templates/lib/nav.xsl b/templates/lib/nav.xsl
index a3a1e2c..3ba7aa5 100644
--- a/templates/lib/nav.xsl
+++ b/templates/lib/nav.xsl
@@ -4,6 +4,8 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     version="1.1">
 
+    <xsl:import href="parseCommand.xsl"/>
+
     <xsl:template match="nmaprun" mode="nav">
         <xsl:param name="basedir"/>
         <xsl:param name="targets"/>
diff --git a/templates/servicesTable.xsl b/templates/servicesTable.xsl
index 1aa9be3..9126bad 100755
--- a/templates/servicesTable.xsl
+++ b/templates/servicesTable.xsl
@@ -5,14 +5,14 @@
     version="1.1">
 
     <xsl:import href="lib/head.xsl"/>
-    <xsl:import href="lib/parseCommand.xsl"/> 
+    <xsl:import href="lib/nav.xsl"/> 
     <xsl:import href="lib/toast.xsl"/>
 
     <xsl:output method="html" encoding="UTF-8"/>
     <xsl:output indent="yes"/>
     <xsl:strip-space elements='*'/>
 
-    <xsl:param name="saveAs" select=""/>
+    <xsl:param name="savedAs" select=""/>
     <xsl:param name="compareWith" select=""/>
     <xsl:param name="refreshPeriod" select="0"/>
     <xsl:param name="sudo" select="false"/>
@@ -23,7 +23,7 @@
     <xsl:variable name="init" select="document($compareWith)/nmaprun"/>
     <xsl:variable name="nextCompareWith">
         <xsl:choose>
-            <xsl:when test="$saveAs"><xsl:value-of select="$saveAs"/></xsl:when>
+            <xsl:when test="$savedAs"><xsl:value-of select="$saveAs"/></xsl:when>
             <xsl:when test="$compareWith"><xsl:value-of select="$compareWith"/></xsl:when>
             <xsl:otherwise></xsl:otherwise>
         </xsl:choose>
@@ -59,17 +59,6 @@
                 </footer>
 
             <script>
-DataTable.ext.type.detect.unshift(function (d) {
-    return /[\d]+\.[\d]+\.[\d]+\.[\d]+/.test(d)
-        ? 'ipv4-address'
-        : null;
-});
-    
-DataTable.ext.type.order['ipv4-address-pre'] = function (ipAddress) {
-    [a, b, c, d] = ipAddress.split(".").map(Number)
-    return 16777216*a + 65536*b + 256*c + d;
-};
-
 var table = $('#scanResultsTable').DataTable({
     buttons    : ['copy', 'excel', 'pdf'],
     fixedHeader: true,
@@ -84,46 +73,6 @@ var table = $('#scanResultsTable').DataTable({
 table.order([1, 'asc']).draw()
 
 $('.ui.dropdown').dropdown()
-
-hiddenButton.onclick = function(event) {
-    if (lanScanForm.checkValidity()) {
-        targetsInputDiv.classList.add('loading')
-        $.toast({
-            title      : 'Scan en cours...',
-            message    : 'Merci de patienter',
-            class      : 'info',
-            showIcon   : 'satellite dish',
-            displayTime: 0,
-            closeIcon  : true,
-            position   : 'bottom right',
-        })
-    }
-}
-refreshButton.onclick = function(event) {
-    refreshButton.getElementsByTagName('i')[0].className = 'loading spinner icon'
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
-}
-
-function hostScanning(link) {
-    link.getElementsByTagName('i')[0].className = 'loading spinner icon'
-    $.toast({
-        title      : 'Scan en cours...',
-        message    : 'Merci de patienter',
-        class      : 'info',
-        showIcon   : 'satellite dish',
-        displayTime: 0,
-        closeIcon  : true,
-        position   : 'bottom right',
-    })
-}
                 </script>
 
                 <xsl:apply-templates select="runstats">