diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0782742..2056b8e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -425,15 +425,11 @@ void MainWindow::setupSettingsModal() {
         int currency_index = settings.comboBoxCurrency->findText(Settings::getInstance()->get_currency_name(), Qt::MatchExactly);
         settings.comboBoxCurrency->setCurrentIndex(currency_index);
         
-
-
        QObject::connect(settings.comboBoxCurrency, &QComboBox::currentTextChanged, [=] (QString currency_name) {
             this->slot_change_currency(currency_name);
             
              // Tell the user to restart
-            QMessageBox::information(this, tr("Currency Change"), tr("Please restart SilentDragonLite to have new currencies apply"), QMessageBox::Ok);
-          
-            
+            QMessageBox::information(this, tr("Currency Change"), tr("Please restart SilentDragonLite to have new currencies apply"), QMessageBox::Ok);  
              });
       
         // Check for updates
@@ -1126,27 +1122,27 @@ void MainWindow::setupReceiveTab() {
         
         ui->rcvLabel->setText(label);
         if (Settings::getInstance()->get_currency_name() == "USD") {
-        ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushUSDString());
+             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushUSDString());
         } else if (Settings::getInstance()->get_currency_name() == "EUR") {
-            ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushEURString());
-            } else if (Settings::getInstance()->get_currency_name() == "BTC") {
-                ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushBTCString());
-                } else if (Settings::getInstance()->get_currency_name() == "CNY") {
+             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushEURString());
+        } else if (Settings::getInstance()->get_currency_name() == "BTC") {
+             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushBTCString());
+        } else if (Settings::getInstance()->get_currency_name() == "CNY") {
             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushCNYString());
-            } else if (Settings::getInstance()->get_currency_name() == "RUB") {
-                ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushRUBString());
-                } else if (Settings::getInstance()->get_currency_name() == "CAD") {
+        } else if (Settings::getInstance()->get_currency_name() == "RUB") {
+            ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushRUBString());
+        } else if (Settings::getInstance()->get_currency_name() == "CAD") {
             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushCADString());
-            } else if (Settings::getInstance()->get_currency_name() == "SGD") {
-                ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushSGDString());
-                } else if (Settings::getInstance()->get_currency_name() == "CHF") {
+        } else if (Settings::getInstance()->get_currency_name() == "SGD") {
+            ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushSGDString());
+        } else if (Settings::getInstance()->get_currency_name() == "CHF") {
             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushCHFString());
-            } else if (Settings::getInstance()->get_currency_name() == "INR") {
-                ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushINRString());
-                } else if (Settings::getInstance()->get_currency_name() == "GBP") {
+        } else if (Settings::getInstance()->get_currency_name() == "INR") {
+            ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushINRString());
+        } else if (Settings::getInstance()->get_currency_name() == "GBP") {
             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushGBPString());
-            } else if (Settings::getInstance()->get_currency_name() == "AUD") {
-                ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushAUDString());
+        } else if (Settings::getInstance()->get_currency_name() == "AUD") {
+            ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushAUDString());
             }
 
         ui->txtReceive->setPlainText(addr);       
@@ -1309,19 +1305,10 @@ void MainWindow::slot_change_currency(const QString& currency_name)
         saved_currency_name = "USD";
         
     }
-
-    
-    
- 
-
 }
 
-
-
-
 void MainWindow::slot_change_theme(const QString& theme_name)
 
