diff --git a/blocnote/apps/financialInputs/forms.py b/blocnote/apps/financialInputs/forms.py
index ce532fc9d92b616b208f37d3c80da30493b1a4d9..65c2e36a1cd17c54ba454e0706bf3398f21e0931 100644
--- a/blocnote/apps/financialInputs/forms.py
+++ b/blocnote/apps/financialInputs/forms.py
@@ -1,6 +1,6 @@
 """Forms to render and validate for financial-inputs endpoint."""
 from django.forms import ModelForm
-from blocnote.apps.financialInputs.models import FinancingOverview, CustomerPreference
+from blocnote.apps.financialInputs.models import FinancingOverview, CustomerPreference, CashBalance
 
 
 class ProformaInputsForm(ModelForm):
@@ -33,3 +33,11 @@ class CustomerPreferenceForm(ModelForm):
             'expected_payback',
             'expected_net_noi_dscr',
         ]
+
+
+class CashBalanceForm(ModelForm):
+    """Define the form to validate cash balance entries."""
+
+    class Meta:
+        model = CashBalance
+        fields = '__all__'
diff --git a/blocnote/apps/financialInputs/old_views.py b/blocnote/apps/financialInputs/old_views.py
index f3d921086dae8a226896360c7312182d998ce3bd..2f568740e684022e5a49f862414079af34535790 100644
--- a/blocnote/apps/financialInputs/old_views.py
+++ b/blocnote/apps/financialInputs/old_views.py
@@ -1,10 +1,8 @@
 import json
-from datetime import date
 import datetime
 
 from django.shortcuts import render
 from django.http import JsonResponse
-from django.db import connections
 from django.views import View
 
 from bpfin.back_end_call.back_end_inputs import monthly_bill, form_prior_income_table as prior_income_statement_table
@@ -12,7 +10,7 @@ from bpfin.back_end_call.back_end_inputs import monthly_bill, form_prior_income_
 from blocnote.lib.fetch_data import get_building_data
 
 from .models import (
-    FinancingOverview, Bills, BillsOverview, EstimationAlgorithm, Liabilities, CashBalance, IncomeStatement,
+    FinancingOverview, Bills, BillsOverview, EstimationAlgorithm, Liabilities, IncomeStatement,
     LoanOptions, DefaultLoan, Lender, GrowthRate
 )
 
@@ -544,59 +542,6 @@ class LiabilitiesTable(View):
         return JsonResponse({})
 
 
