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 7de3cc431..43a601915 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
@@ -108,14 +108,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}}
@@ -123,25 +120,114 @@
                     {{#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>
+                        <div class="form-group">
+                            <input class="form-control modal-input operationDataKeys"
+                                   id="messageTitle" data-key="messageTitle"  placeholder="Title here..." />
+                        </div>
+                        <div class="form-group">
+                                <textarea class="form-control modal-input operationDataKeys"
+                                          id="messageText" data-key="messageText" placeholder="Message here..."></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>