diff --git a/lib/settings.js b/lib/settings.js
index 3be06e4..9fa2ea9 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -48,8 +48,8 @@ exports.dbsettings = {
 //This setting is passed to the wallet
 exports.wallet = { "host" : "127.0.0.1",
   "port" : 51573,
-  "user" : "exorrpc",
-  "pass" : "sSTLyCkrD94Y8&9mr^m6W^Mk367Vr!!K"
+  "username" : "exorrpc",
+  "password" : "sSTLyCkrD94Y8&9mr^m6W^Mk367Vr!!K"
 };
 
 //Locale file
diff --git a/package.json b/package.json
index bc87db3..a704940 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "pug": "~2.0.4",
     "postman-request": "2.88.1-postman.22",
     "jsonminify": "0.4.1",
+    "jstransformer-markdown-it": "^2.1.0",
     "mongodb": "3.5.5",
     "mongoose": "5.9.5",
     "qr-image": "~3.2.0"
diff --git a/settings.json.template b/settings.json.template
index 195d4f5..403d85f 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -56,8 +56,8 @@
   "wallet": {
     "host": "localhost",
     "port": 51573,
-    "user": "exorrpc",
-    "pass": "sSTLyCkrD94Y8&9mr^m6W^Mk367Vr!!K"
+    "username": "exorrpc",
+    "password": "sSTLyCkrD94Y8&9mr^m6W^Mk367Vr!!K"
   },
 
   // confirmations
diff --git a/views/includes/net_addnodes.jade b/views/includes/net_addnodes.pug
similarity index 97%
rename from views/includes/net_addnodes.jade
rename to views/includes/net_addnodes.pug
index 9275ef4..93333e8 100644
--- a/views/includes/net_addnodes.jade
+++ b/views/includes/net_addnodes.pug
@@ -51,7 +51,7 @@ script.
   });
 .panel.panel-default
   .panel-body
-    :markdown
+    :markdown-it
       If you have trouble syncing your wallet, add these lines to your coin daemon .conf file and restart the wallet.
       
       *Typically you can access the config file through QT-wallet menu, Tools > Open Wallet Configuration File*
@@ -62,10 +62,10 @@ script.
     tbody.text-center
 
   .panel-body
-    :markdown
+    :markdown-it
       Alternatively you can try one of these lines in the coin wallet debug window, or add them with *coindaemon*-cli
   table#addnodes2-table.table.table-bordered.table-striped
     thead
       tr
         th.text-center OneTry Node Lines
-    tbody.text-center
+    tbody.text-center
\ No newline at end of file
diff --git a/views/includes/net_list.jade b/views/includes/net_list.pug
similarity index 100%
rename from views/includes/net_list.jade
rename to views/includes/net_list.pug
diff --git a/views/markets/altmarkets.jade b/views/markets/altmarkets.pug
similarity index 98%
rename from views/markets/altmarkets.jade
rename to views/markets/altmarkets.pug
index 3e611b8..aa779f7 100644
--- a/views/markets/altmarkets.jade
+++ b/views/markets/altmarkets.pug
@@ -7,7 +7,7 @@ block market_view
         .panel-heading
           strong #{settings.locale.altmarkets} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours}
           a(href='#')
-            span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title='#{settings.locale.mkt_no_chart}') 
+            span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart) 
         table.table.table-bordered.summary-table 
           thead
             tr
@@ -114,4 +114,3 @@ block market_view
                     =(new Date(order.timestamp * 1000).toUTCString())
 
       .footer-padding
-
diff --git a/views/markets/tradesatoshi.jade b/views/markets/tradesatoshi.pug
similarity index 98%
rename from views/markets/tradesatoshi.jade
rename to views/markets/tradesatoshi.pug
index 0093af6..74da6d7 100644
--- a/views/markets/tradesatoshi.jade
+++ b/views/markets/tradesatoshi.pug
@@ -7,7 +7,7 @@ block market_view
         .panel-heading
           strong #{settings.locale.tradesatoshi} - #{marketdata.coin}/#{marketdata.exchange} - #{settings.locale.mkt_hours}
           a(href='#')
-            span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title='#{settings.locale.mkt_no_chart}')
+            span.fa.fa-line-chart.pull-right.view-chart-disabled.iquidus.market-toggle(data-toggle='tooltip', data-placement='bottom', title=settings.locale.mkt_no_chart)
         table.table.table-bordered.summary-table
           thead
             tr
@@ -110,4 +110,4 @@ block market_view
                     =result.total.toFixed(8).replace(/(?:\.0+|(\.\d+?)0+)$/, "$1")
                   td.hidden-xs
                     =result.timeStamp.substr(0, 19).replace("T", "      ")
-      .footer-padding
+      .footer-padding
\ No newline at end of file
diff --git a/views/movement.pug b/views/movement.pug
index 8217d1d..eead040 100644
--- a/views/movement.pug
+++ b/views/movement.pug
@@ -45,7 +45,7 @@ block content
         return time;
       }
       var rtable = $('#alerts-table').dataTable( {  
-        autoWidth: true,      
+        autoWidth: false,      
         searching: false,
         ordering: false,
         //responsive: true,
diff --git a/views/network.pug b/views/network.pug
index 0b8f3d8..362c476 100644
--- a/views/network.pug
+++ b/views/network.pug
@@ -12,6 +12,6 @@ block content
           a(href='#addnodes', aria-controls='addnodes', role='tab', data-toggle='tab') #{settings.locale.net_addnodes}
     .tab-content
       #connections.tabpanel.tab-pane.active 
-        include ./includes/net_list.jade
+        include ./includes/net_list.pug
       #addnodes.tabpanel.tab-pane
-        include ./includes/net_addnodes.jade
+        include ./includes/net_addnodes.pug
\ No newline at end of file