diff --git a/admin/admin.js b/admin/admin.js
index afa9146a..b0c0fedb 100644
--- a/admin/admin.js
+++ b/admin/admin.js
@@ -384,6 +384,9 @@ function editName(id, name) {
     $('#modaledit').find('.row.epid1').addClass('hide');
     $('#modaledit').find('.row.epid2').addClass('hide');
     $('#modaledit').find('.row.epid3').addClass('hide');
+    $('#modaledit').find('.row.epid4').addClass('hide');
+    $('#modaledit').find('.row.epid5').addClass('hide');
+    $('#modaledit').find('.row.epid6').addClass('hide');
     if (numEP > 0) {
         // go through all the groups. Find the ones to list for each groupable
         if (numEP == 1) {
diff --git a/admin/index_m.html b/admin/index_m.html
index b0bfcd21..0dac18dd 100644
--- a/admin/index_m.html
+++ b/admin/index_m.html
@@ -973,7 +973,7 @@ <h5 id="devActResult" class="card-title"></h5>
 <div class="materialize-dialogs m">
     <div id="modaledit" class="modal">
         <div class="modal-content">
-            <h3 class="translate">Config device</h3>
+            <h3 class="translate">Rename / Group device</h3>
             <div class="row">
                 <div class="col1">
                     <div class="input-field">
@@ -1042,7 +1042,52 @@ <h3 class="translate">Config device</h3>
                     </div>
                 </div>
             </div>
-        </div>
+            <div class="row epid4">
+                <div class="col epid">
+                    <div class=endpointid>
+                        <p class="translate device_with_endpoint">Sub Endpoint 4</p>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="input-field groups">
+                        <select id="d_groups_ep4" class="materialSelect" multiple>
+                            <option value="1">select</option>
+                        </select>
+                        <label for="d_groups_ep4" class="translate">Groups</label>
+                    </div>
+                </div>
+            </div>
+            <div class="row epid5">
+                <div class="col epid">
+                    <div class=endpointid>
+                        <p class="translate device_with_endpoint">Sub Endpoint 5</p>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="input-field groups">
+                        <select id="d_groups_ep5" class="materialSelect" multiple>
+                            <option value="1">select</option>
+                        </select>
+                        <label for="d_groups_ep5" class="translate">Groups</label>
+                    </div>
+                </div>
+            </div>
+            <div class="row epid6">
+                <div class="col epid">
+                    <div class=endpointid>
+                        <p class="translate device_with_endpoint">Sub Endpoint 6</p>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="input-field groups">
+                        <select id="d_groups_ep6" class="materialSelect" multiple>
+                            <option value="1">select</option>
+                        </select>
+                        <label for="d_groups_ep6" class="translate">Groups</label>
+                    </div>
+                </div>
+            </div>
+          </div>
         <div class="modal-footer">
             <a name="save" href="#!"
                class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
diff --git a/admin/tab_m.html b/admin/tab_m.html
index 5b523a04..d9595767 100644
--- a/admin/tab_m.html
+++ b/admin/tab_m.html
@@ -507,7 +507,7 @@ <h5 class="translate center-align">Zigbee adapter</h5>
                 <div class="fixed-action-btn">
                     <a id="refresh" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Refresh"><i class="material-icons large">autorenew</i></a>
                 </div>
-                <div id="viewconfigbtn" class="fixed-action-btn top left" style="">
+                <div id="viewconfigbtn" class="fixed-action-btn top left">
                     <a id="viewconfig" class="btn-floating waves-effect waves-light orange tooltipped center-align hoverable translateT" title="View config"><i class="material-icons large">menu</i></a>
                 </div>
                 <div id="map" class="row">
@@ -672,7 +672,7 @@ <h6>Others</h6>
     <div class="materialize-dialogs m">
       <div id="modaledit" class="modal">
           <div class="modal-content">
-              <h3 class="translate">Config device</h3>
+              <h3 class="translate">Rename / Group device</h3>
               <div class="row">
                   <div class="col1">
                       <div class="input-field">
@@ -741,6 +741,51 @@ <h3 class="translate">Config device</h3>
                       </div>
                   </div>
               </div>
+              <div class="row epid4">
+                <div class="col epid">
+                    <div class=endpointid>
+                        <p class="translate device_with_endpoint">Sub Endpoint 4</p>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="input-field groups">
+                        <select id="d_groups_ep4" class="materialSelect" multiple>
+                            <option value="1">select</option>
+                        </select>
+                        <label for="d_groups_ep4" class="translate">Groups</label>
+                    </div>
+                </div>
+              </div>
+              <div class="row epid5">
+                <div class="col epid">
+                    <div class=endpointid>
+                        <p class="translate device_with_endpoint">Sub Endpoint 5</p>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="input-field groups">
+                        <select id="d_groups_ep5" class="materialSelect" multiple>
+                            <option value="1">select</option>
+                        </select>
+                        <label for="d_groups_ep5" class="translate">Groups</label>
+                    </div>
+                </div>
+              </div>
+              <div class="row epid6">
+            <div class="col epid">
+                <div class=endpointid>
+                    <p class="translate device_with_endpoint">Sub Endpoint 6</p>
+                </div>
+            </div>
+            <div class="col">
+                <div class="input-field groups">
+                    <select id="d_groups_ep6" class="materialSelect" multiple>
+                        <option value="1">select</option>
+                    </select>
+                    <label for="d_groups_ep6" class="translate">Groups</label>
+                </div>
+            </div>
+              </div>
           </div>
           <div class="modal-footer">
               <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>