diff --git a/httpserver.cpp b/httpserver.cpp
index 0a60cda..1894bec 100644
--- a/httpserver.cpp
+++ b/httpserver.cpp
@@ -807,8 +807,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
                             }
                             for (const auto &user: m_servers[originalServerName][originalChannelName]) {
                                 if (QRegularExpression("^(.*;|~|@|\\&|\\+)?"+rawMessage.first+"$").match(user).hasMatch()) {
-                                    message.replace("<div class=\"main_payload__chat_username\">",
-                                                    "<div class=\"main_payload__chat_username\" style=\"color: green\">");
+                                    message.replace("class=\"main_payload__chat_username\"",
+                                                    "class=\"main_payload__chat_username\" style=\"color: green\"");
                                     break;
                                 }
                             }
@@ -868,8 +868,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
                                 }
                                 for (const auto &user: m_servers[originalServerName][originalChannelName]) {
                                     if (QRegularExpression("^^(.*;|~|@|\\&|\\+)?"+rawMessage.first+"$").match(user).hasMatch()) {
-                                        message.replace("<div class=\"main_payload__chat_username\">",
-                                                        "<div class=\"main_payload__chat_username\" style=\"color: green\">");
+                                        message.replace("class=\"main_payload__chat_username\"",
+                                                        "class=\"main_payload__chat_username\" style=\"color: green\"");
                                         break;
                                     }
                                 }
@@ -952,8 +952,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
                             }
                             for (const auto &user: m_servers[originalServerName][originalChannelName]) {
                                 if (QRegularExpression("^^(.*;|~|@|\\&|\\+)?"+rawMessage.first+"$").match(user).hasMatch()) {
-                                    message.replace("<div class=\"main_payload__chat_username\">",
-                                                    "<div class=\"main_payload__chat_username\" style=\"color: green\">");
+                                    message.replace("class=\"main_payload__chat_username\"",
+                                                    "class=\"main_payload__chat_username\" style=\"color: green\"");
                                     break;
                                 }
                             }
@@ -1133,8 +1133,8 @@ void HttpServer::writeMainPage(QTcpSocket *socket, QString &urlPath, bool isHead
                     }
                     for (const auto &user: m_servers[originalServerName][originalChannelName]) {
                         if (QRegularExpression("^(.*;|~|@|\\&|\\+)?"+rawMessage.first+"$").match(user).hasMatch()) {
-                            message.replace("<div class=\"main_payload__chat_username\">",
-                                            "<div class=\"main_payload__chat_username\" style=\"color: green\">");
+                            message.replace("class=\"main_payload__chat_username\"",
+                                            "class=\"main_payload__chat_username\" style=\"color: green\"");
                             break;
                         }
                     }
@@ -1362,8 +1362,8 @@ void HttpServer::writeRealTimeChatPage(QTcpSocket *socket, QString &urlPath, boo
                 message.replace("class=\"main_payload__chat\"",
                                 "class=\"main_payload__chat\" style=\"opacity: .5\"");
             }
-            message.replace("<div class=\"main_payload__chat_username\">",
-                            "<div class=\"main_payload__chat_username\" style=\"color: #e34f10\">");
+            message.replace("class=\"main_payload__chat_username\"",
+                            "class=\"main_payload__chat_username\" style=\"color: #e34f10\"");
 
             replaceTag(message, "USERNAME", rawMessage.first);
             replaceTag(message, "MESSAGE_TEXT", rawMessage.second);
@@ -1373,9 +1373,9 @@ void HttpServer::writeRealTimeChatPage(QTcpSocket *socket, QString &urlPath, boo
         file.close();
     }
     QString hr = HTML_PAYLOAD_LIST_CHAT_MESSAGE;
-    hr.replace("<div class=\"main_payload__chat_mail\">", "<div id=\"hr\" class=\"main_payload__chat_mail\">");
-    hr.replace("<div class=\"main_payload__chat_username\">",
-                    "<div class=\"main_payload__chat_username\" style=\"color: white; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;\">");
+    hr.replace("class=\"main_payload__chat_mail\"", "id=\"hr\" class=\"main_payload__chat_mail\"");
+    hr.replace("class=\"main_payload__chat_username\"",
+                    "class=\"main_payload__chat_username\" style=\"color: white; text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;\"");
     replaceTag(hr, "USERNAME", "IRCaBot");
     replaceTag(hr, "MESSAGE_TEXT", "<b>New messages won't show without JavaScript.</b><br>"
                                    "My JS code is small and simple. Check it at "
diff --git a/httpserver.h b/httpserver.h
index 1629600..61a779f 100644
--- a/httpserver.h
+++ b/httpserver.h
@@ -180,12 +180,12 @@ Content-Length: {{SIZE}}\r\n\r\n";
 
     const QString HTML_PAYLOAD_LIST_CHAT_MESSAGE = "\
                 <div class=\"main_payload__chat\">\n\
-                    <div class=\"main_payload__chat_username\">\n\
+                    <span class=\"main_payload__chat_username\">\n\
                         {{USERNAME}}\n\
-                    </div>\n\
-                    <div class=\"main_payload__chat_mail\">\n\
+                    </span>\n\
+                    <span class=\"main_payload__chat_mail\">\n\
                         {{MESSAGE_TEXT}}\n\
-                    </div>\n\
+                    </span>\n\
                 </div>\n";
 
     const QString HTML_PAYLOAD_ERROR = "\