diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 9774be7b34c..4a69e766722 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -411,7 +411,5 @@ $(document).ready(function () {
     if (!$("#can-invite").val()) {
         $("#invite-user-button").remove();
     }
-    $(".viewEnabledIcon").click(function () {
-        InitiateViewOption();
-    });
+
 });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
index 812acca6f7f..339b60f0690 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
@@ -25,8 +25,7 @@ $.fn.datatables_extended = function(settings){
 
     // EMM related function
     if (InitiateViewOption) {
-        $(".viewEnabledIcon").unbind("click");
-        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
     }
     //--- End of EMM related codes
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
index 4f4a01efc72..3dc7ce83d0e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
@@ -35,7 +35,7 @@ $.fn.datatables_extended_serverside_paging = function (settings , url, dataFilte
 
     // EMM related function
     if (InitiateViewOption) {
-        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
     }
 
     var deviceType;
@@ -239,14 +239,14 @@ $.fn.datatables_extended_serverside_paging = function (settings , url, dataFilte
                         $(button).addClass("active").html('Cancel');
                         $(button).parent().next().children("button").removeClass("disabled");
                         // EMM related code
-                        $(".viewEnabledIcon").unbind("click");
+                        $(document).off('click','.viewEnabledIcon');
                         //--- End of EMM related codes
                     } else if ($(button).html() == 'Cancel') {
                         thisTable.removeClass("table-selectable");
                         $(button).addClass("active").html('Select');
                         $(button).parent().next().children().addClass("disabled");
                         // EMM related function
-                        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+                        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
                         //--- End of EMM related codes
                     }
                 });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
index b17fb406763..b542e9037c7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
@@ -22,7 +22,7 @@
             <!-- content -->
             <div id="config-save-form" class="container col-centered wr-content">
                 <br>
-                Device Notifications
+                <h4> Device Notifications </h4>
                 <br>
                 <br>
                 <div class="wr-advance-operations">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
index 22e8da110ae..29026b82784 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
@@ -65,6 +65,15 @@ function loadNotifications() {
 function showAdvanceOperation(operation, button) {
     $(button).addClass('selected');
     $(button).siblings().removeClass('selected');
+
+    if ($(button).attr("id") == 'allNotifications') {
+        $("#ast-container").html('<div class="panel-body">You do not have any unread notifications </div>');
+    } else if ($(button).attr("id") == 'unReadNotifications') {
+        $("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
+    } else {
+        $("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
+    }
+
     var hiddenOperation = ".wr-hidden-operations-content > div";
     $(hiddenOperation + '[data-operation="' + operation + '"]').show();
     $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
@@ -82,7 +91,7 @@ $(document).ready(function () {
 
     loadNotifications();
 
-    $("#ast-container").on("click", ".new-notification", function(e) {
+    $("#ast-container").on("click", ".new-notification", function (e) {
         var notificationId = $(this).data("id");
         // var redirectUrl = $(this).data("url");
         var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked";