diff --git a/platform/features/events/bundle.json b/platform/features/events/bundle.json
index 495d06b235..549dda7d36 100644
--- a/platform/features/events/bundle.json
+++ b/platform/features/events/bundle.json
@@ -19,6 +19,13 @@
                 "implementation": "EventListController.js",
                 "depends": [ "$scope", "telemetryFormatter" ]
             }
+        ],
+        "directives": [
+            {
+                "key": "mctDataTable",
+                "implementation": "MCTDataTable.js",
+                "depends": [ "$anchorScroll" ]
+            }
         ]
     }
 
diff --git a/platform/features/events/res/templates/messages.html b/platform/features/events/res/templates/messages.html
index 727ab09a79..a549b3530d 100644
--- a/platform/features/events/res/templates/messages.html
+++ b/platform/features/events/res/templates/messages.html
@@ -22,27 +22,23 @@
 <div class="w1" ng-controller="TelemetryController as telemetry">
 	<div class="w2"
 	     ng-controller="EventListController">
-		<table class="tabular">
-			<thead>
-			<tr>
-				<th ng-repeat="header in headers">
-					{{header}}
-				</th>
-			</tr>
-			<!--tr>
-				<th ng-repeat="header in headers">
-					<input type="text" />
-				</th>
-			</tr-->
-			</thead>
-			<tbody>
-			<tr ng-repeat="row in rows">
-				<td ng-repeat="cell in row">
-					{{cell}}
-				</td>
-			</tr>
-			</tbody>
-		</table>
+        <mct-data-table scroll-direction="descending" headers="headers" rows="rows"></mct-data-table>
+        <!--  <table class="tabular">
+            <thead>
+                <tr>
+                    <th ng-repeat="header in headers">
+                        {{header}}
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="row in rows">
+                    <td ng-repeat="cell in row">
+                        {{cell}}
+                    </td>
+                </tr>
+            </tbody>
+        </table> -->
 	</div>
 </div>