diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index dbacb36..fb6681f 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,7 +5,7 @@ import { AppComponent } from './app.component';
 
 
 import { StatusModule } from './views/status/status.module';
-import { EntrollmentModule } from './views/entrollment/entrollment.module';
+import { EnrolmentModule } from './views/enrolment/enrolment.module';
 
 // Import containers
 import {
@@ -65,7 +65,7 @@ import { ChartsModule } from 'ng2-charts/ng2-charts';
     TooltipModule.forRoot(),
     ChartsModule,
     StatusModule,
-    EntrollmentModule
+    EnrolmentModule
   ],
   declarations: [
     AppComponent,
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
index 31bb330..c522ae4 100755
--- a/src/app/app.routing.ts
+++ b/src/app/app.routing.ts
@@ -53,8 +53,8 @@ export const routes: Routes = [
          loadChildren: './views/status/status.module#StatusModule'
       },
       {
-        path: 'entrollment',
-        loadChildren: './views/entrollment/entrollment.module#EntrollmentModule'
+        path: 'enrolment',
+        loadChildren: './views/enrolment/enrolment.module#EnrolmentModule'
       }
     ]
   },
diff --git a/src/app/components/app-sidebar/app-sidebar.component.html b/src/app/components/app-sidebar/app-sidebar.component.html
index c4d5165..09d7ec6 100755
--- a/src/app/components/app-sidebar/app-sidebar.component.html
+++ b/src/app/components/app-sidebar/app-sidebar.component.html
@@ -79,16 +79,11 @@
       <li class="nav-item">
         <a class="nav-link" routerLinkActive="active" [routerLink]="['/dashboard']"><i class="icon-speedometer"></i> Dashboard</a>
       </li>
-      <li class="nav-item nav-dropdown" appNavDropdown>
-        <a class="nav-link nav-dropdown-toggle" href="#" appNavDropdownToggle><i class="fa fa-graduation-cap"></i> Entrollment</a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <a class="nav-link" routerLinkActive="active" [routerLink]="['/entrollment/student']"><i class="fa fa-user"></i> Student</a>
-          </li>
-        </ul>
-      </li> 
       <li class="nav-item">
-        <a class="nav-link" routerLinkActive="active" [routerLink]="['/shareallotment']"><i class="icon-pie-chart"></i> Share Allocate</a>
+        <a class="nav-link" routerLinkActive="active" [routerLink]="['/enrolment']"><i class="fa fa-graduation-cap"></i> Student Enrolment</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" routerLinkActive="active" [routerLink]="['/shareallotment']"><i class="icon-pie-chart"></i> Allocate Fees</a>
       </li>
       <li class="nav-item">
         <a class="nav-link" routerLinkActive="active" [routerLink]="['/feescalculator']"><i class="icon-calculator"></i> Fees Calculator</a>
diff --git a/src/app/views/entrollment/entrollment-routing.module.ts b/src/app/views/enrolment/enrolment-routing.module.ts
similarity index 59%
rename from src/app/views/entrollment/entrollment-routing.module.ts
rename to src/app/views/enrolment/enrolment-routing.module.ts
index 56c0f45..40bf6b0 100644
--- a/src/app/views/entrollment/entrollment-routing.module.ts
+++ b/src/app/views/enrolment/enrolment-routing.module.ts
@@ -7,15 +7,9 @@ const routes: Routes = [
   {
     path: '',
     data: {
-     title: 'Entrollment'
-    },
-    children: [{
-      path: 'student',
-      component: StudentComponent,
-      data : {
-          title: 'Student Entollement'
-      }
-    }]
+    title: 'Student Enrolment',
+   },
+    component: StudentComponent,
   }
 ];
 
@@ -23,4 +17,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class EntrollmentRoutingModule {}
+export class EnrolmentRoutingModule {}
diff --git a/src/app/views/entrollment/entrollment.module.ts b/src/app/views/enrolment/enrolment.module.ts
similarity index 81%
rename from src/app/views/entrollment/entrollment.module.ts
rename to src/app/views/enrolment/enrolment.module.ts
index 83976cd..dc81123 100644
--- a/src/app/views/entrollment/entrollment.module.ts
+++ b/src/app/views/enrolment/enrolment.module.ts
@@ -7,7 +7,7 @@ import { TabsModule } from 'ngx-bootstrap/tabs';
 import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { ModalModule } from 'ngx-bootstrap/modal';
 
-import { EntrollmentRoutingModule } from './entrollment-routing.module';
+import { EnrolmentRoutingModule } from './enrolment-routing.module';
 
 // Student
 import { StudentComponent } from './student/student.component';
