diff --git a/src/components/Alert.jsx b/src/components/Alert.jsx
index f2a2029..81670a2 100644
--- a/src/components/Alert.jsx
+++ b/src/components/Alert.jsx
@@ -59,7 +59,6 @@ const Alert = () => {
         show={show}
         onClick={close}
       />
-      (render || open) && (
       <div
         className={(show) ? 'Alert show' : 'Alert'}
         onTransitionEnd={() => {
diff --git a/src/components/ChatMessage.jsx b/src/components/ChatMessage.jsx
index bafe990..85965e1 100644
--- a/src/components/ChatMessage.jsx
+++ b/src/components/ChatMessage.jsx
@@ -42,10 +42,10 @@ function ChatMessage({
 
   return (
     <li className="chatmsg" ref={refEmbed}>
-      {(!isInfo && !isEvent)
-        && (
-          <div className="chathead" key="ch">
-            <span className="chatname">
+      <div className="msgcont">
+        <span className={className}>
+          {(!isInfo && !isEvent) && (
+            <span className="chatname" key="name">
               <img
                 alt=""
                 title={country}
@@ -78,13 +78,12 @@ function ChatMessage({
                 {name}
               </span>:
             </span>
-            <span className="chatts">
-              {getDateTimeString(ts)}
-            </span>
-          </div>
-        )}
-      <div className={className} key="cm">
-        <MarkdownParagraph refEmbed={refEmbed} pArray={pArray} />
+          )}
+          <MarkdownParagraph refEmbed={refEmbed} pArray={pArray} />
+        </span>
+        <span className="chatts">
+          {getDateTimeString(ts)}
+        </span>
       </div>
     </li>
   );
diff --git a/src/components/ModWatchtools.jsx b/src/components/ModWatchtools.jsx
index 5fad382..d70a42c 100644
--- a/src/components/ModWatchtools.jsx
+++ b/src/components/ModWatchtools.jsx
@@ -267,7 +267,7 @@ function ModWatchtools() {
       {(rows && columns && types) && (
         <React.Fragment key="pxltable">
           <div className="modaldivider" />
-          <table style={{ fontSize: 11 }} >
+          <table style={{ fontSize: 11 }}>
             <thead>
               <tr>
                 {columns.slice(1).map((col, ind) => (
diff --git a/src/components/Window.jsx b/src/components/Window.jsx
index 82e7a3d..4bbe480 100644
--- a/src/components/Window.jsx
+++ b/src/components/Window.jsx
@@ -49,7 +49,7 @@ const Window = ({ id }) => {
     dispatch(cloneWindow(id));
   }, [dispatch]);
 
-  const toggleMaximize = useCallback((evt) => {
+  const toggleMaximize = useCallback(() => {
     setRender(false);
   }, [dispatch]);
 
diff --git a/src/styles/default.css b/src/styles/default.css
index 3e7bef2..5afed3e 100644
--- a/src/styles/default.css
+++ b/src/styles/default.css
@@ -638,12 +638,18 @@ tr:nth-child(even) {
     left: 0px;
     right: 0px;
     bottom: 0px;
-    height: 95%;
-    width: 90%;
     transform: none;
     max-width: none;
     max-height: none;
-    padding: 5%;
+    outline: none;
+    border: none;
+    border-radius: inherit;
+  }
+
+  .modal {
+    height: 100%;
+    width: 100%;
+    padding: 0;
   }
 }
 
@@ -679,6 +685,7 @@ tr:nth-child(even) {
 .chatname {
   font-size: 13px;
   white-space: nowrap;
+  padding-right: 4px;
 }
 .chatts {
   color: #83839f;
@@ -687,20 +694,18 @@ tr:nth-child(even) {
   text-align: right;
 }
 .chatmsg {
-  background-color: #eaeaea;
   font-size: 13px;
   user-select: text;
-  padding: 5px 0 0 0;
-}
-.chatmsg:nth-child(even) {
-  background-color: #f2f2f2;
+  padding: 7px 0 0 2px;
 }
 .chatmsg:hover {
   background-color: #dadada;
 }
+.msgcont {
+  display: flex;
+}
 .msg {
   color: #2d2d2d;
-  padding-left: 15px;
   overflow-y: clip;
   overflow-x: hidden;
 }
diff --git a/src/styles/theme-dark-round.css b/src/styles/theme-dark-round.css
index f54f330..28cf7bf 100644
--- a/src/styles/theme-dark-round.css
+++ b/src/styles/theme-dark-round.css
@@ -136,14 +136,8 @@ tr:nth-child(even) {
   background-color: rgba(187, 187, 187, 0.75);
 }
 
-.chatmsg {
-  background-color: #393939;
-}
-.chatmsg:nth-child(even) {
-  background-color: #414141;
-}
 .chatmsg:hover {
-  background-color: #393939;
+  background-color: #2525252b;
 }
 .msg {
   color: #f3f3f3;
diff --git a/src/styles/theme-dark-sstraight.css b/src/styles/theme-dark-sstraight.css
index ebe57eb..b801282 100644
--- a/src/styles/theme-dark-sstraight.css
+++ b/src/styles/theme-dark-sstraight.css
@@ -141,14 +141,8 @@ tr:nth-child(even) {
   background-color: rgba(187, 187, 187, 0.75);
 }
 
-.chatmsg {
-  background-color: #393939;
-}
-.chatmsg:nth-child(even) {
-  background-color: #414141;
-}
 .chatmsg:hover {
-  background-color: #393939;
+  background-color: #2525252b;
 }
 .msg {
   color: #f3f3f3;
diff --git a/src/styles/theme-dark.css b/src/styles/theme-dark.css
index 4c84141..5c2d407 100644
--- a/src/styles/theme-dark.css
+++ b/src/styles/theme-dark.css
@@ -121,14 +121,8 @@ tr:nth-child(even) {
   background-color: rgba(187, 187, 187, 0.75);
 }
 
-.chatmsg {
-  background-color: #393939;
-}
-.chatmsg:nth-child(even) {
-  background-color: #414141;
-}
 .chatmsg:hover {
-  background-color: #393939;
+  background-color: #2525252b;
 }
 .msg {
   color: #f3f3f3;