diff --git a/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js b/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
index 964c36ca97349be716c6401c88382d2af9011d19..a2b42fef04fedc99f20ba5ba567385b1b6444e43 100644
--- a/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
+++ b/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
@@ -1324,6 +1324,13 @@ function getLoanOptionsTable() {
         },
     }).then(res => {
         if (res.payload.load) {
+            document.querySelector('#no-fund-msg').innerHTML = '';
+            document.querySelector('#save-loan-options').innerHTML = `
+                <input type="submit" class="btn btn-primary" value="Save">
+            `;
+            document.querySelector('#add-loan-options-row').innerHTML = `
+                <button class="btn btn-primary" onclick="return addRowButtonFunction()">Add Row</button>
+            `;
             loadLoanOptionsColumnHeadings();
             if (res.payload.status.length > 0) {
                 var lenders = res.payload.lenders;
@@ -1332,13 +1339,23 @@ function getLoanOptionsTable() {
                     loadLoanOptionsTextBox('Required NOI DSCR', 'required-noi-dscr', res.payload.noi);
                     loadLoanOptionsTextBox('Required Cash DSCR', 'required-cash-dscr', res.payload.cash);
                     for (var index = 0; index < LoansList.length; index++) {
-                        addLoanOptionsRow(lenders,LoansList[index].lender,LoansList[index].interest_rate,LoansList[index].duration,LoansList[index].max_loan_amount);
+                        addLoanOptionsRow(lenders,
+                                          LoansList[index].lender,
+                                          LoansList[index].interest_rate,
+                                          LoansList[index].duration,
+                                          LoansList[index].max_loan_amount
+                                          );
                     }
                 }
                 else {
                     loadLoanOptionsTextBox('Required NOI DSCR', 'required-noi-dscr', '');
                     loadLoanOptionsTextBox('Required Cash DSCR', 'required-cash-dscr', '');
-                    addLoanOptionsRow(lenders,LoansList[0].lender,LoansList[0].interest_rate,LoansList[0].duration,LoansList[0].max_loan_amount);
+                    addLoanOptionsRow(lenders,
+                                      LoansList[0].lender,
+                                      LoansList[0].interest_rate,
+                                      LoansList[0].duration,
+                                      LoansList[0].max_loan_amount
+                                      );
                 }
             }
         }
diff --git a/blocnote/apps/financialInputs/templates/financialInputs/loanOptions.html b/blocnote/apps/financialInputs/templates/financialInputs/loanOptions.html
index 08bddccfd144d1b85e1d698fb9ea77ff4a45c8d1..034b39833984ee745c9642be4fa83dbdf18c9577 100644
--- a/blocnote/apps/financialInputs/templates/financialInputs/loanOptions.html
+++ b/blocnote/apps/financialInputs/templates/financialInputs/loanOptions.html
@@ -2,6 +2,9 @@
     <h4 class="card-title">Loan Options</h4>
 </div>
 <div class="card-block">
+    <div id="no-fund-msg">
+        Please select a Fund to see loan options.
+    </div>
     <div class="row">
         <div class="col">
             <div id="required-noi-dscr" class="col-4">
@@ -16,14 +19,16 @@
 <div class="card-block">
     <div class="row-two">
         <form id="loan-options-table-form" onsubmit="return submitLoanOptionsForm(this)">
-            <input type="submit" class="btn btn-primary" value="Save">
+            <div id="save-loan-options">
+            </div>
             <table id="loan-options-table" class="table table-striped table-bordered">
                 <thead>
                 </thead>
                 <tbody>
                 </tbody>
             </table>
-            <button class="btn btn-primary" onclick="return addRowButtonFunction()">Add Row</button>
+            <div id="add-loan-options-row">
+            </div>
         </form>
     </div>
 </div>