diff --git a/views/address.pug b/views/address.pug
index fc7c0be..4e9949d 100644
--- a/views/address.pug
+++ b/views/address.pug
@@ -1,6 +1,93 @@
 extends layout
 
 block content
+  include ./includes/common.pug
+  script.
+    var hashAddress = "#{address.a_id}";
+    var setting_maxTxCount = parseInt("#{settings.txcount}");
+    var setting_txPerPage = parseInt("#{settings.txcount_per_page}");
+    var lengthMenuOpts = [];
+    var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
+    for (i=0; i < lengthMenuOptsAdd.length; i++) {
+      if (setting_maxTxCount >= lengthMenuOptsAdd[i]) {
+        lengthMenuOpts.push(lengthMenuOptsAdd[i]);
+      }
+    }
+    if (setting_maxTxCount < setting_txPerPage) {
+      var displayLengthMax = setting_maxTxCount;
+    } else {
+      var displayLengthMax = setting_txPerPage;
+    }
+    $(document).ready(function () {
+      var rtable = $('#address-txs').dataTable({
+        autoWidth: true,
+        searching: false,
+        ordering: false,
+        responsive: true,
+        lengthChange: true,
+        processing: true,
+        serverSide: true,
+        iDisplayLength: displayLengthMax,
+        lengthMenu: lengthMenuOpts,
+        scrollX: true,
+        ajax: {
+          url: '/ext/getaddresstxs/' + hashAddress,
+          beforeSend: function(jqXHR, settings) {
+            settings.url = settings.url.substring(0, settings.url.indexOf('?')) + '/' + getParameterByName('start', settings.url) + '/' + getParameterByName('length', settings.url) + '/internal';
+            return true;
+          }
+        },
+        language: {
+          paginate: {
+            previous: '<',
+            next: '>'
+          }
+        },
+        rowCallback: function (row, data, index) {
+          var timestamp = new Date(data[0] * 1000).toUTCString(); //variables for better readability
+          var txhash = data[1]; //variables for better readability
+          var out = data[2]; //variables for better readability
+          var vin = data[3]; //variables for better readability
+          var balance = data[4].toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability
+          var balanceParts = balance.split('.');
+          $("td:eq(0)", row).html('<a href="/tx/' + txhash + '"><span class="fa fa-eye" data-toggle="tooltip" data-placement="top" title="#{settings.locale.view_tx}"></span></a>').addClass('text-center d-table-cell d-md-none');
+          $("td:eq(1)", row).html('<a href="/tx/' + txhash + '">' + txhash + '</a>').addClass('breakWord d-none d-md-table-cell');
+          var amount = 0;
+          var updown = '';
+          var rowclass = 'info';
+
+          if (out > 0 && vin > 0) {
+            amount = Number(out - vin);
+            if (amount < 0) {
+              amount = Number(amount * -1).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+              updown = '-';
+            } else if (amount > 0) {
+              amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+              updown = '+';
+            } else {
+              amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+            }
+          } else if (out > 0) {
+            amount = Number(out).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+            updown = '+';
+            rowclass = 'bg-success';
+          } else {
+            amount = Number(vin).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+            updown = '-';
+            rowclass = 'bg-danger';
+          }
+          var amountParts = amount.split('.');
+          $("td:eq(2)", row).html(updown + amountParts[0] + '.<span class="decimal">' + amountParts[1] + '</span>').addClass(rowclass + ' text-center');
+          $("td:eq(3)", row).html(balanceParts[0] + '.<span class="decimal">' + balanceParts[1] + '</span>').addClass('text-center');
+          $("td:eq(4)", row).html(format_unixtime(new Date(timestamp), true)).addClass('text-center');
+        },
+        fnDrawCallback: function(settings) {
+          fixDataTableColumns();
+          fixFooterHeightAndPosition();
+          enableTooltips();
+        }
+      });
+    });
   - var balance = Number((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
   - var balanceParts = balance.split('.');
   - var sent = Number(address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
@@ -71,4 +158,17 @@ block content
     .card.card-default.border-0.cardSpacer
       .card-header
         strong #{settings.locale.ex_latest_transactions}
-      include ./includes/address_history.pug
\ No newline at end of file
+      table#address-txs.table.table-bordered.table-striped.table-paging.mobile-border-right
+        - var theadClasses = [];
+        if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
+          - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
+        thead(class=theadClasses)
+          tr
+            th.d-table-cell.d-md-none
+            th.d-none.d-md-table-cell #{settings.locale.tx_hash}
+            th.text-center #{settings.locale.mkt_amount}
+              span.small  (#{settings.symbol})
+            th.text-center #{settings.locale.rl_balance}
+              span.small  (#{settings.symbol})
+            th.text-center #{settings.locale.timestamp}
+        tbody
\ No newline at end of file
diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug
deleted file mode 100644
index b0f5654..0000000
--- a/views/includes/address_history.pug
+++ /dev/null
@@ -1,101 +0,0 @@
-include ./common.pug
-script.
-  var hashAddress = "#{address.a_id}";
-  var setting_maxTxCount = parseInt("#{settings.txcount}");
-  var setting_txPerPage = parseInt("#{settings.txcount_per_page}");
-  var lengthMenuOpts = [];
-  var lengthMenuOptsAdd = [ 10, 25, 50, 75, 100, 250, 500, 1000 ];
-  for (i=0; i < lengthMenuOptsAdd.length; i++) {
-    if (setting_maxTxCount >= lengthMenuOptsAdd[i]) {
-      lengthMenuOpts.push(lengthMenuOptsAdd[i]);
-    }
-  }
-  if (setting_maxTxCount < setting_txPerPage) {
-    var displayLengthMax = setting_maxTxCount;
-  } else {
-    var displayLengthMax = setting_txPerPage;
-  }
-  $(document).ready(function () {
-    var rtable = $('#address-txs').dataTable({
-      autoWidth: true,
-      searching: false,
-      ordering: false,
-      responsive: true,
-      lengthChange: true,
-      processing: true,
-      serverSide: true,
-      iDisplayLength: displayLengthMax,
-      lengthMenu: lengthMenuOpts,
-      scrollX: true,
-      ajax: {
-        url: '/ext/getaddresstxs/' + hashAddress,
-        beforeSend: function(jqXHR, settings) {
-          settings.url = settings.url.substring(0, settings.url.indexOf('?')) + '/' + getParameterByName('start', settings.url) + '/' + getParameterByName('length', settings.url) + '/internal';
-          return true;
-        }
-      },
-      language: {
-        paginate: {
-          previous: '<',
-          next: '>'
-        }
-      },
-      rowCallback: function (row, data, index) {
-        var timestamp = new Date(data[0] * 1000).toUTCString(); //variables for better readability
-        var txhash = data[1]; //variables for better readability
-        var out = data[2]; //variables for better readability
-        var vin = data[3]; //variables for better readability
-        var balance = data[4].toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability
-        var balanceParts = balance.split('.');
-        $("td:eq(0)", row).html('<a href="/tx/' + txhash + '"><span class="fa fa-eye" data-toggle="tooltip" data-placement="top" title="#{settings.locale.view_tx}"></span></a>').addClass('text-center d-table-cell d-md-none');
-        $("td:eq(1)", row).html('<a href="/tx/' + txhash + '">' + txhash + '</a>').addClass('breakWord d-none d-md-table-cell');
-        var amount = 0;
-        var updown = '';
-        var rowclass = 'info';
-
-        if (out > 0 && vin > 0) {
-          amount = Number(out - vin);
-          if (amount < 0) {
-            amount = Number(amount * -1).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-            updown = '-';
-          } else if (amount > 0) {
-            amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-            updown = '+';
-          } else {
-            amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-          }
-        } else if (out > 0) {
-          amount = Number(out).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-          updown = '+';
-          rowclass = 'bg-success';
-        } else {
-          amount = Number(vin).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-          updown = '-';
-          rowclass = 'bg-danger';
-        }
-        var amountParts = amount.split('.');
-        $("td:eq(2)", row).html(updown + amountParts[0] + '.<span class="decimal">' + amountParts[1] + '</span>').addClass(rowclass + ' text-center');
-        $("td:eq(3)", row).html(balanceParts[0] + '.<span class="decimal">' + balanceParts[1] + '</span>').addClass('text-center');
-        $("td:eq(4)", row).html(format_unixtime(new Date(timestamp), true)).addClass('text-center');
-      },
-      fnDrawCallback: function(settings) {
-        fixDataTableColumns();
-        fixFooterHeightAndPosition();
-        enableTooltips();
-      }
-    });
-  });
-table#address-txs.table.table-bordered.table-striped.table-paging.mobile-border-right
-  - var theadClasses = [];
-  if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-    - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
-  thead(class=theadClasses)
-    tr
-      th.d-table-cell.d-md-none
-      th.d-none.d-md-table-cell #{settings.locale.tx_hash}
-      th.text-center #{settings.locale.mkt_amount}
-        span.small  (#{settings.symbol})
-      th.text-center #{settings.locale.rl_balance}
-        span.small  (#{settings.symbol})
-      th.text-center #{settings.locale.timestamp}
-  tbody
\ No newline at end of file
diff --git a/views/includes/net_addnodes.pug b/views/includes/net_addnodes.pug
deleted file mode 100644
index 340eb47..0000000
--- a/views/includes/net_addnodes.pug
+++ /dev/null
@@ -1,95 +0,0 @@
-script.
-  $(document).ready(function() {
-    $('#addnodes-table').dataTable({
-      autoWidth: true,
-      searching: false,
-      ordering: false,
-      responsive: true,
-      lengthChange: true,
-      processing: true,
-      scrollX: true,
-      language: {
-        paginate: {
-          previous: '<',
-          next: '>'
-        }
-      },
-      ajax: {
-        url: '/ext/getnetworkpeers/internal',
-        dataSrc: function (json) {
-          var rows = [];
-          for (var i=0; i<json.data.length; i++) {
-            rows.push({'nodes':'addnode='+json.data[i]['address']+':'+json.data[i]['port']});
-          }
-          return rows;
-        }
-      },
-      fnDrawCallback: function(settings) {
-        fixDataTableColumns();
-        fixFooterHeightAndPosition();
-      },
-      columns: [
-        {data: 'nodes', width: '100%'}
-      ],
-      columnDefs: [
-        {targets: '_all', className: 'text-left'}
-      ]
-    });
-    $('#addnodes2-table').dataTable({
-      autoWidth: true,
-      searching: false,
-      ordering: false,
-      responsive: true,
-      lengthChange: true,
-      processing: true,
-      scrollX: true,
-      language: {
-        paginate: {
-          previous: '<',
-          next: '>'
-        }
-      },
-      ajax: {
-        url: '/ext/getnetworkpeers/internal',
-        dataSrc: function (json) {
-          var rows = [];
-          for (var i=0; i<json.data.length; i++) {
-            rows.push({'nodes':'addnode '+json.data[i]['address']+':'+json.data[i]['port']+' onetry'});
-          }
-          return rows;
-        }
-      },
-      fnDrawCallback: function(settings) {
-        fixDataTableColumns();
-        fixFooterHeightAndPosition();
-      },
-      columns: [
-        {data: 'nodes', width: '100%'}
-      ],
-      columnDefs: [
-        {targets: '_all', className: 'text-left'}
-      ]
-    });
-  });
-- var theadClasses = [];
-if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-  - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
-.card.card-default.border-0
-  .card-body.border-top-0
-    :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*
-  table#addnodes-table.table.table-bordered.table-striped.table-paging.mobile-border-right
-    thead(class=theadClasses)
-      tr
-        th AddNode Config Lines
-    tbody.text-center
-  .card-body.border-top-0
-    :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.table-paging.mobile-border-right
-    thead(class=theadClasses)
-      tr
-        th OneTry Node Lines
-    tbody.text-center
\ No newline at end of file
diff --git a/views/includes/net_list.pug b/views/includes/net_list.pug
deleted file mode 100644
index 33f9ddb..0000000
--- a/views/includes/net_list.pug
+++ /dev/null
@@ -1,60 +0,0 @@
-script.
-  $(document).ready(function() {
-    $('#connections-table').dataTable({
-      autoWidth: true,
-      searching: false,
-      ordering: false,
-      responsive: true,
-      lengthChange: true,
-      processing: true,
-      scrollX: true,
-      language: {
-        paginate: {
-          previous: '<',
-          next: '>'
-        }
-      },
-      ajax: {
-        url: '/ext/getnetworkpeers/internal',
-        dataSrc: function (json) {
-          return json.data;
-        }
-      },
-      rowCallback: function (row, data, index) {
-        var flagBlock = '';
-        if (data['country_code'].length > 1) {
-          flagBlock = '<div class="margin-left-5 flag-icon flag-icon-'+data['country_code'].toLowerCase()+'"></div>';
-        }
-        $("td:eq(0)", row).html(data['address']).addClass('breakWord');
-        $("td:eq(1)", row).html(data['protocol']);
-        $("td:eq(2)", row).html(data['version']);
-        $("td:eq(3)", row).html(data['country']+flagBlock);
-      },
-      fnDrawCallback: function(settings) {
-        fixDataTableColumns();
-        fixFooterHeightAndPosition();
-      },
-      columns: [
-        { data: 'address', width: '25%' },
-        { data: 'protocol', width: '25%' },
-        { data: 'version', width:'25%' },
-        { data: 'country', width: '25%'}
-      ]
-    });
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-      fixDataTableColumns();
-      fixFooterHeightAndPosition();
-    });
-  });
-.card.card-default.border-0
-  table#connections-table.table.table-bordered.table-striped.table-paging.mobile-border-right
-    - var theadClasses = [];
-    if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-      - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
-    thead(class=theadClasses)
-      tr
-        th.text-center #{settings.locale.net_address}
-        th.text-center #{settings.locale.net_protocol}
-        th.text-center #{settings.locale.net_subversion}
-        th.text-center #{settings.locale.net_country}
-    tbody.text-center
\ No newline at end of file
diff --git a/views/includes/rl_balance.pug b/views/includes/rl_balance.pug
deleted file mode 100644
index 9467e77..0000000
--- a/views/includes/rl_balance.pug
+++ /dev/null
@@ -1,34 +0,0 @@
-.card.card-default.border-0
-  table.table.table-hover.table-bordered.table-striped.summary-table.right-border-0(style='margin-bottom:0;', cellspacing='0')
-    - var theadClasses = [];
-    if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-      - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
-    thead(class=theadClasses)
-      tr
-        th.text-center
-          span.fa.fa-flag-checkered
-        th #{settings.locale.tx_address}
-        th.text-center #{settings.locale.rl_balance}
-          span.small  (#{settings.symbol})
-        th.text-center %
-    tbody
-      - var count = 0;
-      each address in balance
-        - count = count + 1;
-        - var itemFixed = (parseInt(address.balance) / 100000000);
-        - var itemFixedParts = Number(itemFixed).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split(".");
-        - var percent = Number((itemFixed / stats.supply) * 100).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false});
-        - var percentParts = percent.split(".");
-        tr
-          td.text-center
-            =count
-          td
-            if settings.display.claim_address == false || address.name == null || address.name == ''
-              a.breakWord(href='/address/' + address.a_id) #{address.a_id}
-            else
-              a.breakWord(href='/address/' + address.a_id) #{address.name}
-            include ./rl_labels.pug
-          td.text-center #{itemFixedParts[0]}.
-            span.decimal #{itemFixedParts[1]}
-          td.text-center #{percentParts[0]}.
-            span.decimal #{percentParts[1]}
\ No newline at end of file
diff --git a/views/includes/rl_received.pug b/views/includes/rl_received.pug
deleted file mode 100644
index baf96a0..0000000
--- a/views/includes/rl_received.pug
+++ /dev/null
@@ -1,29 +0,0 @@
-.card.card-default.border-0
-  table.table.table-hover.table-bordered.table-striped.summary-table.right-border-0(style='margin-bottom:0;', cellspacing='0')
-    - var theadClasses = [];
-    if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-      - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
-    thead(class=theadClasses)
-      tr
-        th.text-center
-          span.fa.fa-flag-checkered
-        th #{settings.locale.tx_address}
-        th.text-center #{settings.locale.rl_received}
-          span.small  (#{settings.symbol})
-    tbody
-      - var count = 0;
-      each address in received
-        - count = count + 1;
-        - var itemFixed = Number(parseInt(address.received) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
-        - var itemFixedParts = itemFixed.split(".");
-        tr
-          td.text-center
-            =count
-          td
-            if settings.display.claim_address == false || address.name == null || address.name == ''
-              a.breakWord(href='/address/' + address.a_id) #{address.a_id}
-            else
-              a.breakWord(href='/address/' + address.a_id) #{address.name}
-            include ./rl_labels.pug
-          td.text-center #{itemFixedParts[0]}.
-            span.decimal #{itemFixedParts[1]}
\ No newline at end of file
diff --git a/views/network.pug b/views/network.pug
index 6483763..3e7873d 100644
--- a/views/network.pug
+++ b/views/network.pug
@@ -2,6 +2,127 @@ extends layout
 
 block content
   include ./includes/common.pug
+  script.
+    $(document).ready(function() {
+      $('#connections-table').dataTable({
+        autoWidth: true,
+        searching: false,
+        ordering: false,
+        responsive: true,
+        lengthChange: true,
+        processing: true,
+        scrollX: true,
+        language: {
+          paginate: {
+            previous: '<',
+            next: '>'
+          }
+        },
+        ajax: {
+          url: '/ext/getnetworkpeers/internal',
+          dataSrc: function (json) {
+            return json.data;
+          }
+        },
+        rowCallback: function (row, data, index) {
+          var flagBlock = '';
+          if (data['country_code'].length > 1) {
+            flagBlock = '<div class="margin-left-5 flag-icon flag-icon-'+data['country_code'].toLowerCase()+'"></div>';
+          }
+          $("td:eq(0)", row).html(data['address']).addClass('breakWord');
+          $("td:eq(1)", row).html(data['protocol']);
+          $("td:eq(2)", row).html(data['version']);
+          $("td:eq(3)", row).html(data['country']+flagBlock);
+        },
+        fnDrawCallback: function(settings) {
+          fixDataTableColumns();
+          fixFooterHeightAndPosition();
+        },
+        columns: [
+          { data: 'address', width: '25%' },
+          { data: 'protocol', width: '25%' },
+          { data: 'version', width:'25%' },
+          { data: 'country', width: '25%'}
+        ]
+      });
+      $('#addnodes-table').dataTable({
+        autoWidth: true,
+        searching: false,
+        ordering: false,
+        responsive: true,
+        lengthChange: true,
+        processing: true,
+        scrollX: true,
+        language: {
+          paginate: {
+            previous: '<',
+            next: '>'
+          }
+        },
+        ajax: {
+          url: '/ext/getnetworkpeers/internal',
+          dataSrc: function (json) {
+            var rows = [];
+            for (var i=0; i<json.data.length; i++) {
+              rows.push({'nodes':'addnode='+json.data[i]['address']+':'+json.data[i]['port']});
+            }
+            return rows;
+          }
+        },
+        fnDrawCallback: function(settings) {
+          fixDataTableColumns();
+          fixFooterHeightAndPosition();
+        },
+        columns: [
+          {data: 'nodes', width: '100%'}
+        ],
+        columnDefs: [
+          {targets: '_all', className: 'text-left'}
+        ]
+      });
+      $('#addnodes2-table').dataTable({
+        autoWidth: true,
+        searching: false,
+        ordering: false,
+        responsive: true,
+        lengthChange: true,
+        processing: true,
+        scrollX: true,
+        language: {
+          paginate: {
+            previous: '<',
+            next: '>'
+          }
+        },
+        ajax: {
+          url: '/ext/getnetworkpeers/internal',
+          dataSrc: function (json) {
+            var rows = [];
+            for (var i=0; i<json.data.length; i++) {
+              rows.push({'nodes':'addnode '+json.data[i]['address']+':'+json.data[i]['port']+' onetry'});
+            }
+            return rows;
+          }
+        },
+        fnDrawCallback: function(settings) {
+          fixDataTableColumns();
+          fixFooterHeightAndPosition();
+        },
+        columns: [
+          {data: 'nodes', width: '100%'}
+        ],
+        columnDefs: [
+          {targets: '_all', className: 'text-left'}
+        ]
+      });
+      $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        fixDataTableColumns();
+        fixFooterHeightAndPosition();
+      });
+    });
+  - var theadClasses = [];
+  if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
+    - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
   .col-md-12.cardSpacer
     .text-center(style='margin-bottom:15px;')
       i #{settings.locale.net_warning}
@@ -16,6 +137,32 @@ block content
           a.nav-link(href='#addnodes', aria-controls='addnodes', role='tab', data-toggle='tab') #{settings.locale.net_addnodes}
     .tab-content
       #connections.container.tab-pane.active(style='margin-top:0;border-top:0;')
-        include ./includes/net_list.pug
+        .card.card-default.border-0
+          table#connections-table.table.table-bordered.table-striped.table-paging.mobile-border-right
+            thead(class=theadClasses)
+              tr
+                th.text-center #{settings.locale.net_address}
+                th.text-center #{settings.locale.net_protocol}
+                th.text-center #{settings.locale.net_subversion}
+                th.text-center #{settings.locale.net_country}
+            tbody.text-center
       #addnodes.container.tab-pane(style='margin-top:0;border-top:0;')
-        include ./includes/net_addnodes.pug
\ No newline at end of file
+        .card.card-default.border-0
+          .card-body.border-top-0
+            :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*
+          table#addnodes-table.table.table-bordered.table-striped.table-paging.mobile-border-right
+            thead(class=theadClasses)
+              tr
+                th AddNode Config Lines
+            tbody.text-center
+          .card-body.border-top-0
+            :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.table-paging.mobile-border-right
+            thead(class=theadClasses)
+              tr
+                th OneTry Node Lines
+            tbody.text-center
\ No newline at end of file
diff --git a/views/richlist.pug b/views/richlist.pug
index e0665ff..93ebcd8 100644
--- a/views/richlist.pug
+++ b/views/richlist.pug
@@ -32,6 +32,9 @@ block content
           }
         );
       });
