diff --git a/front/src/components/MessageComponent.tsx b/front/src/components/MessageComponent.tsx
index 9d21183..f8714d6 100644
--- a/front/src/components/MessageComponent.tsx
+++ b/front/src/components/MessageComponent.tsx
@@ -11,33 +11,29 @@ export default function MessageComponent({ message, user, channel }: {
         channel: Channel | undefined;
     }) {
     const [reply, setReply] = useState(false);
-    const token = localStorage.getItem("token");
     const [replyContent, setReplyContent] = useState("");
     const [searchedUsers, setSearchedUsers] = useState<Users>([]);
     const [searchedEmojis, setSearchedEmojis] = useState<Emojis>([]);
     const ref = createRef<HTMLInputElement>();
+    const token = localStorage.getItem("token");
 
     function getMessageArray(message: Message) {
         const array = []
         var string = ''
         message.content.split(" ").forEach((word) => {
-            if (word.startsWith("@")) {
-                const mention = message.mentions.find((mention) => `@${mention.username}` === word);
-                if (mention) {
-                    array.push(string)
-                    string = ''
-                    array.push(word)
-                } else {
-                    string += word + " "
-                }
+            if (word.startsWith("@") && message.mentions.find((mention) => `@${mention.username}` === word)) {
+                array.push(string)
+                string = ''
+                array.push(<Link to={`/u/${word.substring(1)}`}>{word}</Link>)
             } else if (word.startsWith("https://") || word.startsWith("http://")) {
                 array.push(string)
                 string = ''
-                array.push(word)
+                array.push(<Link to={word}>{word}</Link>)
             } else if (word.startsWith(":") && word.endsWith(":") && word.length > 2) {
                 array.push(string)
                 string = ''
-                array.push(word)
+                const emojiName = word.substring(1, word.length - 1);
+                array.push(<img src={`/api/emojis/${emojiName}`} alt={emojiName} className="message-emoji" />)
             } else {
                 string += word + " "
             }
@@ -81,7 +77,7 @@ export default function MessageComponent({ message, user, channel }: {
         const words = replyContent.toString().split(" ");
         const lastWord = words[words.length - 1];
     
-        if (lastWord && lastWord.startsWith("@")) {
+        if (lastWord?.startsWith("@")) {
             const username = lastWord.slice(1);
             axios
                 .get(`/api/users?search=${username}`)
@@ -95,7 +91,7 @@ export default function MessageComponent({ message, user, channel }: {
             setSearchedUsers([]);
         }
 
-        if (lastWord && lastWord.startsWith(":")) {
+        if (lastWord?.startsWith(":")) {
             const emojiName = lastWord.slice(1);
             axios
                 .get(`/api/emojis?search=${emojiName}`)
@@ -118,37 +114,17 @@ export default function MessageComponent({ message, user, channel }: {
                     <span><Link to={`/u/${message.username}`}>{message.username}</Link> {new Date(message.date * 1000).toLocaleString()}</span>
                     <div className="message-text">
                         {getMessageArray(message).map((word, index) => {
-                            if (word.startsWith("@")) {
-                                return <span key={index} ><Link to={`/u/${word.substring(1)}`}>{word}</Link> </span>
-                            } else if (word.startsWith("https://") || word.startsWith("http://")) {
-                                return <span key={index} ><Link to={word}>{word}</Link> </span>
-                            } else if (word.startsWith(":") && word.endsWith(":") && word.length > 2) {
-                                const emojiName = word.substring(1, word.length - 1);
-                                return <span key={index} ><img src={`/api/emojis/${emojiName}`} alt={emojiName} className="message-emoji" /> </span>
-                            }
                             return <span key={index}>{word} </span>;
                         })}
                     </div>
                 </div>
             </div>
-            {message.has_attachments == true && (
-                <div className="message-attachments">
-                    {message.attachments.map((attachment) => (
-                        <img src={`/api/attachments/${attachment.file_name}`} alt="attachment" className="message-attachment" />
-                    ))}
-                </div>
-            )}
-            <div>
-                {message.content.toLocaleLowerCase().includes("gros cochon") && (
-                    <img src="/pig.png" alt="Gros cochon" className="pig" />
-                )}
+            <div className="message-attachments">
+                {message.attachments?.map((attachment) => (
+                    <img src={`/api/attachments/${attachment.file_name}`} alt="attachment" className="message-attachment" />
+                ))}
             </div>
-            <div>
-                {message.content.toLocaleLowerCase().includes("le poisson steve") && (
-                    <img src="/le_poisson_steve.png" alt="Le poisson steve" className="fish" />
-                )}
-            </div>
-            {(channel?.owner_id == user?.id || user?.admin == 1 || user?.id == message.user_id) && (
+            {((channel && channel?.owner_id == user?.id) || user?.admin == 1 || user?.id == message.user_id) && (
                 <button onClick={handleDelete} className="forum-button">Delete</button>
             )}
             {channel && user && !reply && (
diff --git a/front/src/pages/ChannelPage.tsx b/front/src/pages/ChannelPage.tsx
index e84e0cb..6f2c316 100644
--- a/front/src/pages/ChannelPage.tsx
+++ b/front/src/pages/ChannelPage.tsx
@@ -123,7 +123,7 @@ export default function ChannelPage({socket}: {socket: WebSocket}) {
         const words = message.toString().split(" ");
         const lastWord = words[words.length - 1];
     
-        if (lastWord && lastWord.startsWith("@")) {
+        if (lastWord?.startsWith("@")) {
             const username = lastWord.slice(1);
             axios
                 .get(`/api/users?search=${username}`)
@@ -137,7 +137,7 @@ export default function ChannelPage({socket}: {socket: WebSocket}) {
             setSearchedUsers([]);
         }
 
-        if (lastWord && lastWord.startsWith(":")) {
+        if (lastWord?.startsWith(":")) {
             const emojiName = lastWord.slice(1);
             axios
                 .get(`/api/emojis?search=${emojiName}`)
diff --git a/front/src/pages/Login.tsx b/front/src/pages/Login.tsx
index e2db9cf..3ca637e 100644
--- a/front/src/pages/Login.tsx
+++ b/front/src/pages/Login.tsx
@@ -16,8 +16,8 @@ export default function Login() {
                 localStorage.setItem("token", res.data.token);
                 navigate("/");
             })
-            .catch((err) => {
-                alert(err.response);
+            .catch(() => {
+                alert("Login failed");
             });
     }
 
diff --git a/front/src/pages/Register.tsx b/front/src/pages/Register.tsx
index 17265d6..0fc7ce5 100644
--- a/front/src/pages/Register.tsx
+++ b/front/src/pages/Register.tsx
@@ -18,8 +18,8 @@ export default function Register () {
                         localStorage.setItem("token", res.data.token);
                         navigate("/");
                     })
-                    .catch((err) => {
-                        alert(err.response);
+                    .catch(() => {
+                        alert("Register failed");
                     }
                 );
             })