diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html
index 93e9c042..f43f03ed 100755
--- a/Apollo/assets/views/status-update/updateFeesStatus.html
+++ b/Apollo/assets/views/status-update/updateFeesStatus.html
@@ -180,22 +180,7 @@
                                           ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <!--<div class="col-md-3 form-group"
-                                     ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
-                                    <label>
-                                        Waiver</span>
-                                    </label>
 
-                                    <input type="text"  placeholder="Enter Waiver Amount"
-                                           autofocus tabindex="14" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
-                                           ng-model="updateModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" readonly/>
-                                    <span class="error text-small block"
-                                          ng-if="Form.waiver.$dirty && Form.waiver.$invalid"
-                                          ng-hide="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Waiver amount is required</span>
-                                    <span class="error text-small block"
-                                          ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
-
-                                </div>-->
                                 <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
@@ -212,6 +197,14 @@
                                           ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
 
                                 </div>
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.setFeesComments.$dirty && Form.setFeesComments.$invalid}">
+                                    <label>
+                                        Comments
+                                    </label>
+                                    <textarea maxlength="100" placeholder="Enter Comments" tabindex="16" class="form-control" name="setFeesComments" id="setFeesComments" ng-model="updateModel.feesType.Comments" readonly></textarea>
+                                    <!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
+                                </div>
 
                             </div>
 
@@ -219,98 +212,25 @@
 
 
                     </div>
-                    <!--<div class="col-md-4">
-                        <fieldset>
-                            <legend>Course End Fees</legend>
-                            <div class="row">
 
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
-                                    <label>
-                                        PC Fees
-                                    </label>
-
-                                    <input type="text"  placeholder="Enter PC"
-                                           autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
-                                           ng-model="updateModel.feesType.PC" ng-pattern="/^[0-9]*$/" readonly>
-                                    <span class="error text-small block"
-                                          ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
-
-                                </div>
-
-
-
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
-                                    <label>
-                                        TC Fees
-                                    </label>
-
-                                    <input type="text"  placeholder="Enter TC"
-                                           autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
-                                           ng-model="updateModel.feesType.TC" ng-pattern="/^[0-9]*$/" readonly>
-                                    <span class="error text-small block"
-                                          ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
-
-                                </div>
-
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
-                                    <label>
-                                        DC Fees
-                                    </label>
-
-                                    <input type="text"  placeholder="Enter DC"
-                                           autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
-                                           ng-model="updateModel.feesType.DC" ng-pattern="/^[0-9]*$/" readonly>
-                                    <span class="error text-small block"
-                                          ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
-
-                                </div>
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
-                                    <label>
-                                        MC Fees
-                                    </label>
-
-                                    <input type="text"  placeholder="Enter MC"
-                                           autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
-                                           ng-model="updateModel.feesType.MC" ng-pattern="/^[0-9]*$/" readonly>
-                                    <span class="error text-small block"
-                                          ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
-
-                                </div>
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-6 form-group"
-                                     ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
-                                    <label>
-                                        Other Fees
-                                    </label>
-
-                                    <input type="text"  placeholder="Enter Other"
-                                           autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
-                                           ng-model="updateModel.feesType.OtherFees" ng-pattern="/^[0-9]*$/" readonly>
-                                    <span class="error text-small block"
-                                          ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
-
-                                </div>
-                            </div>
-
-
-
-                        </fieldset>
-
-
-                    </div>-->
                     <div class="col-md-12">
                         <fieldset>
                             <legend>Bill Details</legend>
                             <div class="row">
+                                <div class="col-md-3 form-group"
+                                     ng-class="{'has-error':Form.feesTypeBill.$dirty && Form.feesTypeBill.$invalid, 'has-success':Form.feesTypeBill.$valid}">
+                                    <label>
+                                        Sem/Year <span class="symbol required"></span>
+                                    </label>
+                                    <select class="form-control" name="feesTypeBill" tabindex="17" id="feesTypeBill"
+                                            ng-model="updateModel.feesType"
+                                            ng-options="fees.Sem_Year for fees in studentFeesInfo"
+                                            required ng-change="changeTotalFees(updateModel.feesType);">
+                                        <!-- <option value=""> Select Sem/Year</option>-->
+                                    </select>
+                                    <span class="error text-small block"
+                                          ng-if="Form.feesTypeBill.$dirty && Form.feesTypeBill.$invalid">Sem/Year is required</span>
+                                </div>
                                 <div data-ng-controller="DatepickerDemoCtrl">
                                     <div class="col-md-3 form-group"
                                          ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
@@ -346,7 +266,7 @@
                                     </label>
 
                                     <input type="text"  placeholder="Enter Receipt No"
-                                           tabindex="16" class="form-control" name="billno"
+                                           tabindex="18" class="form-control" name="billno"
                                            ng-model="updateModel.billNo" disallow-spaces capitalize ng-pattern="/^(([a-zA-Z]{3}))(([-]){1})([0-9]{5})$/g" ng-disabled="userType=='R002' && financeType=='0'"/>
                                     <!--<span class="error text-small block"
                                           ng-if="Form.billno.$dirty && Form.billno.$error.required">Bill no is required</span>-->
