diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index fafc053374..80db7095c6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -138,11 +138,11 @@
                             </thead>
                             <tbody id="ast-container">
 
-                            <br class="c-both"/>
+                            <br class="c-both" />
                             </tbody>
                         </table>
                     </div>
-                    <br class="c-both"/>
+                    <br class="c-both" />
                     <div id="content-filter-types" style="display: none">
                         <div class="sort-title">Sort By</div>
                         <div class="sort-options">
@@ -163,7 +163,7 @@
                                 registered
                                 {{/if}}
                                 at the moment.</h2>
-                            <br/>
+                            <br />
 
                             <p class="text-center">
                                 {{#if groupName}}
@@ -233,7 +233,9 @@
                         <h3 class="pull-left modal-title">
                             Do you really want to remove this device from your Devices List?
                         </h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i>
+                        </button>
                     </div>
                     <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
 
@@ -256,7 +258,9 @@
                         <h3 class="pull-left modal-title">
                             Device was successfully removed.
                         </h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i>
+                        </button>
                     </div>
                     <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
 
@@ -273,7 +277,9 @@
                         <h3 class="pull-left modal-title">
                             Please enter new name for the device?
                         </h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i>
+                        </button>
                     </div>
                     <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
                         <input id="edit-device-name" style="color:#3f3f3f;padding:5px" type="text"
@@ -298,7 +304,9 @@
                         <h3 class="pull-left modal-title">
                             Device was successfully updated.
                         </h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i>
+                        </button>
                     </div>
                     <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
 
@@ -306,78 +314,82 @@
                     <div class="modal-footer">
                         <div class="buttons">
 
-                <div id="edit-device-200-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Device was successfully updated.</h3>
+                            <div id="edit-device-200-content" class="hide">
+                                <div class="content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>Device was successfully updated.</h3>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div id="device-400-content" class="hide">
-                    <div class="modal-content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Exception at backend. Try Later.</h3>
-                                <br/>
-                                <div class="buttons">
-                                    <a href="#" id="device-400-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
-                                    </a>
+                            <div id="device-400-content" class="hide">
+                                <div class="modal-content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>Exception at backend. Try Later.</h3>
+                                            <br />
+                                            <div class="buttons">
+                                                <a href="#" id="device-400-link" class="btn-operations">
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div id="device-403-content" class="hide">
-                    <div class="modal-content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Operation not permitted.</h3>
-                                <br/>
-                                <div class="buttons">
-                                    <a href="#" id="device-403-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
-                                    </a>
+                            <div id="device-403-content" class="hide">
+                                <div class="modal-content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>Operation not permitted.</h3>
+                                            <br />
+                                            <div class="buttons">
+                                                <a href="#" id="device-403-link" class="btn-operations">
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div id="group-404-content" class="hide">
-                    <div class="modal-content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>You don't have any groups to add this device. Please add group first.</h3>
-                                <br/>
-                                <div class="buttons">
-                                    <a href="{{@app.context}}/group/add" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Add New Group&nbsp;&nbsp;&nbsp;&nbsp;
-                                    </a>
-                                    &nbsp;&nbsp;
-                                    <a href="#" id="cancel-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
-                                    </a>
+                            <div id="group-404-content" class="hide">
+                                <div class="modal-content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>You don't have any groups to add this device. Please add group
+                                                first.</h3>
+                                            <br />
+                                            <div class="buttons">
+                                                <a href="{{@app.context}}/group/add" class="btn-operations">
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;Add New Group&nbsp;&nbsp;&nbsp;&nbsp;
+                                                </a>
+                                                &nbsp;&nbsp;
+                                                <a href="#" id="cancel-link" class="btn-operations">
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div id="device-409-content" class="hide">
-                    <div class="modal-content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Device does not exist.</h3>
-                                <br/>
-                                <div class="buttons">
-                                    <a href="#" id="remove-device-409-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
-                                    </a>
+                            <div id="device-409-content" class="hide">
+                                <div class="modal-content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>Device does not exist.</h3>
+                                            <br />
+                                            <div class="buttons">
+                                                <a href="#" id="remove-device-409-link" class="btn-operations">
+                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>