diff --git a/src/Angor/Client/Pages/Create.razor b/src/Angor/Client/Pages/Create.razor
index 8e2f1325..38d7e34f 100644
--- a/src/Angor/Client/Pages/Create.razor
+++ b/src/Angor/Client/Pages/Create.razor
@@ -9,6 +9,7 @@
 @using Blockcore.NBitcoin
 @using Blockcore.NBitcoin.DataEncoders
 
+@inherits BaseComponent
 @inject IDerivationOperations _derivationOperations
 @inject IWalletStorage _walletStorage;
 @inject IClientStorage storage;
@@ -116,6 +117,13 @@
 
                         <hr>
 
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="FeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
+
+                        <hr>
+
                         <h6 class="mt-3 mb-2">Stages</h6>
                         @foreach (var stage in project.Stages)
                         {
@@ -143,14 +151,15 @@
 
 @code {
 
-    private NotificationComponent notificationComponent;
-
     private bool sendConfirmModal;
     private bool hasWallet;
     private bool showCreateModal;
 
+    Transaction unsignedTransaction;
     Transaction signedTransaction;
 
+    private FeeData feeData = new();
+    
     private ProjectInfo project = new ProjectInfo
     {
         StartDate = DateTime.UtcNow,
@@ -218,14 +227,16 @@
 
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var network = _NetworkConfiguration.GetNetwork();
             var accountInfo = storage.GetAccountInfo(network.Name);
 
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
 
-            var transaction = _founderTransactionActions.CreateNewProjectTransaction(project.FounderKey, _derivationOperations.AngorKeyToScript(project.ProjectIdentifier), 10000, project.NostrPubKey);
+            unsignedTransaction = _founderTransactionActions.CreateNewProjectTransaction(project.FounderKey, _derivationOperations.AngorKeyToScript(project.ProjectIdentifier), 10000, project.NostrPubKey);
 
-            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), transaction, _walletStorage.GetWallet(), accountInfo, feeEstimation.First());
+            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unsignedTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
 
             project.TransactionId = signedTransaction.GetHash().ToString();
 
@@ -243,14 +254,34 @@
         }
     }
 
