diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html
index 95fb91b8..37a2382d 100644
--- a/Apollo/assets/views/courseDetails.html
+++ b/Apollo/assets/views/courseDetails.html
@@ -82,7 +82,7 @@
                                         <td>{{p.UniversityName}}</td>
 
                                         <td>
-                                            <a href="#"  class="text-azure" id="editRowBtn{{p.CourseID}}" ng-click="setEditId(p.CourseID);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
+                                            <a href="#"  class="text-azure" id="editRowBtn{{p.CourseID}}" ng-click="setEditId(p.CourseID,p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                                             </a>
 
                                            </td>
@@ -93,8 +93,8 @@
 
 
                                     </tr>
-                                    <tr ng-show="editId === p.CourseID" ng-if="editId === p.CourseID" style="width: ">
-                                        <td colspan="6" ng-include
+                                    <tr ng-show="editId === p.CourseID" ng-if="editId === p.CourseID">
+                                        <td colspan="12" ng-include
                                             src="'assets/views/editCourseDetails.html'"></td>
                                     </tr>
                                     </tbody>
@@ -124,7 +124,7 @@
 
             <tab heading="Add Course" id="addcourse">
                 <div>
-                    <form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel, 'zoom-in')" method="post">
+                    <form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel, 'zoom-in',addMoreItems)" method="post">
                         <div class="row">
 
                             <div class="col-md-12">
@@ -134,6 +134,21 @@
                                     </legend>
 
                                     <div class="row">
+                                        <div class="col-md-3 form-group"
+                                             ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid, 'has-success':Form.university.$valid}">
+                                            <label>
+                                                University <span class="symbol required"></span>
+                                            </label>
+                                            <select class="form-control" name="university" tabindex="1" id="university"
+                                                    ng-model="myModel.universityName"
+                                                    ng-options="details.UniversityID as details.UniversityName for details in university"
+                                                    required>
+                                                <option value=""> Select University</option>
+                                            </select>
+                                            <span class="error text-small block"
+                                                  ng-if="Form.university.$dirty && Form.university.$invalid">University is required</span>
+                                            <!--<span class="success text-small" ng-if="Form.university.$valid">Thank You!</span>-->
+                                        </div>
                                         <div class="col-md-3 form-group"
                                              ng-class="{'has-error':Form.coursecode.$dirty && Form.coursecode.$invalid, 'has-success':Form.coursecode.$valid}">
                                             <label>
@@ -141,7 +156,7 @@
                                             </label>
 
                                             <input type="text"  placeholder="Enter Course ID"
-                                                   tabindex="1" class="form-control" name="coursecode"
+                                                   tabindex="2" class="form-control" name="coursecode"
                                                    ng-model="myModel.courseCode" ng-pattern="/^[a-zA-Z0-9\s]*$/" required/>
                                             <span class="error text-small block"
                                                   ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
@@ -158,7 +173,7 @@
                                             </label>
 
                                             <input type="text"  placeholder="Enter Course Name"
-                                                   tabindex="2" class="form-control" name="coursename"
+                                                   tabindex="3" class="form-control" name="coursename"
                                                    ng-model="myModel.courseName" ng-pattern="/^[a-zA-Z-./\s]*$/" required/>
                                             <span class="error text-small block"
                                                   ng-if="Form.coursename.$dirty && Form.coursename.$error.required">Course name is required</span>
@@ -167,23 +182,194 @@
                                             <!--<span class="success text-small"-->
                                             <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
                                         </div>
-
                                         <div class="col-md-3 form-group"
-                                             ng-class="{'has-error':Form.university.$dirty && Form.university.$invalid, 'has-success':Form.university.$valid}">
+                                             ng-class="{'has-error':Form.fees.$dirty && Form.fees.$invalid, 'has-success':Form.fees.$valid}">
                                             <label>
-                                                University <span class="symbol required"></span>
+                                                Fees <span class="symbol required"></span>
                                             </label>
-                                            <select class="form-control" name="university" tabindex="3" id="university"
-                                                    ng-model="myModel.universityName"
-                                                    ng-options="details.UniversityID as details.UniversityName for details in university"
+                                            <select class="form-control" name="fees" tabindex="4" id="fees"
+                                                    ng-model="myModel.ListName"
+                                                    ng-options="feesList.ListName for feesList in feesDetails" ng-change="getFeesProgram();"
                                                     required>
-                                                <option value=""> Select University</option>
+                                               <!-- <option value=""> Select Fees</option>-->
                                             </select>
                                             <span class="error text-small block"
-                                                  ng-if="Form.university.$dirty && Form.university.$invalid">University is required</span>
-                                            <!--<span class="success text-small" ng-if="Form.university.$valid">Thank You!</span>-->
+                                                  ng-if="Form.fees.$dirty && Form.fees.$invalid">Fees is required</span>
+                                            <!--<span class="success text-small" ng-if="Form.fees.$valid">Thank You!</span>-->
                                         </div>
