diff --git a/src/Angor/Client/NetworkConfiguration.cs b/src/Angor/Client/NetworkConfiguration.cs
index 6b484480..c6527f0f 100644
--- a/src/Angor/Client/NetworkConfiguration.cs
+++ b/src/Angor/Client/NetworkConfiguration.cs
@@ -8,29 +8,75 @@ namespace Angor.Client;
 public class NetworkConfiguration : INetworkConfiguration
 {
     public static string AngorTestKey = "tpubD8JfN1evVWPoJmLgVg6Usq2HEW9tLqm6CyECAADnH5tyQosrL6NuhpL9X1cQCbSmndVrgLSGGdbRqLfUbE6cRqUbrHtDJgSyQEY2Uu7WwTL";
+    public static string AngorMainKey = "todo: add an Angor key here";
+
+    private Network currentNetwork;
+
+    public void SetNetwork(Network network)
+    {
+        currentNetwork = network;
+    }
 
     public Network GetNetwork()
     {
-        return new BitcoinSignet();
+        if (currentNetwork == null)
+        {
+            throw new ApplicationException("Network not set");
+        }
+
+        return currentNetwork;
     }
 
     public SettingsUrl GetIndexerUrl()
     {
-        return new SettingsUrl { Name = "", Url = "https://tbtc.indexer.angor.io/api" };
+        if (currentNetwork.NetworkType == NetworkType.Testnet)
+        {
+            return new SettingsUrl { Name = "", Url = "https://tbtc.indexer.angor.io/api" };
+        }
+
+        if (currentNetwork.NetworkType == NetworkType.Mainnet)
+        {
+            return new SettingsUrl { Name = "", Url = "https://btc.indexer.angor.io/api" };
+        }
+
+        throw new ApplicationException("Network not set");
     }
 
     public SettingsUrl GetExplorerUrl()
     {
+        if (currentNetwork.NetworkType == NetworkType.Testnet)
+        {
+            return new SettingsUrl { Name = "", Url = "https://explorer.angor.io/tbtc/explorer" };
+        }
+
+        if (currentNetwork.NetworkType == NetworkType.Mainnet)
+        {
+            return new SettingsUrl { Name = "", Url = "https://explorer.angor.io/btc/explorer" };
+        }
 
-        return new SettingsUrl { Name = "", Url = "https://explorer.angor.io/tbtc/explorer" };
+        throw new ApplicationException("Network not set");
     }
 
     public List<SettingsUrl> GetDefaultIndexerUrls()
     {
-        return new List<SettingsUrl>
+        if (currentNetwork.NetworkType == NetworkType.Testnet)
         {
-            new SettingsUrl { Name = "", Url = "https://tbtc.indexer.angor.io", IsPrimary = true },
-        };
+            return new List<SettingsUrl>
+            {
+                new SettingsUrl { Name = "", Url = "https://tbtc.indexer.angor.io", IsPrimary = true },
+            };
+        }
+
+        if (currentNetwork.NetworkType == NetworkType.Mainnet)
+        {
+            return new List<SettingsUrl>
+            {
+                new SettingsUrl { Name = "", Url = "https://btc.indexer.angor.io", IsPrimary = true },
+            };
+        }
+
+        throw new ApplicationException("Network not set");
+
     }
 
     public List<SettingsUrl> GetDefaultRelayUrls()
@@ -45,58 +91,23 @@ public List<SettingsUrl> GetDefaultRelayUrls()
 
     public List<SettingsUrl> GetDefaultExplorerUrl()
     {
-        return new List<SettingsUrl>
+        if (currentNetwork.NetworkType == NetworkType.Testnet)
         {
-            new SettingsUrl { Name = "", Url = "https://explorer.angor.io/tbtc/explorer", IsPrimary = true },
-        };
-    }
+            return new List<SettingsUrl>
+            {
+                new SettingsUrl { Name = "", Url = "https://explorer.angor.io/tbtc/explorer", IsPrimary = true },
+            };
+        }
 
