diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index 2e5c1b3e97..80bcf1faf4 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -33,17 +33,36 @@
 {{/zone}}
 
 {{#zone "navbarActions"}}
-    {{#if permissions.enroll}}
-        <li>
-            <a href="{{@app.context}}/device/enroll" class="cu-btn">
-        <span class="icon fw-stack">
-            <i class="fw fw-add fw-stack-1x"></i>
-            <i class="fw fw-ring fw-stack-2x"></i>
-        </span>
-                Enroll Device
-            </a>
-        </li>
-    {{/if}}
+{{!-- #if permissions.enroll --}}
+    <li>
+        <a href="javascript:toggleEnrollment()">
+                                <span class="fw-stack">
+                                   <i class="fw fw-ring fw-stack-2x"></i>
+                                   <i class="fw fw-mobile fw-stack-1x"></i>
+                                   <span class="fw-stack fw-move-right fw-move-bottom">
+                                      <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
+                                       <i class="fw fw-circle fw-stack-2x"></i>
+                                      <i class="fw fw-add fw-stack-1x"></i>
+                                   </span>
+                                </span>
+            Enroll Device
+        </a>
+    </li>
+    {{!-- /if --}}
+    <li>
+        <a href="{{appContext}}devices/search">
+                                <span class="fw-stack">
+                                   <i class="fw fw-ring fw-stack-2x"></i>
+                                   <i class="fw fw-mobile fw-stack-1x"></i>
+                                   <span class="fw-stack fw-move-right fw-move-bottom">
+                                      <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
+                                       <i class="fw fw-circle fw-stack-2x"></i>
+                                      <i class="fw fw-search fw-stack-1x"></i>
+                                   </span>
+                                </span>
+            Advanced Search
+        </a>
+    </li>
 {{/zone}}
 
 {{#zone "content"}}
@@ -56,7 +75,7 @@
     </div>
     <div id="device-listing-status" class="raw hidden">
         <ul style="list-style-type: none;">
-            <li class="message message-info" >
+            <li class="message message-info">
                 <h4>
                     <i class="icon fw fw-info"></i>
                     <a id="device-listing-status-msg"></a>
@@ -65,7 +84,8 @@
         </ul>
     </div>
     <div id="device-table">
-        <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view" id="device-grid">
+        <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
+               id="device-grid">
             <thead>
             <tr class="sort-row">
                 <th class="no-sort"></th>
@@ -87,7 +107,7 @@
             </tr>
             <tr class="bulk-action-row">
                 <th colspan="7">
-                    <div id = "operation-bar">
+                    <div id="operation-bar">
                         {{unit "mdm.unit.device.operation-bar"}}
                     </div>
                     <div id="operation-guide" class="bs-callout bs-callout-info">
@@ -99,7 +119,7 @@
             </thead>
             <tbody id="ast-container">
 
-            <br class="c-both" />
+            <br class="c-both"/>
             </tbody>
         </table>
     </div>
@@ -117,7 +137,8 @@
 {{/zone}}
 
 {{#zone "bottomJs"}}
-    <script id="device-listing" data-current-user="{{currentUser.username}}" data-image-resource="{{self.publicURL}}/images/"
-            src="{{self.publicURL}}/templates/device-listing.hbs" type="text/x-handlebars-template" ></script>
+    <script id="device-listing" data-current-user="{{currentUser.username}}"
+            data-image-resource="{{self.publicURL}}/images/"
+            src="{{self.publicURL}}/templates/device-listing.hbs" type="text/x-handlebars-template"></script>
     {{js "js/device-listing.js"}}
 {{/zone}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
index 1e65ffb33a..0485b20e09 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
@@ -106,12 +106,12 @@ function loadOperationBar(deviceType) {
     //var selectedDeviceID = deviceId;
     $.template("operations-bar", operationBarSrc, function (template) {
         //var serviceURL = "/mdm-admin/features/" + platformType;
-        var serviceURL = "/api/device-mgt/v1.0/devices/"+platformType+"/*/features";
+        var serviceURL = "/api/device-mgt/v1.0/devices/" + platformType + "/*/features";
         var successCallback = function (data) {
             var viewModel = {};
             data = JSON.parse(data).filter(function (current) {
                 var iconName;
-                switch(deviceType) {
+                switch (deviceType) {
                     case platformTypeConstants.ANDROID:
                         iconName = operationModule.getAndroidIconForFeature(current.code);
                         current.type = deviceType;
@@ -142,7 +142,6 @@ function loadOperationBar(deviceType) {
 function runOperation(operationName) {
     var deviceIdList = getSelectedDeviceIds();
     var list = getDevicesByTypes(deviceIdList);
-    console.log(list);
 
     var successCallback = function (data) {
         if (operationName == "NOTIFICATION") {
@@ -159,16 +158,14 @@ function runOperation(operationName) {
 
     var payload, serviceEndPoint;
     if (list[platformTypeConstants.IOS]) {
-        payload = operationModule.
-        generatePayload(platformTypeConstants.IOS, operationName, list[platformTypeConstants.IOS]);
+        payload = operationModule.generatePayload(platformTypeConstants.IOS, operationName, list[platformTypeConstants.IOS]);
         serviceEndPoint = operationModule.getIOSServiceEndpoint(operationName);
     } else if (list[platformTypeConstants.ANDROID]) {
         payload = operationModule
             .generatePayload(platformTypeConstants.ANDROID, operationName, list[platformTypeConstants.ANDROID]);
         serviceEndPoint = operationModule.getAndroidServiceEndpoint(operationName);
     } else if (list[platformTypeConstants.WINDOWS]) {
-        payload = operationModule.
-        generatePayload(platformTypeConstants.WINDOWS, operationName, list[platformTypeConstants.WINDOWS]);
+        payload = operationModule.generatePayload(platformTypeConstants.WINDOWS, operationName, list[platformTypeConstants.WINDOWS]);
         serviceEndPoint = operationModule.getWindowsServiceEndpoint(operationName);
     }
     if (operationName == "NOTIFICATION") {
@@ -185,7 +182,6 @@ function runOperation(operationName) {
             hidePopup();
         }
     } else {
-        console.log(serviceEndPoint);
         invokerUtil.post(serviceEndPoint, payload, successCallback, errorCallback);
         $(modalPopupContent).removeData();
         hidePopup();
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/hidden-operations-android.hbs
index ad8959bf0f..b92461ff74 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/hidden-operations-android.hbs
@@ -1,304 +1,286 @@
 <div class="row no-gutter">
-<div class="wr-hidden-operations-nav col-lg-4">
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('security', this)" class="selected">
+    <div class="wr-hidden-operations-nav col-lg-4">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('security', this)" class="selected">
                     <span class="wr-hidden-operations-icon fw-stack">
                         <i class="fw fw-padlock fw-stack-2x"></i>
                     </span>
-        Security
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('restriction', this)">
+            Security
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('restriction', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-settings fw-stack-2x"></i>
                 </span>
-        Restrictions
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('application', this)">
+            Restrictions
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('application', this)">
                     <span class="wr-hidden-operations-icon fw-stack">
                         <i class="fw fw-padlock fw-stack-2x"></i>
                     </span>
-        Applications
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
+            Applications
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
-        Wi-fi
-    </a>
-</div>
-<div class="wr-hidden-operations-content col-lg-8">
+            Wi-fi
+        </a>
+    </div>
+    <div class="wr-hidden-operations-content col-lg-8">
 
-<!-- security -->
-<div class="wr-hidden-operation" data-operation="security" style="display: block">
-    <div class="panel panel-default operation-data"
-         data-operation="{{features.ENCRYPT_STORAGE.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#enableEncryptionTab"
-                   aria-expanded="true" aria-controls="enableEncryptionTab">
+        <!-- security -->
+        <div class="wr-hidden-operation" data-operation="security" style="display: block">
+            <div class="panel panel-default operation-data" data-operation="{{features.ENCRYPT_STORAGE.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#enableEncryptionTab"
+                           aria-expanded="true" aria-controls="enableEncryptionTab">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Encryption Enable/Disable
-                </a>
-            </h2>
-        </div>
-        <div id="enableEncryptionTab" class="panel-collapse panel-body collapse in" role="tabpanel"
-             aria-labelledby="enableEncryptionTab">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input type="checkbox" class="operationDataKeys" id="enableEncryption"
-                           data-key="enableEncryption"/>
-                    <span class="helper" title="Enable Encryption">Enable Encryption<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                </label>
+                            Encryption Enable/Disable
+                        </a>
+                    </h2>
+                </div>
+                <div id="enableEncryptionTab" class="panel-collapse panel-body collapse in" role="tabpanel"
+                     aria-labelledby="enableEncryptionTab">
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input type="checkbox" class="operationDataKeys" id="enableEncryption"
+                                   data-key="enableEncryption"/>
+                            <span class="helper" title="Enable Encryption">Enable Encryption<span
+                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
+                        </label>
+                    </div>
+                    <a href="javascript:runOperation('{{features.ENCRYPT_STORAGE.code}}')" class="btn-operations">Configure</a>
+                </div>
             </div>
-            <a href="javascript:runOperation('{{features.ENCRYPT_STORAGE.code}}')"
-               class="btn-operations">Configure</a>
-        </div>
-    </div>
-    <div class="panel panel-default operation-data"
-         data-operation="{{features.PASSCODE_POLICY.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#passCodePolicy"
-                   aria-expanded="false" aria-controls="passCodePolicy" class="collapsed">
+            <div class="panel panel-default operation-data" data-operation="{{features.PASSCODE_POLICY.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#passCodePolicy" aria-expanded="false"
+                           aria-controls="passCodePolicy" class="collapsed">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Passcode Policy
-                </a>
-            </h2>
-        </div>
-        <div id="passCodePolicy" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="passCodePolicy">
-
-            <label class="wr-input-label col-sm-4" for="maxFailedAttempts">Maximum Failed
-                Attempts</label>
-
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="maxFailedAttempts"
-                       data-key="maxFailedAttempts" placeholder="Enter maximum Failed Attempts">
-            </div>
+                            Passcode Policy
+                        </a>
+                    </h2>
+                </div>
+                <div id="passCodePolicy" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="passCodePolicy">
 
-            <label class="wr-input-label col-sm-4" for="minLength">Minimum Length</label>
+                    <label class="wr-input-label col-sm-4" for="maxFailedAttempts">Maximum Failed Attempts</label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="maxFailedAttempts"
+                               data-key="maxFailedAttempts" placeholder="Enter maximum Failed Attempts">
+                    </div>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="minLength"
-                       data-key="minLength" placeholder="Enter minimum Length">
-            </div>
+                    <label class="wr-input-label col-sm-4" for="minLength">Minimum Length</label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="minLength" data-key="minLength"
+                               placeholder="Enter minimum Length">
+                    </div>
 
-            <label class="wr-input-label col-sm-4" for="pinHistory">PIN History</label>
+                    <label class="wr-input-label col-sm-4" for="pinHistory">PIN History</label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="pinHistory" data-key="pinHistory"
+                               placeholder="Enter PIN History">
+                    </div>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="pinHistory"
-                       data-key="pinHistory" placeholder="Enter PIN History">
-            </div>
+                    <label class="wr-input-label col-sm-4" for="minComplexChars">Minimum complex characters</label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="minComplexChars"
+                               data-key="minComplexChars" placeholder="Enter minimum complex characters">
+                    </div>
 
-            <label class="wr-input-label col-sm-4" for="minComplexChars">Minimum complex
-                characters</label>
+                    <label class="wr-input-label col-sm-4" for="lockcode">Minimum PIN Age in days</label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="maxPINAgeInDays"
+                               data-key="maxPINAgeInDays" placeholder="Enter minimum PIN age in days">
+                    </div>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="minComplexChars"
-                       data-key="minComplexChars" placeholder="Enter minimum complex characters">
-            </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input type="checkbox" class="operationDataKeys" id="requireAlphanumeric"
+                                   data-key="requireAlphanumeric"/>
+                            <span class="helper" title="Require Alphanumeric">Require Alphanumeric<span
+                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
+                        </label>
+                    </div>
 
-            <label class="wr-input-label col-sm-4" for="lockcode">Minimum PIN Age in days</label>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input type="checkbox" class="operationDataKeys" id="allowSimple" data-key="allowSimple"/>
+                            <span class="helper" title="Allow simple PIN">Allow simple PIN<span
+                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
+                        </label>
+                    </div>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="maxPINAgeInDays"
-                       data-key="maxPINAgeInDays" placeholder="Enter minimum PIN age in days">
+                    <a href="javascript:runOperation('{{features.PASSCODE_POLICY.code}}')" class="btn-operations">Configure</a>
+                </div>
             </div>
+        </div>
+        <!-- /security -->
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input type="checkbox" class="operationDataKeys" id="requireAlphanumeric"
-                           data-key="requireAlphanumeric"/>
-                    <span class="helper" title="Require Alphanumeric">Require Alphanumeric<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                </label>
-            </div>
+        <!-- wi-fi -->
+        <div class="wr-hidden-operation panel-body" data-operation="wifi">
+            <div class="operation-data" data-operation="{{features.WIFI.code}}">
+                <label class="wr-input-label" title="Identification of the wireless network to connect to">Service Set
+                    Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                <!--span>Identification of the wireless network to connect to</span-->
+                <div class="wr-input-control">
+                    <input type="text" class="form-control operationDataKeys" id="ssid" data-key="ssid"
+                           placeholder="Enter SSID"/>
+                </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input type="checkbox" class="operationDataKeys" id="allowSimple"
-                           data-key="allowSimple"/>
-                    <span class="helper" title="Allow simple PIN">Allow simple PIN<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                </label>
+                <label class="wr-input-label" title="Password for the wireless network">Password<span
+                        class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                <!--span>Password for the wireless network</span-->
+                <div class="wr-input-control">
+                    <input type="password" class="form-control operationDataKeys" id="password" data-key="password"
+                           placeholder="Password"/>
+                </div>
+                <a href="javascript:runOperation('{{features.WIFI.code}}')" class="btn-operations">Configure</a>
             </div>
 
-            <a href="javascript:runOperation('{{features.PASSCODE_POLICY.code}}')"
-               class="btn-operations">Configure</a>
-        </div>
-    </div>
-</div>
-<!-- /security -->
-
-<!-- wi-fi -->
-<div class="wr-hidden-operation panel-body" data-operation="wifi">
-    <div class="operation-data" data-operation="{{features.WIFI.code}}">
-        <label class="wr-input-label" title="Identification of the wireless network to connect to">Service
-            Set Identifier<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-        <!--span>Identification of the wireless network to connect to</span-->
-        <div class="wr-input-control">
-            <input type="text" class="form-control operationDataKeys" id="ssid" data-key="ssid"
-                   placeholder="Enter SSID"/>
         </div>
-
-        <label class="wr-input-label" title="Password for the wireless network">Password<span
-                class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-        <!--span>Password for the wireless network</span-->
-        <div class="wr-input-control">
-            <input type="password" class="form-control operationDataKeys" id="password"
-                   data-key="password" placeholder="Password"/>
-        </div>
-        <a href="javascript:runOperation('{{features.WIFI.code}}')"
-           class="btn-operations">Configure</a>
-    </div>
-
-</div>
-<!-- /wi-fi -->
-<!-- application -->
-<div class="wr-hidden-operation" data-operation="application">
-    <div class="panel panel-default operation-data"
-         data-operation="{{features.INSTALL_APPLICATION.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#installApp"
-                   aria-expanded="true" aria-controls="installApp">
+        <!-- /wi-fi -->
+        <!-- application -->
+        <div class="wr-hidden-operation" data-operation="application">
+            <div class="panel panel-default operation-data" data-operation="{{features.INSTALL_APPLICATION.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#installApp" aria-expanded="true"
+                           aria-controls="installApp">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Install App
-                </a>
-            </h2>
-        </div>
-        <div id="installApp" class="panel-collapse panel-body collapse in" role="tabpanel"
-             aria-labelledby="installApp">
-            <label class="wr-input-label" title="Application Identifier">App Identifier<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                            Install App
+                        </a>
+                    </h2>
+                </div>
+                <div id="installApp" class="panel-collapse panel-body collapse in" role="tabpanel"
+                     aria-labelledby="installApp">
+                    <label class="wr-input-label" title="Application Identifier">App Identifier<span
+                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="package-name"
-                       data-key="packageName" placeholder="Enter App Identifer"/>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-control dropdown">
-                    <span class="helper" title="App Type">App Type<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                    <select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type"
-                            data-key="type">
-                        <option>Public</option>
-                        <option>Enterprise</option>
-                    </select>
-                </label>
-            </div>
-            <label class="wr-input-label" title="URL">URL<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="package-name"
+                               data-key="packageName" placeholder="Enter App Identifer"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control dropdown">
+                            <span class="helper" title="App Type">App Type<span
+                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
+                            <select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type"
+                                    data-key="type">
+                                <option>Public</option>
+                                <option>Enterprise</option>
+                            </select>
+                        </label>
+                    </div>
+                    <label class="wr-input-label" title="URL">URL<span
+                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
-                       placeholder="Enter URL"/>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
+                               placeholder="Enter URL"/>
+                    </div>
+                    <a href="javascript:runOperation('{{features.INSTALL_APPLICATION.code}}')" class="btn-operations">Install</a>
+                </div>
             </div>
-            <a href="javascript:runOperation('{{features.INSTALL_APPLICATION.code}}')"
-               class="btn-operations">Install</a>
-        </div>
-    </div>
-    <div class="panel panel-default operation-data" data-operation="{{features.WEBCLIP.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#installWebClip"
-                   aria-expanded="true" aria-controls="installWebClip" class="collapsed">
+            <div class="panel panel-default operation-data" data-operation="{{features.WEBCLIP.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#installWebClip" aria-expanded="true"
+                           aria-controls="installWebClip" class="collapsed">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Install Web Clip
-                </a>
-            </h2>
-        </div>
-        <div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="installWebClip">
-            <label class="wr-input-label" title="Title of the web clip">Title<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                            Install Web Clip
+                        </a>
+                    </h2>
+                </div>
+                <div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="installWebClip">
+                    <label class="wr-input-label" title="Title of the web clip">Title<span
+                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="title"
-                       data-key="title" placeholder="Enter Title"/>
-            </div>
-            <label class="wr-input-label" title="URL">URL<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="title" data-key="title"
+                               placeholder="Enter Title"/>
+                    </div>
+                    <label class="wr-input-label" title="URL">URL<span
+                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
 
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
-                       placeholder="Enter URL"/>
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
+                               placeholder="Enter URL"/>
+                    </div>
+                    <a href="javascript:runOperation('{{features.WEBCLIP.code}}')" class="btn-operations">Install</a>
+                </div>
             </div>
-            <a href="javascript:runOperation('{{features.WEBCLIP.code}}')" class="btn-operations">Install</a>
-        </div>
-    </div>
-    <div class="panel panel-default operation-data"
-         data-operation="{{features.UNINSTALL_APPLICATION.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#uninstallApp"
-                   aria-expanded="true" aria-controls="uninstallApp" class="collapsed">
+            <div class="panel panel-default operation-data" data-operation="{{features.UNINSTALL_APPLICATION.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#uninstallApp" aria-expanded="true"
+                           aria-controls="uninstallApp" class="collapsed">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Uninstall App
-                </a>
-            </h2>
-        </div>
-        <div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="uninstallApp">
-            <label class="wr-input-label" title="Application Identifier">App Identifier<span
-                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-            <!--span>Identification of the wireless network to connect to</span-->
-            <div class="wr-input-control">
-                <input type="text" class="form-control operationDataKeys" id="package-name"
-                       data-key="packageName" placeholder="Enter App Identifer"/>
+                            Uninstall App
+                        </a>
+                    </h2>
+                </div>
+                <div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="uninstallApp">
+                    <label class="wr-input-label" title="Application Identifier">App Identifier<span
+                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
+                    <!--span>Identification of the wireless network to connect to</span-->
+                    <div class="wr-input-control">
+                        <input type="text" class="form-control operationDataKeys" id="package-name"
+                               data-key="packageName" placeholder="Enter App Identifer"/>
+                    </div>
+                    <a href="javascript:runOperation('{{features.UNINSTALL_APPLICATION.code}}')" class="btn-operations">Uninstall</a>
+                </div>
             </div>
-            <a href="javascript:runOperation('{{features.UNINSTALL_APPLICATION.code}}')"
-               class="btn-operations">Uninstall</a>
         </div>
-    </div>
-</div>
-<!-- /application -->
+        <!-- /application -->
 
-<!-- Restriction -->
-<div class="wr-hidden-operation" data-operation="restriction">
-    <div class="panel panel-default operation-data" data-operation="{{features.CAMERA.code}}">
-        <div class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#cameraDisable"
-                   aria-expanded="true" aria-controls="cameraDisable">
+        <!-- Restriction -->
+        <div class="wr-hidden-operation" data-operation="restriction">
+            <div class="panel panel-default operation-data" data-operation="{{features.CAMERA.code}}">
+                <div class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#cameraDisable" aria-expanded="true"
+                           aria-controls="cameraDisable">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
                                     </span>
-                    Camera Enable/Disable
-                </a>
-            </h2>
-        </div>
-        <div id="cameraDisable" class="panel-collapse panel-body collapse in" role="tabpanel"
-             aria-labelledby="cameraDisable">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input type="checkbox" class="operationDataKeys" id="enableCamera"
-                           data-key="enableCamera" checked/>
-                    <span class="helper" title="Remove App upon dis-enrollment">Enable Camera<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                </label>
+                            Camera Enable/Disable
+                        </a>
+                    </h2>
+                </div>
+                <div id="cameraDisable" class="panel-collapse panel-body collapse in" role="tabpanel"
+                     aria-labelledby="cameraDisable">
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input type="checkbox" class="operationDataKeys" id="enableCamera" data-key="enableCamera"
+                                   checked/>
+                            <span class="helper" title="Remove App upon dis-enrollment">Enable Camera<span
+                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
+                        </label>
+                    </div>
+                    <a href="javascript:runOperation('{{features.CAMERA.code}}')" class="btn-operations">Configure</a>
+                </div>
             </div>
-            <a href="javascript:runOperation('{{features.CAMERA.code}}')" class="btn-operations">Configure</a>
         </div>
+        <!-- /Restriction -->
     </div>
-</div>
-<!-- /Restriction -->
-</div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
index e2fcd8f2cb..e04f1e8816 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
@@ -12,7 +12,6 @@
                 <h4>
                     Please select a device or a list of devices to perform an operation.
                 </h4>
-
                 <div class="buttons">
                     <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
                 </div>
@@ -34,7 +33,6 @@
                 <h4>
                     Unexpected error occurred. Please Try again later.
                 </h4>
-
                 <div class="buttons">
                     <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
                 </div>
@@ -56,7 +54,6 @@
                 <h4>
                     Operation has been queued successfully to be sent to the device.
                 </h4>
-
                 <div class="buttons">
                     <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
                 </div>
@@ -79,7 +76,6 @@
                 <h4>
                     Message has been queued to be sent to the device.
                 </h4>
-
                 <div class="buttons">
                     <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
                 </div>
@@ -107,14 +103,11 @@
                     <h4>
                         {{#equal code "WIPE_DATA"}}
                             {{#equal type "android"}}
-                                Enter PIN code (Optional - This is required only if the device type
-                                is BYOD).
+                                Enter PIN code (Optional - This is required only if the device type is BYOD).
                                 <br><br>
-
                                 <div>
-                                    <input type="password"
-                                           class="form-control modal-input operationDataKeys"
-                                           id="pin" data-key="pin"></textarea>
+                                    <input type="password" class="form-control modal-input operationDataKeys" id="pin"
+                                           data-key="pin">
                                 </div>
                                 <br>
                             {{/equal}}
@@ -122,25 +115,115 @@
                         {{#equal code "NOTIFICATION"}}
                             Type your message below.
                             <br><br>
-
-                            <div id="notification-error-msg" class="alert alert-danger hidden"
-                                 role="alert">
+                            <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
                                 <i class="icon fw fw-error"></i><span></span>
                             </div>
                             <div>
-                                <textarea class="form-control modal-input operationDataKeys"
-                                          id="message" data-key="message"></textarea>
+                                <input type='text' class="form-control modal-input operationDataKeys" id="messageTitle"
+                                       data-key="messageTitle"/>
+                            </div>
+                            <br>
+                            <div>
+                                <textarea class="form-control modal-input operationDataKeys" id="messageText"
+                                          data-key="messageText"></textarea>
                             </div>
                             <br>
                         {{/equal}}
                         {{#equal code "CHANGE_LOCK_CODE"}}
                             Type new lock-code below.
                             <br><br>
-                            <input type="password"
-                                   class="form-control modal-input operationDataKeys" id="lockcode"
+                            <input type="password" class="form-control modal-input operationDataKeys" id="lockcode"
                                    data-key="lockCode" placeholder="Enter Lockcode"/>
                             <br>
                         {{/equal}}
+                        {{#equal code "DEVICE_LOCK"}}
+                            {{#equal type "android"}}
+                                Type your message to be shown in the lock screen (Optional).
+                                <br><br>
+                                <div>
+                                    <textarea class="form-control modal-input operationDataKeys" id="lock-message"
+                                              data-key="lock-message"></textarea>
+                                </div>
+                                <br>
+                                <label class="wr-input-control checkbox">
+                                    <input id="hard-lock" type="checkbox" class="form-control operationDataKeys"
+                                           data-key="hard-lock"/>
+                                    <span class="helper" title="Once it enables, device will be blocked permanently.">
+                                            &nbsp;&nbsp;&nbsp;Enable Permanent Lock
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                        </span>
+                                </label>
+                            {{/equal}}
+                        {{/equal}}
+                        {{#equal code "UPGRADE_FIRMWARE"}}
+                            {{#equal type "android"}}
+                                Enter firmware upgrade scheduling information.
+                                <br><br>
+                                <label class="wr-input-control checkbox">
+                                    <input id="instant-upgrade" type="checkbox" class="form-control operationDataKeys"
+                                           data-key="instant-upgrade"/>
+                                    <span class="helper"
+                                          title="Once enabled, device firmware upgrade process will start instantly.">
+                                            &nbsp;&nbsp;&nbsp;Instant Upgrade
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                        </span>
+                                </label>
+                                <br><br>
+                                <div class='input-group date' id='dateTimePicker'>
+                                    Enter the date and time to schedule firmware upgrade.
+                                    <br><br>
+                                    <div id="firmware-error-msg" class="alert alert-danger hidden" role="alert">
+                                        <i class="icon fw fw-error"></i><span></span>
+                                    </div>
+                                    <input type='text' class="form-control modal-input operationDataKeys"
+                                           style="z-index : 900;" name="daterange" id="schedule" data-key="schedule"/>
+                                </div>
+                                <br><br>
+                                <div class='wr-input-control' id='firmwareServerInfo'>
+                                    Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
+                                    (Optional).
+                                    <br><br>
+                                    <input type='text' class="form-control modal-input operationDataKeys" id="server"
+                                           data-key="server"/>
+                                </div>
+                                <script type="text/javascript">
+                                    $(function () {
+                                        $('.modalpopup-bg').css('z-index', '1000');
+                                        $('.modalpopup-container').css('z-index', '1200');
+
+                                        $('input[name="daterange"]').daterangepicker({
+                                            singleDatePicker: true,
+                                            timePicker: true,
+                                            showDropdowns: true,
+                                            timePickerIncrement: 1,
+                                            locale: {
+                                                format: 'MM-DD-YYYY hh:mm a'
+                                            }
+                                        });
+                                    });
+                                    $('#instant-upgrade').change(function () {
+                                        if ($(this).is(":checked")) {
+                                            $('#dateTimePicker').addClass("hidden");
+                                            $("#schedule").val('');
+
+                                        } else {
+                                            $('#dateTimePicker').removeClass("hidden");
+                                            $('input[name="daterange"]').daterangepicker({
+                                                singleDatePicker: true,
+                                                timePicker: true,
+                                                showDropdowns: true,
+                                                timePickerIncrement: 1,
+                                                locale: {
+                                                    format: 'MM-DD-YYYY hh:mm a'
+                                                }
+                                            });
+                                        }
+                                    });
+                                </script>
+                                <br>
+                            {{/equal}}
+                        {{/equal}}
+                        <br><br>
                         Do you want to perform this operation on selected device(s) ?
                         <br>
                     </h4>