diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign
index f64aeaa..f98b991 100644
Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ
diff --git a/account.py b/account.py
index 02bb540..fcd5368 100644
--- a/account.py
+++ b/account.py
@@ -1276,7 +1276,7 @@ def _execute_batch_operation(account_name, batch, operation_type="sendbatch"):
     # Make the batch request
     try:
         response = requests.post(
-            f"http://x:{HSD_API}@{HSD_IP}:{HSD_WALLET_PORT}", 
+            get_wallet_api_url(), 
             json={"method": operation_type, "params": [batch]},
             timeout=30  # Add timeout to prevent hanging
         ).json()
diff --git a/main.py b/main.py
index 25f645c..7180a3a 100644
--- a/main.py
+++ b/main.py
@@ -530,10 +530,7 @@ def search():
     
     dns = account_module.getDNS(search_term)
 
-    own_domains = account_module.getDomains(account)
-    own_domains = [x['name'] for x in own_domains]
-    own_domains = [x.lower() for x in own_domains]
-    if search_term in own_domains:
+    if account_module.isOwnDomain(account, search_term):
         owner = "You"
 
     dns = render.dns(dns)
@@ -728,10 +725,7 @@ def editPage(domain: str):
     
     domain = domain.lower()
     
-    own_domains = account_module.getDomains(account)
-    own_domains = [x['name'] for x in own_domains]
-    own_domains = [x.lower() for x in own_domains]
-    if domain not in own_domains:
+    if not account_module.isOwnDomain(account, domain):
         return redirect("/search?q=" + domain)
        
 
@@ -973,10 +967,7 @@ def auction(domain):
             expires = domainInfo['info']['stats']['daysUntilExpire']
             next = f"Expires in ~{expires} days"
 
-            own_domains = account_module.getDomains(account)
-            own_domains = [x['name'] for x in own_domains]
-            own_domains = [x.lower() for x in own_domains]
-            if search_term in own_domains:
+            if account_module.isOwnDomain(account,domain):
                 next_action = f'<a href="/manage/{domain}">Manage</a>'
     elif state == "REVOKED":
         next = "Available Now"