@@ -18,10 +18,10 @@ import { StudentComponent } from './student/student.component';
     TabsModule,
     ModalModule.forRoot(),
     TooltipModule,
-    EntrollmentRoutingModule 
+    EnrolmentRoutingModule 
     ],
   declarations: [
    StudentComponent
   ]
 })
-export class EntrollmentModule { }
+export class EnrolmentModule { }
diff --git a/src/app/views/entrollment/student/student.component.html b/src/app/views/enrolment/student/student.component.html
similarity index 93%
rename from src/app/views/entrollment/student/student.component.html
rename to src/app/views/enrolment/student/student.component.html
index c8c1466..bccbd2c 100644
--- a/src/app/views/entrollment/student/student.component.html
+++ b/src/app/views/enrolment/student/student.component.html
@@ -2,26 +2,11 @@
     <a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
 </span>-->
 <div class="col-lg-12" *ngIf="!show">
-    <tabset>
-        <tab>
-            <ng-template tabHeading>Student Entrollment</ng-template>
-            <!--<div class="form-group">
-                <div class="row">
-                    <div class="form-group col-md-4">
-                        <label for="name"> Select Study Center</label>
-                        <select id="disabledSelect" class="form-control">
-                                <option value="0">Please select Study Center</option>
-                                <option value="1">SC 001</option>
-                                <option value="2">SC 002</option>
-                                <option value="3">SC 003</option>
-                            </select>
-                    </div>
-                </div>
-            </div>-->
+ 
             <tabset>
                 <tab>
                     <ng-template tabHeading>Student List</ng-template>
-                    <div class="card">
+                    <div class="card line-height">
                         <div class="card-header">
                             <i class="fa fa-align-justify"></i> Student Details List
                         </div>
@@ -86,14 +71,14 @@
                                 </div>
                             </div>
                             <br>
-                            <table class="table table-bordered table-responsive">
+                            <table class="table table-bordered table-responsive line-height-table">
                                 <thead>
                                     <tr>
                                         <th>Form Id</th>
                                         <th>Student Name</th>
                                         <th>Father Name</th>
                                         <th>Mobile</th>
-                                        <th>Course</th>
+                                        <th>Course/University</th>
                                         <th>Sem/Year</th>
                                         <th>Batch</th>
                                         <th>Status</th>
@@ -106,15 +91,17 @@
                                         <td>{{app.studentName}}</td>
                                         <td>{{app.fatherName}}</td>
                                         <td>{{app.mobile}}</td>
-                                        <td>{{app.course}}</td>
+                                        <td>{{app.course}} / {{app.univ}}</td>
                                         <td>{{app.sem}}</td>
                                         <td>{{app.batch}}</td>
                                         <td>
-                                            <span *ngIf="app.status == 1" class="badge badge-success">Active</span>
-                                            <span *ngIf="app.status == 0" class="badge badge-danger">In-Active</span>
-                                    </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>
+                                        </td>
                                         <td>
-                                            <i class="fa fa-edit" tooltip="Edit" (click)="editDocuments()"></i>
+                                            <i class="fa fa-edit line-height-table" tooltip="Edit" (click)="editDocuments()"></i> |
+                                            <i class="fa fa-edit fa-file-code-o" tooltip="Answer Booklet"></i> | 
+                                            <i class="fa fa-edit fa-id-card-o" tooltip="Mark Card"></i> 
                                             <!--<i class="fa fa-eye" tooltip="View More" data-toggle="modal" (click)="myModal.show(); getModelWindowDetails(app)"></i>-->
                                         </td>
                                     </tr>
@@ -136,14 +123,14 @@
                 <tab>
                     <ng-template tabHeading>Add Student</ng-template>
                     <div align="right">
-                        <button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
-                        <button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>
+                        <!--<button *ngIf="!oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">Re-registration</button>
+                        <button *ngIf="oldReg" (click)="oldReg = !oldReg" type="button" class="btn btn-sm btn-primary">New Student</button>-->
                     </div>
                     <br>
                     <div *ngIf="!oldReg">
-                        <div class="card">
+                        <div class="card line-height">
                             <div class="card-header">
-                                Add Student Personal Details
+                                Personal Details
                             </div>
                             <div class="card-body">
                                 <div class="container">
@@ -156,6 +143,18 @@
                                             <label for="lname">Last Name <span class="danger">*</span></label>
                                             <input type="text" class="form-control" id="lname" placeholder="Enter Last name">
                                         </div>