-
 {
     Settings::getInstance()->set_theme_name(theme_name);
     
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 08aac98..50f833a 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -79,8 +79,7 @@ public:
 public slots:
     void slot_change_theme(const QString& themeName);
     void slot_change_currency(const QString& currencyName);
-    
-    
+     
 private:    
     void closeEvent(QCloseEvent* event);
 
diff --git a/src/requestdialog.cpp b/src/requestdialog.cpp
index 9f14343..203ab2b 100644
--- a/src/requestdialog.cpp
+++ b/src/requestdialog.cpp
@@ -120,23 +120,54 @@ void RequestDialog::showRequesthush(MainWindow* main) {
     req.txtAmount->setValidator(main->getAmountValidator());
     QObject::connect(req.txtAmount, &QLineEdit::textChanged, [=] (auto text) {
         CAmount amount = CAmount::fromDecimalString(text);
-        if (Settings::getInstance()->get_currency_name() == "USD") {
-    req.txtAmountUSD->setText(amount.toDecimalUSDString());
+     if (Settings::getInstance()->get_currency_name() == "USD") {
+         req.txtAmountUSD->setText(amount.toDecimalUSDString());
     } else if (Settings::getInstance()->get_currency_name() == "EUR") {
         req.txtAmountUSD->setText(amount.toDecimalEURString());
-        } else if (Settings::getInstance()->get_currency_name() == "BTC") {
-            req.txtAmountUSD->setText(amount.toDecimalBTCString());
+    } else if (Settings::getInstance()->get_currency_name() == "BTC") {
+        req.txtAmountUSD->setText(amount.toDecimalBTCString());
+    } else if (Settings::getInstance()->get_currency_name() == "CNY") {
+        req.txtAmountUSD->setText(amount.toDecimalCNYString());
+    } else if (Settings::getInstance()->get_currency_name() == "RUB") {
+        req.txtAmountUSD->setText(amount.toDecimalRUBString());
+    } else if (Settings::getInstance()->get_currency_name() == "CAD") {
+        req.txtAmountUSD->setText(amount.toDecimalCADString());
+    } else if (Settings::getInstance()->get_currency_name() == "SGD") {
+        req.txtAmountUSD->setText(amount.toDecimalSGDString());
+    } else if (Settings::getInstance()->get_currency_name() == "CHF") {
+        req.txtAmountUSD->setText(amount.toDecimalCHFString());
+    } else if (Settings::getInstance()->get_currency_name() == "INR") {
+        req.txtAmountUSD->setText(amount.toDecimalINRString());
+    } else if (Settings::getInstance()->get_currency_name() == "GBP") {
+        req.txtAmountUSD->setText(amount.toDecimalGBPString());
+    } else if (Settings::getInstance()->get_currency_name() == "AUD") {
+        req.txtAmountUSD->setText(amount.toDecimalBTCString());
         }
     });
     CAmount amount = CAmount::fromDecimalString(req.txtAmount->text());
     if (Settings::getInstance()->get_currency_name() == "USD") {
-    req.txtAmountUSD->setText(amount.toDecimalUSDString());
+         req.txtAmountUSD->setText(amount.toDecimalUSDString());
     } else if (Settings::getInstance()->get_currency_name() == "EUR") {
         req.txtAmountUSD->setText(amount.toDecimalEURString());
-        } else if (Settings::getInstance()->get_currency_name() == "BTC") {
-            req.txtAmountUSD->setText(amount.toDecimalBTCString());
+    } else if (Settings::getInstance()->get_currency_name() == "BTC") {
+        req.txtAmountUSD->setText(amount.toDecimalBTCString());
+    } else if (Settings::getInstance()->get_currency_name() == "CNY") {
+        req.txtAmountUSD->setText(amount.toDecimalCNYString());
+    } else if (Settings::getInstance()->get_currency_name() == "RUB") {
+        req.txtAmountUSD->setText(amount.toDecimalRUBString());
+    } else if (Settings::getInstance()->get_currency_name() == "CAD") {
+        req.txtAmountUSD->setText(amount.toDecimalCADString());
+    } else if (Settings::getInstance()->get_currency_name() == "SGD") {
+        req.txtAmountUSD->setText(amount.toDecimalSGDString());
+    } else if (Settings::getInstance()->get_currency_name() == "CHF") {
+        req.txtAmountUSD->setText(amount.toDecimalCHFString());
+    } else if (Settings::getInstance()->get_currency_name() == "INR") {
+        req.txtAmountUSD->setText(amount.toDecimalINRString());
+    } else if (Settings::getInstance()->get_currency_name() == "GBP") {
+        req.txtAmountUSD->setText(amount.toDecimalGBPString());
+    } else if (Settings::getInstance()->get_currency_name() == "AUD") {
+        req.txtAmountUSD->setText(amount.toDecimalBTCString());
         }
-
     req.txtMemo->setAcceptButton(req.buttonBox->button(QDialogButtonBox::Ok));
     req.txtMemo->setLenDisplayLabel(req.lblMemoLen);
     req.txtMemo->setMaxLen(400);
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index 83e1a99..0f6e646 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -65,15 +65,15 @@ void MainWindow::setupSendTab() {
         ui->lblMinerFeeUSD->setText(fee.toDecimalEURString());
     } else if (Settings::getInstance()->get_currency_name() == "BTC") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalBTCString());
-         } else if (Settings::getInstance()->get_currency_name() == "CNY") {
+    } else if (Settings::getInstance()->get_currency_name() == "CNY") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalCNYString());
     } else if (Settings::getInstance()->get_currency_name() == "RUB") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalRUBString());
-         } else if (Settings::getInstance()->get_currency_name() == "CAD") {
+    } else if (Settings::getInstance()->get_currency_name() == "CAD") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalCADString());
     } else if (Settings::getInstance()->get_currency_name() == "SGD") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalSGDString());
