diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
index 6e0cc1cf9d..127216f27b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
@@ -225,6 +225,8 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
             throw new DeviceDetailsMgtException("SQL error occurred while retrieving device from database.", e);
         } catch (DeviceDetailsMgtDAOException e) {
             throw new DeviceDetailsMgtException("Exception occurred while retrieving device locations.", e);
+        } finally{
+            DeviceManagementDAOFactory.closeConnection();
         }
     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
index 4a5b9a3cb9..30912b71d4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
@@ -16,8 +16,8 @@
   under the License.
 }}
 {{#zone "bottomJs"}}
-	{{js "js/jquery.qrcode.min.js"}}
-	<script type="text/javascript">
+    {{js "js/jquery.qrcode.min.js"}}
+    <script type="text/javascript">
         var modalPopup = '.wr-modalpopup',
                 modalPopupContainer = modalPopup + ' .modalpopup-container',
                 modalPopupContent = modalPopup + ' .modalpopup-content';
@@ -30,7 +30,6 @@
             });
         }
 
-
         /*
          * set popup maximum height function.
          */
@@ -38,14 +37,13 @@
             var maxHeight = "max-height";
             var marginTop = "margin-top";
             var body = "body";
-            $(modalPopupContent).css(maxHeight, ($(body).height() - ($(body).height()/100 * 30)));
-            $(modalPopupContainer).css(marginTop, (-($(modalPopupContainer).height()/2)));
+            $(modalPopupContainer).css(marginTop, (-($(modalPopupContainer).height() / 2)));
         }
 
         /*
          * show popup function.
          */
-        function showPopup() {
+        function showQRCodePopup() {
             $(modalPopup).show();
             setPopupMaxHeight();
         }
@@ -67,5 +65,12 @@
                 height: 200
             });
         }
-	</script>
+    </script>
+    <script type="text/javascript">
+        function toggleEnrollment(){
+            $(".modalpopup-content").html($("#qr-code-modal").html());
+            generateQRCode(".modalpopup-content .qr-code");
+            showQRCodePopup();
+        }
+    </script>
 {{/zone}}
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 215a495068..4aa6a9fdb0 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
@@ -99,29 +99,6 @@
         </li>
     </ul>
 {{/zone}}
-
-{{#zone "navbarBelow"}}
-    <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>
-                        Scan QR code to start enrollment
-                    </h3>
-                    <h4>
-                        Please scan the QR code using your mobile device to retrieve enrollment URL.
-                    </h4>
-
-                    <div class="panel panel-default">
-                        <div class="panel-body col-centered ">
-                            <div class="qr-code"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{{/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"
@@ -137,5 +114,4 @@
             data-image-resource="{{self.publicURL}}/images/" src="{{self.publicURL}}/templates/notifications.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/nav-menu.js"}}
-    {{js "js/jquery.qrcode.min.js"}}
 {{/zone}}
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 9252003263..89213cf587 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
@@ -1,28 +1,56 @@
 /*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
 
 function onRequest(context) {
-    var userModule = require("/app/modules/user.js").userModule;
+    context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
+        if (arguments.length < 3) {
+            throw new Error("Handlebars Helper equal needs 2 parameters");
+        }
+        if (lvalue != rvalue) {
+            return options.inverse(this);
+        } else {
+            return options.fn(this);
+        }
+    });
+    var userModule = require("/app/modules/user.js")["userModule"];
+    var mdmProps = require('/app/conf/reader/main.js')["conf"];
     var constants = require("/app/modules/constants.js");
-    var carbonUser = session.get(constants.USER_SESSION_KEY);
-    var page_data = {};
-    if (carbonUser){
-        page_data.permissions = userModule.getUIPermissions();
-    }
-    return page_data;
+    var uiPermissions = userModule.getUIPermissions();
+    context["permissions"] = uiPermissions;
+
+    var links = {
+        "user-mgt": [],
+        "role-mgt": [],
+        "policy-mgt": [],
+        "device-mgt": []
+    };
+
+    // following context.link value comes here based on the value passed at the point
+    // where units are attached to a page zone.
+    // eg: {{unit "appbar" pageLink="users" title="User Management"}}
+    context["currentActions"] = links[context["pageLink"]];
+    context["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
+    var  isAuthorizedForNotifications =
+        userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/notifications/view");
+    var currentUser = session.get(constants["USER_SESSION_KEY"]);
+    context["isAuthorizedForNotifications"] = isAuthorizedForNotifications;
+    context["currentUser"] = currentUser;
+    context["appContext"] = mdmProps["appContext"];
+
+    return context;
 }
\ No newline at end of file
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 0a6e68fcda..c15f80b268 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
@@ -22,15 +22,6 @@ var modalPopup = ".wr-modalpopup",
 
 var emmAdminBasePath = "/api/device-mgt/v1.0";
 
-//function openCollapsedNav() {
-//    $(".wr-hidden-nav-toggle-btn").addClass("active");
-//    $("#hiddenNav").slideToggle("slideDown", function () {
-//        if ($(this).css("display") == "none") {
-//            $(".wr-hidden-nav-toggle-btn").removeClass("active");
-//        }
-//    });
-//}
-
 /*
  * set popup maximum height function.
  */
@@ -59,24 +50,6 @@ function hidePopup() {
     $(modalPopup).hide();
 }
 
-/*
- * QR-code generation function.
- */
-function generateQRCode(qrCodeClass) {
-    var enrollmentURL = $("#qr-code-modal").data("enrollment-url");
-    $(qrCodeClass).qrcode({
-        text: enrollmentURL,
-        width: 200,
-        height: 200
-    });
-}
-
-function toggleEnrollment() {
-    $(".modalpopup-content").html($("#qr-code-modal").html());
-    generateQRCode(".modalpopup-content .qr-code");
-    showPopup();
-}
-
 var updateNotificationCount = function (data, textStatus, jqXHR) {
     if (jqXHR.status == 200 && data) {
         var responsePayload = JSON.parse(data);
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/templates/notifications.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/templates/notifications.hbs
index 30cf5fb41f..82edfc498f 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/templates/notifications.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/templates/notifications.hbs
@@ -1,14 +1,14 @@
 {{#each notifications}}
     <li class="message message-info" data-type="selectable" >
-    <h4>
-        <i class="icon fw fw-info"></i>
-        <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
-                                          data-id="{{notificationId}}"
-                                          data-url="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
-                                          class="new-notification" data-click-event="remove-form">
-        Device Type : {{deviceIdentifier.type}}
-        </a>
-    </h4>
-    <p>{{description}}</p>
+        <h4>
+            <i class="icon fw fw-info"></i>
+            <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
+               data-id="{{notificationId}}"
+               data-url="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
+               class="new-notification" data-click-event="remove-form">
+                Device Type : {{deviceIdentifier.type}}
+            </a>
+        </h4>
+        <p>{{description}}</p>
     </li>
 {{/each}}
\ No newline at end of file
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/FeatureManagerImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/FeatureManagerImpl.java
index ea3ed7cd7f..ee4102bfc9 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/FeatureManagerImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/FeatureManagerImpl.java
@@ -245,7 +245,7 @@ public class FeatureManagerImpl implements FeatureManager {
     @Override
     public List<ProfileFeature> getFeaturesForProfile(int profileId) throws FeatureManagementException {
         try {
-            DeviceManagementDAOFactory.openConnection();
+            PolicyManagementDAOFactory.openConnection();
             return featureDAO.getFeaturesForProfile(profileId);
         } catch (FeatureManagerDAOException e) {
             throw new FeatureManagementException("Error occurred while getting the features", e);