-    public static List<ProjectInfo> CreateFakeProjects()
-    {
-        return new List<ProjectInfo>
+        if (currentNetwork.NetworkType == NetworkType.Mainnet)
+        {
+            return new List<SettingsUrl>
             {
-                new ProjectInfo
-                {
-                    StartDate = DateTime.UtcNow,
-                    PenaltyDays = 100,
-                    ExpiryDate = DateTime.UtcNow,
-                    TargetAmount = 300,
-                    ProjectIdentifier = "angor" + Guid.NewGuid().ToString("N"),
-                    Stages = new List<Stage>
-                    {
-                        new Stage { AmountToRelease = 10, ReleaseDate = DateTime.UtcNow.AddDays(1) },
-                        new Stage { AmountToRelease = 30, ReleaseDate = DateTime.UtcNow.AddDays(2) },
-                        new Stage { AmountToRelease = 60, ReleaseDate = DateTime.UtcNow.AddDays(3) },
-                    }
-                },
-                new ProjectInfo
-                {
-                    StartDate = DateTime.UtcNow,
-                    PenaltyDays = 100,
-                    ExpiryDate = DateTime.UtcNow,
-                    TargetAmount = 200,
-                    ProjectIdentifier = "angor" + Guid.NewGuid().ToString("N"),
-                    Stages = new List<Stage>
-                    {
-                        new Stage { AmountToRelease = 10, ReleaseDate = DateTime.UtcNow.AddDays(1) },
-                        new Stage { AmountToRelease = 30, ReleaseDate = DateTime.UtcNow.AddDays(2) },
-                        new Stage { AmountToRelease = 60, ReleaseDate = DateTime.UtcNow.AddDays(3) },
-                    }
-                },
-                new ProjectInfo
-                {
-                    StartDate = DateTime.UtcNow,
-                    PenaltyDays = 100,
-                    ExpiryDate = DateTime.UtcNow,
-                    TargetAmount = 100,
-                    ProjectIdentifier = "angor" + Guid.NewGuid().ToString("N"),
-                    Stages = new List<Stage>
-                    {
-                        new Stage { AmountToRelease = 10, ReleaseDate = DateTime.UtcNow.AddDays(1) },
-                        new Stage { AmountToRelease = 30, ReleaseDate = DateTime.UtcNow.AddDays(2) },
-                        new Stage { AmountToRelease = 60, ReleaseDate = DateTime.UtcNow.AddDays(3) },
-                    }
-                },
+                new SettingsUrl { Name = "", Url = "https://explorer.angor.io/btc/explorer", IsPrimary = true },
             };
+        }
+
+        throw new ApplicationException("Network not set");
     }
+
 }
\ No newline at end of file
diff --git a/src/Angor/Client/Pages/Settings.razor b/src/Angor/Client/Pages/Settings.razor
index 44b1e131..a78b6547 100644
--- a/src/Angor/Client/Pages/Settings.razor
+++ b/src/Angor/Client/Pages/Settings.razor
@@ -12,6 +12,7 @@
 @inject IWalletStorage _walletStorage;
 @inject NavMenuState NavMenuState
 @inject ILogger<Settings> Logger;
+@inject NavigationManager _navManager
 
 @inherits BaseComponent
 
@@ -58,6 +59,17 @@
                                 {
                                     <p class="text-danger-emphasis">Please tick the box to wipe all storage!</p>
                                 }
+                                
+                                <hr />
+
+                                <!-- Dropdown for network selection -->
+                                <div class="mb-3">
+                                    <label for="networkSelection">Select Network:</label>
+                                    <select class="form-control" id="networkSelection" @bind="selectedNetwork">
+                                        <option value="testnet" selected>Testnet</option>
+                                        <option value="mainnet">Mainnet</option>
+                                    </select>
+                                </div>
 
                                 <button class="btn btn-danger" @onclick="WipteAllData">Wipe Storage</button>
                             </div>
@@ -190,6 +202,7 @@
     private bool showWipeallModal = false;
     private bool confirmWipe = false;
     private bool showConfirmWipeMessage = false;
+    private string selectedNetwork = "testnet"; // Default to "testnet"
 
     private SettingsInfo settingsInfo;
 
@@ -201,6 +214,9 @@
 
         networkType = _networkConfiguration.GetNetwork().Name;
 
+        if (!networkType.ToLower().Contains("test"))
+            selectedNetwork = "mainnet";
+
         return base.OnInitializedAsync();
     }
 
@@ -389,8 +405,12 @@
         showWipeallModal = false;
         showConfirmWipeMessage = false;
 
+        _networkService.CheckAndSetNetwork(_navManager.Uri.ToLower(), selectedNetwork);
         _networkService.AddSettingsIfNotExist();
 
+        networkType = _networkConfiguration.GetNetwork().Name;
+        settingsInfo = _clientStorage.GetSettingsInfo();
+
         hasWallet = _walletStorage.HasWallet();
         StateHasChanged();
 
diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor
index 9357e2b4..9a70fcc5 100644
--- a/src/Angor/Client/Pages/Wallet.razor
+++ b/src/Angor/Client/Pages/Wallet.razor
@@ -947,15 +947,15 @@
 
             var res = await _httpClient.GetAsync($"/api/faucet/send/{receiveAddress}");
 