@@ -360,7 +280,7 @@
                                     </label>
 
                                     <input type="text"  placeholder="Enter Fees Amount"
-                                           autofocus tabindex="17" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
+                                           autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
                                            ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
                                     <span class="error text-small block"
                                           ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
@@ -370,12 +290,14 @@
 
                                 </div>
 
-                                <div class="col-md-3 form-group"
+                                </div>
+                            <div class="row">
+                                <div class="col-md-4 form-group"
                                      ng-class="{'has-error':Form.paymentOn.$dirty && Form.paymentOn.$invalid, 'has-success':Form.paymentOn.$valid}">
                                     <label>
                                         Mode Of Payment <span class="symbol required"></span>
                                     </label>
-                                    <select class="form-control" name="paymentOn" tabindex="18" id="paymentOn"
+                                    <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
                                             ng-model="updateModel.paymentOn"
                                             ng-options="payment.paymentOn for payment in paymentOptions"
                                             required>
@@ -384,29 +306,13 @@
                                     <span class="error text-small block"
                                           ng-if="Form.paymentOn.$dirty && Form.paymentOn.$invalid">Payment type is required</span>
                                 </div>
-                                <!--<div class="col-md-3 form-group"
-                                     ng-class="{'has-error':Form.trackStatus.$dirty && Form.trackStatus.$invalid, 'has-success':Form.trackStatus.$valid}">
-                                    <label>
-                                        Status For Track <span class="symbol required"></span>
-                                    </label>
-                                    <select class="form-control" name="trackStatus" tabindex="14" id="trackStatus"
-                                            ng-model="updateModel.statusCode"
-                                            ng-options="trackS.ListCode as trackS.ListName for trackS in getFeesUpdateStatus"
-                                            required>
-                                        <option value=""> Select Status</option>
-                                    </select>
-                                    <span class="error text-small block"
-                                          ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
-                                </div>-->
-                                </div>
-                            <div class="row">
 
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-4 form-group"
                                      ng-class="{'has-error':Form.studcomments.$dirty && Form.studcomments.$invalid,'has-success':Form.studcomments.$valid}">
                                     <label>
                                         Comments For Student <span class="symbol required"></span>
                                     </label>
-                                    <textarea placeholder="Enter Comments" tabindex="19"
+                                    <textarea placeholder="Enter Comments" tabindex="21"
                                               class="form-control textdsc" name="studcomments"
                                               ng-model="updateModel.studComments" required></textarea>
                                     <span class="error text-small block"
@@ -414,12 +320,12 @@
                                     <!--<span class="success text-small"-->
                                     <!--ng-if="Form.address.$valid">Thank You!</span>-->
                                 </div>
-                                <div class="col-md-6 form-group"
+                                <div class="col-md-4 form-group"
                                      ng-class="{'has-error':Form.internalcomments.$dirty && Form.internalcomments.$invalid,'has-success':Form.internalcomments.$valid}">
                                     <label>
                                         Comments For Internal <span class="symbol required"></span>
                                     </label>
-                                    <textarea placeholder="Enter Comments" tabindex="20"
+                                    <textarea placeholder="Enter Comments" tabindex="22"
                                               class="form-control textdsc" name="internalcomments"
                                               ng-model="updateModel.internalComments" required></textarea>
                                     <span class="error text-small block"
@@ -500,6 +406,8 @@
                                                     <th>Bill Amount</th>
                                                     <th>Receipt NO</th>
                                                     <th>Mode of Payment </th>
+                                                    <th>Comments For Student </th>
+                                                    <th>Comments For Internal </th>
                                                     <th>Print</th>
                                                 </tr>
                                                 </thead>
@@ -510,6 +418,8 @@
                                                     <td>{{v.BillAmount}}</td>
                                                     <td>{{v.ReceiptNo}}</td>
                                                     <td>{{v.ModeOfPayment}}</td>
+                                                    <td><span style="white-space: pre-wrap">{{v.CommentsForStudent}}</span></td>
+                                                    <td>{{v.InternalComments}}</td>
 
                                                     <td>
                                                         <a tooltip="Click to print" ng-mouseleave="mouseLeave()" pdf-save-button="{{v.BillNO}}" pdf-name="Billno-{{v.BillNO}}.pdf" class="btn"><i class="fa fa-print" ng-click="ShowHide(v)"></i></a>
@@ -614,11 +524,11 @@
               <div class="row">
                 <div class="col-md-12">
                     <div class="pull-right">
-                        <button type="submit" ladda="ldloading.zoom_in" tabindex="20" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="saveFees(user,Form,updateModel,'zoom-in')">
+                        <button type="submit" ladda="ldloading.zoom_in" tabindex="23" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="saveFees(user,Form,updateModel,'zoom-in')">
                             Save
                         </button>
 
-                        <input type="button" class="btn btn-warning btn-wide" tabindex="21" value="Cancel"
+                        <input type="button" class="btn btn-warning btn-wide" tabindex="24" value="Cancel"
                                ng-click="cancel();">
 
                         </input>