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.view/view.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.view/view.hbs
index da48991dd..7f0bac0b9 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.view/view.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.view/view.hbs
@@ -109,12 +109,14 @@
                                 </tbody>
                             </table>
                         {{/defineZone}}
+            {{#if deviceView.isNotRemoved}}
                         <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
                             Operations
                         </div>
                         <div class="add-margin-top-4x">
                             {{unit "mdm.unit.device.operation-bar" deviceType=deviceView.deviceType ownership=deviceView.ownership}}
                         </div>
+            {{/if}}
                     </div>
                 </div>
                 <div class="media tab-responsive">
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.policy.create/create.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
index 183d45284..e6111c5cb 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
@@ -103,9 +103,7 @@
                                        data-current="policy-naming" data-next="policy-criteria">Back</a>
                                     <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                        data-current="policy-naming-publish" data-next="policy-message"
-                                       data-validate="true">Publish
-                                        to
-                                        Devices</a>
+                                       data-validate="true">Publish</a>
                                     <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                        data-current="policy-naming"
                                        data-next="policy-message" data-validate="true">Save</a>
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.policy.edit/edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
index f6aa0815d..e51e8844d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
@@ -21,7 +21,7 @@
                     <div class="col-md-3 col-xs-3">
                         <div class="itm-wiz" data-step="policy-naming">
                             <div class="wiz-no">3</div>
-                            <div class="wiz-lbl hidden-xs"><span>Republish to devices</span></div>
+                            <div class="wiz-lbl hidden-xs"><span>Republish</span></div>
                         </div>
                         <br class="c-both"/>
                     </div>
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.policy.wizard/public/templates/hidden-operations-windows.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/templates/hidden-operations-windows.hbs
index 3b5bb3bef..7fb5d6323 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/templates/hidden-operations-windows.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/templates/hidden-operations-windows.hbs
@@ -5,7 +5,8 @@
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>
             Passcode Policy
-            <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
             <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
@@ -23,60 +24,66 @@
                     <i class="fw fw-security fw-stack-2x"></i>
                 </span>
             Encryption Settings
-            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
             <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
         </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 Settings-->
-            <!--<span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>-->
-            <!--<span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>-->
-            <!--<span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-wifi fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--Wi-Fi Settings-->
+        <!--<span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>-->
+        <!--<span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>-->
+        <!--<span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>-->
         <!--</a>-->
         <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('install-apps', this)">-->
-                <!--<span class="wr-hidden-operations-icon fw-stack">-->
-                    <!--<i class="fw fw-application fw-stack-2x"></i>-->
-                <!--</span>-->
-            <!--App Installations-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-application fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--App Installations-->
         <!--</a>-->
         <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('blacklist-apps', this)">-->
-                <!--<span class="wr-hidden-operations-icon fw-stack">-->
-                    <!--<i class="fw fw-block fw-stack-2x"></i>-->
-                <!--</span>-->
-            <!--App Blacklisting-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-block fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--App Blacklisting-->
         <!--</a>-->
         <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('web-clips', this)">-->
-                <!--<span class="wr-hidden-operations-icon fw-stack">-->
-                    <!--<i class="fw fw-website fw-stack-2x"></i>-->
-                <!--</span>-->
-            <!--Web clips-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-website fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--Web clips-->
         <!--</a>-->
     </div>
 
     <div class="wr-hidden-operations-content col-lg-8">
         <!-- passcode-policy -->
         <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
-            <div class="panel panel-default operation-data" data-operation="passcode-policy" data-operation-code="PASSCODE_POLICY">
+            <div class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
                 <div id="passcode-policy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Passcode Policy
-                        <label id="passcode-policy-lbl" class="wr-input-control switch" data-toggle="collapse" data-target="#passcode-policy-body">
-                            <input type="checkbox" />
+                        <label id="passcode-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
                         <hr>
                         <div class="panel-title-description">
                             This configuration can be used to set a passcode policy to an Windows Device.
-                            Once this configuration profile is installed on a device, corresponding users will not be able
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
                             to modify these settings on their devices.
                         </div>
                     </h2>
                 </div>
-                <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
+                <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="passcode-policy-body">
 
                     <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
@@ -84,8 +91,11 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="passcode-policy-allow-simple" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple" checked="checked" />
-                            <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked"/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
                                 &nbsp;&nbsp;&nbsp;Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -94,7 +104,9 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="passcode-policy-require-alphanumeric" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric" checked="checked" />
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked"/>
                             <span class="helper" title="Require passcode to contain both letters and numbers">
                                 &nbsp;&nbsp;&nbsp;Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
@@ -109,7 +121,8 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-min-length" class="form-control operationDataKeys" data-key="passcodePolicyMinLength" data-default="0">
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -134,11 +147,13 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="passcode-policy-min-complex-chars">
                             Minimum number of complex characters
-                            <span class="helper" title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
+                            <span class="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys" data-key="passcodePolicyMinComplexChars" data-default="0">
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -159,7 +174,9 @@
                             <br>
                             ( Should be in between 1-to-730 days or none )
                         </label>
-                        <input id="passcode-policy-max-passcode-age-in-days" type="text" class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" placeholder="[ Requires Number Input ]">
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3" placeholder="[ Requires Number Input ]">
                     </div>
 
                     <div class="wr-input-control">
@@ -171,17 +188,23 @@
                             <br>
                             ( Should be in between 1-to-50 passcodes or none )
                         </label>
-                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys" data-key="passcodePolicyPasscodeHistory" maxlength="2" placeholder="[ Requires Number Input ]">
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2"
+                               placeholder="[ Requires Number Input ]">
                     </div>
 
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
-                            <span class="helper" title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password
+                                   is not entered within the defined number of attempts, the data on the device will be
+                                   erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys" data-key="passcodePolicyMaxFailedAttempts" data-default="0">
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -207,19 +230,22 @@
                     <h2 class="sub-title panel-title">
                         Restrictions on Camera
                         <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
-                            <input type="checkbox" />
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
                         <hr>
                         <div class="panel-title-description">
-                            This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera.
-                            Once this configuration profile is installed on a device, corresponding users will not be able
+                            This configuration can be used to restrict the usage of camera on an Windows device together
+                            with all the applications using the camera.
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
                             to modify these settings on their devices.
                         </div>
                     </h2>
                 </div>
-                <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
+                <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="camera-body">
                     <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -228,8 +254,10 @@
                     <br>
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="camera-enabled" type="checkbox" class="operationDataKeys" data-key="cameraEnabled" checked="checked" />
-                            <span class="helper" title="Having this checked would enable Usage of phone camera in the device.">
+                            <input id="camera-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="cameraEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Usage of phone camera in the device.">
                                 &nbsp;&nbsp;&nbsp;Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -243,24 +271,29 @@
 
         <!-- encrypt-storage -->
         <div class="wr-hidden-operation" data-operation="encrypt-storage">
-            <div class="panel panel-default operation-data" data-operation="encrypt-storage" data-operation-code="ENCRYPT_STORAGE">
+            <div class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
                 <div id="encrypt-storage-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Encryption Settings
-                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#encrypt-storage-body">
-                            <input type="checkbox" />
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
                         <hr>
                         <div class="panel-title-description">
-                            This configuration can be used to encrypt data on an Windows device, when the device is locked and
-                            make it readable when the passcode is entered. Once this configuration profile is installed on a device,
+                            This configuration can be used to encrypt data on an Windows device, when the device is
+                            locked and
+                            make it readable when the passcode is entered. Once this configuration profile is installed
+                            on a device,
                             corresponding users will not be able to modify these settings on their devices.
                         </div>
                     </h2>
                 </div>
-                <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
+                <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="encrypt-storage-body">
                     <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -269,8 +302,10 @@
                     <br>
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys" data-key="encryptStorageEnabled" checked="checked" />
-                            <span class="helper" title="Having this checked would enable Storage-encryption in the device">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
                                 &nbsp;&nbsp;&nbsp;Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -284,176 +319,176 @@
 
         <!-- wi-fi -->
         <!--<div class="wr-hidden-operation" data-operation="wifi">-->
-            <!--<div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">-->
-                <!--<div id="wifi-heading" class="panel-heading" role="tab">-->
-                    <!--<h2 class="sub-title panel-title">-->
-                        <!--Wi-Fi Settings-->
-                        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#wifi-body">-->
-                            <!--<input type="checkbox" />-->
-                            <!--<span class="helper"></span>-->
-                            <!--<span class="text"></span>-->
-                        <!--</label>-->
-                        <!--<hr>-->
-                        <!--<div class="panel-title-description">-->
-                            <!--This configurations can be used to configure Wi-Fi access on an Android device.-->
-                            <!--Once this configuration profile is installed on a device, corresponding users will not be able-->
-                            <!--to modify these settings on their devices.-->
-                        <!--</div>-->
-                    <!--</h2>-->
-                <!--</div>-->
-                <!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
-                    <!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
-                        <!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
-                            <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-                                <!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
-                                <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</a>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
-                            <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-                                <!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
-                                <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</a>&ndash;&gt;-->
-                        <!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
-                        <!--&lt;!&ndash;<br>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<br>&ndash;&gt;-->
-                        <!--Please note that * sign represents required fields of data.-->
-                        <!--<br>-->
-                        <!--<br>-->
-                        <!--<div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-                            <!--<i class="icon fw fw-error"></i><span></span>-->
-                        <!--</div>-->
-                        <!--<div class="wr-input-control">-->
-                            <!--<label class="wr-input-label" for="wifi-ssid">-->
-                                <!--Service Set Identifier (SSID) *-->
-                                <!--<span class="helper" title="Identification of the wireless network to be configured.">-->
-                                    <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-                                <!--</span>-->
-                                <!--<br>-->
-                                <!--( should be 1-to-30 characters long )-->
-                            <!--</label>-->
-                            <!--<input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Required field ]"/>-->
-                        <!--</div>-->
-                        <!--<div class="wr-input-control">-->
-                            <!--<label class="wr-input-label" for="wifi-password">-->
-                                <!--Password-->
-                                <!--<span class="helper" title="Password for the wireless network.">-->
-                                    <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-                                <!--</span>-->
-                            <!--</label>-->
-                            <!--<input id="wifi-password" type="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
-                        <!--</div>-->
-                    <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                <!--</div>-->
-            <!--</div>-->
+        <!--<div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">-->
+        <!--<div id="wifi-heading" class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--Wi-Fi Settings-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#wifi-body">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<hr>-->
+        <!--<div class="panel-title-description">-->
+        <!--This configurations can be used to configure Wi-Fi access on an Android device.-->
+        <!--Once this configuration profile is installed on a device, corresponding users will not be able-->
+        <!--to modify these settings on their devices.-->
+        <!--</div>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
+        <!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--Please note that * sign represents required fields of data.-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--<div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<div class="wr-input-control">-->
+        <!--<label class="wr-input-label" for="wifi-ssid">-->
+        <!--Service Set Identifier (SSID) *-->
+        <!--<span class="helper" title="Identification of the wireless network to be configured.">-->
+        <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
+        <!--</span>-->
+        <!--<br>-->
+        <!--( should be 1-to-30 characters long )-->
+        <!--</label>-->
+        <!--<input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Required field ]"/>-->
+        <!--</div>-->
+        <!--<div class="wr-input-control">-->
+        <!--<label class="wr-input-label" for="wifi-password">-->
+        <!--Password-->
+        <!--<span class="helper" title="Password for the wireless network.">-->
+        <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
+        <!--</span>-->
+        <!--</label>-->
+        <!--<input id="wifi-password" type="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
+        <!--</div>-->
+        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--</div>-->
+        <!--</div>-->
         <!--</div>-->
         <!-- /wi-fi -->
 
         <!-- install-applications -->
         <!--<div class="wr-hidden-operation" data-operation="install-apps">-->
