diff --git a/qortal-ui-core/src/redux/user/actions/update-name.js b/qortal-ui-core/src/redux/user/actions/update-name.js
index b1529bb0..c3eb1772 100644
--- a/qortal-ui-core/src/redux/user/actions/update-name.js
+++ b/qortal-ui-core/src/redux/user/actions/update-name.js
@@ -1,9 +1,8 @@
 import { updateAccountInfo } from './update-account-info.js'
-// import { doUpdateStoredWalletName } from '../user-actions.js'
 import { doUpdateStoredWalletName } from './store-wallet.js'
 
 const GET_NAME_URL = 'names/address/'
-const CHECK_NAME_INTERVAL = 1000 * 3 // Every 3 seconds
+const CHECK_NAME_INTERVAL = 1000 * 10 // Every 10 seconds
 
 export const UPDATE_NAME_STATUSES = {
     LOADING: 'LOADING',
@@ -21,8 +20,6 @@ export const doUpdateAccountName = (address, expectedName, awaitingConfirm) => {
         const state = getState()
         const config = state.config
         const node = config.coin.node.api
-        // console.log(config.constants)
-        // const url = config.constants.proxyURL + node.url + node.tail + GET_NAME_URL + address
         const url = node.url + node.tail + GET_NAME_URL + address
         return fetch(url)
             .then(res => res.json())
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
index 285383b5..b50237ee 100644
--- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -1332,18 +1332,21 @@ class TradePortal extends LitElement {
         tabSellContent.style.display = (tab === 'sell') ? 'block' : 'none'
     }
 
-    reRenderHistoricTrades() {
+    async reRenderHistoricTrades() {
         this.requestUpdate()
+        await this.updateComplete
         this.isLoadingHistoricTrades = false
     }
 
-    reRenderOpenFilteredOrders() {
+    async reRenderOpenFilteredOrders() {
         this.requestUpdate()
+        await this.updateComplete
         this.isLoadingOpenTrades = false
     }
 
-    reRenderMyOpenOrders() {
+    async reRenderMyOpenOrders() {
         this.requestUpdate()
+        await this.updateComplete
         this.isLoadingMyOpenOrders = false
     }
 
@@ -1975,7 +1978,6 @@ class TradePortal extends LitElement {
             // Closed Event
             socket.onclose = () => {
                 clearTimeout(socketTimeout)
-                // Restart Socket Connection
                 restartTradeOffersWebSocket()
             }
             // Error Event
@@ -2009,7 +2011,6 @@ class TradePortal extends LitElement {
             // Closed Event
             socket.onclose = () => {
                 clearTimeout(socketTimeout)
-                // Restart Socket Connection
                 restartTradeBotWebSocket()
             }
             // Error Event
@@ -2039,7 +2040,6 @@ class TradePortal extends LitElement {
             // Closed Event
             socket.onclose = () => {
                 clearTimeout(socketTimeout)
-                // Restart Socket Connection
                 restartTradePresenceWebSocket()
             }
             // Error Event
@@ -2070,7 +2070,6 @@ class TradePortal extends LitElement {
             // Closed Event
             socket.onclose = () => {
                 clearTimeout(socketTimeout)
-                // Restart Socket Connection
                 restartPresenceWebSocket()
             }
             // Error Event
@@ -2084,19 +2083,19 @@ class TradePortal extends LitElement {
         }
 
         const restartPresenceWebSocket = () => {
-            setTimeout(() => initPresenceWebSocket(true), 20000)
+            setTimeout(() => initPresenceWebSocket(true), 1000)
         }
 
         const restartTradePresenceWebSocket = () => {
-            setTimeout(() => initTradePresenceWebSocket(true), 20000)
+            setTimeout(() => initTradePresenceWebSocket(true), 1000)
         }
 
         const restartTradeOffersWebSocket = () => {
-            setTimeout(() => initTradeOffersWebSocket(true), 20000)
+            setTimeout(() => initTradeOffersWebSocket(true), 1000)
         }
 
         const restartTradeBotWebSocket = () => {
-            setTimeout(() => initTradeBotWebSocket(true), 20000)
+            setTimeout(() => initTradeBotWebSocket(true), 1000)
         }
 
         // Start TradeOffersWebSocket