diff --git a/.unibeautifyrc.json b/.unibeautifyrc.json
new file mode 100644
index 0000000..847b624
--- /dev/null
+++ b/.unibeautifyrc.json
@@ -0,0 +1,7 @@
+{
+  "LANGUAGE_NAME": {
+    "beautifiers": [
+      "JS-Beautify"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 2ed486d..bb60d80 100644
--- a/index.html
+++ b/index.html
@@ -1,87 +1,105 @@
 <!DOCTYPE html>
 <html>
+
   <head>
     <meta charset="UTF-8">
     <title>Ether-1 Desktop Wallet</title>
-    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> 
+    <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
     <link rel="stylesheet" href="./assets/styles/materialize.min.css">
     <link rel="stylesheet" href="./assets/styles/datatables.min.css">
-    <link rel="stylesheet" href="./assets/styles/iziModal.min.css">    
-    <link rel="stylesheet" href="./assets/styles/iziToast.min.css">        
-    <link rel="stylesheet" href="./assets/styles/transactions.css">    
+    <link rel="stylesheet" href="./assets/styles/iziModal.min.css">
+    <link rel="stylesheet" href="./assets/styles/iziToast.min.css">
+    <link rel="stylesheet" href="./assets/styles/transactions.css">
     <link rel="stylesheet" href="./assets/styles/please-wait.css">
-    <link rel="stylesheet" href="./assets/styles/indicators.css">    
+    <link rel="stylesheet" href="./assets/styles/indicators.css">
     <link rel="stylesheet" href="./assets/styles/all.min.css">
-    <link rel="stylesheet" href="./assets/styles/spinner.css">    
-    <link rel="stylesheet" href="./assets/styles/buttons.css">    
-    <link rel="stylesheet" href="./assets/styles/style.css">    
-    <link rel="stylesheet" href="./assets/styles/forms.css">    
-    <!-- Insert this line above script imports  -->
-    <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
+    <link rel="stylesheet" href="./assets/styles/spinner.css">
+    <link rel="stylesheet" href="./assets/styles/buttons.css">
+    <link rel="stylesheet" href="./assets/styles/style.css">
+    <link rel="stylesheet" href="./assets/styles/forms.css">
+    <!-- Insert this line above script imports -->
+    <script>
+      if (typeof module === 'object') {
+        window.module = module;
+        module = undefined;
+      }
+    </script>
 
-    <!-- normal script imports etc  -->
+    <!-- normal script imports etc -->
     <script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js" integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script>
-    <script src="./assets/scripts/jquery.min.js"></script>    
-    <script src="./assets/scripts/handlebars.js"></script>    
-    <script src="./assets/scripts/materialize.min.js"></script>    
-    <script src="./assets/scripts/datatables.min.js"></script>    
-    <script src="./assets/scripts/iziModal.min.js"></script>    
-    <script src="./assets/scripts/iziToast.min.js"></script>    
-    <script src="./assets/scripts/tippy.min.js"></script>    
-    <script src="./assets/scripts/progressbar.min.js"></script>    
-    <script src="./assets/scripts/sprintf.min.js"></script>        
-    <script src="./assets/scripts/please-wait.js "></script>       
-    <script src="./assets/scripts/moment.min.js"></script>       
-    <script src="./assets/scripts/datetime-moment.js"></script>       
-    <script src="./assets/scripts/datatables-absolute.js"></script>       
-    <script src="./assets/scripts/jquery.floatThead.min.js"></script>           
-    <script src="./assets/scripts/all.min.js"></script>    
-    <script src="./assets/scripts/Chart.js"></script>    
+    <script src="./assets/scripts/jquery.min.js"></script>
+    <script src="./assets/scripts/handlebars.js"></script>
+    <script src="./assets/scripts/materialize.min.js"></script>
+    <script src="./assets/scripts/datatables.min.js"></script>
+    <script src="./assets/scripts/iziModal.min.js"></script>
+    <script src="./assets/scripts/iziToast.min.js"></script>
+    <script src="./assets/scripts/tippy.min.js"></script>
+    <script src="./assets/scripts/progressbar.min.js"></script>
+    <script src="./assets/scripts/sprintf.min.js"></script>
+    <script src="./assets/scripts/please-wait.js "></script>
+    <script src="./assets/scripts/moment.min.js"></script>
+    <script src="./assets/scripts/datetime-moment.js"></script>
+    <script src="./assets/scripts/datatables-absolute.js"></script>
+    <script src="./assets/scripts/jquery.floatThead.min.js"></script>
+    <script src="./assets/scripts/all.min.js"></script>
+    <script src="./assets/scripts/Chart.js"></script>
 
     <!-- Insert this line after script imports -->
-    <script>if (window.module) module = window.module;</script>
+    <script>
+      if (window.module) 
+        module = window.module;
+    </script>
   </head>
+
   <body>
     <script>
-      var loading_screen = pleaseWait({
-        logo: "assets/images/logo.png",
-        backgroundColor: '#000000',
-        loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"
-      });
-  
-      $(document).on("onGethReady", function() {
+      var loading_screen = pleaseWait({logo: "assets/images/logo.png", backgroundColor: '#000000', loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"});
+
+      $(document).on("onGethReady", function () {
         loading_screen.finish();
       });
 
-      $(window).on("beforeunload", function() { 
+      $(window).on("beforeunload", function () {
         EthoBlockchain.closeConnection();
       })
-    </script>  
+    </script>
     <div class="inner">
       <!-- The sidebar -->
       <div class="sidebar">
         <div class="sidebarIconWrapper iconSelected" id="mainNavBtnWalletsWrapper" data-tippy="Wallets" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnWallets" href="#"><i class="fas fa-wallet fa-2x"></i></a>
+          <a class="sidebarIcon" id="mainNavBtnWallets" href="#">
+            <i class="fas fa-wallet fa-2x"></i>
+          </a>
         </div>
         <div class="sidebarIconWrapper iconSelected" id="mainNavBtnAddressBoookWrapper" data-tippy="Address Book" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnAddressBoook" href="#"><i class="far fa-address-book fa-2x"></i></a>
-        </div>          
+          <a class="sidebarIcon" id="mainNavBtnAddressBoook" href="#">
+            <i class="far fa-address-book fa-2x"></i>
+          </a>
+        </div>
         <div class="sidebarIconWrapper" id="mainNavBtnSendWrapper" data-tippy="Send Funds" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnSend" href="#"><i class="fas fas fa-share-square fa-2x"></i></a>
+          <a class="sidebarIcon" id="mainNavBtnSend" href="#">
+            <i class="fas fas fa-share-square fa-2x"></i>
+          </a>
         </div>
         <div class="sidebarIconWrapper" id="mainNavBtnTransactionsWrapper" data-tippy="Transactions" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnTransactions" href="#"><i class="fas fa-exchange-alt fa-2x"></i></a>
+          <a class="sidebarIcon" id="mainNavBtnTransactions" href="#">
+            <i class="fas fa-exchange-alt fa-2x"></i>
+          </a>
         </div>
         <div class="sidebarIconWrapper" id="mainNavBtnMarketsWrapper" data-tippy="Markets" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnMarkets" href="#"><i class="fas fa-poll fa-2x"></i></a>
+          <a class="sidebarIcon" id="mainNavBtnMarkets" href="#">
+            <i class="fas fa-poll fa-2x"></i>
+          </a>
         </div>
         <div class="sidebarIconWrapper" id="mainNavBtnSettingsWrapper" data-tippy="Settings" data-tippy-delay="500">
-          <a class="sidebarIcon" id="mainNavBtnSettings" href="#"><i class="fas fa-cog fa-2x"></i></a>
+          <a class="sidebarIcon" id="mainNavBtnSettings" href="#">
+            <i class="fas fa-cog fa-2x"></i>
+          </a>
         </div>
         <div id="peerCount">
           Peer Count: 0
         </div>
-      </div> 
+      </div>
       <div id="mainContent"></div>
       <div id="syncProgress"></div>
       <script>
@@ -102,7 +120,7 @@
     </div>
 
     <!-- The modal for general error -->
-    <div id="dlgGeneralError" class="modalDialog" data-iziModal-title="Application Error" data-iziModal-subtitle="Something went wrong, don't kill the fish..." data-iziModal-icon="icon-home">
+    <div id="dlgGeneralError" class="modalDialog" data-izimodal-title="Application Error" data-izimodal-subtitle="Something went wrong, don't kill the fish..." data-izimodal-icon="icon-home">
       <div class="modalBody">
         <div class="form-group">
           <span id="txtGeneralError"></span>
@@ -112,7 +130,7 @@
     </div>
 
     <!-- The modal for general confirmation -->
-    <div id="dlgGeneralConfirm" class="modalDialog" data-iziModal-title="Confirmation" data-iziModal-subtitle="" data-iziModal-icon="icon-home">
+    <div id="dlgGeneralConfirm" class="modalDialog" data-izimodal-title="Confirmation" data-izimodal-subtitle="" data-izimodal-icon="icon-home">
       <div class="modalBody">
         <div class="form-group">
           <span id="txtGeneralConfirm"></span>
@@ -123,16 +141,22 @@
     </div>
 
     <!-- The modal for about info -->
-    <div id="dlgAboutInfo" class="modalDialog" data-iziModal-title="About Ether1 Wallet" data-iziModal-icon="icon-home">
+    <div id="dlgAboutInfo" class="modalDialog" data-izimodal-title="About Ether1 Wallet" data-izimodal-icon="icon-home">
       <div class="modalBody">
         <div class="aboutInfo">
           <div class="infoText" id="aboutInfoWallet">Ether1 Wallet</div>
-          <div class="infoText" id="aboutInfoGitHub">GitHub: <a id="urlOpenGitHub" href="https://github.com/taeguscromis/Ether1DesktopWallet">https://github.com/taeguscromis/Ether1DesktopWallet</a></div>        
-          <div class="infoText" id="aboutInfoLicence">Made under <a id="urlOpenLicence" href="https://choosealicense.com/licenses/gpl-3.0">GPL v3.0</a> licence</div>
-          <div class="infoText" id="aboutInfoVersion">Version: <span id="versionNumber"></span></div>
+          <div class="infoText" id="aboutInfoGitHub">GitHub:
+            <a id="urlOpenGitHub" href="https://github.com/taeguscromis/Ether1DesktopWallet">https://github.com/taeguscromis/Ether1DesktopWallet</a>
+          </div>
+          <div class="infoText" id="aboutInfoLicence">Made under
+            <a id="urlOpenLicence" href="https://choosealicense.com/licenses/gpl-3.0">GPL v3.0</a>
+            licence</div>
+          <div class="infoText" id="aboutInfoVersion">Version:
+            <span id="versionNumber"></span></div>
         </div>
         <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAboutInfoClose">Close</button>
       </div>
     </div>
   </body>
+
 </html>
diff --git a/main.js b/main.js
index 351f3ab..9655a35 100644
--- a/main.js
+++ b/main.js
@@ -1,87 +1,85 @@
 // Modules to control application life and create native browser window
-const {app, Menu, ipcMain, BrowserWindow} = require('electron');
-const singleInstance = require('single-instance');
-const path = require('path');
-const fs = require('fs');
+const {app, Menu, ipcMain, BrowserWindow} = require("electron");
+const singleInstance = require("single-instance");
+const path = require("path");
+const fs = require("fs");
 
-var locker = new singleInstance('Ether1DesktopWallet');
+var locker = new singleInstance("Ether1DesktopWallet");
 
-locker.lock().then(function() {
+locker.lock().then(function () {
   // Keep a global reference of the window object, if you don't, the window will
   // be closed automatically when the JavaScript object is garbage collected.
   mainWindow = null;
 
-  function createWindow () {
+  function createWindow() {
     // Create the browser window.
     mainWindow = new BrowserWindow({
-      width: 1200, 
+      width: 1200,
       height: 800,
       minWidth: 1100,
       minHeight: 700,
       backgroundColor: "#000000",
-      icon: 'assets/images/icon.png'
+      icon: "assets/images/icon.png"
     });
 
     // and load the index.html of the app.
-    mainWindow.loadFile('index.html');
+    mainWindow.loadFile("index.html");
     EthoGeth.startGeth();
 
     // Open the DevTools.
     // mainWindow.webContents.openDevTools()
 
     // Emitted when the window is closed.
-    mainWindow.on('closed', function () {
+    mainWindow.on("closed", function () {
       // Dereference the window object, usually you would store windows
       // in an array if your app supports multi windows, this is the time
-      // when you should delete the corresponding element.    
-      mainWindow = null
+      // when you should delete the corresponding element.
+      mainWindow = null;
     });
 
-    require('./modules/menu.js');
+    require("./modules/menu.js");
   }
 
   // This method will be called when Electron has finished
   // initialization and is ready to create browser windows.
   // Some APIs can only be used after this event occurs.
-  app.on('ready', createWindow)
+  app.on("ready", createWindow);
 
   // Quit when all windows are closed.
-  app.on('window-all-closed', function () {
+  app.on("window-all-closed", function () {
     // On OS X it is common for applications and their menu bar
     // to stay active until the user quits explicitly with Cmd + Q
-    if (process.platform !== 'darwin') {
+    if (process.platform !== "darwin") {
       EthoGeth.stopGeth();
       app.quit();
     }
-  })
+  });
 
-  app.on('activate', function () {
+  app.on("activate", function () {
     // On OS X it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.
     if (mainWindow === null) {
-      createWindow()
+      createWindow();
     }
-  })  
+  });
 
   // In this file you can include the rest of your app's specific main process
   // code. You can also put them in separate files and require them here.
   // listen for request to get template
 
   // get the template content from file
-  ipcMain.on('getTemplateContent', (event, arg) => {
-    event.returnValue = fs.readFileSync(path.join(app.getAppPath(), "assets/templates/") + arg, 'utf8');
+  ipcMain.on("getTemplateContent", (event, arg) => {
+    event.returnValue = fs.readFileSync(path.join(app.getAppPath(), "assets/templates/") + arg, "utf8");
   });
 
   // quit the app on coomand
-  ipcMain.on('appQuit', (event, arg) => {
+  ipcMain.on("appQuit", (event, arg) => {
     app.quit();
-  });  
-  
-})
-.catch(function(err) {
+  });
+}).catch(function (err) {
   app.quit();
-})
+});
 
-require('./modules/geth.js');
-require('./modules/accounts.js');
-require('./modules/database.js');
\ No newline at end of file
+require("./modules/geth.js");
+require("./modules/accounts.js");
+require("./modules/database.js");
\ No newline at end of file
diff --git a/modules/accounts.js b/modules/accounts.js
index bc1f012..a0d61c5 100644
--- a/modules/accounts.js
+++ b/modules/accounts.js
@@ -1,103 +1,99 @@
-const {app, dialog, ipcMain} = require('electron');
-const admZip = require('adm-zip');
-const path = require('path');
-const fs = require('fs-extra');
-const os = require('os');
+const {app, dialog, ipcMain} = require("electron");
+const admZip = require("adm-zip");
+const path = require("path");
+const fs = require("fs-extra");
+const os = require("os");
 
 class Accounts {
-  constructor() {
-  }
+  constructor() {}
 
   getKeyStoreLocation() {
-    switch(os.type()) {
-        case "Darwin":
-          return path.join(os.homedir(), 'Library', 'Ether1', 'keystore');
-          break;
-        default:
-          return path.join(process.env.APPDATA, 'Ether1', 'keystore');
-    }     
+    switch (os.type()) {
+      case "Darwin":
+        return path.join(os.homedir(), "Library", "Ether1", "keystore");
+        break;
+      default:
+        return path.join(process.env.APPDATA, "Ether1", "keystore");
+    }
   }
 
   exportAccounts() {
     var savePath = dialog.showSaveDialog({
-        defaultPath: path.join(app.getPath('documents'), 'accounts.zip')
+      defaultPath: path.join(app.getPath("documents"), "accounts.zip")
     });
 
     if (savePath) {
-        const accPath = EthoAccounts.getKeyStoreLocation();
-        
-        fs.readdir(accPath, function(err, files) {
-            var zip = new admZip();
+      const accPath = EthoAccounts.getKeyStoreLocation();
 
-            for(let filePath of files) {
-                zip.addFile(filePath, fs.readFileSync(path.join(accPath, filePath)));
-            }
+      fs.readdir(accPath, function (err, files) {
+        var zip = new admZip();
 
-            // store zip to path
-            zip.writeZip(savePath);
-        }); 
+        for (let filePath of files) {
+          zip.addFile(filePath, fs.readFileSync(path.join(accPath, filePath)));
+        }
+
+        // store zip to path
+        zip.writeZip(savePath);
+      });
     }
   }
 
-  importAccounts(accountsFile) { 
+  importAccounts(accountsFile) {
     var extName = path.extname(accountsFile).toUpperCase();
     const accPath = EthoAccounts.getKeyStoreLocation();
 
-    if (extName == '.ZIP') {
-        var zip = new admZip(accountsFile);
-        zip.extractAllTo(accPath, true);  
-        return { success: true, text: "Accounts ware successfully imported."};
+    if (extName == ".ZIP") {
+      var zip = new admZip(accountsFile);
+      zip.extractAllTo(accPath, true);
+      return {success: true, text: "Accounts ware successfully imported."};
     } else {
-        try {
-            fs.copySync(accountsFile,  path.join(accPath, path.basename(accountsFile)));
-            return { success: true, text: "Account was successfully imported."};
-          } catch (err) {
-            return { success: false, text: err};
-        }
+      try {
+        fs.copySync(accountsFile, path.join(accPath, path.basename(accountsFile)));
+        return {success: true, text: "Account was successfully imported."};
+      } catch (err) {
+        return {success: false, text: err};
+      }
     }
   }
 
-  saveAccount(account) { 
-    fs.writeFile(path.join(tEthoAccountshis.getKeyStoreLocation(), '0x' + account.address), JSON.stringify(account), 'utf8', function() {
-        // file was written
+  saveAccount(account) {
+    fs.writeFile(path.join(tEthoAccountshis.getKeyStoreLocation(), "0x" + account.address), JSON.stringify(account), "utf8", function () {
+      // file was written
     });
   }
 }
 
-ipcMain.on('exportAccounts', (event, arg) => {
-    EthoAccounts.exportAccounts();    
-});
-  
-ipcMain.on('importAccounts', (event, arg) => {
-    var openPath = dialog.showOpenDialog({
-        defaultPath: app.getPath('documents'),
-        "filters":
-        [
-            {
-                "name": "archive",
-                "extensions": ["zip"]
-            },
-            {
-                "name": "json",
-                "extensions": ["json"]
-            },
-            {
-                "name": "All",
-                "extensions": ["*.*"]
-            }
-        ]
-    });
-
-    if (openPath) {
-        event.returnValue = EthoAccounts.importAccounts(openPath[0]);
-    } else {
-        event.returnValue = {}; 
-    }
+ipcMain.on("exportAccounts", (event, arg) => {
+  EthoAccounts.exportAccounts();
 });
 
-ipcMain.on('saveAccount', (event, arg) => {
-    EthoAccounts.saveAccount(arg);
-    event.returnValue = true; 
+ipcMain.on("importAccounts", (event, arg) => {
+  var openPath = dialog.showOpenDialog({
+    defaultPath: app.getPath("documents"),
+    filters: [
+      {
+        name: "archive",
+        extensions: ["zip"]
+      }, {
+        name: "json",
+        extensions: ["json"]
+      }, {
+        name: "All",
+        extensions: ["*.*"]
+      }
+    ]
+  });
+
+  if (openPath) {
+    event.returnValue = EthoAccounts.importAccounts(openPath[0]);
+  } else {
+    event.returnValue = {};
+  }
+});
+
+ipcMain.on("saveAccount", (event, arg) => {
+  EthoAccounts.saveAccount(arg);
+  event.returnValue = true;
 });
 
 EthoAccounts = new Accounts();
\ No newline at end of file
diff --git a/modules/database.js b/modules/database.js
index 9493502..86edbf7 100644
--- a/modules/database.js
+++ b/modules/database.js
@@ -1,50 +1,59 @@
-const {app, dialog, ipcMain} = require('electron');
-const storage = require('electron-storage');
-const datastore = require('nedb');
-const moment = require('moment');
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
+const {app, dialog, ipcMain} = require("electron");
+const storage = require("electron-storage");
+const datastore = require("nedb");
+const moment = require("moment");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
 
-const dbPath = path.join(app.getPath('userData'), 'storage.db');
-const db = new datastore({ filename: dbPath });
-db.loadDatabase(function (err) {    
+const dbPath = path.join(app.getPath("userData"), "storage.db");
+const db = new datastore({filename: dbPath});
+db.loadDatabase(function (err) {
   // Now commands will be executed
 });
 
 // index the block field
-db.ensureIndex({ fieldName: 'block' }, function (err) {
+db.ensureIndex({
+  fieldName: "block"
+}, function (err) {
   // If there was an error, err is not null
 });
 
 // index the txhash field
-db.ensureIndex({ fieldName: 'txhash', unique: true }, function (err) {
+db.ensureIndex({
+  fieldName: "txhash",
+  unique: true
+}, function (err) {
   // If there was an error, err is not null
 });
-  
-ipcMain.on('storeTransaction', (event, arg) => {
-  db.update({ txhash: arg.txhash }, arg, { upsert: true }, function (err, numReplaced, upsert) {
+
+ipcMain.on("storeTransaction", (event, arg) => {
+  db.update({
+    txhash: arg.txhash
+  }, arg, {
+    upsert: true
+  }, function (err, numReplaced, upsert) {
     // do nothing for now
   });
 });
-  
-ipcMain.on('getTransactions', (event, arg) => {
+
+ipcMain.on("getTransactions", (event, arg) => {
   db.find({}).exec(function (err, docs) {
     ResultData = [];
-    
+
     // sort the data
-    docs.sort((a, b)=>{
-      if ((!b.block) && (a.block)) {
+    docs.sort((a, b) => {
+      if (!b.block && a.block) {
         return 1;
-      } else if ((b.block) && (!a.block)) {
+      } else if (b.block && !a.block) {
         return -1;
-      } else if ((!b.block) && (!a.block)) {
-        return moment(b.timestamp, "YYYY-MM-DD HH:mm:ss").toDate() - moment(a.timestamp, "YYYY-MM-DD HH:mm:ss").toDate();
+      } else if (!b.block && !a.block) {
+        return (moment(b.timestamp, "YYYY-MM-DD HH:mm:ss").toDate() - moment(a.timestamp, "YYYY-MM-DD HH:mm:ss").toDate());
       } else {
         return b.block - a.block;
       }
     });
-    
+
     for (i = 0; i < Math.min(docs.length, 500); i++) {
       ResultData.push([
         docs[i].block,
@@ -59,73 +68,93 @@ ipcMain.on('getTransactions', (event, arg) => {
     event.returnValue = ResultData;
   });
 });
-  
-ipcMain.on('getJSONFile', (event, arg) => {
+
+ipcMain.on("getJSONFile", (event, arg) => {
   storage.get(arg, (err, data) => {
     if (err) {
       event.returnValue = null;
     } else {
       event.returnValue = data;
     }
-  });        
+  });
 });
 
-ipcMain.on('setJSONFile', (event, arg) => {
-  storage.set(arg.file, arg.data, (err) => {
+ipcMain.on("setJSONFile", (event, arg) => {
+  storage.set(arg.file, arg.data, err => {
     if (err) {
-      event.returnValue = { success: false, error: err };
+      event.returnValue = {
+        success: false,
+        error: err
+      };
     } else {
-      event.returnValue = { success: true, error: null };
+      event.returnValue = {
+        success: true,
+        error: null
+      };
     }
   });
-});  
+});
 
-ipcMain.on('deleteTransactions', (event, arg) => {
-  fs.unlink(dbPath, (err) => {
+ipcMain.on("deleteTransactions", (event, arg) => {
+  fs.unlink(dbPath, err => {
     if (err) {
-      event.returnValue = { success: false, error: err };
+      event.returnValue = {
+        success: false,
+        error: err
+      };
     } else {
-      event.returnValue = { success: true, error: null };
+      event.returnValue = {
+        success: true,
+        error: null
+      };
     }
-  });  
-});  
+  });
+});
 
-ipcMain.on('deleteWalletData', (event, arg) => {
-  fs.unlink(path.join(app.getPath('userData'), 'wallets.json'), (err) => {
+ipcMain.on("deleteWalletData", (event, arg) => {
+  fs.unlink(path.join(app.getPath("userData"), "wallets.json"), err => {
     if (err) {
-      event.returnValue = { success: false, error: err };
+      event.returnValue = {
+        success: false,
+        error: err
+      };
     } else {
-      event.returnValue = { success: true, error: null };
+      event.returnValue = {
+        success: true,
+        error: null
+      };
     }
-  });  
-});  
+  });
+});
 
-ipcMain.on('deleteBlockchainData', (event, arg) => {  
-  var deleteFolderRecursive = function(path) {
-    if( fs.existsSync(path) ) {
-      fs.readdirSync(path).forEach(function(file,index){
+ipcMain.on("deleteBlockchainData", (event, arg) => {
+  var deleteFolderRecursive = function (path) {
+    if (fs.existsSync(path)) {
+      fs.readdirSync(path).forEach(function (file, index) {
         var curPath = path + "/" + file;
-        if(fs.lstatSync(curPath).isDirectory()) { // recurse
+        if (fs.lstatSync(curPath).isDirectory()) {
+          // recurse
           deleteFolderRecursive(curPath);
-        } else { // delete file
+        } else {
+          // delete file
           fs.unlinkSync(curPath);
         }
       });
       fs.rmdirSync(path);
     }
-  };  
-  
+  };
+
   function getBlockchainDataLocation() {
-    switch(os.type()) {
-        case "Darwin":
-          return path.join(os.homedir(), 'Library', 'Ether1', 'geth');
-          break;
-        default:
-          return path.join(process.env.APPDATA, 'Ether1', 'geth');
-    }     
+    switch (os.type()) {
+      case "Darwin":
+        return path.join(os.homedir(), "Library", "Ether1", "geth");
+        break;
+      default:
+        return path.join(process.env.APPDATA, "Ether1", "geth");
+    }
   }
 
   // delete folder in a synchronous recursive maner
   deleteFolderRecursive(getBlockchainDataLocation());
   event.returnValue = true;
-});  
+});
diff --git a/modules/geth.js b/modules/geth.js
index df7b33d..96c1a75 100644
--- a/modules/geth.js
+++ b/modules/geth.js
@@ -1,47 +1,44 @@
-const {app, dialog, ipcMain} = require('electron');
-const child_process = require('child_process');
-const appRoot = require('app-root-path');
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-
+const {app, dialog, ipcMain} = require("electron");
+const child_process = require("child_process");
+const appRoot = require("app-root-path");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
 
 class Geth {
   constructor() {
     this.gethProcess = null;
     this.logGethEvents = false;
     // create the user data dir (needed for MacOS)
-    if (!fs.existsSync(app.getPath('userData'))) {
-      fs.mkdirSync(app.getPath('userData')); 
-    }   
-
-    if (this.logGethEvents) {
-      this.logStream = fs.createWriteStream(path.join(app.getPath('userData'), 'gethlog.txt'), { flags: 'a' });
+    if (!fs.existsSync(app.getPath("userData"))) {
+      fs.mkdirSync(app.getPath("userData"));
     }
 
-    if (appRoot.path.indexOf('app.asar') > -1) {
+    if (this.logGethEvents) {
+      this.logStream = fs.createWriteStream(path.join(app.getPath("userData"), "gethlog.txt"), {flags: "a"});
+    }
+
+    if (appRoot.path.indexOf("app.asar") > -1) {
       this.rootPath = path.dirname(appRoot.path);
     } else {
       this.rootPath = appRoot.path;
     }
 
-    switch(os.type()) {
+    switch (os.type()) {
       case "Linux":
-        this.binaries = path.join(this.rootPath, 'bin', 'linux');
+        this.binaries = path.join(this.rootPath, "bin", "linux");
         break;
       case "Darwin":
-        this.binaries = path.join(this.rootPath, 'bin', 'macos');
+        this.binaries = path.join(this.rootPath, "bin", "macos");
         break;
       case "Windows_NT":
-        this.binaries = path.join(this.rootPath, 'bin', 'win');
+        this.binaries = path.join(this.rootPath, "bin", "win");
         break;
       default:
-        this.binaries = path.join(this.rootPath, 'bin', 'win');        
-    } 
-
-    
+        this.binaries = path.join(this.rootPath, "bin", "win");
+    }
   }
-  
+
   _writeLog(text) {
     if (this.logGethEvents) {
       this.logStream.write(text);
@@ -51,23 +48,33 @@ class Geth {
   startGeth() {
     // get the path of get and execute the child process
     try {
-      const gethPath = path.join(this.binaries, 'geth');
-      this.gethProcess = child_process.spawn(gethPath, ['--ws', '--wsorigins', '*', '--wsaddr', '127.0.0.1', '--wsport', '8546', '--wsapi', 'admin,db,eth,net,miner,personal,web3']);
+      const gethPath = path.join(this.binaries, "geth");
+      this.gethProcess = child_process.spawn(gethPath, [
+        "--ws",
+        "--wsorigins",
+        "*",
+        "--wsaddr",
+        "127.0.0.1",
+        "--wsport",
+        "8546",
+        "--wsapi",
+        "admin,db,eth,net,miner,personal,web3"
+      ]);
 
       if (!this.gethProcess) {
         dialog.showErrorBox("Error starting application", "Geth failed to start!");
         app.quit();
       } else {
-        this.gethProcess.on('error', function(err) {
+        this.gethProcess.on("error", function (err) {
           dialog.showErrorBox("Error starting application", "Geth failed to start!");
           app.quit();
         });
-        this.gethProcess.stderr.on('data', function(data) {
-          EthoGeth._writeLog(data.toString() + '\n');
+        this.gethProcess.stderr.on("data", function (data) {
+          EthoGeth._writeLog(data.toString() + "\n");
+        });
+        this.gethProcess.stdout.on("data", function (data) {
+          EthoGeth._writeLog(data.toString() + "\n");
         });
-        this.gethProcess.stdout.on('data', function(data) {
-          EthoGeth._writeLog(data.toString() + '\n');
-        });        
       }
     } catch (err) {
       dialog.showErrorBox("Error starting application", err.message);
@@ -75,18 +82,18 @@ class Geth {
     }
   }
 
-  stopGeth() { 
+  stopGeth() {
     if (os.type() == "Windows_NT") {
-      const gethWrapePath = path.join(this.binaries, 'WrapGeth.exe');
-      child_process.spawnSync(gethWrapePath, [this.gethProcess.pid]);  
+      const gethWrapePath = path.join(this.binaries, "WrapGeth.exe");
+      child_process.spawnSync(gethWrapePath, [this.gethProcess.pid]);
     } else {
-      this.gethProcess.kill('SIGTERM');
+      this.gethProcess.kill("SIGTERM");
     }
   }
 }
 
-ipcMain.on('stopGeth', (event, arg) => {
+ipcMain.on("stopGeth", (event, arg) => {
   EthoGeth.stopGeth();
-});  
+});
 
 EthoGeth = new Geth();
\ No newline at end of file
diff --git a/modules/menu.js b/modules/menu.js
index 9cfbc69..67ab021 100644
--- a/modules/menu.js
+++ b/modules/menu.js
@@ -1,202 +1,170 @@
-const {app, Menu, ipcMain} = require('electron');
+const {app, Menu, ipcMain} = require("electron");
 const open = require("open");
 
 const template = [
-    {
-        label: 'File',
-        submenu: [
-          {
-            label:'Exit', 
-            click() { 
-                app.quit() 
-            }           }
-        ]
-      },
-      {
-    label: 'Edit',
+  {
+    label: "File",
     submenu: [
       {
-        role: 'undo'
-      },
-      {
-        role: 'redo'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        role: 'cut'
-      },
-      {
-        role: 'copy'
-      },
-      {
-        role: 'paste'
-      },
-      {
-        role: 'delete'
-      },
-      {
-        role: 'selectall'
+        label: "Exit",
+        click() {
+          app.quit();
+        }
       }
     ]
-  },
-  {
-    label: 'View',
+  }, {
+    label: "Edit",
     submenu: [
       {
-        label: 'Reload',
-        accelerator: 'CmdOrCtrl+R',
-        click (item, focusedWindow) {
-          if (focusedWindow) focusedWindow.reload()
-        }
-      },
-      {
-        label: 'Toggle Developer Tools',
-        accelerator: process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
-        click (item, focusedWindow) {
-          if (focusedWindow) focusedWindow.webContents.toggleDevTools()
-        }
-      },
-      {
-        type: 'separator'
-      },
-      {
-        role: 'resetzoom'
-      },
-      {
-        role: 'zoomin'
-      },
-      {
-        role: 'zoomout'
-      },      
-      {
-        type: 'separator'
-      },
-      {
-        role: 'togglefullscreen'
+        role: "undo"
+      }, {
+        role: "redo"
+      }, {
+        type: "separator"
+      }, {
+        role: "cut"
+      }, {
+        role: "copy"
+      }, {
+        role: "paste"
+      }, {
+        role: "delete"
+      }, {
+        role: "selectall"
       }
     ]
-  },
-  {
-    role: 'window',
+  }, {
+    label: "View",
     submenu: [
       {
-        role: 'minimize'
-      },
-      {
-        role: 'close'
+        label: "Reload",
+        accelerator: "CmdOrCtrl+R",
+        click(item, focusedWindow) {
+          if (focusedWindow) 
+            focusedWindow.reload();
+          }
+        }, {
+        label: "Toggle Developer Tools",
+        accelerator: process.platform === "darwin"
+          ? "Alt+Command+I"
+          : "Ctrl+Shift+I",
+        click(item, focusedWindow) {
+          if (focusedWindow) 
+            focusedWindow.webContents.toggleDevTools();
+          }
+        }, {
+        type: "separator"
+      }, {
+        role: "resetzoom"
+      }, {
+        role: "zoomin"
+      }, {
+        role: "zoomout"
+      }, {
+        type: "separator"
+      }, {
+        role: "togglefullscreen"
       }
     ]
-  },
-  {
-    role: 'help',
+  }, {
+    role: "window",
     submenu: [
       {
-        label: 'About Ether1 wallet',
-        click () { 
-            var infoData = {};
-            infoData.version = app.getVersion();
-            mainWindow.webContents.send('showAboutDialog', infoData);
-        }
-      },
+        role: "minimize"
+      }, {
+        role: "close"
+      }
+    ]
+  }, {
+    role: "help",
+    submenu: [
       {
-        label: 'Ether1 documentation',
-        click () { 
-            open("https://docs.ether1.org");
+        label: "About Ether1 wallet",
+        click() {
+          var infoData = {};
+          infoData.version = app.getVersion();
+          mainWindow.webContents.send("showAboutDialog", infoData);
         }
-      },
-      {
-        label: 'Report issue on GitHub',
-        click () { 
-            open("https://github.com/taeguscromis/Ether1DesktopWallet/issues");
+      }, {
+        label: "Ether1 documentation",
+        click() {
+          open("https://docs.ether1.org");
+        }
+      }, {
+        label: "Report issue on GitHub",
+        click() {
+          open("https://github.com/taeguscromis/Ether1DesktopWallet/issues");
         }
       }
     ]
   }
-]
+];
 
-if (process.platform === 'darwin') {
-  const name = app.getName()
+if (process.platform === "darwin") {
+  const name = app.getName();
   template.unshift({
     label: name,
     submenu: [
       {
-        role: 'about'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        role: 'services',
+        role: "about"
+      }, {
+        type: "separator"
+      }, {
+        role: "services",
         submenu: []
-      },
-      {
-        type: 'separator'
-      },
-      {
-        role: 'hide'
-      },
-      {
-        role: 'hideothers'
-      },
-      {
-        role: 'unhide'
-      },
-      {
-        type: 'separator'
-      },
-      {
-        role: 'quit'
+      }, {
+        type: "separator"
+      }, {
+        role: "hide"
+      }, {
+        role: "hideothers"
+      }, {
+        role: "unhide"
+      }, {
+        type: "separator"
+      }, {
+        role: "quit"
       }
     ]
-  })
+  });
   // Edit menu.
-  template[1].submenu.push(
-    {
-      type: 'separator'
-    },
-    {
-      label: 'Speech',
-      submenu: [
-        {
-          role: 'startspeaking'
-        },
-        {
-          role: 'stopspeaking'
-        }
-      ]
-    }
-  )
+  template[1].submenu.push({
+    type: "separator"
+  }, {
+    label: "Speech",
+    submenu: [
+      {
+        role: "startspeaking"
+      }, {
+        role: "stopspeaking"
+      }
+    ]
+  });
   // Window menu.
   template[3].submenu = [
     {
-      label: 'Close',
-      accelerator: 'CmdOrCtrl+W',
-      role: 'close'
-    },
-    {
-      label: 'Minimize',
-      accelerator: 'CmdOrCtrl+M',
-      role: 'minimize'
-    },
-    {
-      label: 'Zoom',
-      role: 'zoom'
-    },
-    {
-      type: 'separator'
-    },
-    {
-      label: 'Bring All to Front',
-      role: 'front'
+      label: "Close",
+      accelerator: "CmdOrCtrl+W",
+      role: "close"
+    }, {
+      label: "Minimize",
+      accelerator: "CmdOrCtrl+M",
+      role: "minimize"
+    }, {
+      label: "Zoom",
+      role: "zoom"
+    }, {
+      type: "separator"
+    }, {
+      label: "Bring All to Front",
+      role: "front"
     }
-  ]
+  ];
 }
 
-ipcMain.on('openURL', (event, arg) => {
-    open(arg);
+ipcMain.on("openURL", (event, arg) => {
+  open(arg);
 });
-  
-const menu = Menu.buildFromTemplate(template)
-Menu.setApplicationMenu(menu)
\ No newline at end of file
+
+const menu = Menu.buildFromTemplate(template);
+Menu.setApplicationMenu(menu);
diff --git a/package.json b/package.json
index e2f92f8..ab1223b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Ether1Wallet",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Desktop wallet for Ether1 currency",
   "main": "main.js",
   "scripts": {
@@ -22,41 +22,34 @@
       "target": "7z",
       "icon": "build/icon.png",
       "artifactName": "Windows-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/win/*"
-      ]
+      "extraResources": ["bin/win/*"]
     },
     "linux": {
       "target": "tar.gz",
       "icon": "build/icon.icns",
       "artifactName": "Linux-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/linux/*"
-      ]
+      "extraResources": ["bin/linux/*"]
     },
     "mac": {
       "target": "pkg",
       "icon": "build/icon.icns",
       "artifactName": "MacOS-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/macos/*"
-      ]
+      "extraResources": ["bin/macos/*"]
     }
   },
   "repository": "https://github.com/taeguscromis/Ether1DesktopWallet",
   "keywords": [
-    "Ether1",
-    "Desktop",
-    "Wallet"
+    "Ether1", "Desktop", "Wallet"
   ],
   "author": "Ether1",
   "license": "CC0-1.0",
   "dependencies": {
+    "@unibeautify/beautifier-js-beautify": "^0.4.0",
     "adm-zip": "^0.4.13",
     "app-root-path": "^2.1.0",
     "electron-storage": "^1.0.7",
     "fs-extra": "^7.0.1",
-    "handlebars": "^4.0.12",
+    "handlebars": "^4.1.0",
     "moment": "^2.23.0",
     "nedb": "^1.8.0",
     "open": "0.0.5",
@@ -64,6 +57,9 @@
   },
   "devDependencies": {
     "electron": "^3.0.12",
-    "electron-builder": "^20.38.3"
+    "electron-builder": "^20.38.3",
+    "js-beautify": "^1.9.0",
+    "unibeautify": "^0.17.0",
+    "unibeautify-cli": "^0.2.1"
   }
 }
diff --git a/renderer/blockchain.js b/renderer/blockchain.js
index 5b9db45..8b1efbf 100644
--- a/renderer/blockchain.js
+++ b/renderer/blockchain.js
@@ -1,282 +1,280 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Blockchain {
-    constructor() {
-        this.txSubscribe = null;
-        this.bhSubscribe = null;
-    }
+  constructor() {
+    this.txSubscribe = null;
+    this.bhSubscribe = null;
+  }
 
-    getBlock(blockToGet, includeData, clbError, clbSuccess) {
-        web3Local.eth.getBlock(blockToGet, includeData, function(error, block) {
-            if (error) {
-                clbError(error);
-            } else {
-                clbSuccess(block);
-            }
-        });
-    }
+  getBlock(blockToGet, includeData, clbError, clbSuccess) {
+    web3Local.eth.getBlock(blockToGet, includeData, function (error, block) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(block);
+      }
+    });
+  }
 
-    getAccounts(clbError, clbSuccess) {
-        web3Local.eth.getAccounts(function(err, res) { 
-            if (err) {
-                clbError(err);
-            } else {
-                clbSuccess(res);
-            }
-        });
-    }
+  getAccounts(clbError, clbSuccess) {
+    web3Local.eth.getAccounts(function (err, res) {
+      if (err) {
+        clbError(err);
+      } else {
+        clbSuccess(res);
+      }
+    });
+  }
 
-    isAddress(address) {
-        return web3Local.utils.isAddress(address);
-    }
+  isAddress(address) {
+    return web3Local.utils.isAddress(address);
+  }
 
-    getTransaction(thxid, clbError, clbSuccess) {
-        web3Local.eth.getTransaction(thxid, function( error, result ) {
-            if (error) {
-                clbError(error);    
-            } else {
-                clbSuccess(result);
-            }
-        });
-    }
+  getTransaction(thxid, clbError, clbSuccess) {
+    web3Local.eth.getTransaction(thxid, function (error, result) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(result);
+      }
+    });
+  }
 
-    getTranasctionFee(fromAddress, toAddress, value, clbError, clbSuccess) {
-        web3Local.eth.getTransactionCount(fromAddress, function( error, result ) {
-            if (error) {
-                clbError(error);    
-            } else {
-                var amountToSend = web3Local.utils.toWei(value, "ether"); //convert to wei value
-                var RawTransaction = {
-                    from: fromAddress,
-                    to: toAddress, 
-                    value: amountToSend,
-                    nonce: result
-                };
-    
-                web3Local.eth.estimateGas(RawTransaction, function( error, result ) {
-                    if (error) {
-                        clbError(error);
-                    } else {
-                        var usedGas = result + 1;
-                        web3Local.eth.getGasPrice(function( error, result ) {
-                            if (error) {
-                                clbError(error);
-                            } else {
-                                clbSuccess(result * usedGas);
-                            }
-                        });
-                    }
-                });      
-            }
-        });  
-    }
+  getTranasctionFee(fromAddress, toAddress, value, clbError, clbSuccess) {
+    web3Local.eth.getTransactionCount(fromAddress, function (error, result) {
+      if (error) {
+        clbError(error);
+      } else {
+        var amountToSend = web3Local.utils.toWei(value, "ether"); //convert to wei value
+        var RawTransaction = {
+          from: fromAddress,
+          to: toAddress,
+          value: amountToSend,
+          nonce: result
+        };
 
-    prepareTransaction(password, fromAddress, toAddress, value, clbError, clbSuccess) {
-        web3Local.eth.personal.unlockAccount(fromAddress, password, function( error, result ) {                    
-            if (error) {
-                clbError("Wrong password for the selected address!");
-            } else
-            {
-                web3Local.eth.getTransactionCount(fromAddress, 'pending', function( error, result ) {
-                    if (error) {
-                        clbError(error);   
-                    } else {
-                        var amountToSend = web3Local.utils.toWei(value, "ether"); //convert to wei value
-                        var RawTransaction = {
-                            from: fromAddress,
-                            to: toAddress, 
-                            value: amountToSend,
-                            nonce: result
-                        };
-
-                        web3Local.eth.estimateGas(RawTransaction, function( error, result ) {
-                            if (error) {
-                                clbError(error);
-                            } else {
-                                RawTransaction.gas = result + 1;
-                                web3Local.eth.getGasPrice(function( error, result ) {
-                                    if (error) {
-                                        clbError(error);    
-                                    } else {
-                                        RawTransaction.gasPrice = result;
-                                        web3Local.eth.signTransaction(RawTransaction, fromAddress, function( error, result ) {
-                                            if (error) {
-                                                clbError(error);
-                                            } else {
-                                                clbSuccess(result);
-                                            }
-                                        });    
-                                    }
-                                });
-                            }
-                        });    
-                    }
-                });    
-            }
-        });                
-    }
-
-    sendTransaction(rawTransaction, clbError, clbSuccess) {
-        web3Local.eth.sendSignedTransaction(rawTransaction, function( error, result ) {
-            if (error) {
-                clbError(error);
-            } else {
-                clbSuccess(result);
-            }
-        });
-    }
-
-    getAccountsData(clbError, clbSuccess) {
-        var rendererData = {};
-        rendererData.sumBalance = 0;
-        rendererData.addressData = [];
-      
-        var wallets = EthoDatatabse.getWallets();
-        var counter = 0;
-      
-        web3Local.eth.getAccounts(function(err, res) { 
-          if (err) {
-            clbError(err);
+        web3Local.eth.estimateGas(RawTransaction, function (error, result) {
+          if (error) {
+            clbError(error);
           } else {
-            for (var i = 0; i < res.length; i++) {
-                var walletName =  vsprintf("Account %d", [i + 1]);
-                if (wallets) {
-                  walletName = wallets.names[res[i]] || walletName;
-                }
-        
-                var addressInfo = {};
-                addressInfo.balance = 0;
-                addressInfo.address = res[i];
-                addressInfo.name = walletName;
-                rendererData.addressData.push(addressInfo);
-              }
-          
-              if (rendererData.addressData.length > 0) {
-                updateBalance(counter);
+            var usedGas = result + 1;
+            web3Local.eth.getGasPrice(function (error, result) {
+              if (error) {
+                clbError(error);
               } else {
-                clbSuccess(rendererData);
-              }       
-          }
-        });
-      
-        function updateBalance(index)
-        {
-          web3Local.eth.getBalance(rendererData.addressData[index].address, function(error, balance) {
-            rendererData.addressData[index].balance = parseFloat(web3Local.utils.fromWei(balance, 'ether')).toFixed(2); 
-            rendererData.sumBalance = rendererData.sumBalance + parseFloat(web3Local.utils.fromWei(balance, 'ether'));
-      
-            if (counter < rendererData.addressData.length - 1) {
-              counter++;
-              updateBalance(counter);
-            } else {
-              rendererData.sumBalance = parseFloat(rendererData.sumBalance).toFixed(2); 
-              clbSuccess(rendererData);
-            }
-          });    
-        }    
-    }
-
-    getAddressListData(clbError, clbSuccess) {
-        var rendererData = {};
-        rendererData.addressData = [];
-      
-        var wallets = EthoDatatabse.getWallets();
-        var counter = 0;
-      
-        web3Local.eth.getAccounts(function(err, res) { 
-          if (err) {
-            clbError(err);
-          } else {
-            for (var i = 0; i < res.length; i++) {
-                var walletName =  vsprintf("Account %d", [i + 1]);
-                if (wallets) {
-                  walletName = wallets.names[res[i]] || walletName;
-                }
-        
-                var addressInfo = {};
-                addressInfo.address = res[i];
-                addressInfo.name = walletName;
-                rendererData.addressData.push(addressInfo);
-            }
-          
-            clbSuccess(rendererData);
-          }
-        });      
-    }
-
-    createNewAccount(password, clbError, clbSuccess) {
-        web3Local.eth.personal.newAccount(password, function(error, account) {
-            if (error) {
-                clbError(error);
-            } else {
-              clbSuccess(account);
-            }
-        });
-    }
-
-    importFromPrivateKey(privateKey, password) {
-        web3Local.eth.accounts.wallet.clear();
-        web3Local.eth.accounts.wallet.add(privateKey);
-        return web3Local.eth.accounts.wallet.encrypt('123456789');
-    }
-
-    subsribePendingTransactions(clbError, clbSuccess, clbData) {
-        this.txSubscribe = web3Local.eth.subscribe('pendingTransactions', function(error, result){
-            if (error) {
-                clbError(error);
-            } else {
-                clbSuccess(result);
-            }
-        }).on("data", function(transaction){
-            if (clbData) {
-                clbData(transaction);
-            }
-        });        
-    }
-
-    unsubsribePendingTransactions(clbError, clbSuccess) {
-        if (this.txSubscribe) {
-            this.txSubscribe.unsubscribe(function(error, success){
-                if(error) {
-                    clbError(error);
-                } else {
-                    clbSuccess(success) ;
-                }
+                clbSuccess(result * usedGas);
+              }
             });
-        }
-    }
+          }
+        });
+      }
+    });
+  }
 
-    subsribeNewBlockHeaders(clbError, clbSuccess, clbData) {
-        this.bhSubscribe = web3Local.eth.subscribe('newBlockHeaders', function(error, result){
-            if (error) {
+  prepareTransaction(password, fromAddress, toAddress, value, clbError, clbSuccess) {
+    web3Local.eth.personal.unlockAccount(fromAddress, password, function (error, result) {
+      if (error) {
+        clbError("Wrong password for the selected address!");
+      } else {
+        web3Local.eth.getTransactionCount(fromAddress, "pending", function (error, result) {
+          if (error) {
+            clbError(error);
+          } else {
+            var amountToSend = web3Local.utils.toWei(value, "ether"); //convert to wei value
+            var RawTransaction = {
+              from: fromAddress,
+              to: toAddress,
+              value: amountToSend,
+              nonce: result
+            };
+
+            web3Local.eth.estimateGas(RawTransaction, function (error, result) {
+              if (error) {
                 clbError(error);
-            } else {
-                clbSuccess(result);
-            }
-        }).on("data", function(blockHeader){
-            if (clbData) {
-                clbData(blockHeader);
-            }
-        });        
-    }
-
-    unsubsribeNewBlockHeaders(clbError, clbSuccess) {
-        if (this.bhSubscribe) {
-            this.bhSubscribe.unsubscribe(function(error, success){
-                if(error) {
+              } else {
+                RawTransaction.gas = result + 1;
+                web3Local.eth.getGasPrice(function (error, result) {
+                  if (error) {
                     clbError(error);
-                } else {
-                    clbSuccess(success) ;
-                }
-            });    
-        }
-    }
+                  } else {
+                    RawTransaction.gasPrice = result;
+                    web3Local.eth.signTransaction(RawTransaction, fromAddress, function (error, result) {
+                      if (error) {
+                        clbError(error);
+                      } else {
+                        clbSuccess(result);
+                      }
+                    });
+                  }
+                });
+              }
+            });
+          }
+        });
+      }
+    });
+  }
 
-    closeConnection() {
-        web3Local.currentProvider.connection.close();
+  sendTransaction(rawTransaction, clbError, clbSuccess) {
+    web3Local.eth.sendSignedTransaction(rawTransaction, function (error, result) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(result);
+      }
+    });
+  }
+
+  getAccountsData(clbError, clbSuccess) {
+    var rendererData = {};
+    rendererData.sumBalance = 0;
+    rendererData.addressData = [];
+
+    var wallets = EthoDatatabse.getWallets();
+    var counter = 0;
+
+    web3Local.eth.getAccounts(function (err, res) {
+      if (err) {
+        clbError(err);
+      } else {
+        for (var i = 0; i < res.length; i++) {
+          var walletName = vsprintf("Account %d", [i + 1]);
+          if (wallets) {
+            walletName = wallets.names[res[i]] || walletName;
+          }
+
+          var addressInfo = {};
+          addressInfo.balance = 0;
+          addressInfo.address = res[i];
+          addressInfo.name = walletName;
+          rendererData.addressData.push(addressInfo);
+        }
+
+        if (rendererData.addressData.length > 0) {
+          updateBalance(counter);
+        } else {
+          clbSuccess(rendererData);
+        }
+      }
+    });
+
+    function updateBalance(index) {
+      web3Local.eth.getBalance(rendererData.addressData[index].address, function (error, balance) {
+        rendererData.addressData[index].balance = parseFloat(web3Local.utils.fromWei(balance, "ether")).toFixed(2);
+        rendererData.sumBalance = rendererData.sumBalance + parseFloat(web3Local.utils.fromWei(balance, "ether"));
+
+        if (counter < rendererData.addressData.length - 1) {
+          counter++;
+          updateBalance(counter);
+        } else {
+          rendererData.sumBalance = parseFloat(rendererData.sumBalance).toFixed(2);
+          clbSuccess(rendererData);
+        }
+      });
     }
+  }
+
+  getAddressListData(clbError, clbSuccess) {
+    var rendererData = {};
+    rendererData.addressData = [];
+
+    var wallets = EthoDatatabse.getWallets();
+    var counter = 0;
+
+    web3Local.eth.getAccounts(function (err, res) {
+      if (err) {
+        clbError(err);
+      } else {
+        for (var i = 0; i < res.length; i++) {
+          var walletName = vsprintf("Account %d", [i + 1]);
+          if (wallets) {
+            walletName = wallets.names[res[i]] || walletName;
+          }
+
+          var addressInfo = {};
+          addressInfo.address = res[i];
+          addressInfo.name = walletName;
+          rendererData.addressData.push(addressInfo);
+        }
+
+        clbSuccess(rendererData);
+      }
+    });
+  }
+
+  createNewAccount(password, clbError, clbSuccess) {
+    web3Local.eth.personal.newAccount(password, function (error, account) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(account);
+      }
+    });
+  }
+
+  importFromPrivateKey(privateKey, password) {
+    web3Local.eth.accounts.wallet.clear();
+    web3Local.eth.accounts.wallet.add(privateKey);
+    return web3Local.eth.accounts.wallet.encrypt("123456789");
+  }
+
+  subsribePendingTransactions(clbError, clbSuccess, clbData) {
+    this.txSubscribe = web3Local.eth.subscribe("pendingTransactions", function (error, result) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(result);
+      }
+    }).on("data", function (transaction) {
+      if (clbData) {
+        clbData(transaction);
+      }
+    });
+  }
+
+  unsubsribePendingTransactions(clbError, clbSuccess) {
+    if (this.txSubscribe) {
+      this.txSubscribe.unsubscribe(function (error, success) {
+        if (error) {
+          clbError(error);
+        } else {
+          clbSuccess(success);
+        }
+      });
+    }
+  }
+
+  subsribeNewBlockHeaders(clbError, clbSuccess, clbData) {
+    this.bhSubscribe = web3Local.eth.subscribe("newBlockHeaders", function (error, result) {
+      if (error) {
+        clbError(error);
+      } else {
+        clbSuccess(result);
+      }
+    }).on("data", function (blockHeader) {
+      if (clbData) {
+        clbData(blockHeader);
+      }
+    });
+  }
+
+  unsubsribeNewBlockHeaders(clbError, clbSuccess) {
+    if (this.bhSubscribe) {
+      this.bhSubscribe.unsubscribe(function (error, success) {
+        if (error) {
+          clbError(error);
+        } else {
+          clbSuccess(success);
+        }
+      });
+    }
+  }
+
+  closeConnection() {
+    web3Local.currentProvider.connection.close();
+  }
 }
 
 // create new blockchain variable
-EthoBlockchain = new Blockchain();  
\ No newline at end of file
+EthoBlockchain = new Blockchain();
diff --git a/renderer/database.js b/renderer/database.js
index f952e50..c415306 100644
--- a/renderer/database.js
+++ b/renderer/database.js
@@ -1,63 +1,64 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Datatabse {
-    constructor() {}
+  constructor() {}
 
-    getCounters() {
-        var counters = ipcRenderer.sendSync('getJSONFile', 'counters.json');
+  getCounters() {
+    var counters = ipcRenderer.sendSync("getJSONFile", "counters.json");
 
-        if (counters == null) {
-            counters = {};    
-        }
-
-        return counters;
+    if (counters == null) {
+      counters = {};
     }
 
-    setCounters(counters) {
-        ipcRenderer.sendSync('setJSONFile', 
-        { 
-            file: 'counters.json',
-            data: counters
-        });        
+    return counters;
+  }
+
+  setCounters(counters) {
+    ipcRenderer.sendSync("setJSONFile", {
+      file: "counters.json",
+      data: counters
+    });
+  }
+
+  getWallets() {
+    var wallets = ipcRenderer.sendSync("getJSONFile", "wallets.json");
+
+    if (!wallets) {
+      wallets = {
+        names: {}
+      };
     }
 
-    getWallets() {
-        var wallets = ipcRenderer.sendSync('getJSONFile', 'wallets.json');
+    return wallets;
+  }
 
-        if (!wallets) {
-          wallets = { names: {} };
-        }
-  
-        return wallets;
+  setWallets(wallets) {
+    ipcRenderer.sendSync("setJSONFile", {
+      file: "wallets.json",
+      data: wallets
+    });
+  }
+
+  getAddresses() {
+    var addressBook = ipcRenderer.sendSync("getJSONFile", "addresses.json");
+
+    if (!addressBook) {
+      addressBook = {
+        names: {}
+      };
     }
 
-    setWallets(wallets) {
-        ipcRenderer.sendSync('setJSONFile', 
-        { 
-            file: 'wallets.json',
-            data: wallets
-        });        
-    }
+    return addressBook;
+  }
 
-    getAddresses() {
-        var addressBook = ipcRenderer.sendSync('getJSONFile', 'addresses.json');
-
-        if (!addressBook) {
-          addressBook = { names: {} };
-        }
-      
-        return addressBook;
-    }
-
-    setAddresses(addresses) {
-        ipcRenderer.sendSync('setJSONFile', 
-        { 
-            file: 'addresses.json',
-            data: addresses
-        });        
-    }
+  setAddresses(addresses) {
+    ipcRenderer.sendSync("setJSONFile", {
+      file: "addresses.json",
+      data: addresses
+    });
+  }
 }
-          
+
 // create new account variable
-EthoDatatabse = new Datatabse();  
\ No newline at end of file
+EthoDatatabse = new Datatabse();
diff --git a/renderer/maingui.js b/renderer/maingui.js
index 8356e03..5525b9c 100644
--- a/renderer/maingui.js
+++ b/renderer/maingui.js
@@ -1,142 +1,142 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class MainGUI {
-    constructor() {
-        this.appState = "account";
+  constructor() {
+    this.appState = "account";
+  }
+
+  changeAppState(newState) {
+    this.appState = newState;
+    $(".sidebarIconWrapper").removeClass("iconSelected");
+
+    switch (this.appState) {
+      case "account":
+        $("#mainNavBtnWalletsWrapper").addClass("iconSelected");
+        break;
+      case "addressBook":
+        $("#mainNavBtnAddressBoookWrapper").addClass("iconSelected");
+        break;
+      case "send":
+        $("#mainNavBtnSendWrapper").addClass("iconSelected");
+        break;
+      case "transactions":
+        $("#mainNavBtnTransactionsWrapper").addClass("iconSelected");
+        break;
+      case "markets":
+        $("#mainNavBtnMarketsWrapper").addClass("iconSelected");
+        break;
+      case "settings":
+        $("#mainNavBtnSettingsWrapper").addClass("iconSelected");
+        break;
+      default: // do nothing for now
+    }
+  }
+
+  getAppState() {
+    return this.appState;
+  }
+
+  showGeneralError(errorText) {
+    $("#txtGeneralError").html(errorText);
+
+    // create and open the dialog
+    $("#dlgGeneralError").iziModal();
+    $("#dlgGeneralError").iziModal("open");
+
+    $("#btnGeneralErrorOK").click(function () {
+      $("#dlgGeneralError").iziModal("close");
+    });
+  }
+
+  showGeneralConfirmation(confirmText, callback) {
+    $("#txtGeneralConfirm").html(confirmText);
+
+    // create and open the dialog
+    $("#dlgGeneralConfirm").iziModal();
+    $("#dlgGeneralConfirm").iziModal("open");
+
+    $("#btnGeneralConfirmYes").click(function () {
+      $("#dlgGeneralConfirm").iziModal("close");
+      callback(true);
+    });
+
+    $("#btnGeneralConfirmNo").click(function () {
+      $("#dlgGeneralConfirm").iziModal("close");
+      callback(false);
+    });
+  }
+
+  showAboutDialog(infoData) {
+    $("#versionNumber").html(infoData.version);
+
+    // create and open the dialog
+    $("#dlgAboutInfo").iziModal();
+    $("#dlgAboutInfo").iziModal("open");
+
+    $("#urlOpenLicence, #urlOpenGitHub").off("click").on("click", function (even) {
+      event.preventDefault();
+      ipcRenderer.send("openURL", $(this).attr("href"));
+    });
+
+    $("#btnAboutInfoClose").off("click").on("click", function (even) {
+      $("#dlgAboutInfo").iziModal("close");
+    });
+  }
+
+  renderTemplate(template, data, container) {
+    var template = Handlebars.compile(ipcRenderer.sendSync("getTemplateContent", template));
+
+    if (!container) {
+      container = $("#mainContent");
     }
 
-    changeAppState(newState) {
-        this.appState = newState;
-        $(".sidebarIconWrapper").removeClass("iconSelected");
+    container.empty();
+    container.html(template(data));
+  }
 
-        switch(this.appState) {
-            case "account":
-              $("#mainNavBtnWalletsWrapper").addClass("iconSelected"); 
-              break;
-            case "addressBook":
-              $("#mainNavBtnAddressBoookWrapper").addClass("iconSelected"); 
-              break;
-            case "send":
-              $("#mainNavBtnSendWrapper").addClass("iconSelected"); 
-              break;
-            case "transactions":
-              $("#mainNavBtnTransactionsWrapper").addClass("iconSelected"); 
-              break;
-              case "markets":
-              $("#mainNavBtnMarketsWrapper").addClass("iconSelected"); 
-              break;
-            case "settings":
-              $("#mainNavBtnSettingsWrapper").addClass("iconSelected"); 
-              break;
-            default: // do nothing for now
-          } 
-    }
-
-    getAppState() {
-        return this.appState;
-    }
-
-    showGeneralError(errorText) {
-        $("#txtGeneralError").html(errorText);
-
-        // create and open the dialog
-        $("#dlgGeneralError").iziModal();
-        $('#dlgGeneralError').iziModal('open'); 
-        
-        $("#btnGeneralErrorOK").click(function() {
-            $('#dlgGeneralError').iziModal('close');     
-        });
-    }
-
-    showGeneralConfirmation(confirmText, callback) {
-        $("#txtGeneralConfirm").html(confirmText);
-
-        // create and open the dialog
-        $("#dlgGeneralConfirm").iziModal();
-        $('#dlgGeneralConfirm').iziModal('open'); 
-        
-        $("#btnGeneralConfirmYes").click(function() {
-            $('#dlgGeneralConfirm').iziModal('close'); 
-            callback(true);
-        });
-
-        $("#btnGeneralConfirmNo").click(function() {
-            $('#dlgGeneralConfirm').iziModal('close'); 
-            callback(false);
-        });
-    }
-
-    showAboutDialog(infoData) {
-        $("#versionNumber").html(infoData.version);
-
-        // create and open the dialog
-        $("#dlgAboutInfo").iziModal();
-        $('#dlgAboutInfo').iziModal('open'); 
-
-        $("#urlOpenLicence, #urlOpenGitHub").off("click").on("click", function(even) {
-            event.preventDefault();
-            ipcRenderer.send('openURL', $(this).attr("href"));
-        });
-
-        $("#btnAboutInfoClose").off("click").on("click", function(even) {
-            $('#dlgAboutInfo').iziModal('close'); 
-        });
-    }
-
-    renderTemplate(template, data, container) {
-        var template = Handlebars.compile(ipcRenderer.sendSync('getTemplateContent', template)); 
-        
-        if (!container) {
-            container = $("#mainContent") 
-        }
-
-        container.empty();
-        container.html(template(data));
-    }
-
-    copyToClipboard(text) {
-        var $temp = $("<input>");
-        $("body").append($temp);
-        $temp.val(text).select();
-        document.execCommand("copy");
-        $temp.remove();
-    }
+  copyToClipboard(text) {
+    var $temp = $("<input>");
+    $("body").append($temp);
+    $temp.val(text).select();
+    document.execCommand("copy");
+    $temp.remove();
+  }
 }
 
-ipcRenderer.on('showAboutDialog', function(event, message) {
-    EthoMainGUI.showAboutDialog(message);
+ipcRenderer.on("showAboutDialog", function (event, message) {
+  EthoMainGUI.showAboutDialog(message);
 });
 
-$("#mainNavBtnTransactions").click(function() {
-    EthoTransactions.clearFilter();
-    EthoMainGUI.changeAppState("transactions");
-    EthoTransactions.renderTransactions();
-});                
+$("#mainNavBtnTransactions").click(function () {
+  EthoTransactions.clearFilter();
+  EthoMainGUI.changeAppState("transactions");
+  EthoTransactions.renderTransactions();
+});
 
-$("#mainNavBtnAddressBoook").click(function() {
-    EthoMainGUI.changeAppState("addressBook");
-    EthoAddressBook.renderAddressBook();
-});                
+$("#mainNavBtnAddressBoook").click(function () {
+  EthoMainGUI.changeAppState("addressBook");
+  EthoAddressBook.renderAddressBook();
+});
 
-$("#mainNavBtnSend").click(function() {
-    EthoMainGUI.changeAppState("send");
-    EthoSend.renderSendState();
-});                
+$("#mainNavBtnSend").click(function () {
+  EthoMainGUI.changeAppState("send");
+  EthoSend.renderSendState();
+});
 
-$("#mainNavBtnWallets").click(function() {
-    EthoMainGUI.changeAppState("account");
-    EthoWallets.renderWalletsState();
-});                
+$("#mainNavBtnWallets").click(function () {
+  EthoMainGUI.changeAppState("account");
+  EthoWallets.renderWalletsState();
+});
 
-$("#mainNavBtnMarkets").click(function() {
-    EthoMainGUI.changeAppState("markets");
-    EthoMarkets.renderMarkets();
-});                
+$("#mainNavBtnMarkets").click(function () {
+  EthoMainGUI.changeAppState("markets");
+  EthoMarkets.renderMarkets();
+});
 
-$("#mainNavBtnSettings").click(function() {
-    EthoMainGUI.changeAppState("settings");
-    EthoSettings.renderSettingsState();
-});                
+$("#mainNavBtnSettings").click(function () {
+  EthoMainGUI.changeAppState("settings");
+  EthoSettings.renderSettingsState();
+});
 
 EthoMainGUI = new MainGUI();
\ No newline at end of file
diff --git a/renderer/markets.js b/renderer/markets.js
index ea61a82..d9e6d72 100644
--- a/renderer/markets.js
+++ b/renderer/markets.js
@@ -1,69 +1,75 @@
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Markets {
-    constructor() {}
+  constructor() {}
 
-    renderMarkets() {
-        EthoMainGUI.renderTemplate("markets.html", {});          
-        $(document).trigger("render_markets");                
+  renderMarkets() {
+    EthoMainGUI.renderTemplate("markets.html", {});
+    $(document).trigger("render_markets");
 
-        $.getJSON("https://api.coingecko.com/api/v3/coins/ether-1?sparkline=true", function( data ) {
-            $("#ETHOToUSD").html(data.market_data.current_price.usd.toFixed(5) + " $");
-            $("#ETHOToBTC").html(data.market_data.current_price.btc.toFixed(8)) + " sats";
-            $("#marketcap").html(data.market_data.market_cap.usd.toFixed(0) + " $ (" + data.market_cap_rank + ")");
-            $("#dailyVolume").html(data.market_data.total_volume.usd.toFixed(0) + " $");
+    $.getJSON("https://api.coingecko.com/api/v3/coins/ether-1?sparkline=true", function (data) {
+      $("#ETHOToUSD").html(data.market_data.current_price.usd.toFixed(5) + " $");
+      $("#ETHOToBTC").html(data.market_data.current_price.btc.toFixed(8)) + " sats";
+      $("#marketcap").html(data.market_data.market_cap.usd.toFixed(0) + " $ (" + data.market_cap_rank + ")");
+      $("#dailyVolume").html(data.market_data.total_volume.usd.toFixed(0) + " $");
 
-            $("#changeUSD").html("7 days change: " + data.market_data.price_change_percentage_7d_in_currency.usd.toFixed(2) + "%");
-            $("#changeBTC").html("7 days change: " + data.market_data.price_change_percentage_7d_in_currency.btc.toFixed(2) + "%");
-            $("#changeMarketcap").html("high 24h: " +  data.market_data.high_24h.usd.toFixed(5) + " $");
-            $("#changeVolume").html("all time high: " + data.market_data.ath.usd.toFixed(5) + " $");
+      $("#changeUSD").html("7 days change: " + data.market_data.price_change_percentage_7d_in_currency.usd.toFixed(2) + "%");
+      $("#changeBTC").html("7 days change: " + data.market_data.price_change_percentage_7d_in_currency.btc.toFixed(2) + "%");
+      $("#changeMarketcap").html("high 24h: " + data.market_data.high_24h.usd.toFixed(5) + " $");
+      $("#changeVolume").html("all time high: " + data.market_data.ath.usd.toFixed(5) + " $");
 
-            new Chart(document.getElementById('chartMarketPriceCanvas'), {
-                type: 'line',
-                data: {
-                    labels: data.market_data.sparkline_7d.price,
-                    datasets: [{
-                        data: data.market_data.sparkline_7d.price,
-                        backgroundColor: 'rgb(122,19,54,0.1)', 
-                        fill: true,
-                        borderWidth: 3,
-                        pointRadius: 0,
-                        borderColor: '#7A1336'
-                    }]
+      new Chart(document.getElementById("chartMarketPriceCanvas"), {
+        type: "line",
+        data: {
+          labels: data.market_data.sparkline_7d.price,
+          datasets: [
+            {
+              data: data.market_data.sparkline_7d.price,
+              backgroundColor: "rgb(122,19,54,0.1)",
+              fill: true,
+              borderWidth: 3,
+              pointRadius: 0,
+              borderColor: "#7A1336"
+            }
+          ]
+        },
+        options: {
+          animation: false,
+          responsive: true,
+          maintainAspectRatio: false,
+          legend: {
+            display: false,
+            labels: {
+              display: false
+            }
+          },
+          scales: {
+            yAxes: [
+              {
+                ticks: {
+                  maxTicksLimit: 5,
+                  beginAtZero: true,
+                  fontSize: 10,
+                  callback: function (value, index, values) {
+                    return value.toFixed(2) + " $";
+                  }
                 },
-                options: {
-                    animation: false,
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    legend: {
-                        display: false,
-                        labels: {
-                            display: false
-                        }
-                    },
-                    scales: {
-                        yAxes: [{
-                            ticks: {
-                                maxTicksLimit: 5,
-                                beginAtZero:true,
-                                fontSize: 10,
-                                callback: function(value, index, values) {
-                                    return value.toFixed(2) + ' $';
-                                }                    
-                            },
-                            gridLines: {
-                                color: 'rgba(255,255,255,.08)'
-                            }
-                        }],
-                        xAxes: [{
-                            display: false
-                        }]
-                    }
+                gridLines: {
+                  color: "rgba(255,255,255,.08)"
                 }
-            });
-        });
-    }
+              }
+            ],
+            xAxes: [
+              {
+                display: false
+              }
+            ]
+          }
+        }
+      });
+    });
+  }
 }
 
 // create new markets variable
-EthoMarkets = new Markets();  
\ No newline at end of file
+EthoMarkets = new Markets();
diff --git a/renderer/send.js b/renderer/send.js
index 08e0eb4..c9b7e4e 100644
--- a/renderer/send.js
+++ b/renderer/send.js
@@ -1,244 +1,210 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class SendTransaction {
-    constructor() {}
+  constructor() {}
 
-    renderSendState() {
-        EthoBlockchain.getAccountsData(
-            function(error) {
-              EthoMainGUI.showGeneralError(error);
-            },
-            function(data) {     
-                EthoMainGUI.renderTemplate("send.html", data);          
-                $(document).trigger("render_send");          
-            }
-        );
-      
+  renderSendState() {
+    EthoBlockchain.getAccountsData(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (data) {
+      EthoMainGUI.renderTemplate("send.html", data);
+      $(document).trigger("render_send");
+    });
+  }
+
+  validateSendForm() {
+    if (EthoMainGUI.getAppState() == "send") {
+      if (!$("#sendFromAddress").val()) {
+        EthoMainGUI.showGeneralError("Sender address must be specified!");
+        return false;
+      }
+
+      if (!EthoBlockchain.isAddress($("#sendFromAddress").val())) {
+        EthoMainGUI.showGeneralError("Sender address must be a valid address!");
+        return false;
+      }
+
+      if (!$("#sendToAddress").val()) {
+        EthoMainGUI.showGeneralError("Recipient address must be specified!");
+        return false;
+      }
+
+      if (!EthoBlockchain.isAddress($("#sendToAddress").val())) {
+        EthoMainGUI.showGeneralError("Recipient address must be a valid address!");
+        return false;
+      }
+
+      if (Number($("#sendAmmount").val()) <= 0) {
+        EthoMainGUI.showGeneralError("Send ammount must be greater then zero!");
+        return false;
+      }
+
+      return true;
+    } else {
+      return false;
     }
+  }
 
-    validateSendForm() {
-        if (EthoMainGUI.getAppState() == "send") {
-            if (!$("#sendFromAddress").val()) {
-                EthoMainGUI.showGeneralError("Sender address must be specified!");  
-                return false;
-            }
-
-            if (!EthoBlockchain.isAddress($("#sendFromAddress").val())) {
-                EthoMainGUI.showGeneralError("Sender address must be a valid address!");  
-                return false;
-            }
-            
-            if (!$("#sendToAddress").val()) {
-                EthoMainGUI.showGeneralError("Recipient address must be specified!");  
-                return false;
-            }
-
-            if (!EthoBlockchain.isAddress($("#sendToAddress").val())) {
-                EthoMainGUI.showGeneralError("Recipient address must be a valid address!");  
-                return false;
-            }
-
-            if (Number($("#sendAmmount").val()) <= 0) {
-                EthoMainGUI.showGeneralError("Send ammount must be greater then zero!");  
-                return false;
-            }
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    resetSendForm() {
-        if (EthoMainGUI.getAppState() == "send") {
-            $("#sendToAddressName").html("");
-            $("#sendToAddress").val("");
-            $("#sendAmmount").val(0);
-        }
+  resetSendForm() {
+    if (EthoMainGUI.getAppState() == "send") {
+      $("#sendToAddressName").html("");
+      $("#sendToAddress").val("");
+      $("#sendAmmount").val(0);
     }
+  }
 }
-        
-$(document).on("render_send", function() {
-    $('select').formSelect( {classes: "fromAddressSelect"});
 
-    $("#sendFromAddress").on("change", function() {
-        var optionText = $(this).find("option:selected").text();
-        var addrName = optionText.substr(0, optionText.indexOf('-')); 
-        var addrValue = optionText.substr(optionText.indexOf("-") + 1);
-        $(".fromAddressSelect input").val(addrValue.trim());  
-        $("#sendFromAddressName").html(addrName.trim());          
+$(document).on("render_send", function () {
+  $("select").formSelect({classes: "fromAddressSelect"});
 
-        web3Local.eth.getBalance(this.value, function(error, balance) {
-            $("#sendMaxAmmount").html(parseFloat(web3Local.utils.fromWei(balance, 'ether')));
-        });
-    });        
+  $("#sendFromAddress").on("change", function () {
+    var optionText = $(this).find("option:selected").text();
+    var addrName = optionText.substr(0, optionText.indexOf("-"));
+    var addrValue = optionText.substr(optionText.indexOf("-") + 1);
+    $(".fromAddressSelect input").val(addrValue.trim());
+    $("#sendFromAddressName").html(addrName.trim());
 
-    $("#btnSendAll").off('click').on('click', function() {
-        $("#sendAmmount").focus();
-        $("#sendAmmount").val($("#sendMaxAmmount").html());
+    web3Local.eth.getBalance(this.value, function (error, balance) {
+      $("#sendMaxAmmount").html(parseFloat(web3Local.utils.fromWei(balance, "ether")));
     });
-    
-    $("#sendToAddress").off('input').on('input', function() {
-        var addressName = null;
-        $("#sendToAddressName").html("");
-        addressName = EthoAddressBook.getAddressName($("#sendToAddress").val()); 
+  });
 
-        if (!addressName) { 
-            var wallets = EthoDatatabse.getWallets();
-            addressName = wallets.names[$("#sendToAddress").val()];      
+  $("#btnSendAll").off("click").on("click", function () {
+    $("#sendAmmount").focus();
+    $("#sendAmmount").val($("#sendMaxAmmount").html());
+  });
+
+  $("#sendToAddress").off("input").on("input", function () {
+    var addressName = null;
+    $("#sendToAddressName").html("");
+    addressName = EthoAddressBook.getAddressName($("#sendToAddress").val());
+
+    if (!addressName) {
+      var wallets = EthoDatatabse.getWallets();
+      addressName = wallets.names[$("#sendToAddress").val()];
+    }
+    $("#sendToAddressName").html(addressName);
+  });
+
+  $("#btnLookForToAddress").off("click").on("click", function () {
+    EthoBlockchain.getAddressListData(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (addressList) {
+      var addressBook = EthoAddressBook.getAddressList();
+
+      for (var key in addressBook) {
+        if (addressBook.hasOwnProperty(key)) {
+          var adddressObject = {};
+          adddressObject.address = key;
+          adddressObject.name = addressBook[key];
+          addressList.addressData.push(adddressObject);
         }
-        $("#sendToAddressName").html(addressName);
+      }
+
+      $("#dlgAddressList").iziModal({width: "800px"});
+      EthoMainGUI.renderTemplate("addresslist.html", addressList, $("#dlgAddressListBody"));
+      $("#dlgAddressList").iziModal("open");
+
+      $(".btnSelectToAddress").off("click").on("click", function () {
+        $("#sendToAddressName").html($(this).attr("data-name"));
+        $("#sendToAddress").val($(this).attr("data-wallet"));
+        $("#dlgAddressList").iziModal("close");
+      });
+
+      $("#addressListFilter").off("input").on("input", function (e) {
+        EthoUtils.filterTable($("#addressTable"), $("#addressListFilter").val());
+      });
+
+      $("#btnClearSearchField").off("click").on("click", function () {
+        EthoUtils.filterTable($("#addressTable"), "");
+        $("#addressListFilter").val("");
+      });
     });
-    
-    $("#btnLookForToAddress").off('click').on('click', function() {
-        EthoBlockchain.getAddressListData(
-            function(error) {
+  });
+
+  $("#btnAddToAddressBook").off("click").on("click", function () {
+    if (EthoBlockchain.isAddress($("#sendToAddress").val())) {
+      $("#dlgAddAddressToBook").iziModal();
+      $("#inputAddressName").val("");
+      $("#dlgAddAddressToBook").iziModal("open");
+
+      function doAddAddressToAddressBook() {
+        EthoAddressBook.setAddressName($("#sendToAddress").val(), $("#inputAddressName").val());
+        $("#dlgAddAddressToBook").iziModal("close");
+
+        iziToast.success({title: "Success", message: "Address was added to address book", position: "topRight", timeout: 2000});
+      }
+    } else {
+      EthoMainGUI.showGeneralError("Recipient address is not valid!");
+    }
+
+    $("#btnAddAddressToBookConfirm").off("click").on("click", function () {
+      doAddAddressToAddressBook();
+    });
+
+    $("#dlgAddAddressToBook").off("keypress").on("keypress", function (e) {
+      if (e.which == 13) {
+        doAddAddressToAddressBook();
+      }
+    });
+  });
+
+  $("#btnSendTransaction").off("click").on("click", function () {
+    if (EthoSend.validateSendForm()) {
+      EthoBlockchain.getTranasctionFee($("#sendFromAddress").val(), $("#sendToAddress").val(), $("#sendAmmount").val(), function (error) {
+        EthoMainGUI.showGeneralError(error);
+      }, function (data) {
+        $("#dlgSendWalletPassword").iziModal();
+        $("#walletPassword").val("");
+        $("#fromAddressInfo").html($("#sendFromAddress").val());
+        $("#toAddressInfo").html($("#sendToAddress").val());
+        $("#valueToSendInfo").html($("#sendAmmount").val());
+        $("#feeToPayInfo").html(parseFloat(web3Local.utils.fromWei(data.toString(), "ether")));
+        $("#dlgSendWalletPassword").iziModal("open");
+
+        function doSendTransaction() {
+          $("#dlgSendWalletPassword").iziModal("close");
+
+          EthoBlockchain.prepareTransaction($("#walletPassword").val(), $("#sendFromAddress").val(), $("#sendToAddress").val(), $("#sendAmmount").val(), function (error) {
+            EthoMainGUI.showGeneralError(error);
+          }, function (data) {
+            EthoBlockchain.sendTransaction(data.raw, function (error) {
               EthoMainGUI.showGeneralError(error);
-            },
-            function(addressList) {
-                var addressBook = EthoAddressBook.getAddressList();
+            }, function (data) {
+              EthoSend.resetSendForm();
 
-                for (var key in addressBook) {
-                    if (addressBook.hasOwnProperty(key)) {
-                        var adddressObject = {};
-                        adddressObject.address = key
-                        adddressObject.name = addressBook[key]; 
-                        addressList.addressData.push(adddressObject);
-                    }
-                }
-                
-                $("#dlgAddressList").iziModal({ width: "800px" });
-                EthoMainGUI.renderTemplate("addresslist.html", addressList, $("#dlgAddressListBody")); 
-                $('#dlgAddressList').iziModal('open');
+              iziToast.success({title: "Sent", message: "Transaction was successfully sent to the chain", position: "topRight", timeout: 5000});
 
-                $(".btnSelectToAddress").off('click').on('click', function() {
-                    $("#sendToAddressName").html($(this).attr('data-name'));
-                    $("#sendToAddress").val($(this).attr('data-wallet'));
-                    $('#dlgAddressList').iziModal('close');
+              EthoBlockchain.getTransaction(data, function (error) {
+                EthoMainGUI.showGeneralError(error);
+              }, function (transaction) {
+                ipcRenderer.send("storeTransaction", {
+                  block: transaction.blockNumber,
+                  txhash: transaction.hash.toLowerCase(),
+                  fromaddr: transaction.from.toLowerCase(),
+                  timestamp: moment().format("YYYY-MM-DD HH:mm:ss"),
+                  toaddr: transaction.to.toLowerCase(),
+                  value: transaction.value
                 });
-
-                $('#addressListFilter').off('input').on('input',function(e){
-                    EthoUtils.filterTable($("#addressTable"), $('#addressListFilter').val());
-                });
-
-                $("#btnClearSearchField").off('click').on('click', function() {
-                    EthoUtils.filterTable($("#addressTable"), "");
-                    $('#addressListFilter').val("")
-                });                
-            }
-        );
-    });
-
-    $("#btnAddToAddressBook").off('click').on('click', function() {
-        if (EthoBlockchain.isAddress($("#sendToAddress").val())) {
-            $("#dlgAddAddressToBook").iziModal();
-            $("#inputAddressName").val("");
-            $('#dlgAddAddressToBook').iziModal('open');
-    
-            function doAddAddressToAddressBook() {
-                EthoAddressBook.setAddressName($("#sendToAddress").val(), $("#inputAddressName").val());
-                $('#dlgAddAddressToBook').iziModal('close');
-    
-                iziToast.success({
-                    title: 'Success',
-                    message: 'Address was added to address book',
-                    position: 'topRight',
-                    timeout: 2000
-                });     
-            }    
-        } else {
-            EthoMainGUI.showGeneralError("Recipient address is not valid!");
+              });
+            });
+          });
         }
 
-        $("#btnAddAddressToBookConfirm").off('click').on('click', function() {
-            doAddAddressToAddressBook();
+        $("#btnSendWalletPasswordConfirm").off("click").on("click", function () {
+          doSendTransaction();
         });
-        
-        $("#dlgAddAddressToBook").off('keypress').on('keypress', function(e) {
-            if(e.which == 13) {
-                doAddAddressToAddressBook();
-            }
-        });                                
-    });
 
-    
-    $("#btnSendTransaction").off('click').on('click', function() {
-        if (EthoSend.validateSendForm()) {
-            EthoBlockchain.getTranasctionFee($("#sendFromAddress").val(), $("#sendToAddress").val(), $("#sendAmmount").val(),
-                function(error) {
-                    EthoMainGUI.showGeneralError(error);
-                },
-                function(data) {
-                    $("#dlgSendWalletPassword").iziModal();
-                    $("#walletPassword").val("");
-                    $("#fromAddressInfo").html($("#sendFromAddress").val());
-                    $("#toAddressInfo").html($("#sendToAddress").val());
-                    $("#valueToSendInfo").html($("#sendAmmount").val());
-                    $("#feeToPayInfo").html(parseFloat(web3Local.utils.fromWei(data.toString(), 'ether')));
-                    $('#dlgSendWalletPassword').iziModal('open');
-            
-                    function doSendTransaction() {
-                        $('#dlgSendWalletPassword').iziModal('close');
-                        
-                        EthoBlockchain.prepareTransaction(
-                            $("#walletPassword").val(),
-                            $("#sendFromAddress").val(), 
-                            $("#sendToAddress").val(), 
-                            $("#sendAmmount").val(),
-                            function(error) {
-                                EthoMainGUI.showGeneralError(error);
-                            },
-                            function(data) {
-                                EthoBlockchain.sendTransaction(data.raw, 
-                                    function(error) {
-                                        EthoMainGUI.showGeneralError(error);
-                                    },
-                                    function(data) {
-                                        EthoSend.resetSendForm();
-
-                                        iziToast.success({
-                                            title: 'Sent',
-                                            message: 'Transaction was successfully sent to the chain',
-                                            position: 'topRight',
-                                            timeout: 5000
-                                        });                                         
-
-                                        EthoBlockchain.getTransaction(data,
-                                            function(error) {
-                                                EthoMainGUI.showGeneralError(error);
-                                            },
-                                            function(transaction) {
-                                                ipcRenderer.send('storeTransaction', {
-                                                    block: transaction.blockNumber,
-                                                    txhash: transaction.hash.toLowerCase(),
-                                                    fromaddr: transaction.from.toLowerCase(),
-                                                    timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
-                                                    toaddr: transaction.to.toLowerCase(),
-                                                    value: transaction.value
-                                                });                    
-                                            }        
-                                        );
-                                    }
-                                );
-                            }
-                        );
-                    }
-
-                    $("#btnSendWalletPasswordConfirm").off('click').on('click', function() {
-                        doSendTransaction();
-                    });
-                    
-                    $("#dlgSendWalletPassword").off('keypress').on('keypress', function(e) {
-                        if(e.which == 13) {
-                            doSendTransaction();
-                        }
-                    });                                
-                }
-            );
-        }         
-    });
+        $("#dlgSendWalletPassword").off("keypress").on("keypress", function (e) {
+          if (e.which == 13) {
+            doSendTransaction();
+          }
+        });
+      });
+    }
+  });
 });
-  
+
 // create new account variable
-EthoSend = new SendTransaction();  
\ No newline at end of file
+EthoSend = new SendTransaction();
diff --git a/renderer/settings.js b/renderer/settings.js
index e299e4d..b8242ce 100644
--- a/renderer/settings.js
+++ b/renderer/settings.js
@@ -1,107 +1,88 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Settings {
-    constructor() {}
+  constructor() {}
 
-    renderSettingsState() {
-        EthoMainGUI.renderTemplate("settings.html", {});          
-        $(document).trigger("render_settings");                
-    }
+  renderSettingsState() {
+    EthoMainGUI.renderTemplate("settings.html", {});
+    $(document).trigger("render_settings");
+  }
 }
-        
-$(document).on("render_settings", function() {
-    $("#btnSettingsCleanTransactions").off('click').on('click', function() {
-        if (isFullySynced) {
-            EthoMainGUI.showGeneralConfirmation("Do you really want to resync transactions?", function(result) {
-                if (result) {
-                    if (EthoTransactions.getIsSyncing()) {
-                        EthoMainGUI.showGeneralError("Transactions sync is currently in progress");  
-                    } else {
-                        // first disable keepInSync
-                        EthoTransactions.disableKeepInSync();
-                        // then delete the transactions data    
-                        var counters = EthoDatatabse.getCounters();
-                        counters.transactions = 0;
-                        EthoDatatabse.setCounters(counters);
-                        ipcResult = ipcRenderer.sendSync('deleteTransactions', null);
 
-                        if (ipcResult.success) {
-                            // sync all the transactions to the current block
-                            web3Local.eth.getBlock("latest", function(error, localBlock) {
-                                if (error) {
-                                    EthoMainGUI.showGeneralError(error);
-                                } else {
-                                    EthoTransactions.enableKeepInSync();
-                                    EthoTransactions.syncTransactionsForAllAddresses(localBlock.number);
-            
-                                    iziToast.success({
-                                        title: 'Success',
-                                        message: 'Transactions are being resynced',
-                                        position: 'topRight',
-                                        timeout: 5000
-                                    });             
-                                }                    
-                            });
-                        } else {
-                            EthoMainGUI.showGeneralError("Error resyncing transactions: " + ipcResult.error);
-                        }
-                    }
-                }
-            });    
-        } else {
-            iziToast.info({
-                title: 'Wait...',
-                message: 'You need to be fully sync before cleaning transactions',
-                position: 'topRight',
-                timeout: 5000
-            });             
-        }
-    });
+$(document).on("render_settings", function () {
+  $("#btnSettingsCleanTransactions").off("click").on("click", function () {
+    if (isFullySynced) {
+      EthoMainGUI.showGeneralConfirmation("Do you really want to resync transactions?", function (result) {
+        if (result) {
+          if (EthoTransactions.getIsSyncing()) {
+            EthoMainGUI.showGeneralError("Transactions sync is currently in progress");
+          } else {
+            // first disable keepInSync
+            EthoTransactions.disableKeepInSync();
+            // then delete the transactions data
+            var counters = EthoDatatabse.getCounters();
+            counters.transactions = 0;
+            EthoDatatabse.setCounters(counters);
+            ipcResult = ipcRenderer.sendSync("deleteTransactions", null);
 
-    $("#btnSettingsCleanWallets").off('click').on('click', function() {
-        EthoMainGUI.showGeneralConfirmation("Do you really want to delete wallets data?", function(result) {
-            if (result) {
-                ipcResult = ipcRenderer.sendSync('deleteWalletData', null);
-
-                if (ipcResult.success) {
-                    iziToast.success({
-                        title: 'Success',
-                        message: 'Wallet names were succesfully cleaned',
-                        position: 'topRight',
-                        timeout: 5000
-                    });             
+            if (ipcResult.success) {
+              // sync all the transactions to the current block
+              web3Local.eth.getBlock("latest", function (error, localBlock) {
+                if (error) {
+                  EthoMainGUI.showGeneralError(error);
                 } else {
-                    EthoMainGUI.showGeneralError("Error clearing wallet names: " + ipcResult.error);  
+                  EthoTransactions.enableKeepInSync();
+                  EthoTransactions.syncTransactionsForAllAddresses(localBlock.number);
+
+                  iziToast.success({title: "Success", message: "Transactions are being resynced", position: "topRight", timeout: 5000});
                 }
+              });
+            } else {
+              EthoMainGUI.showGeneralError("Error resyncing transactions: " + ipcResult.error);
             }
-        });
-    });
+          }
+        }
+      });
+    } else {
+      iziToast.info({title: "Wait...", message: "You need to be fully sync before cleaning transactions", position: "topRight", timeout: 5000});
+    }
+  });
 
-    $("#btnSettingsCleanBlockchain").off('click').on('click', function() {
-        EthoMainGUI.showGeneralConfirmation("Do you really want to delete the blockchain data? Wallet will close and you will need to restart it!", function(result) {
-            if (result) {                
-                var loading_screen = pleaseWait({
-                    logo: "assets/images/logo.png",
-                    backgroundColor: '#000000',
-                    loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Deleting blockchain data, wallet will automatically close, please wait...</div>"
-                });
-                          
-                setTimeout(() => {
-                    // first stop the geth process
-                    ipcResult = ipcRenderer.send('stopGeth', null);
+  $("#btnSettingsCleanWallets").off("click").on("click", function () {
+    EthoMainGUI.showGeneralConfirmation("Do you really want to delete wallets data?", function (result) {
+      if (result) {
+        ipcResult = ipcRenderer.sendSync("deleteWalletData", null);
 
-                    setTimeout(() => {
-                        // delete the blockchain date async and wait for 5 seconds
-                        ipcResult = ipcRenderer.sendSync('deleteBlockchainData', null);
-                        // finally quit the application
-                        ipcResult = ipcRenderer.send('appQuit', null);                    
-                    }, 5000);
-                }, 2000);
-            }
-        });
+        if (ipcResult.success) {
+          iziToast.success({title: "Success", message: "Wallet names were succesfully cleaned", position: "topRight", timeout: 5000});
+        } else {
+          EthoMainGUI.showGeneralError("Error clearing wallet names: " + ipcResult.error);
+        }
+      }
     });
+  });
+
+  $("#btnSettingsCleanBlockchain").off("click").on("click", function () {
+    EthoMainGUI.showGeneralConfirmation("Do you really want to delete the blockchain data? Wallet will close and you will need to restart it!", function (result) {
+      if (result) {
+        var loading_screen = pleaseWait({logo: "assets/images/logo.png", backgroundColor: "#000000", loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Deleting blockchain data, wallet will automatically close, please wait...</div>"});
+
+        setTimeout(() => {
+          // first stop the geth process
+          ipcResult = ipcRenderer.send("stopGeth", null);
+
+          setTimeout(() => {
+            // delete the blockchain date async and wait for 5 seconds
+            ipcResult = ipcRenderer.sendSync("deleteBlockchainData", null);
+            // finally quit the application
+            ipcResult = ipcRenderer.send("appQuit", null);
+          }, 5000);
+        }, 2000);
+      }
+    });
+  });
 });
-  
+
 // create new settings variable
-EthoSettings = new Settings();  
\ No newline at end of file
+EthoSettings = new Settings();
diff --git a/renderer/syncing.js b/renderer/syncing.js
index 2752ac1..c6272bb 100644
--- a/renderer/syncing.js
+++ b/renderer/syncing.js
@@ -1,18 +1,17 @@
 // In renderer process (web page).
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 // Set the provider you want from Web3.providers
-SyncProgress = new ProgressBar.Line('#syncProgress', 
-{
+SyncProgress = new ProgressBar.Line("#syncProgress", {
   strokeWidth: 6,
-  easing: 'easeInOut',
+  easing: "easeInOut",
   duration: 1400,
   color: "#7A1336",
-  trailColor: '#eee',
+  trailColor: "#eee",
   trailWidth: 1,
   text: {
     style: {
-      color: '#bbb',
+      color: "#bbb",
       position: "absolute",
       left: "50%",
       top: "-1px",
@@ -23,107 +22,113 @@ SyncProgress = new ProgressBar.Line('#syncProgress',
     },
     autoStyleContainer: false
   },
-  from: {color: '#FFEA82'},
-  to: {color: '#ED6A5A'}
+  from: {
+    color: "#FFEA82"
+  },
+  to: {
+    color: "#ED6A5A"
+  }
 });
 
 // set initial value for the progress text
 SyncProgress.setText("Waiting for blockchain, please wait...");
 isFullySynced = false;
 
-var peerCountInterval = setInterval(function()
-{   
-  web3Local.eth.net.getPeerCount(function(error, count) {
+var peerCountInterval = setInterval(function () {
+  web3Local.eth.net.getPeerCount(function (error, count) {
     $("#peerCount").html(vsprintf("Peer Count: %d", [count]));
   });
-}, 5000);  
+}, 5000);
 
 function StartSyncProcess() {
   var alreadyCatchedUp = false;
   var nodeSyncInterval = null;
 
-  var subscription = web3Local.eth.subscribe('syncing', function(error, sync){
+  var subscription = web3Local.eth.subscribe("syncing", function (error, sync) {
     if (!error) {
       if (!sync) {
         if (nodeSyncInterval) {
-          clearInterval(nodeSyncInterval); 
+          clearInterval(nodeSyncInterval);
         }
 
-        nodeSyncInterval = setInterval(function()
-        {             
-          web3Local.eth.getBlock("latest", function(error, localBlock) {
+        nodeSyncInterval = setInterval(function () {
+          web3Local.eth.getBlock("latest", function (error, localBlock) {
             if (!error) {
               if (localBlock.number > 0) {
                 if (!EthoTransactions.getIsSyncing()) {
-                  SyncProgress.animate(1);    
-                  SyncProgress.setText(vsprintf('%d/%d (100%%)', [localBlock.number, localBlock.number]));
+                  SyncProgress.animate(1);
+                  SyncProgress.setText(vsprintf("%d/%d (100%%)", [localBlock.number, localBlock.number]));
                 }
-  
-                if (alreadyCatchedUp == false) 
-                {
+
+                if (alreadyCatchedUp == false) {
                   // clear the repeat interval and render wallets
                   $(document).trigger("onNewAccountTransaction");
                   alreadyCatchedUp = true;
                   isFullySynced = true;
-  
+
                   // enable the keep in sync feature
                   EthoTransactions.enableKeepInSync();
                   // sync all the transactions to the current block
                   EthoTransactions.syncTransactionsForAllAddresses(localBlock.number);
-  
+
                   // signal that the sync is complete
                   $(document).trigger("onSyncComplete");
-                }      
-              }  
+                }
+              }
             } else {
               EthoMainGUI.showGeneralError(error);
             }
-          });              
-        }, 10000);  
+          });
+        }, 10000);
       }
     } else {
       EthoMainGUI.showGeneralError(error);
     }
-  }).on("data", function(sync){
-    if ((sync) && (sync.HighestBlock > 0)) {
+  }).on("data", function (sync) {
+    if (sync && sync.HighestBlock > 0) {
       SyncProgress.animate(sync.CurrentBlock / sync.HighestBlock);
-      SyncProgress.setText(vsprintf('%d/%d (%d%%)', [sync.CurrentBlock, sync.HighestBlock, Math.floor(sync.CurrentBlock / sync.HighestBlock * 100)]));  
+      SyncProgress.setText(vsprintf("%d/%d (%d%%)", [
+        sync.CurrentBlock,
+        sync.HighestBlock,
+        Math.floor(sync.CurrentBlock / sync.HighestBlock * 100)
+      ]));
     }
-  }).on("changed", function(isSyncing){
-    if(isSyncing) {
-      nodeSyncInterval = setInterval(function()
-      {   
-        web3Local.eth.isSyncing(function(error, sync){
-          if ((!error) && (sync)) {
+  }).on("changed", function (isSyncing) {
+    if (isSyncing) {
+      nodeSyncInterval = setInterval(function () {
+        web3Local.eth.isSyncing(function (error, sync) {
+          if (!error && sync) {
             SyncProgress.animate(sync.currentBlock / sync.highestBlock);
-            SyncProgress.setText(vsprintf('%d/%d (%d%%)', [sync.currentBlock, sync.highestBlock, Math.floor(sync.currentBlock / sync.highestBlock * 100)]));      
+            SyncProgress.setText(vsprintf("%d/%d (%d%%)", [
+              sync.currentBlock,
+              sync.highestBlock,
+              Math.floor(sync.currentBlock / sync.highestBlock * 100)
+            ]));
           } else if (error) {
             EthoMainGUI.showGeneralError(error);
           }
-        }); 
-      }, 2000);     
+        });
+      }, 2000);
     } else {
       if (nodeSyncInterval) {
-        clearInterval(nodeSyncInterval); 
+        clearInterval(nodeSyncInterval);
       }
     }
-  });          
+  });
 }
 
-var InitWeb3 = setInterval(function()
-{     
+var InitWeb3 = setInterval(function () {
   try {
-    web3Local = new Web3(new Web3.providers.WebsocketProvider('ws://localhost:8546'));
+    web3Local = new Web3(new Web3.providers.WebsocketProvider("ws://localhost:8546"));
 
-    web3Local.eth.net.isListening(function(error, success) {
+    web3Local.eth.net.isListening(function (error, success) {
       if (!error) {
         $(document).trigger("onGethReady");
         clearInterval(InitWeb3);
-        StartSyncProcess();  
+        StartSyncProcess();
       }
     });
-  }
-  catch(err) {
+  } catch (err) {
     EthoMainGUI.showGeneralError(err);
   }
-}, 2000);  
\ No newline at end of file
+}, 2000);
diff --git a/renderer/tableTransactions.js b/renderer/tableTransactions.js
index df72a51..e48f755 100644
--- a/renderer/tableTransactions.js
+++ b/renderer/tableTransactions.js
@@ -1,83 +1,84 @@
 class tableTransactions {
-    constructor() {
-        this.appState = "account";
-    }
+  constructor() {
+    this.appState = "account";
+  }
 
-    initialize(id, data) {
-        // register the sort datetime format
-        $.fn.dataTable.moment('MMM Do YYYY HH:mm:ss');
+  initialize(id, data) {
+    // register the sort datetime format
+    $.fn.dataTable.moment("MMM Do YYYY HH:mm:ss");
 
-        var namesType = $.fn.dataTable.absoluteOrderNumber(
-        [
-            { value: null, position: 'top' }
-        ]);
-                        // render the transactions
-        $(id).DataTable({
-            "dom": 'Bfrtip',
-            "paging": false,
-            "scrollY": "calc(100vh - 115px)",
-            "responsive": true,
-            "processing": true,
-            "order": [[ 1, "desc" ]],
-            "data": data,
-            "oSearch": {"sSearch": EthoTransactions.getFilter() },
-            "buttons": 
-            [
-                {
-                    text: '<i class="fas fa-sync-alt"></i>',
-                    action: function ( e, dt, node, config ) {
-                        EthoTransactions.renderTransactions();    
-                    }
-                }
-            ],
-            "columnDefs": [
-                {
-                    "targets": 0,
-                    "render": function ( data, type, row ) {
-                        if (data == 0) {
-                            return '<i class="fas fa-arrow-left"></i>';
-                        } else if (data == 1) {
-                            return '<i class="fas fa-arrow-right"></i>';
-                        } else {
-                            return '<i class="fas fa-arrows-alt-h"></i>';
-                        }
-                    }
-                },
-                { 
-                    "className": "transactionsBlockNum",
-                    "type": namesType,
-                    "targets": 1
-                },
-                {
-                    "targets": 2,
-                    "render": function ( data, type, row ) {
-                        return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss"); 
-                    }
-                },
-                {
-                    "targets": 5,
-                    "render": function ( data, type, row ) {
-                        return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), 'ether')).toFixed(2); 
-                    }
-                },
-                {
-                    "targets": 6,
-                    "defaultContent": "",
-                    "render": function ( data, type, row ) {
-                        if (row[1]) {
-                            return '<i class="fas fa-check"></i>';
-                        } else {
-                            return '<i class="fas fa-question"></i>';
-                        }
-                    }
-                }
-            ],
-            "drawCallback": function( settings ) {
-                $("#loadingTransactionsOverlay").css("display", "none");  
+    var namesType = $.fn.dataTable.absoluteOrderNumber([
+      {
+        value: null,
+        position: "top"
+      }
+    ]);
+    // render the transactions
+    $(id).DataTable({
+      dom: "Bfrtip",
+      paging: false,
+      scrollY: "calc(100vh - 115px)",
+      responsive: true,
+      processing: true,
+      order: [
+        [1, "desc"]
+      ],
+      data: data,
+      oSearch: {
+        sSearch: EthoTransactions.getFilter()
+      },
+      buttons: [
+        {
+          text: '<i class="fas fa-sync-alt"></i>',
+          action: function (e, dt, node, config) {
+            EthoTransactions.renderTransactions();
+          }
+        }
+      ],
+      columnDefs: [
+        {
+          targets: 0,
+          render: function (data, type, row) {
+            if (data == 0) {
+              return '<i class="fas fa-arrow-left"></i>';
+            } else if (data == 1) {
+              return '<i class="fas fa-arrow-right"></i>';
+            } else {
+              return '<i class="fas fa-arrows-alt-h"></i>';
             }
-        });                
-    }
+          }
+        }, {
+          className: "transactionsBlockNum",
+          type: namesType,
+          targets: 1
+        }, {
+          targets: 2,
+          render: function (data, type, row) {
+            return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss");
+          }
+        }, {
+          targets: 5,
+          render: function (data, type, row) {
+            return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), "ether")).toFixed(2);
+          }
+        }, {
+          targets: 6,
+          defaultContent: "",
+          render: function (data, type, row) {
+            if (row[1]) {
+              return '<i class="fas fa-check"></i>';
+            } else {
+              return '<i class="fas fa-question"></i>';
+            }
+          }
+        }
+      ],
+      drawCallback: function (settings) {
+        $("#loadingTransactionsOverlay").css("display", "none");
+      }
+    });
+  }
 }
 
 // create new tables variable
-EthoTableTransactions = new tableTransactions();  
+EthoTableTransactions = new tableTransactions();
diff --git a/renderer/transactions.js b/renderer/transactions.js
index 9c789a6..7370cfd 100644
--- a/renderer/transactions.js
+++ b/renderer/transactions.js
@@ -1,183 +1,174 @@
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Transactions {
-    constructor() {
-        this.filter = "";
-        this.isSyncing = false;
-        this.isLoading = false;
+  constructor() {
+    this.filter = "";
+    this.isSyncing = false;
+    this.isLoading = false;
+  }
+
+  setIsSyncing(value) {
+    this.isSyncing = value;
+  }
+
+  getIsSyncing() {
+    return this.isSyncing;
+  }
+
+  setIsLoading(value) {
+    this.isLoading = value;
+  }
+
+  getIsLoading() {
+    return this.isLoading;
+  }
+
+  setFilter(text) {
+    this.filter = text;
+  }
+
+  getFilter() {
+    return this.filter;
+  }
+
+  clearFilter() {
+    this.filter = "";
+  }
+
+  syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter) {
+    if (counter < addressList.length) {
+      SyncProgress.setText(vsprintf("Syncing address transactions %d/%d, please wait...", [counter, addressList.length]));
+
+      var startBlock = parseInt(counters.transactions) || 0;
+      var params = vsprintf("?address=%s&fromBlock=%d&toBlock=%d", [
+        addressList[counter].toLowerCase(),
+        startBlock,
+        lastBlock
+      ]);
+
+      $.getJSON("https://richlist.ether1.org/transactions_list.php" + params, function (result) {
+        result.data.forEach(element => {
+          if (element.fromaddr && element.toaddr) {
+            ipcRenderer.send("storeTransaction", {
+              block: element.block.toString(),
+              txhash: element.txhash.toLowerCase(),
+              fromaddr: element.fromaddr.toLowerCase(),
+              timestamp: element.timestamp,
+              toaddr: element.toaddr.toLowerCase(),
+              value: element.value
+            });
+          }
+        });
+
+        // call the transaction sync for the next address
+        EthoTransactions.syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter + 1);
+      });
+    } else {
+      // update the counter and store it back to file system
+      counters.transactions = lastBlock;
+      EthoDatatabse.setCounters(counters);
+
+      SyncProgress.setText("Syncing transactions is complete.");
+      EthoTransactions.setIsSyncing(false);
     }
+  }
 
-    setIsSyncing(value) {
-        this.isSyncing = value;
+  syncTransactionsForAllAddresses(lastBlock) {
+    var counters = EthoDatatabse.getCounters();
+    var counter = 0;
+
+    EthoBlockchain.getAccounts(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (data) {
+      EthoTransactions.setIsSyncing(true);
+      EthoTransactions.syncTransactionsForSingleAddress(data, counters, lastBlock, counter);
+    });
+  }
+
+  renderTransactions() {
+    if (!EthoTransactions.getIsLoading()) {
+      EthoMainGUI.renderTemplate("transactions.html", {});
+      $(document).trigger("render_transactions");
+      EthoTransactions.setIsLoading(true);
+
+      // show the loading overlay for transactions
+      $("#loadingTransactionsOverlay").css("display", "block");
+
+      setTimeout(() => {
+        var dataTransactions = ipcRenderer.sendSync("getTransactions");
+        var addressList = EthoWallets.getAddressList();
+
+        dataTransactions.forEach(function (element) {
+          var isFromValid = addressList.indexOf(element[2].toLowerCase()) > -1;
+          var isToValid = addressList.indexOf(element[3].toLowerCase()) > -1;
+
+          if (isToValid && !isFromValid) {
+            element.unshift(0);
+          } else if (!isToValid && isFromValid) {
+            element.unshift(1);
+          } else {
+            element.unshift(2);
+          }
+        });
+
+        EthoTableTransactions.initialize("#tableTransactionsForAll", dataTransactions);
+        EthoTransactions.setIsLoading(false);
+      }, 200);
     }
+  }
 
-    getIsSyncing() {
-        return this.isSyncing;
-    }
+  enableKeepInSync() {
+    EthoBlockchain.subsribeNewBlockHeaders(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (data) {
+      EthoBlockchain.getBlock(data.number, true, function (error) {
+        EthoMainGUI.showGeneralError(error);
+      }, function (data) {
+        if (data.transactions) {
+          data.transactions.forEach(element => {
+            if (element.from && element.to) {
+              if (EthoWallets.getAddressExists(element.from) || EthoWallets.getAddressExists(element.to)) {
+                var Transaction = {
+                  block: element.blockNumber.toString(),
+                  txhash: element.hash.toLowerCase(),
+                  fromaddr: element.from.toLowerCase(),
+                  timestamp: moment.unix(data.timestamp).format("YYYY-MM-DD HH:mm:ss"),
+                  toaddr: element.to.toLowerCase(),
+                  value: Number(element.value).toExponential(5).toString().replace("+", "")
+                };
 
-    setIsLoading(value) {
-        this.isLoading = value;
-    }
+                // store transaction and notify about new transactions
+                ipcRenderer.send("storeTransaction", Transaction);
+                $(document).trigger("onNewAccountTransaction");
 
-    getIsLoading() {
-        return this.isLoading;
-    }
-
-    setFilter(text) {
-        this.filter = text;
-    }
-
-    getFilter() {
-        return this.filter;
-    }
-
-    clearFilter() {
-        this.filter = "";
-    }
-
-    syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter) { 
-        if (counter < addressList.length) {
-            SyncProgress.setText(vsprintf("Syncing address transactions %d/%d, please wait...", [counter, addressList.length]));
-
-            var startBlock = parseInt(counters.transactions) || 0;
-            var params = vsprintf('?address=%s&fromBlock=%d&toBlock=%d', [addressList[counter].toLowerCase(), startBlock, lastBlock]);
-            
-            $.getJSON("https://richlist.ether1.org/transactions_list.php" + params,  function( result ) {
-                result.data.forEach(element => {
-                    if (element.fromaddr && element.toaddr) {
-                        ipcRenderer.send('storeTransaction', {
-                            block: element.block.toString(),
-                            txhash: element.txhash.toLowerCase(),
-                            fromaddr: element.fromaddr.toLowerCase(),
-                            timestamp: element.timestamp,
-                            toaddr: element.toaddr.toLowerCase(),
-                            value: element.value
-                        });    
-                    }
+                iziToast.info({
+                  title: "New Transaction",
+                  message: vsprintf("Transaction from address %s to address %s was just processed", [Transaction.fromaddr, Transaction.toaddr]),
+                  position: "topRight",
+                  timeout: 10000
                 });
-        
-                // call the transaction sync for the next address
-                EthoTransactions.syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter + 1);
-            });  
-        } else {
-            // update the counter and store it back to file system
-            counters.transactions = lastBlock;
-            EthoDatatabse.setCounters(counters);
 
-            SyncProgress.setText("Syncing transactions is complete.");
-            EthoTransactions.setIsSyncing(false);
-        }
-    }
-
-    syncTransactionsForAllAddresses(lastBlock) {
-        var counters = EthoDatatabse.getCounters();
-        var counter = 0;
-
-        EthoBlockchain.getAccounts(
-            function(error) {
-                EthoMainGUI.showGeneralError(error);
-            },
-            function(data) {
-                EthoTransactions.setIsSyncing(true);
-                EthoTransactions.syncTransactionsForSingleAddress(data, counters, lastBlock, counter);
+                if (EthoMainGUI.getAppState() == "transactions") {
+                  setTimeout(function () {
+                    EthoTransactions.renderTransactions();
+                  }, 500);
+                }
+              }
             }
-        );
-    }
-
-    renderTransactions() {
-        if (!EthoTransactions.getIsLoading()) {
-            EthoMainGUI.renderTemplate("transactions.html", {});          
-            $(document).trigger("render_transactions");
-            EthoTransactions.setIsLoading(true);
-            
-            // show the loading overlay for transactions
-            $("#loadingTransactionsOverlay").css("display", "block");
-        
-            setTimeout(() => {
-                var dataTransactions = ipcRenderer.sendSync('getTransactions');
-                var addressList = EthoWallets.getAddressList();
-
-                dataTransactions.forEach(function(element) {
-                    var isFromValid = (addressList.indexOf(element[2].toLowerCase()) > -1);
-                    var isToValid = (addressList.indexOf(element[3].toLowerCase()) > -1);
-            
-                    if ((isToValid) && (!isFromValid)) {
-                        element.unshift(0);
-                    } else if ((!isToValid) && (isFromValid)) { 
-                        element.unshift(1);
-                    } else {
-                        element.unshift(2);
-                    }
-                });
-
-                EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);             
-                EthoTransactions.setIsLoading(false);
-            }, 200);
+          });
         }
-    }
+      });
+    });
+  }
 
-    enableKeepInSync() {
-        EthoBlockchain.subsribeNewBlockHeaders(
-            function(error) {
-                EthoMainGUI.showGeneralError(error);
-            },
-            function(data) 
-            {
-                EthoBlockchain.getBlock(data.number, true,
-                    function(error) {
-                        EthoMainGUI.showGeneralError(error);
-                    },
-                    function(data) {
-                        if (data.transactions) {                                    
-                            data.transactions.forEach(element => {
-                                if (element.from && element.to) {
-                                    if ((EthoWallets.getAddressExists(element.from)) || (EthoWallets.getAddressExists(element.to))) {
-                                        var Transaction = {
-                                            block: element.blockNumber.toString(),
-                                            txhash: element.hash.toLowerCase(),
-                                            fromaddr: element.from.toLowerCase(),
-                                            timestamp: moment.unix(data.timestamp).format('YYYY-MM-DD HH:mm:ss'),
-                                            toaddr: element.to.toLowerCase(),
-                                            value: Number(element.value).toExponential(5).toString().replace('+','')
-                                        }
-                                        
-                                        // store transaction and notify about new transactions
-                                        ipcRenderer.send('storeTransaction', Transaction);
-                                        $(document).trigger("onNewAccountTransaction");
-    
-                                        iziToast.info({
-                                            title: 'New Transaction',
-                                            message: vsprintf('Transaction from address %s to address %s was just processed', [Transaction.fromaddr, Transaction.toaddr]),
-                                            position: 'topRight',
-                                            timeout: 10000
-                                        });                                                     
-    
-                                        if (EthoMainGUI.getAppState() == "transactions") {
-                                            setTimeout(function() { 
-                                                EthoTransactions.renderTransactions();    
-                                            }, 500);                    
-                                        }                                
-                                    }    
-                                }
-                            });                                                            
-                        }
-                    }
-                );  
-            }          
-        );   
-    } 
-
-    disableKeepInSync() {
-        EthoBlockchain.unsubsribeNewBlockHeaders(
-            function(error) {
-                EthoMainGUI.showGeneralError(error);
-            },
-            function(data) {
-                // success
-            }        
-        );
-    }
+  disableKeepInSync() {
+    EthoBlockchain.unsubsribeNewBlockHeaders(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (data) {
+      // success
+    });
+  }
 }
-        
+
 // create new transactions variable
-EthoTransactions = new Transactions();  
\ No newline at end of file
+EthoTransactions = new Transactions();
diff --git a/renderer/utils.js b/renderer/utils.js
index 6b6c22c..8c9b403 100644
--- a/renderer/utils.js
+++ b/renderer/utils.js
@@ -1,57 +1,60 @@
 class Utils {
-    constructor() {}
-    
-    toFixed(x) {
-        if (Math.abs(x) < 1.0) {
-        var e = parseInt(x.toString().split('e-')[1]);
-        if (e) {
-            x *= Math.pow(10,e-1);
-            x = '0.' + (new Array(e)).join('0') + x.toString().substring(2);
-        }
+  constructor() {}
+
+  toFixed(x) {
+    if (Math.abs(x) < 1.0) {
+      var e = parseInt(x.toString().split("e-")[1]);
+      if (e) {
+        x *= Math.pow(10, e - 1);
+        x = "0." + new Array(e).join("0") + x.toString().substring(2);
+      }
+    } else {
+      var e = parseInt(x.toString().split("+")[1]);
+      if (e > 20) {
+        e -= 20;
+        x /= Math.pow(10, e);
+        x += new Array(e + 1).join("0");
+      }
+    }
+    return x;
+  }
+
+  filterTable(table, text) {
+    // Declare variables
+    var filter,
+      tr,
+      td,
+      i,
+      txtValue;
+    filter = text.toUpperCase();
+    tr = $(table).find("tr");
+
+    // Loop through all table rows, and hide those who don't match the search query
+    for (i = 0; i < tr.length; i++) {
+      td = $(tr[i]).find("td")[0];
+
+      if (td) {
+        txtValue = td.textContent || td.innerText;
+        if (txtValue.toUpperCase().indexOf(filter) > -1) {
+          $(tr[i]).css("display", "");
         } else {
-        var e = parseInt(x.toString().split('+')[1]);
-        if (e > 20) {
-            e -= 20;
-            x /= Math.pow(10,e);
-            x += (new Array(e+1)).join('0');
+          $(tr[i]).css("display", "none");
         }
-        }
-        return x;
-    }
-
-    filterTable(table, text) {
-        // Declare variables
-        var filter, tr, td, i, txtValue;
-        filter = text.toUpperCase();
-        tr = $(table).find("tr");
-      
-        // Loop through all table rows, and hide those who don't match the search query
-        for (i = 0; i < tr.length; i++) {
-          td = $(tr[i]).find("td")[0];
-    
-          if (td) {
-            txtValue = td.textContent || td.innerText;
-            if (txtValue.toUpperCase().indexOf(filter) > -1) {
-              $(tr[i]).css("display", "");
-            } else {
-                $(tr[i]).css("display", "none");
-            }
-          }
-        }
-    }    
-
-    createToolTip(element, text) {
-        tippy(element, {
-            content: text,
-            delay: 500,
-            arrow: true,
-            arrowType: 'round',
-            size: 'large',
-            duration: 500,
-            animation: 'scale'
-        });      
+      }
     }
+  }
 
+  createToolTip(element, text) {
+    tippy(element, {
+      content: text,
+      delay: 500,
+      arrow: true,
+      arrowType: "round",
+      size: "large",
+      duration: 500,
+      animation: "scale"
+    });
+  }
 }
 
-EthoUtils = new Utils(); 
\ No newline at end of file
+EthoUtils = new Utils();
diff --git a/renderer/wallets.js b/renderer/wallets.js
index 30e1ddf..97df626 100644
--- a/renderer/wallets.js
+++ b/renderer/wallets.js
@@ -1,13 +1,12 @@
-const {ipcRenderer} = require('electron');
+const {ipcRenderer} = require("electron");
 
 class Wallets {
   constructor() {
-    this.addressList = []; 
+    this.addressList = [];
 
-    $.getJSON("https://min-api.cryptocompare.com/data/price?fsym=ETHO&tsyms=USD", function( price ) 
-    {
+    $.getJSON("https://min-api.cryptocompare.com/data/price?fsym=ETHO&tsyms=USD", function (price) {
       EthoWallets._setPrice(price.USD);
-    });         
+    });
   }
 
   _getPrice() {
@@ -23,7 +22,7 @@ class Wallets {
   }
 
   clearAddressList() {
-    this.addressList = []; 
+    this.addressList = [];
   }
 
   getAddressExists(address) {
@@ -47,111 +46,103 @@ class Wallets {
     EthoUtils.createToolTip("#btnImportAccounts", "Import Accounts");
     EthoUtils.createToolTip("#btnImportFromPrivateKey", "Import From Private Key");
   }
-    
+
   validateNewAccountForm() {
     if (EthoMainGUI.getAppState() == "account") {
-        if (!$("#walletPasswordFirst").val()) {
-            EthoMainGUI.showGeneralError("Password cannot be empty!");  
-            return false;
-        }
-        
-        if (!$("#walletPasswordSecond").val()) {
-          EthoMainGUI.showGeneralError("Password cannot be empty!");  
-          return false;
-        }
-
-        if ($("#walletPasswordFirst").val() !== $("#walletPasswordSecond").val()) {
-            EthoMainGUI.showGeneralError("Passwords do not match!");  
-            return false;
-        }
-
-        return true;
-    } else {
+      if (!$("#walletPasswordFirst").val()) {
+        EthoMainGUI.showGeneralError("Password cannot be empty!");
         return false;
-    }
-}
+      }
 
-renderWalletsState() {
+      if (!$("#walletPasswordSecond").val()) {
+        EthoMainGUI.showGeneralError("Password cannot be empty!");
+        return false;
+      }
+
+      if ($("#walletPasswordFirst").val() !== $("#walletPasswordSecond").val()) {
+        EthoMainGUI.showGeneralError("Passwords do not match!");
+        return false;
+      }
+
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  renderWalletsState() {
     // clear the list of addresses
     EthoWallets.clearAddressList();
 
-    EthoBlockchain.getAccountsData(
-      function(error) {
-        EthoMainGUI.showGeneralError(error);
-      },
-      function(data) {
-        data.addressData.forEach(element => {
-          EthoWallets.addAddressToList(element.address);
-        });
+    EthoBlockchain.getAccountsData(function (error) {
+      EthoMainGUI.showGeneralError(error);
+    }, function (data) {
+      data.addressData.forEach(element => {
+        EthoWallets.addAddressToList(element.address);
+      });
 
-        // render the wallets current state
-        EthoMainGUI.renderTemplate("wallets.html", data);          
-        $(document).trigger("render_wallets");
-        EthoWallets.enableButtonTooltips();
+      // render the wallets current state
+      EthoMainGUI.renderTemplate("wallets.html", data);
+      $(document).trigger("render_wallets");
+      EthoWallets.enableButtonTooltips();
 
-        $("#labelSumDollars").html(vsprintf("/ %.2f $ / %.4f $ per ETHO", [data.sumBalance * EthoWallets._getPrice(), EthoWallets._getPrice()]));
-      }
-    );
+      $("#labelSumDollars").html(vsprintf("/ %.2f $ / %.4f $ per ETHO", [
+        data.sumBalance * EthoWallets._getPrice(),
+        EthoWallets._getPrice()
+      ]));
+    });
   }
 }
 
 // the event to tell us that the wallets are rendered
-$(document).on("render_wallets", function() {
-  $('#addressTable').floatThead();
+$(document).on("render_wallets", function () {
+  $("#addressTable").floatThead();
 
-  $("#btnNewAddress").off('click').on('click', function() {
+  $("#btnNewAddress").off("click").on("click", function () {
     $("#dlgCreateWalletPassword").iziModal();
     $("#walletPasswordFirst").val("");
     $("#walletPasswordSecond").val("");
-    $('#dlgCreateWalletPassword').iziModal('open');
+    $("#dlgCreateWalletPassword").iziModal("open");
 
     function doCreateNewWallet() {
-      $('#dlgCreateWalletPassword').iziModal('close');
+      $("#dlgCreateWalletPassword").iziModal("close");
 
       if (EthoWallets.validateNewAccountForm()) {
-        EthoBlockchain.createNewAccount($("#walletPasswordFirst").val(),
-          function(error) {
-            EthoMainGUI.showGeneralError(error);
-          },
-          function(account) {      
-            EthoWallets.addAddressToList(account);
-            EthoWallets.renderWalletsState();
+        EthoBlockchain.createNewAccount($("#walletPasswordFirst").val(), function (error) {
+          EthoMainGUI.showGeneralError(error);
+        }, function (account) {
+          EthoWallets.addAddressToList(account);
+          EthoWallets.renderWalletsState();
 
-            iziToast.success({
-              title: 'Created',
-              message: 'New wallet was successfully created',
-              position: 'topRight',
-              timeout: 5000
-            });                                         
-          }
-        );
-      }      
+          iziToast.success({title: "Created", message: "New wallet was successfully created", position: "topRight", timeout: 5000});
+        });
+      }
     }
 
-    $("#btnCreateWalletConfirm").off('click').on('click', function() {
+    $("#btnCreateWalletConfirm").off("click").on("click", function () {
       doCreateNewWallet();
     });
 
-    $("#dlgCreateWalletPassword").off('keypress').on('keypress', function(e) {
-      if(e.which == 13) {
+    $("#dlgCreateWalletPassword").off("keypress").on("keypress", function (e) {
+      if (e.which == 13) {
         doCreateNewWallet();
       }
-    });                                
-  });                
+    });
+  });
 
-  $(".btnShowAddressTransactions").off('click').on('click', function() {
-    EthoTransactions.setFilter($(this).attr('data-wallet'));
+  $(".btnShowAddressTransactions").off("click").on("click", function () {
+    EthoTransactions.setFilter($(this).attr("data-wallet"));
     EthoMainGUI.changeAppState("transactions");
     EthoTransactions.renderTransactions();
   });
 
-  $(".btnChangWalletName").off('click').on('click', function() {
-    var walletAddress = $(this).attr('data-wallet');
-    var walletName = $(this).attr('data-name');
+  $(".btnChangWalletName").off("click").on("click", function () {
+    var walletAddress = $(this).attr("data-wallet");
+    var walletName = $(this).attr("data-name");
 
     $("#dlgChangeWalletName").iziModal();
     $("#inputWalletName").val(walletName);
-    $('#dlgChangeWalletName').iziModal('open');
+    $("#dlgChangeWalletName").iziModal("open");
 
     function doChangeWalletName() {
       var wallets = EthoDatatabse.getWallets();
@@ -160,103 +151,86 @@ $(document).on("render_wallets", function() {
       wallets.names[walletAddress] = $("#inputWalletName").val();
       EthoDatatabse.setWallets(wallets);
 
-      $('#dlgChangeWalletName').iziModal('close');
+      $("#dlgChangeWalletName").iziModal("close");
       EthoWallets.renderWalletsState();
     }
 
-    $("#btnChangeWalletNameConfirm").off('click').on('click', function() {
+    $("#btnChangeWalletNameConfirm").off("click").on("click", function () {
       doChangeWalletName();
     });
 
-    $("#dlgChangeWalletName").off('keypress').on('keypress', function(e) {
-      if(e.which == 13) {
+    $("#dlgChangeWalletName").off("keypress").on("keypress", function (e) {
+      if (e.which == 13) {
         doChangeWalletName();
       }
-    });                                
-  });                
-  
-  $("#btnRefreshAddress").off('click').on('click', function() {
+    });
+  });
+
+  $("#btnRefreshAddress").off("click").on("click", function () {
     EthoWallets.renderWalletsState();
   });
 
-  $("#btnExportAccounts").off('click').on('click', function() {
-    ipcRenderer.send('exportAccounts', {});
+  $("#btnExportAccounts").off("click").on("click", function () {
+    ipcRenderer.send("exportAccounts", {});
   });
 
-  $("#btnImportAccounts").off('click').on('click', function() {
-    var ImportResult = ipcRenderer.sendSync('importAccounts', {});
+  $("#btnImportAccounts").off("click").on("click", function () {
+    var ImportResult = ipcRenderer.sendSync("importAccounts", {});
 
     if (ImportResult.success) {
-      iziToast.success({
-        title: 'Imported',
-        message: ImportResult.text,
-        position: 'topRight',
-        timeout: 2000
-      });                   
+      iziToast.success({title: "Imported", message: ImportResult.text, position: "topRight", timeout: 2000});
     } else if (ImportResult.success == false) {
       EthoMainGUI.showGeneralError(ImportResult.text);
     }
-
   });
 
-  $("#btnImportFromPrivateKey").off('click').on('click', function() {
+  $("#btnImportFromPrivateKey").off("click").on("click", function () {
     $("#dlgImportFromPrivateKey").iziModal();
     $("#inputPrivateKey").val("");
-    $('#dlgImportFromPrivateKey').iziModal('open');
+    $("#dlgImportFromPrivateKey").iziModal("open");
 
     function doImportFromPrivateKeys() {
       var account = EthoBlockchain.importFromPrivateKey($("#inputPrivateKey").val());
-      $('#dlgImportFromPrivateKey').iziModal('close');
+      $("#dlgImportFromPrivateKey").iziModal("close");
 
       if (account) {
-        ipcRenderer.sendSync('saveAccount', account[0]);
+        ipcRenderer.sendSync("saveAccount", account[0]);
         EthoWallets.renderWalletsState();
 
-        iziToast.success({
-          title: 'Imported',
-          message: "Account was succesfully imported",
-          position: 'topRight',
-          timeout: 2000
-        });                   
-  
+        iziToast.success({title: "Imported", message: "Account was succesfully imported", position: "topRight", timeout: 2000});
       } else {
         EthoMainGUI.showGeneralError("Error importing account from private key!");
       }
     }
 
-    $("#btnImportFromPrivateKeyConfirm").off('click').on('click', function() {
+    $("#btnImportFromPrivateKeyConfirm").off("click").on("click", function () {
       doImportFromPrivateKeys();
     });
 
-    $("#dlgImportFromPrivateKey").off('keypress').on('keypress', function(e) {
-      if(e.which == 13) {
+    $("#dlgImportFromPrivateKey").off("keypress").on("keypress", function (e) {
+      if (e.which == 13) {
         doImportFromPrivateKeys();
       }
-    });                                
+    });
   });
 
-  $(".textAddress").off('click').on('click', function() {
+  $(".textAddress").off("click").on("click", function () {
     EthoMainGUI.copyToClipboard($(this).html());
 
-    iziToast.success({
-      title: 'Copied',
-      message: 'Address was copied to clipboard',
-      position: 'topRight',
-      timeout: 2000
-    }); 
+    iziToast.success({title: "Copied", message: "Address was copied to clipboard", position: "topRight", timeout: 2000});
   });
 });
 
 // event that tells us that geth is ready and up
-$(document).on("onGethReady", function() {
+$(document).on("onGethReady", function () {
   EthoMainGUI.changeAppState("account");
   EthoWallets.renderWalletsState();
 });
 
-$(document).on("onNewAccountTransaction", function() {
+$(document).on("onNewAccountTransaction", function () {
   if (EthoMainGUI.getAppState() == "account") {
-    EthoWallets.renderWalletsState();      
+    EthoWallets.renderWalletsState();
   }
 });
-  
+
 EthoWallets = new Wallets();
\ No newline at end of file
