diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index 47efdb81..b7ca4661 100755
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -24,7 +24,43 @@
 
 						<tabset class="tabbable no-padding no-margin">
 							<tab heading="Follow Ups For Today : {{todayFolloupDetails.length}}" class="padding-top-5 padding-left-5">
-								<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+								<div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+									<div ng-if="emptyDataToday==true">
+										<center>
+											<h5 class="text-dark">No Followup!</h5>
+										</center>
+									</div>
+									<div class="cl-effect-13" style="float: right" ng-if="emptyDataToday==false">
+										<a ui-sref="app.call.tracking">
+											view more
+										</a>
+									</div>
+									<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
+										<thead>
+										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
+										<tr>
+											<th> ID</th>
+											<th> Name</th>
+											<th>Mobile  </th>
+											<th>Activity</th>
+											<th class="hidden-xs">Status</th>
+
+										</tr>
+										</thead>
+										<tbody>
+
+										<tr ng-repeat="today in todayFolloupDetails">
+											<td>{{today.TrackingID}}</td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.LeadName}}</a></td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(today);">{{today.MobileNumber}}</a></td>
+											<td>{{today.ActivityName}}</td>
+											<td class="hidden-xs" ng-if="today.statusName=='CLOSE'"><span class="label label-sm label-success">{{today.statusName}}</span></td>
+											<td class="hidden-xs" ng-if="today.statusName!='CLOSE'"><span class="label label-sm label-warning">{{today.statusName}}</span></td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+								<div ng-if="getLoginType=='R004'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
 									<div ng-if="emptyDataToday==true">
 										<center>
 											<h5 class="text-dark">No Followup!</h5>
@@ -62,13 +98,54 @@
 								</div>
 							</tab>
 							<tab heading="Pending Follow Ups : {{pendingFolloupDetails.length}}" class="padding-top-5">
-								<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+
+								<div ng-if="getLoginType!='R004'" class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
 									<div ng-if="emptyDataPending==true">
 										<center>
 											<h5 class="text-dark">No Pending Followup!</h5>
 										</center>
 									</div>
-									<div class="cl-effect-13" style="float: right" ng-if="emptyDataToday==false">
+									<div class="cl-effect-13" style="float: right" ng-if="emptyDataPending==false">
+										<a ui-sref="app.call.tracking">
+											view more
+										</a>
+									</div>
+									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+										<thead>
+										<!-- <tr> -->
+										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
+										<tr>
+											<th> ID</th>
+											<th> Name</th>
+											<th>Mobile  </th>
+											<th>Activity</th>
+											<th>Followup </th>
+											<th class="hidden-xs">Status</th>
+
+										</tr>
+										</thead>
+										<tbody>
+
+										<tr ng-repeat="pending in pendingFolloupDetails">
+											<td>{{pending.TrackingID}}</td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.LeadName}}</a></td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(pending);">{{pending.MobileNumber}}</a></td>
+											<td>{{pending.ActivityName}}</td>
+											<td>{{pending.FollowupOn}}</td>
+											<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusName}}</span></td>
+										</tr>
+										</tbody>
+
+									</table>
+								</div>
+								<div ng-if="getLoginType=='R004'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+
+									<div ng-if="emptyDataPending==true">
+										<center>
+											<h5 class="text-dark">No Pending Followup!</h5>
+										</center>
+									</div>
+									<div class="cl-effect-13" style="float: right" ng-if="emptyDataPending==false">
 										<a ui-sref="app.call.tracking">
 											view more
 										</a>
@@ -103,7 +180,46 @@
 								</div>
 							</tab>
 							<tab heading="Leads Created Today : {{leadDetails.length}}" class="padding-top-5">
-								<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+								<div ng-if="getLoginType!='R004'"  class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
+									<div ng-if="emptyDataLead==true">
+										<center>
+											<h5 class="text-dark">No Lead Created By Today!</h5>
+										</center>
+									</div>
+									<div class="cl-effect-13" style="float: right" ng-if="emptyDataLead==false && getLoginType=='R004' || getLoginType=='R003'">
+										<a ui-sref="app.call.lead">
+											view more
+										</a>
+									</div>
+									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+										<thead>
+										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
+										<tr>
+											<th> ID</th>
+											<th>  Name</th>
+											<th>Mobile  </th>
+											<th>Activity</th>
+											<th>Followup  </th>
+											<th class="hidden-xs">Status</th>
+
+										</tr>
+										</thead>
+										<tbody>
+
+										<tr ng-repeat="lead in leadDetails">
+											<td>{{lead.TrackingID}}</td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.LeadName}}</a></td>
+											<td><a tooltip="View Student" class="text-dark" ng-click="open(lead);">{{lead.MobileNumber}}</a></td>
+											<td>{{lead.ActivityName}}</td>
+											<td>{{lead.FollowupOn}}</td>
+											<td class="hidden-xs" ng-if="lead.statusName=='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
+											<td class="hidden-xs" ng-if="lead.statusName!='CLOSE'"><span class="label label-sm label-info">{{lead.statusName}}</span></td>
+										</tr>
+										</tbody>
+
+									</table>
+								</div>
+								<div ng-if="getLoginType=='R004'"  class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
 									<div ng-if="emptyDataLead==true">
 										<center>
 											<h5 class="text-dark">No Lead Created By Today!</h5>