diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
index 42add2b..da4ad92 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
@@ -14,16 +14,18 @@
 ~ limitations under the License.
 -->
 <div id="ov-alarm-table">
-    <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
-    <div class="tabular-header">
-    <h2>Alarms  for {{ "all devices."}} ({{ tableData.length }} total)</h2>
+  <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
+  <div class="tabular-header">
+    <h2>Alarms for {{ devId ? devId : "all devices" }} ({{ tableData.length }} total)</h2>
     <div class="ctrl-btns">
       <div class="refresh" (click)="toggleRefresh()">
         <!-- See icon.theme.css for the defintions of the classes active and refresh-->
-        <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}" iconId="refresh" iconSize="36" toolTip="{{ autoRefreshTip }}"></onos-icon>
+        <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}"
+                   iconId="refresh" iconSize="36"
+                   toolTip="{{ autoRefreshTip }}"></onos-icon>
       </div>
-      <!--div class="separator"></div>
-      <div (click)="(!!selId) ? confirmAction(AlarmActionEnum.ACKNOWLEDGE) : ''">
+      <div class="separator"></div>
+      <!--div (click)="(!!selId) ? confirmAction(AlarmActionEnum.ACKNOWLEDGE) : ''">
         <onos-icon classes="{{ ctrlBtnState.acknowledged?'active-rect play':'play' }}"
                    iconId="play" iconSize="42" toolTip="{{ acknowledgeTip }}"></onos-icon>
       </div>
@@ -35,30 +37,38 @@
   </div>
 
   <div class="summary-list" class="summary-list" onosTableResize>
-
     <div class="table-header">
       <table>
         <tr>
-          <td colId="alarmId" (click)="onSort('id')">Id
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('id')"></onos-icon>
+          <td colId="alarmId" (click)="onSort('id')">Alarm Id
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('id')"></onos-icon>
           </td>
           <td colId="alarmDeviceId" (click)="onSort('alarmDeviceId')">Device
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmDeviceId')"></onos-icon>
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmDeviceId')"></onos-icon>
           </td>
           <td colId="alarmDesc" (click)="onSort('alarmDesc')">Description
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmDesc')"></onos-icon>
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmDesc')"></onos-icon>
           </td>
           <td colId="alarmSource" (click)="onSort('alarmSource')">Source
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmSource')"></onos-icon>
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmSource')"></onos-icon>
           </td>
-          <td colId="alarmTimeRaised" (click)="onSort('alarmTimeRaised')">Time Raised
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmTimeRaised')"></onos-icon>
+          <td colId="alarmTimeRaised" (click)="onSort('alarmTimeRaised')">Time
+            Raised
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmTimeRaised')"></onos-icon>
           </td>
           <td colId="alarmSeverity" (click)="onSort('alarmSeverity')">Severity
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmSeverity')"></onos-icon>
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmSeverity')"></onos-icon>
           </td>
-          <td colId="alarmAcknowledged" (click)="onSort('alarmAcknowledged')">Acknowledged
-              <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmAcknowledged')"></onos-icon>
+          <td colId="alarmAcknowledged" class="table-icon"
+              (click)="onSort('alarmAcknowledged')">Ack
+            <onos-icon classes="active-sort" [iconSize]="10"
+                       [iconId]="sortIcon('alarmAcknowledged')"></onos-icon>
           </td>
         </tr>
       </table>
@@ -69,13 +79,15 @@
         <tr class="table-body" *ngIf="tableData.length === 0" class="no-data">
           <td colspan="9">{{ annots.noRowsMsg }}</td>
         </tr>
-        <tr *ngFor="let item of tableData | filter : tableDataFilter" (click)="selectCallback($event, item)" [ngClass]="{selected: item.id === selId, 'data-change': isChanged(item.id)}">
+        <tr *ngFor="let item of tableData | filter : tableDataFilter"
+            (click)="selectCallback($event, item)"
+            [ngClass]="{selected: item.id === selId, 'data-change': isChanged(item.id)}">
           <td>{{ item.id }}</td>
           <td>{{ item.alarmDeviceId }}</td>
           <td>{{ item.alarmDesc }}</td>
           <td>{{ item.alarmSource }}</td>
           <td>{{ item.alarmTimeRaised }}</td>
-          <td>{{ item.alarmSeverity }}</td>
+          <td [ngClass]="[item.alarmSeverity, 'severity']">{{ item.alarmSeverity }}</td>
           <td class="table-icon">
             <onos-icon [iconId]="ackIcon(item.alarmAcknowledged)"></onos-icon>
           </td>
@@ -84,5 +96,6 @@
     </div>
   </div>
 
-  <onos-alarmdetails class="floatpanels" id="{{ selId }}" (closeEvent)="deselectRow($event)"></onos-alarmdetails>
+  <onos-alarmdetails class="floatpanels" id="{{ selId }}"
+                     (closeEvent)="deselectRow($event)"></onos-alarmdetails>
 </div>