|#756| Did some ui changes and added default value for calculatedIsa in the modal