diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
index 81f8b06f..82afb848 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
@@ -138,13 +138,13 @@
 
                     <div id="user-groups">Loading...</div>
                     <div class="buttons">
-                        <a href="#" id="group-device-cancel-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                        &nbsp;&nbsp;
                         <a href="#" id="group-device-yes-link" class="btn-operations">
                             &nbsp;&nbsp;&nbsp;&nbsp;Assign&nbsp;&nbsp;&nbsp;&nbsp;
                         </a>
+                        &nbsp;&nbsp;
+                        <a href="#" id="group-device-cancel-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
                     </div>
                 </div>
             </div>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
index e4fe30c4..b4313021 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/group-listing.hbs
@@ -38,13 +38,13 @@
                     <h3>Select user to manage group sharing</h3>
 					<div id="user-names">Loading...</div>
                     <div class="buttons">
-                        <a href="#" id="share-group-w1-cancel-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                        &nbsp;&nbsp;
                         <a href="#" id="share-group-next-link" class="btn-operations">
                             &nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;
                         </a>
+                        &nbsp;&nbsp;
+                        <a href="#" id="share-group-w1-cancel-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
                     </div>
                 </div>
             </div>
@@ -59,13 +59,13 @@
                     <br />
                     <div id="user-roles">Loading...</div>
                     <div class="buttons">
-                        <a href="#" id="share-group-w2-cancel-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
-                        </a>
-                        &nbsp;&nbsp;
                         <a href="#" id="share-group-yes-link" class="btn-operations">
                             &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
                         </a>
+                        &nbsp;&nbsp;
+                        <a href="#" id="share-group-w2-cancel-link" class="btn-operations">
+                            &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                        </a>
                     </div>
                 </div>
             </div>