+  - var theadClasses = [];
+  if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
+    - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
   .row(style='margin-left:0;margin-right:0;')
     div(class=(show_dist == true ? 'col-xs-12 col-lg-8' : 'col-12'))
       .container
@@ -45,18 +48,70 @@ block content
             a.nav-link(href='#received', aria-controls='received', role='tab', data-toggle='tab') #{settings.locale.rl_received_coins}
       .tab-content
         #balance.container.tab-pane.active(style='margin-top:0;')
-          include ./includes/rl_balance.pug
+          .card.card-default.border-0
+            table.table.table-hover.table-bordered.table-striped.summary-table.right-border-0(style='margin-bottom:0;', cellspacing='0')
+              thead(class=theadClasses)
+                tr
+                  th.text-center
+                    span.fa.fa-flag-checkered
+                  th #{settings.locale.tx_address}
+                  th.text-center #{settings.locale.rl_balance}
+                    span.small  (#{settings.symbol})
+                  th.text-center %
+              tbody
+                - var count = 0;
+                each address in balance
+                  - count = count + 1;
+                  - var itemFixed = (parseInt(address.balance) / 100000000);
+                  - var itemFixedParts = Number(itemFixed).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split(".");
+                  - var percent = Number((itemFixed / stats.supply) * 100).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false});
+                  - var percentParts = percent.split(".");
+                  tr
+                    td.text-center
+                      =count
+                    td
+                      if settings.display.claim_address == false || address.name == null || address.name == ''
+                        a.breakWord(href='/address/' + address.a_id) #{address.a_id}
+                      else
+                        a.breakWord(href='/address/' + address.a_id) #{address.name}
+                      include ./includes/rl_labels.pug
+                    td.text-center #{itemFixedParts[0]}.
+                      span.decimal #{itemFixedParts[1]}
+                    td.text-center #{percentParts[0]}.
+                      span.decimal #{percentParts[1]}
         #received.container.tab-pane(style='margin-top:0;')
