diff --git a/src/app/views/courier/courier/courier.component.html b/src/app/views/courier/courier/courier.component.html
index c89c234..1210bd4 100644
--- a/src/app/views/courier/courier/courier.component.html
+++ b/src/app/views/courier/courier/courier.component.html
@@ -11,7 +11,7 @@
                     <i class="fa fa-align-justify"></i> Courier Details List
                 </div>
                 <div class="card-body">
-                     <div class="row">
+                    <div class="row">
                         <div class="col-md-4">
                             <div class="input-prepend input-group">
                                 <span class="input-group-addon">
@@ -73,13 +73,21 @@
                     <div class="col-md-12">
                         <div class="card">
                             <div class="card-header">
-                             <i class="fa fa-align-justify"></i> Add Courier Details
+                                <i class="fa fa-align-justify"></i> Add Courier Details
                             </div>
                             <form>
                                 <div class="card-body">
                                     <fieldset>
                                         <div class="container">
                                             <div class="row">
+                                                <div class="form-group col-md-4">
+                                                    <label for="pmobile">Type<span class="danger">*</span></label>
+                                                    <select id="disabledSelect" class="form-control">
+                                                            <option value="0">Please Select Type</option>
+                                                            <option value="1">Received</option>
+                                                            <option value="2">Dispatched</option>
+                                                        </select>
+                                                </div>
                                                 <div class="form-group col-md-4">
                                                     <label for="cname">Courier Name <span class="danger">*</span></label>
                                                     <input type="text" class="form-control" id="cname" placeholder="Enter Courier name">
@@ -88,19 +96,12 @@
                                                     <label for="lname">Docket No. <span class="danger">*</span></label>
                                                     <input type="text" class="form-control" id="lname" placeholder="Enter Docket No">
                                                 </div>
-                                                <div class="form-group col-md-4">
-                                                    <label for="motherName">Date<span class="danger">*</span></label>
-                                                    <input type="date" class="form-control" id="motherName" placeholder="Enter Date">
-                                                </div>
+
                                             </div>
                                             <div class="row">
                                                 <div class="form-group col-md-4">
-                                                    <label for="pmobile">Type<span class="danger">*</span></label>
-                                                        <select id="disabledSelect" class="form-control">
-                                                            <option value="0">Please Select Type</option>
-                                                            <option value="1">Received</option>
-                                                            <option value="2">Dispatched</option>
-                                                        </select>
+                                                    <label for="motherName">Date<span class="danger">*</span></label>
+                                                    <input type="text" placeholder="dd/mm/yyyy" class="form-control" id="motherName">
                                                 </div>
                                                 <div class="form-group col-md-4">
                                                     <label for="sendFor">Send To / Receive From <span class="danger"> *</span></label>
@@ -115,7 +116,7 @@
                                                 </div>
                                                 <div class="form-group col-md-4">
                                                     <label for="sendFor">Select Study Center<span class="danger"> *</span></label>
-                                                
+
                                                     <div class="input-prepend input-group">
                                                         <select id="disabledSelect" class="form-control">
                                                     <option value="0">Please Select SC</option>
@@ -126,11 +127,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div class="row"> 
-                                            <div class="form-group col-md-4">
-                                                    <label for="smobile">Comments</label>
-                                                    <textarea type="text" class="form-control" id="smobile" placeholder="Enter Comments"></textarea>
-                                                </div> 
+                                            <div class="row">
                                                 <div class="form-group col-md-4">
                                                     <label for="email">Qty <span class="danger">*</span></label>
                                                     <input type="text" class="form-control" id="email" placeholder="Enter Qty">
@@ -139,13 +136,18 @@
                                                     <label for="fatherName">Amount</label>
                                                     <input type="text" class="form-control" id="fatherName" placeholder="Enter Amount">
                                                 </div>
-                                            </div>
-                                            <div class="row">
                                                 <div class="form-group col-md-4">
                                                     <label for="motherName">Received By / Dispatched By<span class="danger">*</span></label>
                                                     <input type="text" class="form-control" id="motherName" placeholder="Enter Name">
                                                 </div>
                                             </div>
+                                            <div class="row">
+
+                                                <div class="form-group col-md-4">
+                                                    <label for="smobile">Comments</label>
+                                                    <textarea type="text" class="form-control" id="smobile" placeholder="Enter Comments"></textarea>
+                                                </div>
+                                            </div>
                                         </div>
                                     </fieldset>
                                 </div>
