diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html
index 3418eba6..3a28dc8f 100755
--- a/Apollo/assets/views/callTrackingFollowup.html
+++ b/Apollo/assets/views/callTrackingFollowup.html
@@ -58,81 +58,84 @@
 
                         <div class="row">
                             <div class="col-md-4">
-                                <div class="user-left">
 
-                                    <!--{{followupDetails | json}}-->
-                                    <table class="table table-condensed" ng-controller="studentModalDemoCtrl">
-                                        <thead>
-                                        <tr>
-                                            <th colspan="3">Contact Information</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        <tr>
-                                            <td class="text-primary">Student Name</td>
-                                            <td><span class="text-blue text-bold">
+                                <div class="panel panel-white">
+                                    <div class="panel-heading border-light" >
+                                        <h4 class="panel-title text-blue">Contact Information</h4>
+                                    </div>
+                                    <div class="panel-body " >
+                                        <table class="table table-condensed" ng-controller="studentModalDemoCtrl">
+                                            <!--<thead>
+                                            <tr>
+                                                <th colspan="3">Contact Information</th>
+                                            </tr>
+                                            </thead>-->
+                                            <tbody>
+                                            <tr>
+                                                <td class="text-primary">Student Name</td>
+                                                <td><span class="text-blue text-bold">
 
                                                 <a  tooltip="View Student" class="text-blue" ng-click="open(followupDetails);"> {{followupDetails.LeadName}}</a></span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Mobile Number</td>
-                                            <td><span class="text-blue text-bold">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Mobile Number</td>
+                                                <td><span class="text-blue text-bold">
                                                 <a tooltip="View Student" class="text-blue" ng-click="open(followupDetails);">  {{followupDetails.MobileNumber}} </a></span></td>
 
-                                        </tr>
-                                        <tr>
-                                            <td>University</td>
-                                            <td ng-class="{'has-error':Form.editUniversity.$dirty && Form.editUniversity.$invalid, 'has-success':Form.editUniversity.$valid}">
-                                                <input type="text"  placeholder="Enter University"
-                                                       autofocus tabindex="2" class="form-control" name="editUniversity" id="editUniversity"  ng-maxlength="50"
-                                                       ng-model="followupDetails.UniversityName" ng-pattern="/^[a-zA-Z.,/\-\s]*$/" >
+                                            </tr>
+                                            <tr>
+                                                <td>University</td>
+                                                <td ng-class="{'has-error':Form.editUniversity.$dirty && Form.editUniversity.$invalid, 'has-success':Form.editUniversity.$valid}">
+                                                    <input type="text"  placeholder="Enter University"
+                                                           autofocus tabindex="2" class="form-control" name="editUniversity" id="editUniversity"  ng-maxlength="50"
+                                                           ng-model="followupDetails.UniversityName" ng-pattern="/^[a-zA-Z.,/\-\s]*$/" >
 
-                                                <span class="error text-small block"
-                                                      ng-if="Form.editUniversity.$error.maxlength || Form.editUniversity.$error.pattern">Enter a valid university name</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Course</td>
-                                            <td ng-class="{'has-error':Form.editCourse.$dirty && Form.editCourse.$invalid, 'has-success':Form.editCourse.$valid}">
-                                                <input type="text"  placeholder="Enter Course"
-                                                       autofocus tabindex="3" class="form-control" name="editCourse" id="editCourse"  ng-maxlength="50"
-                                                       ng-model="followupDetails.CourseName" ng-pattern="/^[a-zA-Z.,/\-\s]*$/" >
+                                                    <span class="error text-small block"
+                                                          ng-if="Form.editUniversity.$error.maxlength || Form.editUniversity.$error.pattern">Enter a valid university name</span>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Course</td>
+                                                <td ng-class="{'has-error':Form.editCourse.$dirty && Form.editCourse.$invalid, 'has-success':Form.editCourse.$valid}">
+                                                    <input type="text"  placeholder="Enter Course"
+                                                           autofocus tabindex="3" class="form-control" name="editCourse" id="editCourse"  ng-maxlength="50"
+                                                           ng-model="followupDetails.CourseName" ng-pattern="/^[a-zA-Z.,/\-\s]*$/" >
 
