diff --git a/client/src/containers/Purchases/Bills/BillForm/BillFloatingActions.js b/client/src/containers/Purchases/Bills/BillForm/BillFloatingActions.js
index 40471eb84..52ae12712 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillFloatingActions.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillFloatingActions.js
@@ -146,7 +146,7 @@ export default function BillFloatingActions() {
       <If condition={bill && bill?.is_open}>
         <ButtonGroup>
           <Button
-            disabled={isSubmitting}
+            loading={isSubmitting}
             intent={Intent.PRIMARY}
             onClick={handleSubmitOpenBtnClick}
             text={<T id={'save'} />}
diff --git a/client/src/containers/Purchases/Bills/BillForm/BillForm.js b/client/src/containers/Purchases/Bills/BillForm/BillForm.js
index 11dc49733..75a859563 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillForm.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillForm.js
@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { Formik, Form } from 'formik';
 import { Intent } from '@blueprintjs/core';
 import classNames from 'classnames';
+import * as R from 'ramda';
 import intl from 'react-intl-universal';
 import { useHistory } from 'react-router-dom';
 import { isEmpty, omit } from 'lodash';
@@ -44,7 +45,6 @@ function BillForm({
           }
         : {
             ...defaultBill,
-            entries: orderingLinesIndexes(defaultBill.entries),
             currency_code: baseCurrency,
           }),
     }),
@@ -81,7 +81,7 @@ function BillForm({
     const form = {
       ...values,
       open: submitPayload.status,
-      entries: entries.map((entry) => ({ ...omit(entry, ['total']) })),
+      entries: R.compose(orderingLinesIndexes)(entries),
     };
     // Handle the request success.
     const onSuccess = (response) => {
diff --git a/client/src/containers/Purchases/Bills/BillForm/BillFormPage.js b/client/src/containers/Purchases/Bills/BillForm/BillFormPage.js
index f24552b4b..7accf6e6b 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillFormPage.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillFormPage.js
@@ -8,10 +8,10 @@ import 'style/pages/Bills/PageForm.scss';
 
 export default function BillFormPage() {
   const { id } = useParams();
-  const idInt = parseInt(id, 10);
+  const billId = parseInt(id, 10);
 
   return (
-    <BillFormProvider billId={idInt}>
+    <BillFormProvider billId={billId}>
       <BillForm />
     </BillFormProvider>
   );
diff --git a/client/src/containers/Purchases/Bills/BillForm/utils.js b/client/src/containers/Purchases/Bills/BillForm/utils.js
index 373c6411b..ce31668bc 100644
--- a/client/src/containers/Purchases/Bills/BillForm/utils.js
+++ b/client/src/containers/Purchases/Bills/BillForm/utils.js
@@ -39,11 +39,11 @@ export const defaultBill = {
 
 export const transformToEditForm = (bill) => {
   const initialEntries = [
-    ...bill.entries.map((bill) => ({
-      ...transformToForm(bill, defaultBill.entries[0]),
+    ...bill.entries.map((entry) => ({
+      ...transformToForm(entry, defaultBillEntry),
     })),
     ...repeatValue(
-      defaultBill,
+      defaultBillEntry,
       Math.max(MIN_LINES_NUMBER - bill.entries.length, 0),
     ),
   ];
diff --git a/client/src/hooks/query/bills.js b/client/src/hooks/query/bills.js
index 664065958..d46225079 100644
--- a/client/src/hooks/query/bills.js
+++ b/client/src/hooks/query/bills.js
@@ -53,6 +53,9 @@ export function useEditBill(props) {
       onSuccess: (res, [id, values]) => {
         // Common invalidate queries.
         commonInvalidateQueries(queryClient);
+
+        // Invalidate bill query.
+        queryClient.invalidateQueries([t.BILL, id]);
       },
       ...props,
     },
@@ -70,6 +73,9 @@ export function useOpenBill(props) {
     onSuccess: (res, id) => {
       // Common invalidate queries.
       commonInvalidateQueries(queryClient);
+
+      // Invalidate bill query.
+      queryClient.invalidateQueries([t.BILL, id]);
     },
     ...props,
   });
@@ -86,6 +92,9 @@ export function useDeleteBill(props) {
     onSuccess: (res, id) => {
       // Common invalidate queries.
       commonInvalidateQueries(queryClient);
+
+      // Invalidate bill query.
+      queryClient.invalidateQueries([t.BILL, id]);
     },
     ...props,
   });
diff --git a/client/src/style/pages/Dashboard/Dashboard.scss b/client/src/style/pages/Dashboard/Dashboard.scss
index 3889134b2..1e9307c91 100644
--- a/client/src/style/pages/Dashboard/Dashboard.scss
+++ b/client/src/style/pages/Dashboard/Dashboard.scss
@@ -219,6 +219,7 @@ $dashboard-views-bar-height: 44px;
       .bp3-control.bp3-switch{
         margin-bottom: 0;
         margin-left: 8px;
+        color: #3d3b53;
 
         .bp3-control-indicator{
           height: 16px;
@@ -508,6 +509,10 @@ $dashboard-views-bar-height: 44px;
   .bp3-navbar-group{
     height: $dashboard-views-bar-height;
   }
+
+  .bp3-tab[aria-selected="true"]{
+    box-shadow: inset 0 -2px 0 #0052cc;
+  }
 }
 
 .navbar-omnibar {