-            <!--<div class="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
-                <!--<div class="panel-heading" role="tab">-->
-                    <!--<h2 class="sub-title panel-title">-->
-                        <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;App Installations-->
-                        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
-                            <!--<input type="checkbox" />-->
-                            <!--<span class="helper"></span>-->
-                            <!--<span class="text"></span>-->
-                        <!--</label>-->
-                        <!--<br>-->
-                        <!--<br>-->
-                    <!--</h2>-->
-                <!--</div>-->
-                <!--<div id="installApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installApp">-->
-                    <!--<div id="install-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-                        <!--<i class="icon fw fw-error"></i><span></span>-->
-                    <!--</div>-->
-                    <!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+        <!--<div class="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;App Installations-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="installApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installApp">-->
+        <!--<div id="install-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<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 Identifier"/>-->
-                    <!--</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 Identifier"/>-->
+        <!--</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>-->
-                <!--</div>-->
-            <!--</div>-->
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
         <!--</div>-->
         <!-- /install-applications -->
 
         <!-- /uninstall-applications -->
         <!--<div class="wr-hidden-operation" data-operation="uninstall-apps">-->
-            <!--<div class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
-                <!--<div class="panel-heading" role="tab">-->
-                    <!--<h2 class="sub-title panel-title">-->
-                        <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
-                        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
-                            <!--<input type="checkbox" />-->
-                            <!--<span class="helper"></span>-->
-                            <!--<span class="text"></span>-->
-                        <!--</label>-->
-                        <!--<br>-->
-                        <!--<br>-->
-                    <!--</h2>-->
-                <!--</div>-->
-                <!--<div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="uninstallApp">-->
-                    <!--<div id="uninstall-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-                        <!--<i class="icon fw fw-error"></i><span></span>-->
-                    <!--</div>-->
-                    <!--<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 Identifier"/>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
+        <!--<div class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="uninstallApp">-->
+        <!--<div id="uninstall-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<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 Identifier"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
         <!--</div>-->
         <!-- /uninstall-applications -->
 
         <!-- /web-clips -->
         <!--<div class="wr-hidden-operation" data-operation="web-clips">-->
-            <!--<div class="panel panel-default operation-data" data-operation="WEBCLIP">-->
-                <!--<div class="panel-heading" role="tab">-->
-                    <!--<h2 class="sub-title panel-title">-->
-                        <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;Web clips-->
-                        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
-                            <!--<input type="checkbox" />-->
-                            <!--<span class="helper"></span>-->
-                            <!--<span class="text"></span>-->
-                        <!--</label>-->
-                        <!--<br>-->
-                        <!--<br>-->
-                    <!--</h2>-->
-                <!--</div>-->
-                <!--<div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installWebClip">-->
-                    <!--<div id="install-webclip-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-                        <!--<i class="icon fw fw-error"></i><span></span>-->
-                    <!--</div>-->
-                    <!--<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="url" data-key="url" placeholder="Enter URL"/>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
+        <!--<div class="panel panel-default operation-data" data-operation="WEBCLIP">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;Web clips-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installWebClip">-->
+        <!--<div id="install-webclip-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<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="url" data-key="url" placeholder="Enter URL"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
         <!--</div>-->
         <!-- /web-clips -->
     </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
index 99a8df250..8526ce9ed 100644
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk and b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk differ