-class CashBalanceView(View):
-    """Display, store and use cash balance data."""
-
-    model = CashBalance
-
-    def get(self, request, building_id):
-        """Handle HTTP GET request.
-
-        Fetch cash balance data from database if present. If not, return false status.
-
-        Args:
-            request: HTTP GET request.
-            building_id: id of the building.
-        """
-        objs = self.model.objects.filter(building_id=building_id)
-        instance = {}
-        if objs:
-            instance['result'] = []
-            for obj in objs:
-                temp = {}
-                temp['date'] = obj.statement_date
-                temp['is_from_balance_sheet'] = obj.is_from_balance_sheet
-                temp['balance_amount'] = obj.balance_amount
-                instance['result'].append(temp)
-            return JsonResponse({'instance': instance})
-        return JsonResponse({})
-
-    def put(self, request, building_id):
-        """Handle HTTP PUT request.
-
-        Retrieve the list of records from the request. Delete existing records and create new records.
-
-        Args:
-            request: HTTP PUT request.
-            building_id: id of the building.
-
-        Returns:
-            JsonResponse: An instance with OK.
-        """
-        put = json.loads(request.body.decode())
-        self.model.objects.filter(
-            building_id=building_id,
-            ).delete()
-        for record in put:
-            self.model.objects.create(
-                building_id=building_id,
-                statement_date=record['statement-date'],
-                is_from_balance_sheet=record['is-from-balance-sheet'],
-                balance_amount=record['balance'],
-            )
-        return JsonResponse({})
-
-
 class IncomeStatementTable(View):
     """Income Statement table.
 
diff --git a/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js b/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
index 416d0b5c4ec60e827876cb18f74e08f7ef81c529..5cc9ab2503ebf4452b915e75fe2ac490f1ca644f 100644
--- a/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
+++ b/blocnote/apps/financialInputs/static/financialInputs/scripts/app.js
@@ -12,7 +12,6 @@ loadBillsOverview();
 getIncomeStatementTable();
 
 getLiabilitiesTable();
-getCashBalanceForm();
 getLoanOptionsTable();
 
 /** Validate that commissioning date is after the construction start date. */
@@ -545,154 +544,6 @@ function getLiabilitiesTable() {
         });
 }
 
-/**Send HTTP GET request to obtain all cash balance records. */
-function getCashBalanceForm() {
-    request(`cash-balance/`, {
-        method: 'GET',
-        credentials: 'same-origin',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-    }).then(res => {
-        loadCashBalanceTable(res.payload.instance);
-    });
-}
-
-/**Load cash balance table with initial values. Takes response from GET request to construct the table. */
-function loadCashBalanceTable(instance) {
-    table = document.querySelector('#cash-balance-table');
-    if (instance) {
-        for (var record=0; record < instance.result.length; record++) {
-            balanceAmount = Number(instance.result[record].balance_amount);
-            date = instance.result[record].date;
-            isFromBalanceSheet = instance.result[record]['is_from_balance_sheet']
-            addCashBalanceRow(balanceAmount, date, isFromBalanceSheet);
-        }
-    }
-    else {
-        addCashBalanceRow('', '', false);
-    }
-}
-
-/**
- * Return check box to indicate if a record is from balance sheet or not. Takes a boolean as argument which
- * is true if the record is from balance, else not. This function returns a checked checkbox if it is from balance
- * sheet, else an unchecked checkbox.
- */
-function getCashBalanceCheckBox(isFromBalanceSheet) {
-    var check = "";
-    if (isFromBalanceSheet) {
-        check = "checked";
-    }
-    var text = `
-                <label class="btn btn-default">
-                    <input type="checkbox" ${check} name="is-from-balance-sheet">
-                </label>
-        `;
-    return text;
-}
-
-/**Delete a given row in the cash balance table. Takes in the row index as argument. */
-function deleteCashBalanceRow(row) {
-    var result = confirm('ARE YOU SURE YOU WANT TO DELETE THIS ROW?');
-    if (result) {
-        table = document.querySelector('#cash-balance-table');
-        var rowCount = table.rows.length;
-        if (rowCount === 2) {
-            alert('YOU MUST HAVE ATLEAST ONE CASH BALANCE ENTRY!');
-            return false;
-        }
-        table.deleteRow(row);
-        for (rowInd = 1; rowInd < table.rows.length; rowInd++) {
-            row = table.rows.item(rowInd).cells;
-            row.item(0).innerHTML = rowInd;
-        }
-    }
-    return false;
-}
-
-/**
- * Add a row to the cash balance table. Take balance amount, date and boolean that represents if a record is from
- * balance sheet or not.
- */
-function addCashBalanceRow(balance, date, isFromBalanceSheet) {
-    table = document.querySelector('#cash-balance-table tbody');
-    var rowCount = table.rows.length;
-    var row = table.insertRow(rowCount);
-    var cell = row.insertCell(0);
-    cell.innerHTML = `${rowCount + 1}`;
-    cell = row.insertCell(1);
-    cell.innerHTML = `
-        <input name="balance-amount" class="form-control" type="number" step="any" value="${balance}" required>
-    `;
-    cell = row.insertCell(2);
-    cell.innerHTML = `
-        <input type="date" class="form-control date" value="${date}" required>
-    `;
-    cell = row.insertCell(3);
-    cell.innerHTML = getCashBalanceCheckBox(isFromBalanceSheet);
-    cell = row.insertCell(4)
-    cell.innerHTML = `
-        <button class="btn btn-danger" onclick="return deleteCashBalanceRow(this.parentNode.parentNode.rowIndex)">Delete Row</button>
-    `;
-    return false;
-}
-
-// Watch cash balance to display/erase error/success messages.
-var cashBalanceForm = document.querySelector('#cash-balance-form');
-cashBalanceForm.onchange = function() {
-    document.querySelector('#cash-balance-warning-message').innerHTML = '';
-}
-
-/**Make PUT request with data from the cash balance table. */
-function submitCashBalanceForm(form) {
-    var myResult = [];
-    table = document.querySelector('#cash-balance-table');
-    var rowCount = table.rows.length;
-    for (rowIndex = 1; rowIndex < rowCount; rowIndex++) {
-        record = {};
-        record['balance'] = table.rows[rowIndex].cells[1].children[0].value;
-        date = table.rows[rowIndex].cells[2].children[0].value;
-        dateSplit = date.split('-');
-        dateDict = {
-            'day': Number(dateSplit[2]),
-            'month': Number(dateSplit[1]),
-            'year': Number(dateSplit[0]),
-        }
-        if (!validateDate(dateDict, todaysDate)) {
-            document.querySelector('#cash-balance-warning-message').innerHTML = `
-                <font color="red">Statement date cannot be in the future!</font>
-            `;
-            return false;
-        }
-        record['statement-date'] = date;
-        checkBox = table.rows[rowIndex].querySelectorAll('input[type="checkbox"]:checked');
-        if (checkBox.length > 0) {
-            record['is-from-balance-sheet'] = true;
-        }
-        else {
-            record['is-from-balance-sheet'] = false;
-        }
-        myResult.push(record);
-    }
-    request('cash-balance/', {
-            method: 'PUT',
-            credentials: 'same-origin',
-            body: JSON.stringify(myResult),
-            headers: new Headers({
-                'Content-Type': 'application/json',
-                'X-CSRFToken': Cookies.get('csrftoken')
-            })
-        }).then(res => {
-            if (!res.payload.err) {
-                document.querySelector('#cash-balance-warning-message').innerHTML = `
-                    <font color="blue">Saved</font>
-                `;
-            }
-        });
-    return false;
-}
-
 /**
  * Load income statement table. The column heading are displayed first along with the table body. The growth rate
  * drop down box is displayed as well.
diff --git a/blocnote/apps/financialInputs/static/financialInputs/scripts/cashBalance.js b/blocnote/apps/financialInputs/static/financialInputs/scripts/cashBalance.js
new file mode 100644
index 0000000000000000000000000000000000000000..524f2274752d4e24fff77799b15ecbc5f469f48a
--- /dev/null
+++ b/blocnote/apps/financialInputs/static/financialInputs/scripts/cashBalance.js
@@ -0,0 +1,150 @@
+/**Send HTTP GET request to obtain all cash balance records. */
+function getCashBalanceForm() {
+  request('cash-balance/', {
+    method: 'GET',
+    credentials: 'same-origin',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+  }).then(res => {
+    loadCashBalanceTable(res.payload.instance);
+  });
+}
+
+/**Load cash balance table with initial values. Takes response from GET request to construct the table. */
+function loadCashBalanceTable(instance) {
+  if (instance) {
+    for (let record = 0; record < instance.result.length; record++) {
+      let balanceAmount = Number(instance.result[record].balance_amount);
+      let date = instance.result[record].statement_date;
+      let isFromBalanceSheet = instance.result[record]['is_from_balance_sheet'];
+      addCashBalanceRow(balanceAmount, date, isFromBalanceSheet);
+    }
+  }
+  else {
+    addCashBalanceRow('', '', false);
+  }
+}
+
+/**
+ * Return check box to indicate if a record is from balance sheet or not. Takes a boolean as argument which
+ * is true if the record is from balance, else not. This function returns a checked checkbox if it is from balance
+ * sheet, else an unchecked checkbox.
+ */
+function getCashBalanceCheckBox(isFromBalanceSheet) {
+  let check = '';
+  if (isFromBalanceSheet) {
+    check = 'checked';
+  }
+  const text = `
+    <label class="btn btn-default">
+        <input type="checkbox" ${check} name="is-from-balance-sheet">
+    </label>
+  `;
+  return text;
+}
+
+/**Delete a given row in the cash balance table. Takes in the row index as argument. */
+function deleteCashBalanceRow(row) {
+  const result = confirm('ARE YOU SURE YOU WANT TO DELETE THIS ROW?');
+  if (result) {
+    const table = document.querySelector('#cash-balance-table');
+    const rowCount = table.rows.length;
+    if (rowCount === 2) {
+      alert('YOU MUST HAVE ATLEAST ONE CASH BALANCE ENTRY!');
+      return false;
+    }
+    table.deleteRow(row);
+    for (let rowInd = 1; rowInd < table.rows.length; rowInd++) {
+      row = table.rows.item(rowInd).cells;
+      row.item(0).innerHTML = rowInd;
+    }
+  }
+  return false;
+}
+
+/**
+ * Add a row to the cash balance table. Take balance amount, date and boolean that represents if a record is from
+ * balance sheet or not.
+ */
+function addCashBalanceRow(balance, date, isFromBalanceSheet) {
+  const table = document.querySelector('#cash-balance-table tbody');
+  const rowCount = table.rows.length;
+  const row = table.insertRow(rowCount);
+  let cell = row.insertCell(0);
+  cell.innerHTML = `${rowCount + 1}`;
+  cell = row.insertCell(1);
+  cell.innerHTML = `
+      <input name="balance-amount" class="form-control" type="number" step="any" value="${balance}" required>
+  `;
+  cell = row.insertCell(2);
+  cell.innerHTML = `
+      <input type="date" class="form-control date" value="${date}" required>
+  `;
+  cell = row.insertCell(3);
+  cell.innerHTML = getCashBalanceCheckBox(isFromBalanceSheet);
+  cell = row.insertCell(4);
+  cell.innerHTML = `
+      <button class="btn btn-danger" onclick="return deleteCashBalanceRow(this.parentNode.parentNode.rowIndex)">Delete Row</button>
+  `;
+  return false;
+}
+
+// Watch cash balance to display/erase error/success messages.
+const cashBalanceForm = document.querySelector('#cash-balance-form');
+cashBalanceForm.onchange = function() {
+  document.querySelector('#cash-balance-warning-message').innerHTML = '';
+};
+
+/**Make PUT request with data from the cash balance table. */
+function submitCashBalanceForm() {
+  let myResult = [];
+  const table = document.querySelector('#cash-balance-table');
+  const rowCount = table.rows.length;
+  for (let rowIndex = 1; rowIndex < rowCount; rowIndex++) {
+    let record = {};
+    record['balance_amount'] = table.rows[rowIndex].cells[1].children[0].value;
+    const todaysDate = new Date();
+    const date = table.rows[rowIndex].cells[2].children[0].value;
+    let currentDate = new Date(date);
+    if (currentDate > todaysDate) {
+      document.querySelector('#cash-balance-warning-message').innerHTML = `
+        <font color="red">Statement date cannot be in the future!</font>
+      `;
+      return false;
+    }
+    record['statement_date'] = date;
+    const checkBox = table.rows[rowIndex].querySelectorAll('input[type="checkbox"]:checked');
+    record['is_from_balance_sheet'] = (checkBox.length > 0)
+    myResult.push(record);
+  }
+  request('cash-balance/', {
+    method: 'PUT',
+    credentials: 'same-origin',
+    body: JSON.stringify(myResult),
+    headers: new Headers({
+      'Content-Type': 'application/json',
+      'X-CSRFToken': Cookies.get('csrftoken')
+    })
+  }).then(res => {
+    if (!res.err) {
+      document.querySelector('#cash-balance-warning-message').innerHTML = `
+          <font color="blue">Saved</font>
+      `;
+    }
+    else {
+      res.err.responseBody.then((error) => {
+        let errorMsg = '';
+        Object.keys(error).forEach((key) => {
+          errorMsg += `${key}: ${error[key]}.\n`;
+        });
+        document.querySelector('#cash-balance-warning-message').innerHTML = `
+          <font color="red">${errorMsg}</font>
+        `;
+      });
+    }
+  });
+  return false;
+}
+
+getCashBalanceForm();
diff --git a/blocnote/apps/financialInputs/templates/financialInputs/cashBalance.html b/blocnote/apps/financialInputs/templates/financialInputs/cashBalance.html
index e383f8b9ac5721bb0a5246a25db06d6d59e5aed9..2f2af77cc4fe0581616024a711f13ab145041f12 100644
--- a/blocnote/apps/financialInputs/templates/financialInputs/cashBalance.html
+++ b/blocnote/apps/financialInputs/templates/financialInputs/cashBalance.html
@@ -1,7 +1,7 @@
 <h4 class="card-title" align="center">
     Cash Balance
 </h4>
-<form id="cash-balance-form" class="form-inline" onsubmit="return submitCashBalanceForm(this)">
+<form id="cash-balance-form" class="form-inline" onsubmit="return submitCashBalanceForm()">
     <div class="col-8">
         <input type="submit" class="btn btn-primary" value="Save">
         <div id="cash-balance-warning-message">
diff --git a/blocnote/apps/financialInputs/templates/financialInputs/index.html b/blocnote/apps/financialInputs/templates/financialInputs/index.html
index b9b7c291f5f0b5a46127cacfcb399193acf7c338..dfb6ab090a31aab7409ccf4f06b5f976a5611b3a 100644
--- a/blocnote/apps/financialInputs/templates/financialInputs/index.html
+++ b/blocnote/apps/financialInputs/templates/financialInputs/index.html
@@ -58,4 +58,5 @@
   <script src="{% static "financialInputs/scripts/app.js" %}"></script>
   <script src="{% static "financialInputs/scripts/proformaInputs.js" %}"></script>
   <script src="{% static "financialInputs/scripts/customerPreference.js" %}"></script>
+  <script src="{% static "financialInputs/scripts/cashBalance.js" %}"></script>
 {% endblock %}
diff --git a/blocnote/apps/financialInputs/urls.py b/blocnote/apps/financialInputs/urls.py
index f27b683542619dea2052549774b359ac0e0995c4..55e1e8dd4ca9c93b8ee90223404226c088c1751a 100644
--- a/blocnote/apps/financialInputs/urls.py
+++ b/blocnote/apps/financialInputs/urls.py
@@ -1,8 +1,10 @@
+"""Define the routes for the financial inputs endpoint."""
 from django.conf.urls import url
 
 from . import old_views
-from .views import proforma_input
-from .views import customer_preference
+from .views import (
+    proforma_input, customer_preference, cash_balance
+)
 
 app_name = 'financial-inputs'
 urlpatterns = [
@@ -12,7 +14,7 @@ urlpatterns = [
     url(r'^bills-overview/$', old_views.BillsOverviewView.as_view(), name='bills_overview'),
     url(r'^customer-preference/$', customer_preference.CustomerPreferenceView.as_view(), name='customer_preference'),
     url(r'^liabilities/$', old_views.LiabilitiesTable.as_view(), name='liabilities'),
-    url(r'^cash-balance/$', old_views.CashBalanceView.as_view(), name='cash_balance'),
+    url(r'^cash-balance/$', cash_balance.CashBalanceView.as_view(), name='cash_balance'),
     url(r'^income-statement/$', old_views.IncomeStatementTable.as_view(), name='income_statement'),
     url(r'^loan-options/$', old_views.LoanOptionsTable.as_view(), name='loan_options'),
 ]
diff --git a/blocnote/apps/financialInputs/views/cash_balance.py b/blocnote/apps/financialInputs/views/cash_balance.py
new file mode 100644
index 0000000000000000000000000000000000000000..cde25582036ef40614df6f39785570534164e758
--- /dev/null
+++ b/blocnote/apps/financialInputs/views/cash_balance.py
@@ -0,0 +1,69 @@
+"""Views for the cash balance end-point."""
+import json
+
+from django.views import View
+from django.http import JsonResponse
+
+from blocnote.apps.financialInputs.models import CashBalance
+from blocnote.apps.financialInputs.forms import CashBalanceForm
+
+
+class CashBalanceView(View):
+    """Display, store and use cash balance data."""
+
+    model = CashBalance
+
+    def get(self, request, building_id):
+        """Handle HTTP GET request.
+
+        Fetch cash balance data from database if present. If not present, return empty.
+
+        Args:
+            request: HTTP GET request.
+            building_id: id of the building.
+        """
+        cash_balance_objs = self.model.objects.filter(building_id=building_id)
+        fields = [
+            'statement_date',
+            'is_from_balance_sheet',
+            'balance_amount',
+        ]
+        instance = {}
+        if cash_balance_objs:
+            instance['result'] = []
+            for obj in cash_balance_objs:
+                temp = {}
+                for field in fields:
+                    temp[field] = obj.__dict__[field]
+                instance['result'].append(temp)
+            return JsonResponse({'instance': instance})
+        return JsonResponse({})
+
+    def put(self, request, building_id):
+        """Handle HTTP PUT request.
+
+        Retrieve the list of records from the request. Delete existing records and create new records.
+
+        Args:
+            request: HTTP PUT request.
+            building_id: id of the building.
+
+        Returns:
+            JsonResponse: An instance with OK.
+        """
+        put = json.loads(request.body.decode())
+        self.model.objects.filter(
+            building_id=building_id,
+        ).delete()
+        error_dict = {}
+        for record in put:
+            record['building_id'] = building_id
+            form = CashBalanceForm(record)
+            if form.is_valid():
+                self.model.objects.create(**record)
+            else:
+                for field, error in form.errors.items():
+                    error_dict[field] = error
+        if error_dict:
+            return JsonResponse(error_dict, status=400)
+        return JsonResponse({})