@@ -195,7 +197,7 @@
                             <label><b>Weight : </b> </label> {{myModalData.weight}}
                         </div>
                     </div>
-                     <div class="row">
+                    <div class="row">
                         <div class="col-md-6">
                             <label><b>Amount : </b> </label> {{myModalData.amt}}
                         </div>
@@ -203,7 +205,7 @@
                             <label><b>Date : </b> </label> {{myModalData.date}}
                         </div>
                     </div>
-                      <div class="row">
+                    <div class="row">
                         <div class="col-md-4">
                             <label for="name"> Status</label>
                             <select id="disabledSelect" class="form-control">
diff --git a/src/app/views/enrolment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
index 15c0f10..25fe570 100644
--- a/src/app/views/enrolment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -5,7 +5,7 @@
     <tabset>
         <tab>
             <ng-template tabHeading>Student Enrolment</ng-template>
-            <div class="form-group line-height">
+            <div class="form-group">
                 <div class="row">
                     <div class="form-group col-md-4">
                         <label for="name"> Select Study Center</label>
@@ -21,7 +21,7 @@
             <tabset>
                 <tab>
                     <ng-template tabHeading>Student List</ng-template>
-                    <div class="card line-height">
+                    <div class="card">
                         <div class="card-header">
                             <i class="fa fa-align-justify"></i> Student Details List
                         </div>
@@ -30,7 +30,7 @@
                                 <div class="col-md-2">
                                     <div class="input-prepend input-group">
                                         <select id="disabledSelect" class="form-control">
-                                    <option value="0">Batch</option>
+                                    <option value="0">Session</option>
                                     <option value="1">Jan 2017</option>
                                     <option value="2">Jul 2017</option>
                                     <option value="3">Jan 2018</option>
@@ -86,10 +86,10 @@
                                 </div>
                             </div>
                             <br>
-                            <table class="table table-bordered table-responsive line-height-table">
+                            <table class="table table-bordered table-responsive">
                                 <thead>
                                     <tr>
-                                        <th>Batch</th>
+                                        <th>Session</th>
                                         <th>Form Id</th>
                                         <th>Student Name</th>
                                         <th>Father Name</th>
@@ -111,8 +111,9 @@
                                         <td>{{app.course}} / {{app.univ}}</td>
                                         <td>{{app.sem}}</td>
                                         <td>
-                                            <span *ngIf="app.status == 1"  style="line-height: 0.1;">Active</span>
-                                            <span *ngIf="app.status == 0"  style="line-height: 0.1;">In-Active</span>
+                                            {{app.status}}
+                                            <!--<span *ngIf="app.status == 1"  style="line-height: 0.1;">Active</span>
+                                            <span *ngIf="app.status == 0"  style="line-height: 0.1;">In-Active</span>-->
                                         </td>
                                         <td>{{app.comments}}</td>
                                         <td>
@@ -366,11 +367,12 @@
                                     <table class="table table-bordered table-responsive">
                                         <thead>
                                             <tr>
-                                                <th>Batch</th>
+                                                <th>Session</th>
                                                 <th>Form Id</th>
                                                 <th>Course</th>
                                                 <th>University</th>
                                                 <th>Sem/Year</th>
+                                                <th>Action</th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -380,6 +382,8 @@
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>3</td>
+                                                    <td> <i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>
+                                           </td>
                                             </tr>
                                             <tr>
                                                 <td>Jul 2017</td>
@@ -387,6 +391,10 @@
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>2</td>
+                                                    <td>
+                                                         <i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>  
+                                            
+                                                    </td>
                                             </tr>
                                             <tr>
                                                 <td>Jan 2017</td>
@@ -394,6 +402,10 @@
                                                 <td>B.Com</td>
                                                 <td>KR Univ</td>
                                                 <td>1</td>
+                                                    <td>
+                                                         <i class="fa fa-file-code-o line-height-table" tooltip="Re-registration Form" (click)="myModelReReg.show()"></i>  
+                                            
+                                                    </td>
                                             </tr>
                                         </tbody>
                                     </table>
@@ -446,7 +458,7 @@
                                         <table class="table table-bordered table-responsive">
                                             <thead>
                                                 <tr>