+    private void FeeRangeChanged(ChangeEventArgs e)
+    {
+        var selected = e.Value?.ToString();
+
+        if (selected != null)
+        {
+            if (int.TryParse(selected, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+
+                    signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unsignedTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task Send()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
             showCreateModal = false;
 
-            var network = _NetworkConfiguration.GetNetwork();
-
             var response = await _WalletOperations.PublishTransactionAsync(network, signedTransaction);
 
             if (!response.Success)
diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor
index bfc206e4..e1fe7128 100644
--- a/src/Angor/Client/Pages/Invest.razor
+++ b/src/Angor/Client/Pages/Invest.razor
@@ -106,6 +106,13 @@
 
                         <p class="mb-1"><strong>Miner fee:</strong> [Your fee here]</p>
                         <p class="mb-1"><strong>Angor fee:</strong> 1000 sats</p>
+                        
+                        <hr>
+
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="FeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
 
                         <hr>
 
@@ -164,7 +171,13 @@
     private ProjectInfo project;
     private bool showCreateModal;
     Transaction signedTransaction;
+    Transaction unSignedTransaction;
+    //InvestorContext context;
+
     SignatureInfo recoverySigs;
+    
+    private FeeData feeData = new();
+    
 
     protected override async Task OnInitializedAsync()
     {
@@ -275,46 +288,23 @@
 
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var network = _NetworkConfiguration.GetNetwork();
             var accountInfo = storage.GetAccountInfo(network.Name);
 
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
 
             var investorKey = _derivationOperations.DeriveInvestorKey(_walletStorage.GetWallet(), project.FounderKey);
-
-            InvestorContext context = new InvestorContext
-            {
-                ProjectInfo = project,
-                ChangeAddress = accountInfo.GetNextChangeReceiveAddress(),
-                InvestorKey = investorKey,
-            };
-
+            
             if (Investment.IsSeeder)
             {
                 var seederHash = _derivationOperations.DeriveSeederSecretHash(_walletStorage.GetWallet(), project.FounderKey);
-
-                context.InvestorSecretHash = seederHash;
             }
 
-            var transaction = _InvestorTransactionActions.CreateInvestmentTransaction(context.ProjectInfo, context.InvestorKey, Money.Coins(Investment.InvestmentAmount).Satoshi);
-
-            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(context.ChangeAddress, transaction, _walletStorage.GetWallet(), accountInfo, feeEstimation.First());
+            unSignedTransaction = _InvestorTransactionActions.CreateInvestmentTransaction(project, investorKey, Money.Coins(Investment.InvestmentAmount).Satoshi);
 
-            // remove signatures when requesting founder to sign 
-            var strippedInvestmentTransaction = network.CreateTransaction(signedTransaction.ToHex());
-            strippedInvestmentTransaction.Inputs.ForEach(f => f.WitScript = Blockcore.Consensus.TransactionInfo.WitScript.Empty);
-
-            recoverySigs = await _SignService.GetInvestmentSigsAsync(new SignRecoveryRequest
-            {
-                ProjectIdentifier = project.ProjectIdentifier, 
-                InvestmentTransaction = strippedInvestmentTransaction.ToHex(network.Consensus.ConsensusFactory)
-            });
-
-            // validate the signatures
-            _InvestorTransactionActions.CheckInvestorRecoverySignatures(context.ProjectInfo, signedTransaction, recoverySigs);
-
-            // link the trx to the signatures
-            recoverySigs.TransactionId = signedTransaction.GetHash().ToString();
+            signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unSignedTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
 
             return new OperationResult { Success = true };
 
@@ -330,13 +320,49 @@
         }
     }
 
+    private void FeeRangeChanged(ChangeEventArgs e)
+    {
+        var selected = e.Value?.ToString();
+
+        if (selected != null)
+        {
+            if (int.TryParse(selected, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+                   
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+
+                    signedTransaction = _WalletOperations.AddInputsAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unSignedTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task Send()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
             showCreateModal = false;
+            
+            // remove signatures when requesting founder to sign 
+            var strippedInvestmentTransaction = network.CreateTransaction(signedTransaction.ToHex());
+            strippedInvestmentTransaction.Inputs.ForEach(f => f.WitScript = Blockcore.Consensus.TransactionInfo.WitScript.Empty);
+
+            recoverySigs = await _SignService.GetInvestmentSigsAsync(new SignRecoveryRequest
+            {
+                ProjectIdentifier = project.ProjectIdentifier, 
+                InvestmentTransaction = strippedInvestmentTransaction.ToHex(network.Consensus.ConsensusFactory)
+            });
+
+            // validate the signatures
+            _InvestorTransactionActions.CheckInvestorRecoverySignatures(project, signedTransaction, recoverySigs);
 
-            var network = _NetworkConfiguration.GetNetwork();
+            // link the trx to the signatures
+            recoverySigs.TransactionId = signedTransaction.GetHash().ToString();
 
             storage.AddOrUpdateSignatures(recoverySigs);
 
diff --git a/src/Angor/Client/Pages/Recover.razor b/src/Angor/Client/Pages/Recover.razor
index b9a4f911..7aa311db 100644
--- a/src/Angor/Client/Pages/Recover.razor
+++ b/src/Angor/Client/Pages/Recover.razor
@@ -107,8 +107,16 @@
                         <p class="mb-1">The amount to be recovered in to a penalty = @StageInfo.Items.Where(s=> !s.IsSpent).Sum(s=> s.Amount) BTC</p>
 
                         <p class="mb-1">The penalty duration is @((project.PenaltyDate - DateTime.UtcNow).Days) days </p>
+                        
+                        <hr>
+
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="RecoveryFeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
 
                         <hr>
+
                         <p class="mt-3">Are you sure you want to recover these funds?</p>
                     </div>
                     <div class="modal-footer">
@@ -136,6 +144,14 @@
                         <p class="mb-1">Send to @releaseRecoveryTransaction.Outputs[0].ScriptPubKey.GetDestinationAddress(_NetworkConfiguration.GetNetwork()) </p>
 
                         <hr>
+
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="ReleaseFeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
+
+                        <hr>
+
                         <p class="mt-3">Are you sure you want to release these funds from the penalty?</p>
                     </div>
                     <div class="modal-footer">
@@ -163,6 +179,14 @@
                         <p class="mb-1">Send to @endOfProjectTransaction.Outputs[0].ScriptPubKey.GetDestinationAddress(_NetworkConfiguration.GetNetwork()) </p>
 
                         <hr>
+
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="EndOfProjectFeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
+
+                        <hr>
+
                         <p class="mt-3">Are you sure you want to claim these funds?</p>
                     </div>
                     <div class="modal-footer">
@@ -186,6 +210,7 @@
     private bool showEndOfProjectModal = false;
 
     private Transaction? investmentTransaction; 
+    private Transaction? unsignedRecoveryTransaction;
     private Transaction? recoveryTransaction;
     private Transaction? releaseRecoveryTransaction;
     private Transaction? endOfProjectTransaction;
@@ -194,6 +219,9 @@
     string explorerLink;
     SignatureInfo recoverySigs;
 
+    private FeeData feeData = new();
+
+
     public class StageData
     {
         public string Trxid;
@@ -355,7 +383,7 @@
 
         StageInfo.CanRecover = StageInfo.Items.Any(a => a.IsSpent == false);
         StageInfo.TotalSpendable = StageInfo.Items.Where(a => !a.IsSpent).Sum(a => a.Amount);
-        StageInfo.CanRelease = StageInfo.Items.Any(a => a.ProjectScriptType?.ScriptType == ProjectScriptTypeEnum.InvestorWithPenalty);
+        StageInfo.CanRelease = (StageInfo.Items.Any(a => a.ProjectScriptType?.ScriptType == ProjectScriptTypeEnum.InvestorWithPenalty) && DateTime.UtcNow > project.PenaltyDate);
         StageInfo.TotalInPenalty = StageInfo.Items.Where(t => t.ProjectScriptType?.ScriptType == ProjectScriptTypeEnum.InvestorWithPenalty).Sum(t => t.Amount);
         StageInfo.EndOfProject = project.ExpiryDate < DateTime.Now;
     }
@@ -364,14 +392,17 @@
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
 
             recoverySigs = storage.GetSignaturess().First(p => p.ProjectIdentifier == ProjectId);
             var accountInfo = storage.GetAccountInfo(network.Name);
 
             var investorPrivateKey = _derivationOperations.DeriveInvestorPrivateKey(_walletStorage.GetWallet(), project.FounderKey);
 
-            recoveryTransaction = _InvestorTransactionActions.AddSignaturesToRecoverSeederFundsTransaction(project, investmentTransaction, recoverySigs, Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()));
+            unsignedRecoveryTransaction = _InvestorTransactionActions.AddSignaturesToRecoverSeederFundsTransaction(project, investmentTransaction, recoverySigs, Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()));
 
             // remove outputs that have been spent
             List<TxOut> removeTxout = new();
@@ -380,16 +411,16 @@
             {
                 if (item.IsSpent)
                 {
-                    removeTxout.Add(recoveryTransaction.Outputs[item.StageIndex]); 
-                    removeTxin.Add(recoveryTransaction.Inputs[item.StageIndex]);
+                    removeTxout.Add(unsignedRecoveryTransaction.Outputs[item.StageIndex]);
+                    removeTxin.Add(unsignedRecoveryTransaction.Inputs[item.StageIndex]);
                 }
             }
 
-            foreach (var txOut in removeTxout) recoveryTransaction.Outputs.Remove(txOut);
-            foreach (var txIn in removeTxin) recoveryTransaction.Inputs.Remove(txIn);
+            foreach (var txOut in removeTxout) unsignedRecoveryTransaction.Outputs.Remove(txOut);
+            foreach (var txIn in removeTxin) unsignedRecoveryTransaction.Inputs.Remove(txIn);
 
             // add fee to the recovery trx
-            recoveryTransaction = _WalletOperations.AddFeeAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), recoveryTransaction, _walletStorage.GetWallet(), accountInfo, feeEstimation.First());
+            recoveryTransaction = _WalletOperations.AddFeeAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unsignedRecoveryTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
 
             recoverySigs.RecoveryTransactionId = recoveryTransaction.GetHash().ToString();
 
@@ -408,6 +439,30 @@
         }
     }
 
+    private void RecoveryFeeRangeChanged(ChangeEventArgs e)
+    {
+        var selected = e.Value?.ToString();
+
+        if (selected != null)
+        {
+            if (int.TryParse(selected, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+                   
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+
+                    recoveryTransaction = _WalletOperations.AddFeeAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unsignedRecoveryTransaction, _walletStorage.GetWallet(), accountInfo, feeData.SelectedFeeEstimation);
+
+                    recoverySigs.RecoveryTransactionId = recoveryTransaction.GetHash().ToString();
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task RecoverCoins()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
@@ -438,7 +493,10 @@
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
 
             var accountInfo = storage.GetAccountInfo(network.Name);
 
@@ -451,7 +509,7 @@
             }
 
             releaseRecoveryTransaction = _InvestorTransactionActions.BuildAndSignRecoverReleaseFundsTransaction(project, investmentTransaction, recoveryTransaction,
-                accountInfo.GetNextChangeReceiveAddress(), feeEstimation.First(), Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()));
+                accountInfo.GetNextChangeReceiveAddress(), feeData.SelectedFeeEstimation, Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()));
 
             recoverySigs.RecoveryReleaseTransactionId = releaseRecoveryTransaction.GetHash().ToString();
 
@@ -470,6 +528,33 @@
         }
     }
 
+    private void ReleaseFeeRangeChanged(ChangeEventArgs e)
+    {
+        var selected = e.Value?.ToString();
+
+        if (selected != null)
+        {
+            if (int.TryParse(selected, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+                   
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+
+                    var investorPrivateKey = _derivationOperations.DeriveInvestorPrivateKey(_walletStorage.GetWallet(), project.FounderKey);
+
+                    releaseRecoveryTransaction = _InvestorTransactionActions.BuildAndSignRecoverReleaseFundsTransaction(project, investmentTransaction, recoveryTransaction,
+                        accountInfo.GetNextChangeReceiveAddress(), feeData.SelectedFeeEstimation, Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()));
+
+                    recoverySigs.RecoveryReleaseTransactionId = releaseRecoveryTransaction.GetHash().ToString();
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task ReleaseCoins()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
@@ -501,7 +586,11 @@
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
+
 
             var accountInfo = storage.GetAccountInfo(network.Name);
 
@@ -510,11 +599,11 @@
             var fromStage = StageInfo.Items.First(f => f.IsSpent == false);
 
             endOfProjectTransaction = _InvestorTransactionActions.RecoverEndOfProjectFunds(investmentTransaction.ToHex(network.Consensus.ConsensusFactory), project, fromStage.StageIndex,
-                accountInfo.GetNextChangeReceiveAddress(), Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()), feeEstimation.First());
+                accountInfo.GetNextChangeReceiveAddress(), Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()), feeData.SelectedFeeEstimation);
 
             recoverySigs.EndOfProjectTransactionId = endOfProjectTransaction.GetHash().ToString();
 
