diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
index 0fb2945cf4..f8cfa13520 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
@@ -24,6 +24,7 @@ var uriMatcher = new URIMatcher(String(uri));
 
 var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
 var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
+var utility = require("/app/modules/utility.js")["utility"];
 
 function appendQueryParam (url, queryParam , value) {
     if (url.indexOf("?") > 0) {
@@ -60,7 +61,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker")) {
             // response callback
             function (backendResponse) {
                 response["status"] = backendResponse["status"];
-                response["content"] =  backendResponse["responseText"];
+                response["content"] =  utility.encodeJson(backendResponse["responseText"]);
             }
     );
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
index 49b1a0d5b1..d1658872b3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
@@ -153,5 +153,24 @@ utility = function () {
         return scopesList;
     };
 
+
+    /**
+     * Escapes special characters such as <,>,',",...etc
+     * This will prevent XSS attacks upon JSON.
+     * @param text
+     * @returns {*}
+     */
+    publicMethods.encodeJson = function (text) {
+        return text
+            .replace(/\\u003c/g, "&lt;")
+            .replace(/</g, "&lt;")
+            .replace(/\\u003e/g, "&gt;")
+            .replace(/>/g, "&gt;")
+            .replace(/\\u0027/g, "&#39;")
+            .replace(/'/g, "&#39;")
+            .replace(/\\"/g, "&quot;")
+            .replace(/\\u0022/g, "&quot;")
+    };
+
     return publicMethods;
 }();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 51d087ca34..61655a5f44 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -80,9 +80,9 @@
             <!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">-->
             <a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
                aria-expanded="false" rel="notifications-sidebar">
-                                <span class="icon fw-stack">
-                                    <i class="fw fw-notification fw-stack-1x"></i>
-                                </span>
+                <span class="icon fw-stack">
+                    <i class="fw fw-notification fw-stack-1x"></i>
+                </span>
                 <span class="hidden-xs">Notifications</span>
                 <span class="badge notifications" id="notification-bubble"></span>
             </a>
@@ -90,9 +90,8 @@
     </ul>
 {{/zone}}
 {{#zone "sidePanes"}}
-    <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{isAuthorizedForNotifications}}"
-         data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="50" data-spy="affix"
-         data-offset-top="80">
+        <div class="sidebar-wrapper sidebar-wrapper-animation-fix" id="right-sidebar" is-authorized="{{isAuthorizedForNotifications}}"
+         data-side="right" data-width="320" data-sidebar-fixed="true" data-top="90" data-fixed-offset="90" data-offset-top="50" data-spy="affix">
         <ul class="sidebar-messages">
         </ul>
         <div class="text-center"><a href="{{@app.context}}/notification-listing" class="btn btn-primary">Show All Notifications</a></div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
index 363d9688e6..471a152402 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
@@ -32,6 +32,7 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var uiPermissions = userModule.getUIPermissions();
     context["permissions"] = uiPermissions;
+    context["userMgtEnabled"] = (uiPermissions["LIST_USERS"] || uiPermissions["LIST_ROLES"]);
 
     var links = {
         "user-mgt": [],
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index e94a5500a6..2b7d3cf2d4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -128,15 +128,16 @@ function loadNewNotifications() {
 }
 
 /**
- * Toggle function for
- * notification listing sidebar.
+ * Sidebar function
  * @return {Null}
  */
-$.sidebar_toggle = function (action, target, container) {
+$.sidebar_toggle = function(action, target, container) {
     var elem = '[data-toggle=sidebar]',
         button,
-        containerOffsetLeft,
-        containerOffsetRight,
+        container,
+        conrainerOffsetLeft,
+        conrainerOffsetRight,
+        target,
         targetOffsetLeft,
         targetOffsetRight,
         targetWidth,
@@ -145,104 +146,177 @@ $.sidebar_toggle = function (action, target, container) {
         pushType,
         buttonParent;
 
+    /**
+     * Dynamically adjust the height of sidebar to fill parent
+     */
+    function sidebarHeightAdjust(){
+        $('.sidebar-wrapper').each(function(){
+            var elemOffsetBottom = $(this).data('offset-bottom'),
+                scrollBottom = ($(document).height() - $(window).height()),
+                offesetBottom = 0,
+                getBottomOffset = elemOffsetBottom - (scrollBottom - ($(window).scrollTop()-elemOffsetBottom) - elemOffsetBottom);
+
+            if(getBottomOffset > 0){
+                offesetBottom = getBottomOffset;
+            }
+
+            $(this).height(($(window).height() - ($(this).offset().top - $(window).scrollTop())) - offesetBottom);
+
+            if((typeof $.fn.nanoScroller == 'function') && ($('.nano-content', this).length > 0)){
+                $(".nano-content").parent()[0].nanoscroller.reset();
+            }
+        });
+    };
+
     var sidebar_window = {
-        update: function (target, container, button) {
-            containerOffsetLeft = $(container).data('offset-left') ? $(container).data('offset-left') : 0;
-            containerOffsetRight = $(container).data('offset-right') ? $(container).data('offset-right') : 0;
-            targetOffsetLeft = $(target).data('offset-left') ? $(target).data('offset-left') : 0;
-            targetOffsetRight = $(target).data('offset-right') ? $(target).data('offset-right') : 0;
-            targetWidth = $(target).data('width');
-            targetSide = $(target).data("side");
-            pushType = $(container).parent().is('body') == true ? 'padding' : 'margin';
-
-            if (button !== undefined) {
+        update: function(target, container, button){
+            conrainerOffsetLeft = $(container).data('offset-left') ? $(container).data('offset-left') : 0,
+                conrainerOffsetRight = $(container).data('offset-right') ? $(container).data('offset-right') : 0,
+                targetTop = $(target).data('top') ? $(target).data('top') : 0,
+                targetOffsetLeft = $(target).data('offset-left') ? $(target).data('offset-left') : 0,
+                targetOffsetRight = $(target).data('offset-right') ? $(target).data('offset-right') : 0,
+                targetWidth = $(target).data('width'),
+                targetSide = $(target).data("side"),
+                pushType = $(container).parent().is('body') == true ? 'padding' : 'padding'; //TODO: Remove if works everywhere
+
+            $(container).addClass('sidebar-target');
+
+            if(button !== undefined){
                 relationship = button.attr('rel') ? button.attr('rel') : '';
                 buttonParent = $(button).parent();
             }
-        },
 
-        show: function () {
-            if ($(target).data('sidebar-fixed') == true) {
+            $(target).css('top', targetTop);
+
+            sidebarHeightAdjust();
+        },
+        show: function(){
+            if($(target).data('sidebar-fixed') == true) {
+                $(target).css('top',$(target).data('fixed-offset') + 'px');
                 $(target).height($(window).height() - $(target).data('fixed-offset'));
             }
+
+            $(target).off('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend');
             $(target).trigger('show.sidebar');
-            if (targetWidth !== undefined) {
+
+            if(targetWidth !== undefined) {
                 $(target).css('width', targetWidth);
             }
+
             $(target).addClass('toggled');
-            if (button !== undefined) {
-                if (relationship !== '') {
+
+            if(button !== undefined){
+                if(relationship !== ''){
                     // Removing active class from all relative buttons
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').removeClass("active");
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').attr('aria-expanded', 'false');
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').removeClass("active");
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').attr('aria-expanded', 'false');
                 }
+
                 // Adding active class to button
-                if (button.attr('data-handle') !== 'close') {
+                if(button.attr('data-handle') !== 'close'){
                     button.addClass("active");
                     button.attr('aria-expanded', 'true');
                 }
-                if (buttonParent.is('li')) {
-                    if (relationship !== '') {
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().removeClass("active");
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().
-                        attr('aria-expanded', 'false');
+
+                if(buttonParent.is('li')) {
+                    if(relationship !== ''){
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().removeClass("active");
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().attr('aria-expanded', 'false');
                     }
                     buttonParent.addClass("active");
                     buttonParent.attr('aria-expanded', 'true');
                 }
             }
+
             // Sidebar open function
-            if (targetSide == 'left') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetWidth + targetOffsetLeft);
+            if (targetSide == 'left'){
+                if ($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetWidth + targetOffsetLeft);
+                    $(target).css(targetSide, targetOffsetLeft);
                 }
-                $(target).css(targetSide, targetOffsetLeft);
-            } else if (targetSide == 'right') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetWidth + targetOffsetRight);
+                else if ($(target).attr('data-container-push')){
+                    $(container).css(targetSide,  Math.abs(targetWidth + targetOffsetLeft));
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
+                }
+                else {
+                    $(target).css(targetSide, Math.abs(targetOffsetLeft));
+                }
+            }
+            else if (targetSide == 'right'){
+                if ($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetWidth + targetOffsetRight);
+                    $(target).css(targetSide, targetOffsetRight);
+                }
+                else if ($(target).attr('data-container-push')){
+                    $(container).css(targetSide, Math.abs(targetWidth + targetOffsetRight));
+                    $(target).css(targetSide,  -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else {
+                    $(target).css(targetSide, Math.abs(targetOffsetRight));
                 }
-                $(target).css(targetSide, targetOffsetRight);
             }
+
             $(target).trigger('shown.sidebar');
         },
-
-        hide: function () {
+        hide: function(){
             $(target).trigger('hide.sidebar');
             $(target).removeClass('toggled');
-            if (button !== undefined) {
-                if (relationship !== '') {
+
+            if(button !== undefined){
+                if(relationship !== ''){
                     // Removing active class from all relative buttons
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').removeClass("active");
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').attr('aria-expanded', 'false');
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').removeClass("active");
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').attr('aria-expanded', 'false');
                 }
                 // Removing active class from button
-                if (button.attr('data-handle') !== 'close') {
+                if(button.attr('data-handle') !== 'close'){
                     button.removeClass("active");
                     button.attr('aria-expanded', 'false');
                 }
-                if ($(button).parent().is('li')) {
-                    if (relationship !== '') {
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().removeClass("active");
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().
-                        attr('aria-expanded', 'false');
+
+                if($(button).parent().is('li')){
+                    if(relationship !== ''){
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().removeClass("active");
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().attr('aria-expanded', 'false');
                     }
                 }
             }
+
             // Sidebar close function
-            if (targetSide == 'left') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetOffsetLeft);
+            if (targetSide == 'left'){
+                if($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetOffsetLeft);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
                 }
-                $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
-            } else if (targetSide == 'right') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetOffsetRight);
+                else if($(target).attr('data-container-push')){
+                    $(container).css(targetSide, targetOffsetLeft);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
+                }
+                else {
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
                 }
-                $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
             }
+            else if (targetSide == 'right'){
+                if($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetOffsetRight);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else if($(target).attr('data-container-push')){
+                    $(container).css(targetSide, targetOffsetRight);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else {
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+            }
+
             $(target).trigger('hidden.sidebar');
+            $(target).on('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend', function(e) {
+                $(container).removeClass('sidebar-target');
+            });
         }
     };
+
     if (action === 'show') {
         sidebar_window.update(target, container);
         sidebar_window.show();
@@ -251,27 +325,52 @@ $.sidebar_toggle = function (action, target, container) {
         sidebar_window.update(target, container);
         sidebar_window.hide();
     }
+
     // binding click function
-    var body = 'body';
-    $(body).off('click', elem);
-    $(body).on('click', elem, function (e) {
+    $('body').off('click', elem);
+    $('body').on('click', elem, function(e) {
         e.preventDefault();
+
         button = $(this);
-        container = button.data('container');
         target = button.data('target');
+        container = $(target).data('container');
         sidebar_window.update(target, container, button);
+
         /**
          * Sidebar function on data container divide
          * @return {Null}
          */
-        if (button.attr('aria-expanded') == 'false') {
+        if(button.attr('aria-expanded') == 'false'){
             sidebar_window.show();
-        } else if (button.attr('aria-expanded') == 'true') {
+        }
+        else if (button.attr('aria-expanded') == 'true') {
             sidebar_window.hide();
         }
+
     });
+
+    $(window)
+        .load(sidebarHeightAdjust)
+        .resize(sidebarHeightAdjust)
+        .scroll(sidebarHeightAdjust);
+
 };
 
+var sideWrapper = $('.sidebar-wrapper');
+
+$(document).on('affix.bs.affix','.sidebar-wrapper',function(){
+    sideWrapper.css('top',$('.navbar-wrapper').height());
+    sideWrapper.data('top',$('.navbar-wrapper').height());
+    sideWrapper.data('fixed-offset', $('.navbar-wrapper').height());
+});
+
+$(document).on('affix-top.bs.affix','.sidebar-wrapper',function(){
+    sideWrapper.css('top',$('.navbar-wrapper').height() + $('.header').height());
+    sideWrapper.data('top',$('.navbar-wrapper').height() + $('.header').height());
+    sideWrapper.data('fixed-offset', $('.navbar-wrapper').height() + $('.header').height());
+});
+
+
 $.fn.collapse_nav_sub = function () {
     var navSelector = 'ul.nav';
 
@@ -324,7 +423,6 @@ $.fn.collapse_nav_sub = function () {
 
 $(document).ready(function () {
     loadNotificationsPanel();
-    $.sidebar_toggle();
 
     $("#right-sidebar").on("click", ".new-notification", function () {
         var notificationId = $(this).data("id");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index a84549d307..6321372ccd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -804,7 +804,7 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
 .navbar .container-fluid > .navbar-header .icon,
 .navbar .container > .navbar-collapse .icon,
 .navbar .container > .navbar-header .icon {
-  margin-bottom: 4px;
+  margin-bottom: 0px !important;
 }
 
 .navbar-nav {
@@ -1108,6 +1108,14 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
   right: 0;
 }
 
+.sidebar-wrapper-animation-fix{
+  -webkit-transition: left 0.5s ease, right 0.5s ease !important;
+  -moz-transition: left 0.5s ease, right 0.5s ease !important;
+  -ms-transition: left 0.5s ease, right 0.5s ease !important;
+  -o-transition: left 0.5s ease, right 0.5s ease !important;
+  transition: left 0.5s ease, right 0.5s ease !important;
+}
+
 ul.sidebar-messages {
   padding: 0;
   margin: 0;
@@ -6393,6 +6401,7 @@ ul.tiles .icon {
      background: #f4f4f4;
      border:1px solid #ddd;
      margin-bottom:10px;
+     padding: 15px;
  }
  .media .list-group-item a, .media .list-group-item a{
      background:#f4f4f4;
@@ -6536,6 +6545,9 @@ select > option:hover {
   padding-right: 5px;
 }
 
+.btn-operations:hover, .btn-operations:focus, .btn-operations:active {
+    color : #C7C7C7;
+}
 
 /**
  *