-                                                <span class="error text-small block"
-                                                      ng-if="Form.editCourse.$error.maxlength || Form.editCourse.$error.pattern">Enter a valid course name</span>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Alternate Mobile</td>
-                                            <td class="form-group"
-                                                ng-class="{'has-error':Form.editAltermobilenumber.$dirty && Form.editAltermobilenumber.$invalid, 'has-success':Form.editAltermobilenumber.$valid}">
+                                                    <span class="error text-small block"
+                                                          ng-if="Form.editCourse.$error.maxlength || Form.editCourse.$error.pattern">Enter a valid course name</span>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>Alternate Mobile</td>
+                                                <td class="form-group"
+                                                    ng-class="{'has-error':Form.editAltermobilenumber.$dirty && Form.editAltermobilenumber.$invalid, 'has-success':Form.editAltermobilenumber.$valid}">
 
-                                                <input type="text"  placeholder="Enter Alter Mobile Number"
-                                                       autofocus tabindex="4" class="form-control" name="editAltermobilenumber" id="altermobilenumber" ng-minlength="10" ng-maxlength="12"
-                                                       ng-model="myModel1.AlternateMobile" ng-pattern="/^[0-9]*$/" />
+                                                    <input type="text"  placeholder="Enter Alter Mobile Number"
+                                                           autofocus tabindex="4" class="form-control" name="editAltermobilenumber" id="altermobilenumber" ng-minlength="10" ng-maxlength="12"
+                                                           ng-model="myModel1.AlternateMobile" ng-pattern="/^[0-9]*$/" />
                                                     <span class="error text-small block"
                                                           ng-if="Form.editAltermobilenumber.$error.maxlength || Form.editAltermobilenumber.$error.minlength || Form.editAltermobilenumber.$error.pattern">Enter a valid phone number</span>
 
-                                            </td>
+                                                </td>
 
-                                        </tr>
-                                        <tr>
-                                            <td>Address</td>
-                                            <td>
+                                            </tr>
+                                            <tr>
+                                                <td>Address</td>
+                                                <td>
                                                     <textarea placeholder="Enter Address" tabindex="5"
                                                               class="form-control textdsc" name="editaddress" rows="3"
                                                               ng-model="myModel1.Address"></textarea>
                                                     <!--<span class="error text-small block"
                                                           ng-if="Form.address.$dirty && Form.address.$invalid">Address is required</span>-->
-                                              </td>
+                                                </td>
 
-                                        </tr>
-                                        <tr>
-                                            <td>Referred By</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Referred By</td>
 
                                                 <td class="form-group"
-                                                     ng-class="{'has-error':Form.refered.$dirty && Form.refered.$invalid, 'has-success':Form.refered.$valid}">
+                                                    ng-class="{'has-error':Form.refered.$dirty && Form.refered.$invalid, 'has-success':Form.refered.$valid}">
 
                                                     <input type="text"  placeholder="Enter Referred By Name"
                                                            tabindex="6" class="form-control" name="refered"
@@ -141,224 +144,173 @@
                                                     <span class="error text-small block"
                                                           ng-if="Form.refered.$dirty && Form.refered.$error.pattern">Invalid referred by name </span>
                                                 </td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-
-                                    <table class="table table-condensed">
-                                        <thead>
-                                        <tr>
-                                            <th colspan="3">Tracking information</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        <tr>
-                                            <td>Tracking ID</td>
-                                            <td>{{followupDetails.TrackingID}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Activity</td>
-                                            <td><span class="label label-sm label-info">{{followupDetails.ActivityName}}</span></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Followup On</td>
-                                            <td class="form-group"
-                                                ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
-
-
-                                                <div data-ng-controller="DatepickerDemoCtrl">
-
-
-                                                    <input type="text" tabindex="7"
-                                                           class="form-control "
-                                                           ng-click="startOpen = !startOpen"
-                                                           datepicker-popup="dd-MM-yyyy"
-                                                           ng-model="myModel1.date"
-                                                           is-open="startOpen"
-                                                           ng-init="startOpen = false"
-                                                           name="date"
-                                                           datepicker-options="dateOptions"
-                                                           placeholder="Select Date"
-                                                           min-date="currentDate1"
-                                                           max-date="futureDate1"
-                                                           close-text="Close" required="required" ng-readonly="true"/>
-                                                    <!--<span class="success text-small block"-->
-                                                    <!--ng-if="Form.date.$valid ">Thank You</span>-->
-                                                    <span class="error text-small block"
-                                                          ng-if="Form.date.$dirty && Form.date.$error.required">Followup date is required.</span>
-                                                </div>
-
-
-
-                                            </td>
-                                        </tr>
-                                        <!--ng-if="userType != 'R004'"-->
-                                        <tr>
-                                            <td>Assigned To</td>
-                                            <td>
-                                                <select class="form-control" name="status" id="Box4" tabindex="8"
-                                                        ng-model="myModel1.assignStaff"
-                                                        ng-options="checkStaf.loginId as checkStaf.staffName for checkStaf in staffDetails"
-                                                        required>
-
-                                                    <!--  <option value="">Select Status</option>-->
-
-                                                </select>
-                                            </td>
-                                        </tr>
-                                       <!-- <tr ng-if="userType == 'R004'">
-                                            <td>Select Branch</td>
-                                            <td>
-                                                <select class="form-control" name="status" id="Box43" tabindex="9"
-                                                        ng-model="myModel1.branch"
-                                                        ng-options="checkBranch.BranchCode as checkBranch.BranchName for checkBranch in staffDetails" ng-change="changeBranch(myModel1.branch);"
-                                                        required>
-
-                                                    &lt;!&ndash;  <option value="">Select Status</option>&ndash;&gt;
-
-                                                </select>
-                                            </td>
-                                        </tr>-->
-
-                                        <!--<tr ng-if="userType == 'R004'">
-                                            <td>Assigned To</td>
-                                            <td>
-                                                <select class="form-control" name="status" id="Box44" tabindex="10"
-                                                        ng-model="myModel1.assignStaff"
-                                                        ng-options="checkStaf.loginId as checkStaf.staffName for checkStaf in staffArray"
-                                                        required>
-
-                                                     &lt;!&ndash; <option value="">Select</option>&ndash;&gt;
-
-                                                </select>
-                                            </td>
-                                        </tr>-->
-                                        <tr>
-                                            <td>Status</td>
-                                            <!--
-                                                                                <td><span class="label label-sm label-info">{{followupDetails.statusListName}}</span></td>
-                                            -->
-                                            <td>
-                                                <select class="form-control" name="status" id="Box3" tabindex="11"
-                                                        ng-model="myModel1.status"
-                                                        ng-options="checkStatus.ListCode as checkStatus.ListName for checkStatus in trackingStatus"
-                                                        required>
-
-                                                  <!--  <option value="">Select Status</option>-->
-
-                                                </select>
-
-                                            </td>
-                                        </tr>
-
-
-
-                                        </tbody>
-                                    </table>
-                                    <div class="panel panel-white" id="lead">
-                                        <div class="panel-heading border-light">
-                                            <h4 class="panel-title text-pink">Other Lead/Activities</h4>
-                                            <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
-                                        </div>
-                                        <div collapse="lead" ng-init="lead=false" class="panel-wrapper">
-                                            <div class="panel-body panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
-                                                 <ul class="timeline-xs">
-                                                    <li ng-class-odd="'timeline-item success'" ng-class-even="'timeline-item info'" ng-repeat="trackValues in followupDetails.collectTrackedID">
-                                                        <!--<div class="margin-left-15">
-                                                            <div class="text-muted text-small">
-                                                                {{trackValues.ActivityName}}
-                                                            </div>
-                                                            <p>
-                                                                <a tooltip="Click to view details" class="text-blue" ng-click="loadFollowupDetails(trackValues.TrackingID);">
-                                                                    Tracking ID {{trackValues.TrackingID}}
-                                                                </a>
-
-                                                            </p>
-
-
-
-
-                                                        </div>-->
-                                                        <br>
-                                                        <div class="clearfix padding-5 space5">
-                                                            <div class="col-xs-4 text-center no-padding">
-                                                                <a class="text-dark" tooltip="Status">
-                                                                    <i class="ti-flag text-blue"></i> {{trackValues.ListName}}
-                                                                </a>
-                                                            </div>
-                                                            <div class="col-xs-8 text-center no-padding">
-                                                                    <a class="text-dark" tooltip="Activity">
-                                                                        <i class="ti-check-box text-red"></i> {{trackValues.ActivityName}}
-                                                                    </a>
-                                                            </div>
-
-
-                                                        </div>
-                                                        <div class="clearfix padding-5 space5">
-
-
-                                                            <div class="col-xs-6 text-center no-padding">
-                                                                <a tooltip="Click to view details" class="text-green " ng-click="loadFollowupDetails(trackValues.TrackingID);">
-                                                                    <i class="fa fa-pencil text-green"></i> <span class="text-bold">Tracking ID {{trackValues.TrackingID}}</span>
-                                                                </a>
-                                                            </div>
-                                                        </div>
-                                                    </li>
-                                                </ul>
-                                            </div>
-
+                                            </tr>
+                                            </tbody>
+                                        </table>
                                         </div>
                                     </div>
+                                </div>
+                            <div class="col-md-4">
+                            <div class="col-md-12">
 
-
-
-
-                                    <!--<div class="panel panel-white" id="lead">
-                                        <div class="panel-heading border-light">
-                                            <h4 class="panel-title text-orange">Other Lead/Activities</h4>
-                                            <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
-                                        </div>
-                                        <div collapse="activities" ng-init="lead=false" class="panel-wrapper">
-                                            <div class="panel-body" style="max-height: 5%;overflow-y: scroll;">
-                                                <ul class="timeline-xs">
-                                                    <li ng-class-odd="'timeline-item info'" ng-class-even="'timeline-item warning'" ng-repeat="trackValues in followupDetails.collectTrackedID">
-                                                        <div class="margin-left-15">
-                                                            <div class="text-muted text-small">
-                                                                {{trackValues.ListName}}, TrackID {{trackValues.TrackingID}}
-                                                            </div>
-                                                            <p>
-                                                                <a href="#"  class="text-orange" ng-click="setEditId(p);"><b class="fa fa-hover fa-phone " aria-hidden="true"></b>
-                                                                </a>
-                                                            </p>
-                                                        </div>
-                                                    </li>
-                                                </ul>
-                                            </div>
-                                        </div>
+                                <div class="panel panel-white">
+                                    <div class="panel-heading border-light" >
+                                        <h4 class="panel-title text-blue">Tracking information</h4>
                                     </div>
--->
+                                    <div class="panel-body " >
+                                        <table class="table table-condensed">
+                                            <!--<thead>
+                                            <tr>
+                                                <th colspan="3">Tracking information</th>
+                                            </tr>
+                                            </thead>-->
+                                            <tbody>
+                                            <tr>
+                                                <td>Tracking ID</td>
+                                                <td>{{followupDetails.TrackingID}}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Activity</td>
+                                                <td><span class="label label-sm label-info">{{followupDetails.ActivityName}}</span></td>
+                                            </tr>
+                                            <tr>
+                                                <td>Followup On</td>
+                                                <td class="form-group"
+                                                    ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
+
+
+                                                    <div data-ng-controller="DatepickerDemoCtrl">
+
+
+                                                        <input type="text" tabindex="7"
+                                                               class="form-control "
+                                                               ng-click="startOpen = !startOpen"
+                                                               datepicker-popup="dd-MM-yyyy"
+                                                               ng-model="myModel1.date"
+                                                               is-open="startOpen"
+                                                               ng-init="startOpen = false"
+                                                               name="date"
+                                                               datepicker-options="dateOptions"
+                                                               placeholder="Select Date"
+                                                               min-date="currentDate1"
+                                                               max-date="futureDate1"
+                                                               close-text="Close" required="required" ng-readonly="true"/>
+                                                        <!--<span class="success text-small block"-->
+                                                        <!--ng-if="Form.date.$valid ">Thank You</span>-->
+                                                        <span class="error text-small block"
+                                                              ng-if="Form.date.$dirty && Form.date.$error.required">Followup date is required.</span>
+                                                    </div>
 
 
 
+                                                </td>
+                                            </tr>
+                                            <!--ng-if="userType != 'R004'"-->
+                                            <tr>
+                                                <td>Assigned To</td>
+                                                <td>
+                                                    <select class="form-control" name="status" id="Box4" tabindex="8"
+                                                            ng-model="myModel1.assignStaff"
+                                                            ng-options="checkStaf.loginId as checkStaf.staffName for checkStaf in staffDetails"
+                                                            required>
 
+                                                        <!--  <option value="">Select Status</option>-->
 
+                                                    </select>
+                                                </td>
+                                            </tr>
 
+                                            <tr>
+                                                <td>Status</td>
+                                                <td>
+                                                    <select class="form-control" name="status" id="Box3" tabindex="11"
+                                                            ng-model="myModel1.status"
+                                                            ng-options="checkStatus.ListCode as checkStatus.ListName for checkStatus in trackingStatus"
+                                                            required>
 
+                                                        <!--  <option value="">Select Status</option>-->
+
+                                                    </select>
+
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="col-md-8">
+
+                            <div class="col-md-12">
+                                <div class="panel panel-white" id="lead">
+                                    <div class="panel-heading border-light">
+                                        <h4 class="panel-title text-pink">Other Lead/Activities</h4>
+                                        <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
+                                    </div>
+                                    <div collapse="lead" ng-init="lead=false" class="panel-wrapper">
+                                        <div class="panel-body panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+                                            <ul class="timeline-xs">
+                                                <li ng-class-odd="'timeline-item success'" ng-class-even="'timeline-item info'" ng-repeat="trackValues in followupDetails.collectTrackedID">
+                                                    <!--<div class="margin-left-15">
+                                                        <div class="text-muted text-small">
+                                                            {{trackValues.ActivityName}}
+                                                        </div>
+                                                        <p>
+                                                            <a tooltip="Click to view details" class="text-blue" ng-click="loadFollowupDetails(trackValues.TrackingID);">
+                                                                Tracking ID {{trackValues.TrackingID}}
+                                                            </a>
+
+                                                        </p>
+
+
+
+
+                                                    </div>-->
+                                                    <br>
+                                                    <div class="clearfix padding-5 space5">
+                                                        <div class="col-xs-4 text-center no-padding">
+                                                            <a class="text-dark" tooltip="Status">
+                                                                <i class="ti-flag text-blue"></i> {{trackValues.ListName}}
+                                                            </a>
+                                                        </div>
+                                                        <div class="col-xs-8 text-center no-padding">
+                                                            <a class="text-dark" tooltip="Activity">
+                                                                <i class="ti-check-box text-red"></i> {{trackValues.ActivityName}}
+                                                            </a>
+                                                        </div>
+
+
+                                                    </div>
+                                                    <div class="clearfix padding-5 space5">
+
+
+                                                        <div class="col-xs-6 text-center no-padding">
+                                                            <a tooltip="Click to view details" class="text-green " ng-click="loadFollowupDetails(trackValues.TrackingID);">
+                                                                <i class="fa fa-pencil text-green"></i> <span class="text-bold">Tracking ID {{trackValues.TrackingID}}</span>
+                                                            </a>
+                                                        </div>
+                                                    </div>
+                                                </li>
+                                            </ul>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                            </div>
+                            <div class="col-md-4">
+                                <div class="col-md-12">
 
                                 <div class="panel panel-white">
                                     <div class="panel-heading border-light" >
                                         <h4 class="panel-title text-azure">Comments</h4>
                                     </div>
-                                    <div class="panel-body" >
-                                        <div class="col-md-8">
+                                    <div class="panel-body " >
+                                        <div class="col-md-12">
 
                                             <textarea tabindex="12" class="form-control text-dark" placeholder="Enter a comments" rows="2" ng-model="myModel1.comments"></textarea>
                                         </div>
 
-                                        <div class="col-md-4 text-left">
+                                        <div class="col-md-4 text-left" style="margin-top: 7px;">
                                             <button type="submit" ladda="ldloading2.zoom_in" class="btn btn-sm btn-success" tabindex="13" data-style="zoom-in" ng-click="updateFollowup(Form,followupDetails,myModel1,'zoom-in');">
                                                 Save
                                             </button>
@@ -371,21 +323,23 @@
                                         </div>
                                     </div>
                                 </div>
+                                </div>
 
+                            <div class="col-md-12">
                                 <div class="panel panel-white" id="activities">
                                     <div class="panel-heading border-light">
                                         <h4 class="panel-title text-orange">Comments History</h4>
                                         <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
                                     </div>
                                     <div collapse="activities" ng-init="activities=false" class="panel-wrapper">
-                                        <div class="panel-body panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+                                        <div class="panel-body panel-scroll height-300" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
                                             <ul class="timeline-xs">
                                                 <li ng-class-odd="'timeline-item info'" ng-class-even="'timeline-item warning'" ng-repeat="message in followupDetails.followupDetails">
                                                     <div class="margin-left-15">
                                                         <div class="text-muted text-small">
                                                             {{message.FirstName}} &nbsp;&nbsp; On &nbsp;&nbsp;{{message.CreatedOn}}
                                                         </div>
-                                                            <span style="white-space:pre-wrap;margin-left: -4px;"> {{message.FollowupComments}}</span>
+                                                        <span style="white-space:pre-wrap;margin-left: -4px;"> {{message.FollowupComments}}</span>
 
                                                     </div>
                                                 </li>
@@ -393,7 +347,7 @@
                                         </div>
                                     </div>
                                 </div>
-
+                            </div>
                             </div>
                         </div>