+                                        <div class="form-group col-md-4">
+                                            <label for="gender">Gender <span class="danger">*</span></label>
+                                            <!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
+                                            <div>
+                                            <label class="radio" for="gender">
+                                                        <input type="radio" id="gender-male" name="inline-radios" value="Male"> Male
+                                                    </label>
+                                            <label class="radio" for="inline-radio2">
+                                                        <input type="radio" id="gender-female" name="inline-radios" value="Female"> Female
+                                                    </label>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="row">
                                         <div class="form-group col-md-4">
@@ -186,16 +185,7 @@
                                         </div>
                                     </div>
                                     <div class="row">
-                                        <div class="form-group col-md-4">
-                                            <label for="gender">Gender <span class="danger">*</span></label>
-                                            <!--<input type="text" class="form-control" id="gender" placeholder="Enter Gender">-->
-                                            <label class="radio" for="gender">
-                                                        <input type="radio" id="gender-male" name="inline-radios" value="Male"> Male
-                                                    </label>
-                                            <label class="radio" for="inline-radio2">
-                                                        <input type="radio" id="gender-female" name="inline-radios" value="Female"> Female
-                                                    </label>
-                                        </div>
+                                        
                                         <div class="form-group col-md-4">
                                             <label for="adhar">Aadhar Number <span class="danger">*</span></label>
                                             <input type="text" class="form-control" id="adhar" placeholder="Enter Aadhar Number">
@@ -208,12 +198,13 @@
                                     <!--/.row-->
                                     <div class="row">
                                         <div class="form-group col-md-4">
-                                            <label for="premanentAddress">Premanent Address <span class="danger">*</span></label>
+                                            <label for="premanentAddress">Permanent Address <span class="danger">*</span></label>
                                             <textarea class="form-control" id="premanentAddress" placeholder="Enter Permanent Address"></textarea>
                                         </div>
                                         <div class="form-group col-md-4">
-                                            <label for="currentAddress">Current Address <span class="danger">*</span></label>
+                                            <label for="currentAddress">Current Address<span class="danger">*</span> </label>
                                             <textarea class="form-control" id="currentAddress" placeholder="Enter Current Address"></textarea>
+                                            Same as Permanent Address <span><input type="checkbox"></span>
                                         </div>
                                     </div>
                                 </div>
@@ -221,9 +212,9 @@
                             <!--<div class="card-footer">
                         </div>-->
                         </div>
-                        <div class="card">
+                        <div class="card line-height">
                             <div class="card-header">
-                                Add Course Details
+                                Course Details
                             </div>
                             <div class="card-body">
                                 <div class="container">
@@ -287,8 +278,12 @@
                             </div>
                         </div>
                     </div>
-                    <div *ngIf="oldReg">
-                        <div class="card">
+
+                </tab>
+                <tab>
+                    <ng-template tabHeading>Re-registertion</ng-template>
+                    <div>
+                        <div class="card line-height">
                             <div class="card-header">
                                 Re-registration
                             </div>
@@ -366,8 +361,6 @@
                     </div>
                 </tab>
             </tabset>
-        </tab>
-    </tabset>
 </div>
 
 <div bsModal #myModal="bs-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
diff --git a/src/app/views/entrollment/student/student.component.scss b/src/app/views/enrolment/student/student.component.scss
similarity index 100%
rename from src/app/views/entrollment/student/student.component.scss
rename to src/app/views/enrolment/student/student.component.scss
diff --git a/src/app/views/entrollment/student/student.component.ts b/src/app/views/enrolment/student/student.component.ts
similarity index 92%
rename from src/app/views/entrollment/student/student.component.ts
rename to src/app/views/enrolment/student/student.component.ts
index 0958466..4885938 100644
--- a/src/app/views/entrollment/student/student.component.ts
+++ b/src/app/views/enrolment/student/student.component.ts
@@ -21,6 +21,7 @@ export class StudentComponent implements OnInit {
         fatherName: 'mmm mmm',
         mobile: '+919876543210',
         course: 'B.Sc',
+        univ: 'KR university',
         sem: 2,
         batch: 'Jan 2018',
         status: '1'
@@ -31,6 +32,7 @@ export class StudentComponent implements OnInit {
         fatherName: 'sss sss',
         mobile: '+919876511111',
         course: 'B.Sc',
+        univ: 'KR university',
         sem: 4,
         batch: 'Jan 2018',
         status: '1'
@@ -41,6 +43,7 @@ export class StudentComponent implements OnInit {
         fatherName: 'nnn nnn',
         mobile: '+919876500000',
         course: 'B.Sc',
+        univ: 'KR university',
         sem: 8,
         batch: 'Jan 2018',
         status: '0'