       message += remote_esps[i].relayState;
       message += "<br>";
       //check relay state
-      if (relayState[0] == '0'){
+      // /001 -> 0 = 1ESP-Relay 0=first relay(0,1,2 or 3) 1=ON
+      if (remote_esps[i].relayState[0] == '0'){
+        message += "<a href='/";
+        message += i;
+        message += "01'>";
         message += svg_relayOff;
+        message += "</a>";
       }else{
+        message += "<a href='/";
+        message += i;
+        message += "00'>";
         message += svg_relayOn;
-      }
-      if (relayState[1] == '0'){
+        message += "</a>";
+      }
+      if (remote_esps[i].relayState[1] == '0'){
+        message += "<a href='/";
+        message += i;
+        message += "11'>";
         message += svg_relayOff;
+        message += "</a>";
       }else{
+        message += "<a href='/";
+        message += i;
+        message += "10'>";
         message += svg_relayOn;
-      }
-      if (relayState[2] == '0'){
+        message += "</a>";
+      }
+      if (remote_esps[i].relayState[2] == '0'){
+        message += "<a href='/";
+        message += i;
+        message += "21'>";
         message += svg_relayOff;
+        message += "</a>";
       }else{
+       message += "<a href='/";
+        message += i;
+        message += "20'>";
         message += svg_relayOn;
-      }
-      if (relayState[3] == '0'){
+        message += "</a>";
+      }
+      if (remote_esps[i].relayState[3] == '0'){
+        message += "<a href='/";
+        message += i;
+        message += "31'>";
         message += svg_relayOff;
+        message += "</a>";
       }else{
+        message += "<a href='/";
+        message += i;
+        message += "30'>";
         message += svg_relayOn;
+        message += "</a>";
       }
       message += "<br>";
       message += "\nCurrent: ";

      udp.write(current);
      // Add relay data and current
      udp.endPacket();
    }

    // Receiving broadcast respons
    if ( packetBuffer[0] == '2' ){

            currentBuffer[i-offset] = packetBuffer[i];
            currentBuffer[i-offset+1] = '\0';
            break;
          default: 
            // if nothing else matches, do the default
            // default is optional
          break;
        }
      }
      
      Serial.println("");
      Serial.println(nameBuffer);
      Serial.println(relayBuffer);
      Serial.println(currentBuffer);
      
      int updateEntry = -1;
      for( int i=0; i < maxRemoteEsps; i++){
        // if name exists in array