-         } else if (Settings::getInstance()->get_currency_name() == "CHF") {
+    } else if (Settings::getInstance()->get_currency_name() == "CHF") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalCHFString());
     } else if (Settings::getInstance()->get_currency_name() == "INR") {
         ui->lblMinerFeeUSD->setText(fee.toDecimalINRString());
@@ -91,37 +91,37 @@ void MainWindow::setupSendTab() {
             QString txt = ui->minerFeeAmt->text();
         if (Settings::getInstance()->get_currency_name() == "USD") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalUSDString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "EUR") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalEURString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "BTC") {
-        QString feeUSD = CAmount::fromDecimalString(txt).toDecimalEURString();
-         ui->lblMinerFeeUSD->setText(feeUSD);
+            QString feeUSD = CAmount::fromDecimalString(txt).toDecimalEURString();
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "CNY") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalCNYString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "RUB") {
-        QString feeUSD = CAmount::fromDecimalString(txt).toDecimalRUBString();
-         ui->lblMinerFeeUSD->setText(feeUSD);
+            QString feeUSD = CAmount::fromDecimalString(txt).toDecimalRUBString();
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "CAD") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalCADString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "SGD") {
-        QString feeUSD = CAmount::fromDecimalString(txt).toDecimalSGDString();
-         ui->lblMinerFeeUSD->setText(feeUSD);
+            QString feeUSD = CAmount::fromDecimalString(txt).toDecimalSGDString();
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "CHF") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalCHFString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "INR") {
-        QString feeUSD = CAmount::fromDecimalString(txt).toDecimalINRString();
-         ui->lblMinerFeeUSD->setText(feeUSD);
-         } else if (Settings::getInstance()->get_currency_name() == "GBP") {
+            QString feeUSD = CAmount::fromDecimalString(txt).toDecimalINRString();
+            ui->lblMinerFeeUSD->setText(feeUSD);
+    } else if (Settings::getInstance()->get_currency_name() == "GBP") {
             QString feeUSD = CAmount::fromDecimalString(txt).toDecimalGBPString();
-             ui->lblMinerFeeUSD->setText(feeUSD);
+            ui->lblMinerFeeUSD->setText(feeUSD);
     } else if (Settings::getInstance()->get_currency_name() == "AUD") {
-        QString feeUSD = CAmount::fromDecimalString(txt).toDecimalAUDString();
-         ui->lblMinerFeeUSD->setText(feeUSD);
+            QString feeUSD = CAmount::fromDecimalString(txt).toDecimalAUDString();
+            ui->lblMinerFeeUSD->setText(feeUSD);
     }  
     }
 
@@ -748,27 +748,27 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
         minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
         minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
         confirm.gridLayout->addWidget(minerFeeUSD, row, 2, 1, 1);
-        if (Settings::getInstance()->get_currency_name() == "USD") {
-        minerFeeUSD->setText(tx.fee.toDecimalUSDString());
-      } else if (Settings::getInstance()->get_currency_name() == "EUR") {
-          minerFeeUSD->setText(tx.fee.toDecimalEURString());
-          } else if (Settings::getInstance()->get_currency_name() == "BTC") {
-              minerFeeUSD->setText(tx.fee.toDecimalBTCString());
-               } else if (Settings::getInstance()->get_currency_name() == "CNY") {
+     if (Settings::getInstance()->get_currency_name() == "USD") {
+            minerFeeUSD->setText(tx.fee.toDecimalUSDString());
+    } else if (Settings::getInstance()->get_currency_name() == "EUR") {
+            minerFeeUSD->setText(tx.fee.toDecimalEURString());
+    } else if (Settings::getInstance()->get_currency_name() == "BTC") {
+            minerFeeUSD->setText(tx.fee.toDecimalBTCString());
+    } else if (Settings::getInstance()->get_currency_name() == "CNY") {
           minerFeeUSD->setText(tx.fee.toDecimalCNYString());
-          } else if (Settings::getInstance()->get_currency_name() == "RUB") {
-              minerFeeUSD->setText(tx.fee.toDecimalRUBString());
-               } else if (Settings::getInstance()->get_currency_name() == "CAD") {
+    } else if (Settings::getInstance()->get_currency_name() == "RUB") {
+          minerFeeUSD->setText(tx.fee.toDecimalRUBString());
+    } else if (Settings::getInstance()->get_currency_name() == "CAD") {
           minerFeeUSD->setText(tx.fee.toDecimalCADString());
-          } else if (Settings::getInstance()->get_currency_name() == "SGD") {
-              minerFeeUSD->setText(tx.fee.toDecimalSGDString());
-           } else if (Settings::getInstance()->get_currency_name() == "CHF") {
+    } else if (Settings::getInstance()->get_currency_name() == "SGD") {
+          minerFeeUSD->setText(tx.fee.toDecimalSGDString());
+    } else if (Settings::getInstance()->get_currency_name() == "CHF") {
           minerFeeUSD->setText(tx.fee.toDecimalCHFString());
-          } else if (Settings::getInstance()->get_currency_name() == "INR") {
-              minerFeeUSD->setText(tx.fee.toDecimalINRString());
-               } else if (Settings::getInstance()->get_currency_name() == "GBP") {
+    } else if (Settings::getInstance()->get_currency_name() == "INR") {
+          minerFeeUSD->setText(tx.fee.toDecimalINRString());
+    } else if (Settings::getInstance()->get_currency_name() == "GBP") {
           minerFeeUSD->setText(tx.fee.toDecimalGBPString());
-          } else if (Settings::getInstance()->get_currency_name() == "AUD") {
+    } else if (Settings::getInstance()->get_currency_name() == "AUD") {
               minerFeeUSD->setText(tx.fee.toDecimalAUDString());
     }
     }