diff --git a/src/packages/infra/component/map/map.component.html b/src/packages/infra/component/map/map.component.html
index 9d80824..31d69d6 100644
--- a/src/packages/infra/component/map/map.component.html
+++ b/src/packages/infra/component/map/map.component.html
@@ -17,7 +17,7 @@
         </div>
         <div style="float: right; margin: 30px 15px 0 0;">
           <i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>Up
-          <i class="fa ui-icon-stop ui-status-icon ui-status-fatal"></i>Dwon
+          <i class="fa ui-icon-stop ui-status-icon ui-status-fatal"></i>Down
           <i class="fa ui-icon-stop ui-status-icon ui-status-warn"></i>Warn
           <i class="fa ui-icon-stop ui-status-icon ui-status-error"></i>Error
         </div>
diff --git a/src/packages/notification/component/notification/notification.component.html b/src/packages/notification/component/notification/notification.component.html
index ce875db..60b649a 100644
--- a/src/packages/notification/component/notification/notification.component.html
+++ b/src/packages/notification/component/notification/notification.component.html
@@ -1,4 +1,8 @@
 <h1>Notifications</h1>
+<div>
+    <a href="javascript:void(0)" (click)="onMarkAllAsRead()">Mark all as read</a>
+</div>
+
 <p-table [value]="notifications" selectionMode="single"  (onRowSelect)="onRowSelect($event)" [resizableColumns]="true">
   <ng-template pTemplate="body" let-notification let-rowIndex="rowIndex" >
       <tr [pSelectableRow]="notification" [ngStyle]="notification.confirmDate ? '' : {'background-color': 'lightblue'}">
diff --git a/src/packages/notification/component/notification/notification.component.ts b/src/packages/notification/component/notification/notification.component.ts
index 9f3e7a6..636690c 100644
--- a/src/packages/notification/component/notification/notification.component.ts
+++ b/src/packages/notification/component/notification/notification.component.ts
@@ -22,6 +22,7 @@ export class NotificationComponent implements OnInit, AfterContentInit {
 
     pageSize = '12';
     totalLength = 0;
+    currPage = 0;
 
     constructor(
         private router: Router,
@@ -55,7 +56,7 @@ export class NotificationComponent implements OnInit, AfterContentInit {
     }
 
     ngAfterContentInit() {
-        this.getNotifications(0);
+        this.getNotifications(this.currPage);
     }
 
     updateData(noti: Notification) {
@@ -79,6 +80,7 @@ export class NotificationComponent implements OnInit, AfterContentInit {
                     sortDirection: 'descending'
                 };
                 this.listStore.dispatch(new ListStore.ReadAllByMember({ member, pageParams }));
+                this.currPage = pageIndex;
             },
             (error) => {
                 console.log(error);
@@ -95,4 +97,21 @@ export class NotificationComponent implements OnInit, AfterContentInit {
     onPaging(e) {
         this.getNotifications(e.page);
     }
+
+    onMarkAllAsRead() {
+        this.listStore.select(AuthSelector.select('member')).subscribe(
+            (member: Member) => {
+                const pageParams: PageParams = {
+                    pageNo: this.currPage + '',
+                    countPerPage: this.pageSize,
+                    sortCol: 'id',
+                    sortDirection: 'descending'
+                };
+                this.listStore.dispatch(new ListStore.MarkAllAsRead({ member, pageParams }));
+            },
+            (error) => {
+                console.log(error);
+            }
+        );
+    }
 }
diff --git a/src/packages/sensor/component/list/list.component.html b/src/packages/sensor/component/list/list.component.html
index 9cfb1c0..622477d 100644
--- a/src/packages/sensor/component/list/list.component.html
+++ b/src/packages/sensor/component/list/list.component.html
@@ -24,7 +24,7 @@
             <div class="ui-g-12 ui-md-7 ui-g-nopad">
                 <div style="float: right; margin-top: 30px;">
                     <i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>Up
-                    <i class="fa ui-icon-stop ui-status-icon ui-status-fatal"></i>Dwon
+                    <i class="fa ui-icon-stop ui-status-icon ui-status-fatal"></i>Down
                     <i class="fa ui-icon-stop ui-status-icon ui-status-warn"></i>Warn
                     <i class="fa ui-icon-stop ui-status-icon ui-status-error"></i>Error
                 </div>