-            if (res.IsSuccessStatusCode)
-            {
-                var trxhex = await res.Content.ReadAsStringAsync();
-                var trx = network.CreateTransaction(trxhex);
-                var unconfirmedInboundFunds = _cacheStorage.GetUnconfirmedInboundFunds();
-                unconfirmedInboundFunds.Add(new UtxoData { PendingSpent = true, address = receiveAddress, value = trx.Outputs.FirstOrDefault()?.Value.Satoshi ?? Money.Coins(50).Satoshi, outpoint = new Outpoint(trx.GetHash().ToString(), 0) });
-                _cacheStorage.SetUnconfirmedInboundFunds(unconfirmedInboundFunds);
-                accountBalanceInfo.UpdateAccountBalanceInfo(accountBalanceInfo.AccountInfo, unconfirmedInboundFunds);
-            }
+            res.EnsureSuccessStatusCode();
+
+            var trxhex = await res.Content.ReadAsStringAsync();
+            var trx = network.CreateTransaction(trxhex);
+            var unconfirmedInboundFunds = _cacheStorage.GetUnconfirmedInboundFunds();
+            unconfirmedInboundFunds.Add(new UtxoData { PendingSpent = true, address = receiveAddress, value = trx.Outputs.FirstOrDefault()?.Value.Satoshi ?? Money.Coins(50).Satoshi, outpoint = new Outpoint(trx.GetHash().ToString(), 0) });
+            _cacheStorage.SetUnconfirmedInboundFunds(unconfirmedInboundFunds);
+            accountBalanceInfo.UpdateAccountBalanceInfo(accountBalanceInfo.AccountInfo, unconfirmedInboundFunds);
+
         }
         catch (Exception e)
         {
diff --git a/src/Angor/Client/Program.cs b/src/Angor/Client/Program.cs
index af8fcb7f..1f2aadef 100644
--- a/src/Angor/Client/Program.cs
+++ b/src/Angor/Client/Program.cs
@@ -21,7 +21,7 @@
 builder.Services.AddBlazoredLocalStorage();
 builder.Services.AddBlazoredSessionStorage();
 
-builder.Services.AddTransient<INetworkConfiguration, NetworkConfiguration>();
+builder.Services.AddSingleton<INetworkConfiguration, NetworkConfiguration>();
 builder.Services.AddTransient<IHdOperations, HdOperations>();
 builder.Services.AddTransient <IClientStorage, ClientStorage>();
 builder.Services.AddTransient<INetworkStorage, ClientStorage>();
diff --git a/src/Angor/Client/Shared/MainLayout.razor b/src/Angor/Client/Shared/MainLayout.razor
index 1f847b2c..9aa70438 100644
--- a/src/Angor/Client/Shared/MainLayout.razor
+++ b/src/Angor/Client/Shared/MainLayout.razor
@@ -1,7 +1,14 @@
 @using Angor.Client.Storage
 @using System.Reflection
+@using Angor.Shared
+@using Angor.Shared.Networks
+@using Angor.Shared.Services
+@using Blockcore.Networks
 @inherits LayoutComponentBase
 @inject IJSRuntime Js;
+@inject INetworkConfiguration _networkConfiguration
+@inject INetworkService _networkService
+@inject NavigationManager _navManager
 
 <aside class="sidenav navbar navbar-vertical navbar-expand-xs border-0 border-radius-xl my-3 fixed-start ms-3 b-shadow bg-gradient-dark"
        id="sidenav-main">
@@ -16,7 +23,7 @@
             <nav>
                 <div class="mb-0 pb-0 pt-1 px-0 me-sm-6 me-5">
                     <div class="text-sm">
-                        <h6 class="font-weight-bolder" title="Alpha app - only use test wallets.">Only use test wallets.</h6>
+                        <h6 class="font-weight-bolder" title="Alpha app - only use test wallets.">Only use test wallets.  @networkText</h6>
                     </div>
                 </div>
             </nav>
@@ -77,6 +84,8 @@
     ElementReference contentRef;
     ElementReference footerRef;
 
+    string networkText = string.Empty;
+
     private async Task InstallApp()
     {
         try
@@ -100,6 +109,13 @@
 
         if (version != null) _softwareVersion = version.ToString();
 
+        _networkService.CheckAndSetNetwork(_navManager.Uri.ToLower());
+
+        networkText = "(mainnet)";
+        if (_networkConfiguration.GetNetwork().NetworkType != NetworkType.Mainnet)
+        {
+            networkText = "(testnet)";
+        }
     }
 
     /// <summary>
@@ -108,9 +124,7 @@
     /// <param name="firstRender"></param>
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-
         await Js.InvokeVoidAsync("angor.setTheme");
-
     }
 
 }