-                                                    <th>Batch</th>
+                                                    <th>Session</th>
                                                     <th>Form Id</th>
                                                     <th>Course</th>
                                                     <th>University</th>
@@ -491,13 +503,14 @@
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Re-registertion</h4>
+                <h4 class="modal-title">Re-registration</h4>
                 <button type="button" class="close" (click)="myModal.hide()" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
             </div>
             <div class="modal-body">
                 <div class="container">
+                   
                     <div class="row">
                         <div class="col-md-6">
                             <label><b> Student Name : </b> </label> XYZ
@@ -552,6 +565,105 @@
 </div>
 <!-- /.modal -->
 
+<div bsModal #myModelReReg="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">Re-registration Form</h4>
+                <button type="button" class="close" (click)="myModelReReg.hide()" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+            </div>
+            <div class="modal-body">
+                <div class="container">
+                      <div class="row">
+                        <div class="col-md-6">
+                            <label><b> Form ID : </b> </label> KES08432
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <label><b> Student Name : </b> </label> XYZ
+                        </div>
+                        <div class="col-md-6">
+                            <label><b>Enrolment Number : </b> </label> UNIV120876
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <label><b> Course : </b> </label> B.Com
+                        </div>
+                        <div class="col-md-6">
+                            <label><b> University : </b> </label> KR Univ
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <label for="name"> <b>Sem/Year :</b> </label> 3
+                         
+                        </div>
+                        <div class="col-md-6">
+                            <label for="name"><b>Session :</b></label> Jan 2018
+                        </div>
+                    </div>
+                    <div class="container">
+                    <div class="row">
+                    <table class="table table-bordered table-responsive">
+                        <thead>
+                            <th>Subject Code</th>
+                            <th>Subject Name</th>
+                        </thead>
+                        <tbody>
+                            <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 1</td>
+                            </tr>
+                              <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 2</td>
+                            </tr>
+                              <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 3</td>
+                            </tr>
+                              <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 4</td>
+                            </tr>
+                              <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 5</td>
+                            </tr>
+                              <tr>
+                            <td>SFJK000021</td>
+                            <td>Subject 6</td>
+                            </tr>
+                               <tr>
+                            <td></td>
+                            <td></td>
+                            </tr>
+                               <tr>
+                            <td></td>
+                            <td></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    </div>
+                </div>
+                </div>
+                
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" (click)="myModelReReg.hide()">Close</button>
+                <!--<button type="button" class="btn btn-primary">Save</button>-->
+            </div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
 <!-- start student fees modal-->
 
 <div bsModal #feesModal="bs-modal" class="modal fade" tabindex="-2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
diff --git a/src/app/views/enrolment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts
index 842ff4b..de44e15 100644
--- a/src/app/views/enrolment/student/student.component.ts
+++ b/src/app/views/enrolment/student/student.component.ts
@@ -10,6 +10,7 @@ export class StudentComponent implements OnInit {
   closed = false;
   public myModal;
   public myModalData;
+  public myModelReReg;
   students: any;
   oldReg: boolean = false;
   public feesModal;
@@ -23,10 +24,10 @@ export class StudentComponent implements OnInit {
         fatherName: 'mmm mmm',
         mobile: '+919876543210',
         course: 'B.Sc',
-        univ: 'KR university',
+        univ: 'KR univ',
         sem: 2,
         batch: 'Jan 2018',
-        status: '1',
+        status: 'Send To Univ',
         comments: 'approved by Univ',
         feesDetails:[
         {
@@ -48,10 +49,10 @@ export class StudentComponent implements OnInit {
         fatherName: 'sss sss',
         mobile: '+919876511111',
         course: 'B.Sc',
-        univ: 'KR university',
+        univ: 'KR univ',
         sem: 4,
         batch: 'Jan 2018',
-        status: '1',
+        status: 'Approved by Univ',
         comments: 'approved by Univ',
         feesDetails:[
         {
@@ -73,10 +74,10 @@ export class StudentComponent implements OnInit {
         fatherName: 'nnn nnn',
         mobile: '+919876500000',
         course: 'B.Sc',
-        univ: 'KR university',
+        univ: 'KR univ',
         sem: 8,
         batch: 'Jan 2018',
-        status: '0',
+        status: 'rejected by Univ',
         comments: 'rejected by Univ',
         feesDetails:[
         {