-                                        <div class="col-md-3">
+
+                                    </div>
+                                    <div class="col-md-6">
+                                    <fieldset>
+                                    <div class="row">
+                                        <div class="col-md-12 form-group"
+                                             ng-class="{'has-error':Form.fees.$dirty && Form.fees.$invalid, 'has-success':Form.fees.$valid}">
+                                            <label>
+                                                Program <span class="symbol required"></span>
+                                            </label>
+                                            <select class="form-control" name="program" tabindex="5" id="program"
+                                                    ng-model="myModel.programListName"
+                                                    ng-options="program.ListCode as program.ListName for program in myModel.ListName.programType"
+                                                    required>
+                                                <!-- <option value=""> Select Program</option>-->
+                                            </select>
+                                            <span class="error text-small block"
+                                                  ng-if="Form.program.$dirty && Form.program.$invalid">Program is required</span>
+                                            <!--<span class="success text-small" ng-if="Form.fees.$valid">Thank You!</span>-->
+                                            </div>
+
+
+
+
+
+
+                                            <div class="col-md-6 form-group" ng-if="myModel.programListName=='Y001'"
+                                                 ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid, 'has-success':Form.sem_year.$valid}">
+                                                <label>
+                                                    Sem/Year <span class="symbol required"></span>
+                                                </label>
+
+                                                <input type="text"  placeholder="Enter Sem/year"
+                                                       tabindex="6" class="form-control" name="sem_year"
+                                                       ng-model="myModel.semYear" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
+                                                <span class="error text-small block"
+                                                      ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>
+                                                <span class="error text-small block"
+                                                      ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
+                                            </div>
+
+                                            <div class="col-md-6 form-group"
+                                                 ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid, 'has-success':Form.feesAmount.$valid}">
+                                                <label>
+                                                    Fees <span class="symbol required"></span>
+                                                </label>
+
+                                                <input type="text"  placeholder="Enter Fees Amount"
+                                                       autofocus tabindex="7" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
+                                                       ng-model="myModel.feesAmount" ng-pattern="/^[0-9]*$/" required/>
+                                                <span class="error text-small block"
+                                                      ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
+                                                      ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>
+                                                <span class="error text-small block"
+                                                      ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
+
+                                            </div>
+                                    </div>
+                                        <div class="row" ng-if="myModel.programListName=='Y001'">
+                                            <div class="col-md-12">
+                                                <div class="pull-right">
+                                            <input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-click="addMoreFeesItems(myModel,Form);"/>
+
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="row" ng-if="myModel.programListName=='Y001'" ng-repeat="n in addMoreItems">
+                                            <div class="col-md-6 form-group" ng-class="{'has-error':n.FeesName==undefined, 'has-success':n.FeesName!=undefined}">
+                                                <label>
+
+                                                </label>
+
+                                                <input type="text"  placeholder="Enter Sem/year"
+                                                       class="form-control" name="sem_year{{$index}}"
+                                                       ng-model="n.FeesName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
+                                                <span class="error text-small block"  ng-if="n.FeesName==undefined">Enter a valid name</span>
+                                            </div>
+                                            <div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
+                                                <label>
+
+                                                </label>
+
+                                                <input type="text"  placeholder="Enter Fees Amount"
+                                                       autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
+                                                       ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
+                                                <span class="error text-small block"  ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
+
+                                            </div>
+
+                                        </div>
+
+                                    </fieldset>
+                                    </div>
+
+                                    <div class="col-md-6">
+                                    <fieldset>
+                                        <div class="row">
+                                        <div class="col-md-6 form-group"
+                                             ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
+                                            <label>
+                                                Prov Cert Fees
+                                            </label>
+
+                                            <input type="text"  placeholder="Enter Prov Cert Fees"
+                                                   autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
+                                                   ng-model="myModel.provFess" ng-pattern="/^[0-9]*$/">
+                                            <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>
+                                                Transfer Cert Fees
+                                            </label>
+
+                                            <input type="text"  placeholder="Enter transfer Cert Fees"
+                                                   autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
+                                                   ng-model="myModel.transferAmount" ng-pattern="/^[0-9]*$/">
+                                            <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>
+                                                Degree Cert Fees
+                                            </label>
+
+                                            <input type="text"  placeholder="Enter Degree Cert Fees"
+                                                   autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
+                                                   ng-model="myModel.degreeAmount" ng-pattern="/^[0-9]*$/">
+                                            <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>
+                                                Migration Cert Fees
+                                            </label>
+
+                                            <input type="text"  placeholder="Enter Migration Cert Fees"
+                                                   autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
+                                                   ng-model="myModel.migrationAmount" ng-pattern="/^[0-9]*$/">
+                                            <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 Fees"
+                                                   autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
+                                                   ng-model="myModel.otherAmount" ng-pattern="/^[0-9]*$/">
+                                            <span class="error text-small block"
+                                                  ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
+
+                                        </div>
+                                            <div class="col-md-6">
                                             <label>
                                                 Active/De-Active
                                             </label>
@@ -205,19 +391,24 @@
                                             </div>
 
                                         </div>
+
+                                        </div>
+                                    </fieldset>
                                     </div>
 
 
 
+
+
                                     <div class="col-md-12">
                                         <div class="pull-right">
-                                            <button type="submit" ladda="ldloading1.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in">
+                                            <button type="submit" ladda="ldloading1.zoom_in" tabindex="13" class="btn btn-wide btn-success" data-style="zoom-in">
                                                 Submit
                                             </button>
                                             <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
                                                  Submit
                                              </button>-->
-                                            <button type="reset" class="btn btn-warning btn-wide" tabindex="10"
+                                            <button type="reset" class="btn btn-warning btn-wide" tabindex="14" ng-click="courseForm.reset(Form);"
                                                     ng-click="branchForm.reset(Form)">
                                                 Reset
                                             </button>