diff --git a/source/Styles/xb3/jst/connected_devices_computers.jst b/source/Styles/xb3/jst/connected_devices_computers.jst
index f007cc4..bd8ea12 100644
--- a/source/Styles/xb3/jst/connected_devices_computers.jst
+++ b/source/Styles/xb3/jst/connected_devices_computers.jst
@@ -419,32 +419,34 @@ $(document).ready(function() {
 		});
     }    
     $("input:checked[name='ip']").trigger("click");
-    // activate validation plugin
-	$(".pageForm").validate({
-	    rules : {
-	    	host_name: {
-	    		allowed_char: true
-	    	},
-	    	staticIPAddress: {
-	    		ipv4 : {
-	            	depends : function() {
-	            		return ("static" == $("input:radio[name=ip]:checked").val());
-	            	}
-	            },
-	            required : {
-	                depends : function() {
-	                	return ("static" == $("input:radio[name=ip]:checked").val());
-	                }
-	            }
-	    	}
-	    	,mac_address:{
-	    		required: true,
-	    		mac: true
-	    	},
-	    	comments:{
-	    		allowed_char: true
-	    	}
-	    }
+	    // activate validation plugin for each edit form
+	$(".pageForm").each(function() {
+		$(this).validate({
+	    		rules : {
+	    			host_name: {
+	    				allowed_char: true
+	    			},
+	    			staticIPAddress: {
+	    				ipv4 : {
+	            			depends : function() {
+						return ("static" == $(this).closest('form').find("input:radio[name=ip]:checked").val());
+	            			}
+	            		},
+	            		required : {
+	                		depends : function() {
+						return ("static" == $(this).closest('form').find("input:radio[name=ip]:checked").val());
+	                		}
+	            		}
+	    			},
+	    			mac_address:{
+	    				required: true,
+	    				mac: true
+	    			},
+	    			comments:{
+	    				allowed_char: true
+	    			}
+	    		}
+		});
 	});
     $(".edit-device").hide();
     $('.device-info').addClass('device-hide');
@@ -473,179 +475,91 @@ $(document).ready(function() {
 			$("#" + editTarget).show();
 		}
 	});
-    for (var i = 0; i < onlineDeviceNum; i++) {  
-    ( 
-    	function(x) {
-    	//alert(onlineDeviceInstanceArr[i]);    	
-    	var submitEditDevice = "#submit_editDevice-" + onlineDeviceInstanceArr[x];
-    	var macAddr          = "#mac_address-"       + onlineDeviceInstanceArr[x];
-    	var staticIPAddr     = "#staticIPAddress-"   + onlineDeviceInstanceArr[x]; 
-        var ipDHCP           = "#ip_dhcp-"           + onlineDeviceInstanceArr[x];
-        var ipResv	         = "#ip_static-"         + onlineDeviceInstanceArr[x];
-        var comment          = "#comment-"           + onlineDeviceInstanceArr[x];
-        var dhcp_mac   = "#dhcp-mac"   + onlineDeviceInstanceArr[x];
-        var static_ip  = "#static-ip"  + onlineDeviceInstanceArr[x];
-    	//alert(onlineDeviceInstanceArr[x]);
-    	var isDHCP = $(ipDHCP).is(":checked");
-    	if (isDHCP) {
-    	    $(static_ip).hide();
-    	}
-    	else{
-    	    $(static_ip).show();
-    	}
-    	$(ipResv).click(function(){
-    	    $(static_ip).show();
-    	});
-    	$(ipDHCP).click(function(){
-    	    $(static_ip).hide();
-    	});
-        var hostName = onlineHostNameArr[x];
-        var macAddress = onlineHostMAC[x];
-    	$(submitEditDevice).click(function(e){
-            e.preventDefault();
-            var reseverd_ipAddr = $(staticIPAddr).val();
-            var isDHCP = $(ipDHCP).is(":checked");
-            var Comments = $(comment).val();
-            if (Comments.length > 63) {
-                alertLocale("The comments should be no more than 63 characters !");
-                return;
-            }
-		Comments=Comments.replace(/[\r\n]+/gm, "@" );
-            if (isDHCP){
-                if($(ipDHCP).val() == 'DHCP'){
-           	  	//this initial value is DHCP, user is going to modify comments
-                    var editDevInfo = '{"UpdateComments": "true", "Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-                }
-                else{
-	                // this is to provide info to remove this device in the static addr list, REservedIP => DHCP
-	                var editDevInfo = '{"delFlag": "true", "Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-                }
-            }
-            else{
-				//to check if "Reserved IP Address" is in "DHCP Pool range"
-				if(reseverd_ipAddr==""){
-					alertLocale("Please enter Reserved IP Address !");
-					return;
+	function toggleStaticIpInForm($form) {
+		var isDHCP = $form.find("input[name='ip'][value='DHCP']").is(":checked");
+		if (isDHCP) {
+			$form.find('.static-ip').hide();
+		}
+		else {
+			$form.find('.static-ip').show();
+		}
+	}
+
+	$('.edit-device-form').each(function(){
+		toggleStaticIpInForm($(this));
+	});
+
+	$(document).on('change', '.edit-device-form input[name="ip"]', function(){
+		var $form = $(this).closest('.edit-device-form');
+		toggleStaticIpInForm($form);
+	});
+
+	$(document).on('click', '.btn-save-edit-device', function(e){
+		e.preventDefault();
+		var $form = $(this).closest('.edit-device-form');
+		var hostName = $form.attr('data-host-name');
+		var macAddress = $form.attr('data-mac-address');
+		var initialAddrSrc = $form.attr('data-initial-addrsrc');
+		var reseverd_ipAddr = $form.find('.static-ip-input').val();
+		var isDHCP = $form.find("input[name='ip'][value='DHCP']").is(":checked");
+		var Comments = $form.find('.comment-input').val();
+		var editDevInfo = "";
+		if (Comments.length > 63) {
+			alertLocale("The comments should be no more than 63 characters !");
+			return;
+		}
+		Comments = Comments.replace(/[\r\n]+/gm, "@");
+
+		var editDevObj;
+		var commentsPayload = " " + Comments + " ";
+		if (isDHCP){
+			if(initialAddrSrc == 'DHCP'){
+				//this initial value is DHCP, user is going to modify comments
+				editDevObj = { UpdateComments: "true", Comments: commentsPayload, hostName: hostName, macAddress: macAddress, reseverd_ipAddr: reseverd_ipAddr };
+			}
+			else{
+				// this is to provide info to remove this device in the static addr list, REservedIP => DHCP
+				editDevObj = { delFlag: "true", Comments: commentsPayload, hostName: hostName, macAddress: macAddress, reseverd_ipAddr: reseverd_ipAddr };
+			}
+		}
+		else{
+			//to check if "Reserved IP Address" is in "DHCP Pool range"
+			if(reseverd_ipAddr==""){
+				alertLocale("Please enter Reserved IP Address !");
+				return;
+			}
+			var validIpaddr = valid_GW_IP(beginAddr, endAddr, reseverd_ipAddr);
+			if(!validIpaddr){
+				jAlert($.i18n('Reserved IP Address is not in valid range:')+"\n"+beginAddr+" ~ "+endAddr);
+				return;
+			}
+			// this is to provide info to edit REservedIP
+			editDevObj = { Comments: commentsPayload, hostName: hostName, macAddress: macAddress, reseverd_ipAddr: reseverd_ipAddr };
+		}
+		editDevInfo = JSON.stringify(editDevObj);
+
+		if($form.valid()){
+			jProgress($.i18n('This may take several seconds'), 60);
+			$.ajax({
+				type: "POST",
+				url: "actionHandler/ajaxSet_add_device.jst",
+				data: { DeviceInfo: editDevInfo, csrfp_token: token },
+				dataType: "json",
+				success: function(results){
+					setTimeout(function(){
+						jHide();
+						if (results=="success") { window.location.href="connected_devices_computers.jst";}
+						else if (results=="") {alertLocale("Failure! Please check your inputs.");}
+						else alertLocale(results);
+					}, 15000);
+				},
+				error: function(){
+					jHide();
+					alertLocale("Failure, Please check your inputs and try again.");
 				}
-				var validIpaddr = valid_GW_IP(beginAddr, endAddr,reseverd_ipAddr);
-                                if(!validIpaddr){
-                                         jAlert($.i18n('Reserved IP Address is not in valid range:')+"\n"+beginAddr+" ~ "+endAddr);
-                                                return;
-                                }
-				var reseverd_ipArr	= reseverd_ipAddr.split(".");
-				// this is to provide info to edit REservedIP
-				var editDevInfo = '{"Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-            } 
-            //alert(editDevInfo);
-            if($(".pageForm").valid()){
-                jProgress($.i18n('This may take several seconds'), 60); 
-    			$.ajax({           	
-    				type: "POST",
-    				url: "actionHandler/ajaxSet_add_device.jst",
-    				data: { DeviceInfo: editDevInfo,csrfp_token: token },
-    				dataType: "json",
-    				success: function(results){
-    					setTimeout(function(){
-    						jHide();
-    						if (results=='success') { window.location.href="connected_devices_computers.jst";}
-    						else if (results=="") {alertLocale("Failure! Please check your inputs.");}
-    						else alertLocale(results);
-    					}, 15000);
-    				},
-    				error: function(){
-    					jHide();
-    					alertLocale("Failure, Please check your inputs and try again.");
-    				}
-    			});
-            } //end of page form valid
-    	}); //end of submit edit device click
-       }) (i); //end of function(x)
-    }; // end of for loop
-      
-   for (var i = 0; i < offlineDeviceNum; i++) {
-    (
-        function(x) {
-        //alert(offlineDeviceInstanceArr[i]);
-        var submitEditDevice = "#submit_editDevice-" + offlineDeviceInstanceArr[x];
-        var macAddr          = "#mac_address-"       + offlineDeviceInstanceArr[x];
-        var staticIPAddr     = "#staticIPAddress-"   + offlineDeviceInstanceArr[x];
-        var ipDHCP           = "#ip_dhcp-"           + offlineDeviceInstanceArr[x];
-        var ipResv               = "#ip_static-"         + offlineDeviceInstanceArr[x];
-        var comment          = "#comment-"           + offlineDeviceInstanceArr[x];
-        var dhcp_mac   = "#dhcp-mac"   + offlineDeviceInstanceArr[x];
-        var static_ip  = "#static-ip"  + offlineDeviceInstanceArr[x];
-        //alert(offlineDeviceInstanceArr[x]);
-        var isDHCP = $(ipDHCP).is(":checked");
-        if (isDHCP) {
-            $(static_ip).hide();
-        }
-        else{
-            $(static_ip).show();
-        }
-        $(ipResv).click(function(){
-            $(static_ip).show();
-        });
-        $(ipDHCP).click(function(){
-            $(static_ip).hide();
-        });
-        var hostName = offlineHostNameArr[x];
-        var macAddress = offlineHostMAC[x];
-        $(submitEditDevice).click(function(e){
-            e.preventDefault();
-            var reseverd_ipAddr = $(staticIPAddr).val();
-            var isDHCP = $(ipDHCP).is(":checked");
-            var Comments = $(comment).val();
-            Comments=Comments.replace(/[\r\n]+/gm, "@" );		
-            if (isDHCP){
-                if($(ipDHCP).val() == 'DHCP'){
-                        //this initial value is DHCP, user is going to modify comments
-                    var editDevInfo = '{"UpdateComments": "true", "Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-                }
-                else{
-                        // this is to provide info to remove this device in the static addr list, REservedIP => DHCP
-                        var editDevInfo = '{"delFlag": "true", "Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-                }
-            }
-            else{
-                                //to check if "Reserved IP Address" is in "DHCP Pool range"
-                                if(reseverd_ipAddr==""){
-                                        alertLocale("Please enter Reserved IP Address !");
-                                        return;
-                                }
-				var validIpaddr = valid_GW_IP(beginAddr, endAddr,reseverd_ipAddr);
-                                if(!validIpaddr){
-                                         jAlert($.i18n('Reserved IP Address is not in valid range:')+"\n"+beginAddr+" ~ "+endAddr);
-                                                return;
-                                }
-                                var reseverd_ipArr      = reseverd_ipAddr.split(".");
-                                // this is to provide info to edit REservedIP
-                                var editDevInfo = '{"Comments": " '+ Comments +' ", "hostName": "' + hostName + '", "macAddress": "' + macAddress + '", "reseverd_ipAddr": "' + reseverd_ipAddr + '"}';
-            }
-            //alert(editDevInfo);
-            if($(".pageForm").valid()){
-                jProgress($.i18n('This may take several seconds'), 60);
-                        $.ajax({
-                                type: "POST",
-                                url: "actionHandler/ajaxSet_add_device.jst",
-                                data: { DeviceInfo: editDevInfo,csrfp_token: token },
-                                dataType: "json",
-                                success: function(results){
-                                        setTimeout(function(){
-                                                jHide();
-                                                if (results=="success") { window.location.href="connected_devices_computers.jst";}
-                                                else if (results=="") {alertLocale("Failure! Please check your inputs.");}
-                                                else alertLocale(results);
-                                        }, 15000);
-                                },
-                                error: function(){
-                                        jHide();
-                                        alertLocale("Failure, Please check your inputs and try again.");
-                                }
-                        });
-            } //end of page form valid
-        }); //end of submit edit device click
-       }) (i); //end of function(x)
-    }; // end of for loop   
+			});
+		}
+	});
 
     $('.confirm').off('click').click(function(e){
 	    if(!(privateDisabled && $(this).hasClass("private"))){
@@ -748,7 +662,7 @@ function getTitle(val){
 			if(($CloudUIEnable == "true" ) || $onlinePrivateNetworkHost[$x.toString()]['Blocked']) $style = "&nbsp;";
 			else $style = "<input type='button' id=" + "'online-X-" +$k+ "'" + " value='X' tabindex='0' title='add this device to Blocked Devices List' name=" + "'{\"dev_name\":\""+$dev_name+"\", \"mac_addr\":\""+$mac_addr+"\"}'" + " class=\"btn confirm private\"></input>";
 		}
-		$editStyle = "<input type='button' value='Edit' tabindex='0' id=" + "'btn-" +$onlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'"+ " data-edit-target=" + "'edit-device-" +$onlinePrivateNetworkHost[$x.toString()]['instanceID'] + "'" + " class=\"btn private edbutton mlo-edit-btn\"></input>";
+		$editStyle = "<input type='button' value='Edit' tabindex='0' id=" + "'btn-" +$onlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'"+ " data-edit-target=" + "'edit-device-" +$onlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'" + " class=\"btn private edbutton mlo-edit-btn\"></input>";
 		if($k % 2)  $odd = "";
 				else $odd = " class='odd'";
          	echo( "\
@@ -860,7 +774,7 @@ else if($offlinePrivateNetworkHost[$x.toString()]['Connection']=="Ethernet"){pri
 			if(($CloudUIEnable == "true" ) || $offlinePrivateNetworkHost[$x.toString()]['Blocked']) $style = "&nbsp;";
 			else $style = "<input type='button' id=" + "'offline-X-" +$k+ "'" + " value='X' tabindex='0' onmouseover=getTitle("+$k+")  name=" + "'{\"dev_name\":\""+$dev_name+"\", \"mac_addr\":\""+$mac_addr+"\"}'" + "  class=\"btn confirm private\"></input>";
 		}
-		$editStyle = "<input type='button' value='Edit' tabindex='0' id=" + "'btn-" +$offlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'"+ " data-edit-target=" + "'offline-edit-device-" +$offlinePrivateNetworkHost[$x.toString()]['instanceID'] + "'" + " class=\"btn private edbutton mlo-edit-btn\"></input>";
+		$editStyle = "<input type='button' value='Edit' tabindex='0' id=" + "'btn-" +$offlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'"+ " data-edit-target=" + "'offline-edit-device-" +$offlinePrivateNetworkHost[$x.toString()]['instanceID'] + "-" +$k+ "'" + " class=\"btn private edbutton mlo-edit-btn\"></input>";
     	if($k % 2) $odd = "";
     	else $odd = " class='odd'";
 	echo('<input type="hidden" id=devicename_'+$k+' value='+$dev_name+'>');
@@ -1173,9 +1087,7 @@ else if($offlinePrivateNetworkHost[$x.toString()]['Connection']=="Ethernet"){pri
 <?% 
 //this part is to populate edit device info on each online private network host basis
 for ($i=0; $i < $onlinePrivateNetworkHost['hostNum']; $i++) {
-	if(!$onlinePrivateNetworkHost[$i.toString()]['ShowActions']) {
-		continue;
-	}
+	$rowKey = $i + 1;
 	$commentsOnline2= $onlinePrivateNetworkHost[$i.toString()]['Comments'];
 	$commentsOnline2=$commentsOnline2.trim();
     	if($commentsOnline2.search('@')!=-1){
@@ -1197,6 +1109,8 @@ for ($i=0; $i < $onlinePrivateNetworkHost['hostNum']; $i++) {
     } 
 	$ID      = $onlinePrivateNetworkHost[$i.toString()]['instanceID'];
 	$AddrSrc = $onlinePrivateNetworkHost[$i.toString()]['AddressSource'];
+	$editHostName = htmlspecialchars($onlinePrivateNetworkHost[$i.toString()]['HostName'], ENT_NOQUOTES, 'UTF-8');
+	$editMacAddress = $onlinePrivateNetworkHost[$i.toString()]['PhysAddress'];
 	var unknowid="";
 	if($onlinePrivateNetworkHost[$i.toString()]['Connection']=="Unknown"){
 		unknowid="unknown";
@@ -1206,19 +1120,23 @@ for ($i=0; $i < $onlinePrivateNetworkHost['hostNum']; $i++) {
 	}
 	else if($onlinePrivateNetworkHost[$i.toString()]['Connection']=="Wi-Fi 5 GHz"){
 		unknowid ="5_G";
-	}else if($onlinePrivateNetworkHost[$i.toString()]['Connection']=="Ethernet"){unknowid ="ethcon";}
+	}
+	else if($onlinePrivateNetworkHost[$i.toString()]['Connection']=="Wi-Fi 6 GHz"){
+		unknowid ="6_G";
+	}
+	else if($onlinePrivateNetworkHost[$i.toString()]['Connection']=="Ethernet"){unknowid ="ethcon";}
 	echo( "\
-        <div id=\"edit-device-" +$ID+ "\"  class=\"edit-device content \" class='hidden'>\
-		    <h1 id=\"conndevedithead\">Connected Devices > Devices > Edit Device</h1>\
+        <div id=\"edit-device-" +$ID+ "-" +$rowKey+ "\" class=\"edit-device content hidden\">\
+		    <h1 class=\"conndevedithead\">Connected Devices > Devices > Edit Device</h1>\
 		    <div  class=\"educational-tip-edit\">\
 				<p  class=\"tip\" id='chipadd'>Change the IP address assignment method for Online Devices.</p>\
 				<p  class=\"hidden\" id=\"connedittip"+$id4+"\">If DHCP is selected, the Gateway\'s DHCP server will automatically assign the IP address.</p>\
 				<p  class=\"hidden\" id=\"connedittip"+$id5+"\">If Reserved IP is selected, the IP address will be fixed without DHCP operation and you\'ll need to manually enter the IP address. The IP address must be within the DHCP IP address pool. To find your IP address range, go to <strong>Gateway > Connection > Local IP Network.</strong></p>\
 				<p  class=\"hidden\" id='connedittip3'>Reserved IP addresses can be assigned to any device that acts as a server or that requires a fixed IP address.</p> \
 			</div>\
-		<div  class=\"module forms\" id=\"computers-edit-" +$ID+ "\" >\
+		<div  class=\"module forms\" id=\"computers-edit-" +$ID+ "-" +$rowKey+ "\" >\
 		<h2 id='editdevloc'>Edit Device</h2> \
-        <form id=\"pageForm-" +$ID+ "\"   class=\"pageForm\">\
+        <form id=\"pageForm-" +$ID+ "-" +$rowKey+ "\"   class=\"pageForm edit-device-form\" data-host-name=\"" +$editHostName+ "\" data-mac-address=\"" +$editMacAddress+ "\" data-initial-addrsrc=\"" +$AddrSrc+ "\">\
 			<div  class=\"form-row\">\
         		<span  class=\"readonlyLabel\" name=\"host_name\" id=\"hostnew\">Host Name:</span>\
         		<span  class=\"value\">" + $onlinePrivateNetworkHost[$i.toString()]['HostName'] + "</span>\
@@ -1229,27 +1147,27 @@ for ($i=0; $i < $onlinePrivateNetworkHost['hostNum']; $i++) {
 			</div>\
 			<div  class=\"form-row\">\
 				<label for=\"ip\" class='condev_config' id='confloc'>Configuration:</label>\
-				<input type=\"radio\" name=\"ip\" value=\"" +$AddrSrc+ "\" " +( ($AddrSrc == "DHCP") ? "checked='checked'" : '' )+ " class=\"ip_dchp\" id=\"ip_dhcp-" +$ID+ "\" />\
-				<label  class=\"radio\" for=\"ip_dhcp-" +$ID+ "\">DHCP</label>\
+				<input type=\"radio\" name=\"ip\" value=\"DHCP\" " +( ($AddrSrc == "DHCP") ? "checked='checked'" : '' )+ " class=\"ip_dchp\" id=\"ip_dhcp-" +$ID+ "-" +$rowKey+ "\" />\
+				<label  class=\"radio\" for=\"ip_dhcp-" +$ID+ "-" +$rowKey+ "\">DHCP</label>\
 				<br/>\
-				<input  class=\"trigger ip_static\" type=\"radio\"" +(($AddrSrc == "DHCP") ? '' : "checked='checked'"  )+ " name=\"ip\" value=\"static\" id=\"ip_static-" +$ID+ "\" />\
-				<label  class=\"radio\" for=\"ip_static-" +$ID+ "\" id=\"reserveip\">Reserved IP</label>\
+				<input  class=\"trigger ip_static\" type=\"radio\"" +(($AddrSrc == "DHCP") ? '' : "checked='checked'"  )+ " name=\"ip\" value=\"static\" id=\"ip_static-" +$ID+ "-" +$rowKey+ "\" />\
+				<label  class=\"radio\" for=\"ip_static-" +$ID+ "-" +$rowKey+ "\" id=\"reserveip\">Reserved IP</label>\
 			</div>\
-			<div id=\"dhcp-mac" +$ID+ "\"  class=\"dhcp-mac form-row odd\">\
+			<div id=\"dhcp-mac" +$ID+ "-" +$rowKey+ "\"  class=\"dhcp-mac form-row odd\">\
 			    	<span  class=\"readonlyLabel\" id=\"macaddronline\">MAC Address:</span>\
         			<span  class=\"value\">"+$onlinePrivateNetworkHost[$i.toString()]['PhysAddress']+"</span>\
 			</div>\
-      		<div id=\"static-ip" +$ID+ "\"  class=\"static-ip form-row odd\" >\
-				<label for=\"staticIPAddress-" +$ID+ "\" id=\"reservediploc\">Reserved IP Address:</label>\
-				<input type=\"text\" value=\""+ $onlinePrivateNetworkHost[$i.toString()]['IPv4Address'] +"\" id=\"staticIPAddress-" +$ID+ "\" name=\"staticIPAddress\"  class=\"target\" />\
+			<div id=\"static-ip" +$ID+ "-" +$rowKey+ "\"  class=\"static-ip form-row odd\" >\
+				<label for=\"staticIPAddress-" +$ID+ "-" +$rowKey+ "\" id=\"reservediploc\">Reserved IP Address:</label>\
+				<input type=\"text\" value=\""+ $onlinePrivateNetworkHost[$i.toString()]['IPv4Address'] +"\" id=\"staticIPAddress-" +$ID+ "-" +$rowKey+ "\" name=\"staticIPAddress\"  class=\"target static-ip-input\" />\
 			</div>\
 			<div  class=\"form-row\">\
-				<label for=\"comment-" +$ID+ "\" id=\"commentloc\">Comments:</label>\
-		        <textarea id=\"comment-" +$ID+ "\" name=\"comments\" ros=\"6\" cols=\"18\" maxlength=\"63\">"+ $commentsOnline2 +"</textarea>\
+				<label for=\"comment-" +$ID+ "-" +$rowKey+ "\" id=\"commentloc\">Comments:</label>\
+		        <textarea id=\"comment-" +$ID+ "-" +$rowKey+ "\" name=\"comments\" rows=\"6\" cols=\"18\" maxlength=\"63\" class=\"comment-input\">"+ $commentsOnline2 +"</textarea>\
 			</div>\
 			<div  class=\"form-row form-btn\">\
-				<input type=\"button\" id=\"submit_editDevice-" +$ID+ "\"  class=\"btn\" value=\"Save\"/>\
-			    <input type=\"reset\" id=\"btn-cancel-" +$ID+ "\" class=\"btn-cancel btn alt reset\" value=\"Cancel\"/>\
+				<input type=\"button\" id=\"submit_editDevice-" +$ID+ "-" +$rowKey+ "\"  class=\"btn btn-save-edit-device\" value=\"Save\"/>\
+			    <input type=\"reset\" id=\"btn-cancel-" +$ID+ "-" +$rowKey+ "\" class=\"btn-cancel btn alt reset\" value=\"Cancel\"/>\
 			</div>\
 		</form>\
 	</div> <!-- end .module -->\
@@ -1258,9 +1176,7 @@ for ($i=0; $i < $onlinePrivateNetworkHost['hostNum']; $i++) {
 }
 //this part is to populate edit device info on each offline private network host basis
 for ($i=0; $i < $offlinePrivateNetworkHost['hostNum']; $i++) {
-	if(!$offlinePrivateNetworkHost[$i.toString()]['ShowActions']) {
-		continue;
-	}
+	$rowKey = $i + 1;
   	$commentOffline1=      $offlinePrivateNetworkHost[$i.toString()]['Comments'];
 	$commentOffline1=$commentOffline1.trim();
 	if($commentOffline1.search('@')!=-1){
@@ -1284,6 +1200,8 @@ for ($i=0; $i < $offlinePrivateNetworkHost['hostNum']; $i++) {
 
         $ID      = $offlinePrivateNetworkHost[$i.toString()]['instanceID'];
         $AddrSrc = $offlinePrivateNetworkHost[$i.toString()]['AddressSource'];
+	$editHostName = htmlspecialchars($offlinePrivateNetworkHost[$i.toString()]['HostName'], ENT_NOQUOTES, 'UTF-8');
+	$editMacAddress = $offlinePrivateNetworkHost[$i.toString()]['PhysAddress'];
 	var unknowid="";
         if($offlinePrivateNetworkHost[$i.toString()]['Connection']=="Unknown"){
                 unknowid="unknown";
@@ -1293,19 +1211,23 @@ for ($i=0; $i < $offlinePrivateNetworkHost['hostNum']; $i++) {
 	}
 	else if($offlinePrivateNetworkHost[$i.toString()]['Connection']=="Wi-Fi 5 GHz"){
 		unknowid ="5_G";
-	}else{unknowid ="ethcon";}
-        echo("\
-        <div id=\"offline-edit-device-" +$ID+ "\"  class=\"edit-device content \" class='hidden'>\
-                    <h1 id=\"conndevedithead1\">Connected Devices > Devices > Edit Device</h1>\
+	}
+	else if($offlinePrivateNetworkHost[$i.toString()]['Connection']=="Wi-Fi 6 GHz"){
+		unknowid ="6_G";
+	}
+	else{unknowid ="ethcon";}
+		echo("\
+		<div id=\"offline-edit-device-" +$ID+ "-" +$rowKey+ "\" class=\"edit-device content hidden\">\
+					<h1 class=\"conndevedithead\">Connected Devices > Devices > Edit Device</h1>\
                     <div  class=\"educational-tip-edit\">\
                                 <p  class=\"tip\" id=\"conndeveditoffmess1\">Change the IP address assignment method for Offline Devices</p> \
                                 <p  class=\"hidden\" id=\"connedittip"+$id4+"\">If DHCP is selected, the Gateway\'s DHCP server will automatically assign the IP address.</p> \
                                 <p  class=\"hidden\" id=\"connedittip"+$id5+"\">If Reserved IP is selected, the IP address will be fixed without DHCP operation and you\'ll need to manually enter the IP address. The IP address must be within the DHCP IP address pool. To find your IP address range, go to <strong>Gateway > Connection > Local IP Network.</strong></p> \
                                 <p  class=\"hidden\" id='connedittip3'>Reserved IP addresses can be assigned to any device that acts as a server or that requires a fixed IP address.</p> \
                         </div> \
-                <div  class=\"module forms\" id=\"computers-edit-" +$ID+ "\" > \
+				<div  class=\"module forms\" id=\"computers-edit-" +$ID+ "-" +$rowKey+ "\" > \
                 <h2 id=\"editdevloc1\">Edit Device</h2> \
-        <form id=\"pageForm-" +$ID+ "\"   class=\"pageForm\"> \
+			<form id=\"pageForm-" +$ID+ "-" +$rowKey+ "\"   class=\"pageForm edit-device-form\" data-host-name=\"" +$editHostName+ "\" data-mac-address=\"" +$editMacAddress+ "\" data-initial-addrsrc=\"" +$AddrSrc+ "\"> \
                         <div  class=\"form-row\"> \
                         <span  class=\"readonlyLabel\" name=\"host_name\" id=\"hostnew\">Host Name:</span> \
                         <span  class=\"value\">" + $offlinePrivateNetworkHost[$i.toString()]['HostName'] + "</span> \
@@ -1316,27 +1238,27 @@ for ($i=0; $i < $offlinePrivateNetworkHost['hostNum']; $i++) {
                         </div>\
                         <div  class=\"form-row\">\
                                 <label for=\"ip\" class='condev_config'  id='confloc'>Configuration:</label>\
-                                <input type=\"radio\" name=\"ip\" value=\"" +$AddrSrc+ "\" " +( ($AddrSrc == "DHCP") ? "checked='checked'" : '' )+ " class=\"ip_dchp\" id=\"ip_dhcp-" +$ID+ "\" />\
-                                <label  class=\"radio\" for=\"ip_dhcp-" +$ID+ "\">DHCP</label>\
+								<input type=\"radio\" name=\"ip\" value=\"DHCP\" " +( ($AddrSrc == "DHCP") ? "checked='checked'" : '' )+ " class=\"ip_dchp\" id=\"ip_dhcp-" +$ID+ "-" +$rowKey+ "\" />\
+								<label  class=\"radio\" for=\"ip_dhcp-" +$ID+ "-" +$rowKey+ "\">DHCP</label>\
                                 <br/>\
-                                <input  class=\"trigger ip_static\" type=\"radio\"" +(($AddrSrc == "DHCP") ? '' : "checked='checked'"  )+ " name=\"ip\" value=\"static\" id=\"ip_static-" +$ID+ "\" />\
-                                <label  class=\"radio\" for=\"ip_static-" +$ID+ "\" id=\"reserveip\">Reserved IP</label>\
+								<input  class=\"trigger ip_static\" type=\"radio\"" +(($AddrSrc == "DHCP") ? '' : "checked='checked'"  )+ " name=\"ip\" value=\"static\" id=\"ip_static-" +$ID+ "-" +$rowKey+ "\" />\
+								<label  class=\"radio\" for=\"ip_static-" +$ID+ "-" +$rowKey+ "\" id=\"reserveip\">Reserved IP</label>\
                         </div>\
-                        <div id=\"dhcp-mac" +$ID+ "\"  class=\"dhcp-mac form-row odd\">\
+							<div id=\"dhcp-mac" +$ID+ "-" +$rowKey+ "\"  class=\"dhcp-mac form-row odd\">\
                                 <span  class=\"readonlyLabel\" id=\"macaddronline\">MAC Address:</span>\
                                 <span  class=\"value\">"+$offlinePrivateNetworkHost[$i.toString()]['PhysAddress']+"</span>\
                         </div>\
-                <div id=\"static-ip" +$ID+ "\"  class=\"static-ip form-row odd\" >\
-                                <label for=\"staticIPAddress-" +$ID+ "\" id=\"reservediploc\">Reserved IP Address:</label>\
-                                <input type=\"text\" value=\""+ $resIp +"\" id=\"staticIPAddress-" +$ID+ "\" name=\"staticIPAddress\"  class=\"target\" />\
+						<div id=\"static-ip" +$ID+ "-" +$rowKey+ "\"  class=\"static-ip form-row odd\" >\
+								<label for=\"staticIPAddress-" +$ID+ "-" +$rowKey+ "\" id=\"reservediploc\">Reserved IP Address:</label>\
+								<input type=\"text\" value=\""+ $resIp +"\" id=\"staticIPAddress-" +$ID+ "-" +$rowKey+ "\" name=\"staticIPAddress\"  class=\"target static-ip-input\" />\
                         </div>\
                         <div  class=\"form-row\">\
-                                <label for=\"comment-" +$ID+ "\" id=\"commentloc\">Comments:</label>\
-                        <textarea id=\"comment-" +$ID+ "\" name=\"comments\" ros=\"6\" cols=\"18\" maxlength=\"63\">"+ $commentOffline1 +"</textarea>\
+								<label for=\"comment-" +$ID+ "-" +$rowKey+ "\" id=\"commentloc\">Comments:</label>\
+							<textarea id=\"comment-" +$ID+ "-" +$rowKey+ "\" name=\"comments\" rows=\"6\" cols=\"18\" maxlength=\"63\" class=\"comment-input\">"+ $commentOffline1 +"</textarea>\
                         </div>\
                         <div  class=\"form-row form-btn\">\
-                                <input type=\"button\" id=\"submit_editDevice-" +$ID+ "\"  class=\"btn\" value=\"Save\"/>\
-                            <input type=\"reset\" id=\"btn-cancel-" +$ID+ "\" class=\"btn-cancel btn alt reset\" value=\"Cancel\"/>\
+								<input type=\"button\" id=\"submit_editDevice-" +$ID+ "-" +$rowKey+ "\"  class=\"btn btn-save-edit-device\" value=\"Save\"/>\
+							    <input type=\"reset\" id=\"btn-cancel-" +$ID+ "-" +$rowKey+ "\" class=\"btn-cancel btn alt reset\" value=\"Cancel\"/>\
                         </div>\
                 </form>\
         </div> <!-- end .module -->\
diff --git a/source/Styles/xb3/jst/locale/global.js b/source/Styles/xb3/jst/locale/global.js
index 77946af..3dde4a2 100755
--- a/source/Styles/xb3/jst/locale/global.js
+++ b/source/Styles/xb3/jst/locale/global.js
@@ -202,7 +202,7 @@ $("#nocyc").text($.i18n("Number of Cycles to date:"));
 $("#batmodno").text($.i18n("Battery Model Number:"));
 $("#batserno").text($.i18n("Battery Serial Number:"));
 $("#connhead").text($.i18n("Connected Devices > Devices"));
-$("#conndevedithead,#conndevedithead1").text($.i18n("Connected Devices > Devices > Edit Device"));
+$(".conndevedithead").text($.i18n("Connected Devices > Devices > Edit Device"));
 $("#connhom1").text($.i18n("Managing your home network settings is now easier than ever."));
 $("#visithead").text($.i18n("Visit "));
 $("#connhom2").text($.i18n(" to view and manage your list of connected/offline devices. You can block access to your home network for any device, among many other features and settings."));