-          include ./includes/rl_received.pug
+          .card.card-default.border-0
+            table.table.table-hover.table-bordered.table-striped.summary-table.right-border-0(style='margin-bottom:0;', cellspacing='0')
+              thead(class=theadClasses)
+                tr
+                  th.text-center
+                    span.fa.fa-flag-checkered
+                  th #{settings.locale.tx_address}
+                  th.text-center #{settings.locale.rl_received}
+                    span.small  (#{settings.symbol})
+              tbody
+                - var count = 0;
+                each address in received
+                  - count = count + 1;
+                  - var itemFixed = Number(parseInt(address.received) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true});
+                  - var itemFixedParts = itemFixed.split(".");
+                  tr
+                    td.text-center
+                      =count
+                    td
+                      if settings.display.claim_address == false || address.name == null || address.name == ''
+                        a.breakWord(href='/address/' + address.a_id) #{address.a_id}
+                      else
+                        a.breakWord(href='/address/' + address.a_id) #{address.name}
+                      include ./includes/rl_labels.pug
+                    td.text-center #{itemFixedParts[0]}.
+                      span.decimal #{itemFixedParts[1]}
     if show_dist == true
       .col-xs-12.col-lg-4
         #summary-panel.card.card-default.border-0(style='margin-top:34px;')
           .card-header
             strong #{settings.locale.rl_wealth}
           table.table.table-hover.table-bordered.summary-table.right-border-0(style='margin-bottom:0;')
-            - var theadClasses = [];
-            if settings.display.table_header_bgcolor != null && settings.display.table_header_bgcolor != ''
-              - theadClasses.push('thead-' + settings.display.table_header_bgcolor);
             thead(class=theadClasses)
               tr
                 th