\ No newline at end of file
diff --git a/src/Angor/Client/Storage/ClientStorage.cs b/src/Angor/Client/Storage/ClientStorage.cs
index 1293994c..0a78666a 100644
--- a/src/Angor/Client/Storage/ClientStorage.cs
+++ b/src/Angor/Client/Storage/ClientStorage.cs
@@ -216,4 +216,15 @@ public void WipeStorage()
     {
         _storage.Clear();
     }
+
+    public void SetNetwork(string network)
+    {
+        _storage.SetItem("network", network);
+
+    }
+
+    public string GetNetwork()
+    {
+        return _storage.GetItem<string>("network");
+    }
 }
\ No newline at end of file
diff --git a/src/Angor/Server/FaucetController.cs b/src/Angor/Server/FaucetController.cs
index 7b0c28dd..25405482 100644
--- a/src/Angor/Server/FaucetController.cs
+++ b/src/Angor/Server/FaucetController.cs
@@ -143,5 +143,10 @@ public void HandleException(Exception exception)
         {
             throw exception;
         }
+
+        public void CheckAndSetNetwork(string url, string? setNetwork = null)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Angor/Shared/INetworkConfiguration.cs b/src/Angor/Shared/INetworkConfiguration.cs
index ff355ebc..a1f8b941 100644
--- a/src/Angor/Shared/INetworkConfiguration.cs
+++ b/src/Angor/Shared/INetworkConfiguration.cs
@@ -6,6 +6,7 @@ namespace Angor.Shared;
 public interface INetworkConfiguration
 {
     Network GetNetwork();
+    void SetNetwork(Network network);
     SettingsUrl GetIndexerUrl();
     SettingsUrl GetExplorerUrl();
     List<SettingsUrl> GetDefaultIndexerUrls();
diff --git a/src/Angor/Shared/INetworkStorage.cs b/src/Angor/Shared/INetworkStorage.cs
index 0d838709..c2c75562 100644
--- a/src/Angor/Shared/INetworkStorage.cs
+++ b/src/Angor/Shared/INetworkStorage.cs
@@ -6,4 +6,8 @@ public interface INetworkStorage
 {
     SettingsInfo GetSettings();
     void SetSettings(SettingsInfo settingsInfo);
+
+    public void SetNetwork(string network);
+    public string GetNetwork();
+
 }
\ No newline at end of file
diff --git a/src/Angor/Shared/Services/INetworkService.cs b/src/Angor/Shared/Services/INetworkService.cs
index 58b92e4e..9c29571b 100644
--- a/src/Angor/Shared/Services/INetworkService.cs
+++ b/src/Angor/Shared/Services/INetworkService.cs
@@ -11,4 +11,5 @@ public interface INetworkService
     List<SettingsUrl> GetRelays();
     void CheckAndHandleError(HttpResponseMessage httpResponseMessage);
     void HandleException(Exception exception);
+    void CheckAndSetNetwork(string url, string? setNetwork = null);
 }
\ No newline at end of file
diff --git a/src/Angor/Shared/Services/NetworkService.cs b/src/Angor/Shared/Services/NetworkService.cs
index 42b5db09..422d02a7 100644
--- a/src/Angor/Shared/Services/NetworkService.cs
+++ b/src/Angor/Shared/Services/NetworkService.cs
@@ -2,6 +2,8 @@
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using Angor.Shared.Models;
+using Angor.Shared.Networks;
+using Blockcore.Networks;
 using Microsoft.Extensions.Logging;
 
 namespace Angor.Shared.Services
@@ -21,6 +23,47 @@ public NetworkService(INetworkStorage networkStorage, HttpClient httpClient, ILo
             _networkConfiguration = networkConfiguration;
         }
 
+        public void CheckAndSetNetwork(string url, string? setNetwork = null)
+        {
+            string networkName = _networkStorage.GetNetwork();
+            if (string.IsNullOrEmpty(networkName))
+            {
+                Network network = null;
+
+                if (setNetwork != null)
+                {
+                    network = setNetwork.Contains("test") ? new BitcoinTest() : new BitcoinMain();
+
+                } else if (url.Contains("test"))
+                {
+                    network = new BitcoinTest();
+                }
+                else if (url.Contains("localhost"))
+                {
+                    network = new BitcoinTest();
+                }
+                else
+                {
+                    network = new BitcoinMain();
+                }
+
+                _networkStorage.SetNetwork(network.NetworkType.ToString());
+                _networkConfiguration.SetNetwork(network);
+            }
+            else
+            {
+                if (networkName == NetworkType.Mainnet.ToString())
+                {
+                    _networkConfiguration.SetNetwork(new BitcoinMain());
+                }
+
+                if (networkName == NetworkType.Testnet.ToString())
+                {
+                    _networkConfiguration.SetNetwork(new BitcoinTest());
+                }
+            }
+        }
+
         public void AddSettingsIfNotExist()
         {
             var settings = _networkStorage.GetSettings();