-            Logger.LogInformation($"rndOfProjectTransactionId={recoverySigs.EndOfProjectTransactionId}");
+            Logger.LogInformation($"EndOfProjectTransactionId={recoverySigs.EndOfProjectTransactionId}");
 
             return new OperationResult { Success = true };
         });
@@ -529,6 +618,35 @@
         }
     }
 
+    private void EndOfProjectFeeRangeChanged(ChangeEventArgs e)
+    {
+        var selected = e.Value?.ToString();
+
+        if (selected != null)
+        {
+            if (int.TryParse(selected, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+
+                    var investorPrivateKey = _derivationOperations.DeriveInvestorPrivateKey(_walletStorage.GetWallet(), project.FounderKey);
+
+                    var fromStage = StageInfo.Items.First(f => f.IsSpent == false);
+
+                    endOfProjectTransaction = _InvestorTransactionActions.RecoverEndOfProjectFunds(investmentTransaction.ToHex(network.Consensus.ConsensusFactory), project, fromStage.StageIndex,
+                        accountInfo.GetNextChangeReceiveAddress(), Encoders.Hex.EncodeData(investorPrivateKey.ToBytes()), feeData.SelectedFeeEstimation);
+
+                    recoverySigs.EndOfProjectTransactionId = endOfProjectTransaction.GetHash().ToString();
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task EndOfProjectCoins()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor
index e29bc637..da63379b 100644
--- a/src/Angor/Client/Pages/Spend.razor
+++ b/src/Angor/Client/Pages/Spend.razor
@@ -110,10 +110,17 @@
 
                         <hr>
 
+                        <div class="mb-3">
+                            <label for="feeRange" class="form-label">Feerate for @feeData.SelectedFeeEstimation.Confirmations blocks is @feeData.SelectedFeeEstimation.FeeRate sats</label>
+                            <input type="range" class="form-range" id="feeRange" @bind="feeData.FeePosition" @oninput="FeeRangeChanged" min="@feeData.FeeMin" max="@feeData.FeeMax">
+                        </div>
+
+                        <hr>
+
                         <h6 class="mt-3 mb-2">Stages</h6>
                         @foreach (var item in selected)
                         {
-                            <p class="mb-1">@item.Key</p>
+                            <p style="font-size: 0.7em;" class="mb-1">@item.Key</p>
                         }
 
                         <hr>
@@ -143,6 +150,8 @@
 
     private ProjectInfo project;
 
+    private FeeData feeData = new();
+
     List<(Transaction Transaction, string TrxId)> transactions = new();
 
     Dictionary<string, string> selected = new();
@@ -166,6 +175,8 @@
     List<StageData> stageDatas = new();
 
     Transaction signedTransaction;
+    FounderContext founderContext;
+    int selectedStageId;
 
     protected override async Task OnInitializedAsync()
     {
@@ -286,9 +297,14 @@
 
         var operationResult = await notificationComponent.LongOperation(async () =>
         {
-            var feeEstimation = await _WalletOperations.GetFeeEstimationAsync();
+            selectedStageId = stageId;
+
+            var fetchFees = await _WalletOperations.GetFeeEstimationAsync();
+            feeData.FeeEstimations.Fees.Clear();
+            feeData.FeeEstimations.Fees.AddRange(fetchFees);
+            feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.First();
 
-            FounderContext founderContext = new FounderContext { ProjectInfo = project, ProjectSeeders = new ProjectSeeders() };
+            founderContext = new FounderContext { ProjectInfo = project, ProjectSeeders = new ProjectSeeders() };
 
             foreach (var item in selected)
             {
@@ -306,7 +322,7 @@
 
             var key = _derivationOperations.DeriveFounderPrivateKey(_walletStorage.GetWallet(), keys.Index);
 
-            signedTransaction = _founderTransactionActions.SpendFounderStage(founderContext.ProjectInfo, founderContext.InvestmentTrasnactionsHex, stageId, addressScript, Encoders.Hex.EncodeData(key.ToBytes()), feeEstimation.First());
+            signedTransaction = _founderTransactionActions.SpendFounderStage(founderContext.ProjectInfo, founderContext.InvestmentTrasnactionsHex, selectedStageId, addressScript, Encoders.Hex.EncodeData(key.ToBytes()), feeData.SelectedFeeEstimation);
 
             return new OperationResult { Success = true };
         });
@@ -321,6 +337,33 @@
         }
     }
 
+    private void FeeRangeChanged(ChangeEventArgs e)
+    {
+        var selectedItem = e.Value?.ToString();
+
+        if (selectedItem != null)
+        {
+            if (int.TryParse(selectedItem, out int res))
+            {
+                if (res <= feeData.FeeEstimations.Fees.Count)
+                {
+                    feeData.SelectedFeeEstimation = feeData.FeeEstimations.Fees.OrderBy(fee => fee.Confirmations).ToList()[res - 1];
+
+                    var accountInfo = storage.GetAccountInfo(network.Name);
+                    var address = accountInfo.GetNextReceiveAddress();
+                    var addressScript = BitcoinWitPubKeyAddress.Create(address, network).ScriptPubKey;
+
+                    var keys = storage.GetFounderKeys().Keys.First(k => k.ProjectIdentifier == project.ProjectIdentifier);
+                    var key = _derivationOperations.DeriveFounderPrivateKey(_walletStorage.GetWallet(), keys.Index);
+
+                    signedTransaction = _founderTransactionActions.SpendFounderStage(founderContext.ProjectInfo, founderContext.InvestmentTrasnactionsHex, selectedStageId, addressScript, Encoders.Hex.EncodeData(key.ToBytes()), feeData.SelectedFeeEstimation);
+
+                    StateHasChanged();
+                }
+            }
+        }
+    }
+
     private async Task Send()
     {
         var operationResult = await notificationComponent.LongOperation(async () =>
diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor
index 45470dfd..67160f7e 100644
--- a/src/Angor/Client/Pages/Wallet.razor
+++ b/src/Angor/Client/Pages/Wallet.razor
@@ -263,7 +263,7 @@
                                 <hr>
 
                                 <div class="mb-3">
-                                    <label for="feeRange" class="form-label">Feerate for @_sendInfo.FeeBlockCount blocks is @_sendInfo.FeeRate BTC</label>
+                                    <label for="feeRange" class="form-label">Feerate for @_sendInfo.FeeBlockCount blocks is @_sendInfo.FeeRate sats</label>
                                     <input type="range" class="form-range" id="feeRange" @bind="FeePosition" @oninput="FeeRangeChanged" min="@FeeMin" max="@_feeMax">
                                 </div>
                                 
@@ -389,7 +389,7 @@
     string symbol = "BTC";
 
     // Max index for the range input
-        private const int FeeMin = 1;
+    private int FeeMin = 1;
     private int _feeMax = 3;
     DateTime _lastFeeRefresh = DateTime.MinValue;
 
diff --git a/src/Angor/Client/Shared/FeeData.cs b/src/Angor/Client/Shared/FeeData.cs
new file mode 100644
index 00000000..8ca4e9b3
--- /dev/null
+++ b/src/Angor/Client/Shared/FeeData.cs
@@ -0,0 +1,15 @@
+using Angor.Client.Storage;
+using Angor.Shared.Models;
+using Microsoft.AspNetCore.Components;
+
+namespace Angor.Client.Shared
+{
+    public class FeeData
+    {
+        public FeeEstimations FeeEstimations { get; set; } = new();
+        public FeeEstimation SelectedFeeEstimation { get; set; } = new();
+        public int FeePosition { get; set; } = 1;
+        public int FeeMin { get; set; } = 1;
+        public int FeeMax { get; set; } = 3;
+    }
+}
diff --git a/src/Angor/Shared/WalletOperations.cs b/src/Angor/Shared/WalletOperations.cs
index 791f0635..a7d86d67 100644
--- a/src/Angor/Shared/WalletOperations.cs
+++ b/src/Angor/Shared/WalletOperations.cs
@@ -67,9 +67,11 @@ public Transaction AddFeeAndSignTransaction(string changeAddress, Transaction tr
     {
         Network network = _networkConfiguration.GetNetwork();
 
-        var changeOutput = transaction.AddOutput(Money.Zero, BitcoinAddress.Create(changeAddress, network).ScriptPubKey);
+        var clonedTransaction = network.CreateTransaction(transaction.ToHex());
 
-        var virtualSize = transaction.GetVirtualSize(4);
+        var changeOutput = clonedTransaction.AddOutput(Money.Zero, BitcoinAddress.Create(changeAddress, network).ScriptPubKey);
+
+        var virtualSize = clonedTransaction.GetVirtualSize(4);
         var fee = new FeeRate(Money.Satoshis(feeRate.FeeRate)).GetFee(virtualSize);
         
         var utxoDataWithPaths = FindOutputsForTransaction((long)fee, accountInfo);
@@ -82,7 +84,7 @@ public Transaction AddFeeAndSignTransaction(string changeAddress, Transaction tr
         // add all inputs
         foreach (var coin in coins.coins)
         {
-            transaction.AddInput(new TxIn(coin.Outpoint, null));
+            clonedTransaction.AddInput(new TxIn(coin.Outpoint, null));
         }
 
         // sign each new input
@@ -91,14 +93,14 @@ public Transaction AddFeeAndSignTransaction(string changeAddress, Transaction tr
         {
             var key = coins.keys[index];
 
-            var input = transaction.Inputs.Single(p => p.PrevOut == coin.Outpoint);
-            var signature = transaction.SignInput(network, key, coin, SigHash.All);
+            var input = clonedTransaction.Inputs.Single(p => p.PrevOut == coin.Outpoint);
+            var signature = clonedTransaction.SignInput(network, key, coin, SigHash.All);
             input.WitScript = new WitScript(Op.GetPushOp(signature.ToBytes()), Op.GetPushOp(key.PubKey.ToBytes()));
 
             index++;
         }
 
-        return transaction;
+        return clonedTransaction;
     }
 
     public async Task<OperationResult<Transaction>> SendAmountToAddress(WalletWords walletWords, SendInfo sendInfo) //TODO change the passing of wallet words as parameter after refactoring is complete