diff --git a/content/showArticle.php b/content/showArticle.php
index dbd4082..0038341 100644
--- a/content/showArticle.php
+++ b/content/showArticle.php
@@ -3,11 +3,28 @@ include_once 'php/controller/showArticle-controller.php';
 require_once 'php/model/CommentManager.php';
 
 $comments = [];
+$mainComments = [];
+$repliesByParent = [];
 
 if (isset($_GET["id"])) {
     try {
         $commentManager = CommentManager::getInstance();
         $comments = $commentManager->getCommentsByArticle($_GET["id"]);
+
+        foreach ($comments as $comment) {
+            if ($comment->isReply()) {
+                $parentId = $comment->getParentCommentId();
+
+                if (!isset($repliesByParent[$parentId])) {
+                    $repliesByParent[$parentId] = [];
+                }
+
+                $repliesByParent[$parentId][] = $comment;
+            } else {
+                $mainComments[] = $comment;
+            }
+        }
+
     } catch (Exception $e) {
         $_SESSION["message"] = "internal_error";
     }
@@ -26,7 +43,7 @@ if (isset($_GET["id"])) {
         </p>
     <?php endif; ?>
 
-    <?php if (isset($_SESSION["message"]) &&  $_SESSION["message"] == "missing_id"): ?>
+    <?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "missing_id"): ?>
         <p class="alert-message is-error">
             Es ist ein Fehler aufgetreten. Die ID konnte nicht ausgelesen werden. Bitte versuche es erneut.
         </p>
@@ -102,40 +119,38 @@ if (isset($_GET["id"])) {
         <h2>Kommentare</h2>
 
         <div id="comments-list">
-            <?php if (!empty($comments)): ?>
-                <?php foreach ($comments as $comment): ?>
-                    <?php if (!$comment->isReply()): ?>
-                        <div class="comment-item" data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>">
-                            <p>
-                                <strong><?php echo htmlspecialchars($comment->getAuthor()); ?></strong>
-                                <span><?php echo htmlspecialchars($comment->getCreated()); ?></span>
-                            </p>
+            <?php if (!empty($mainComments)): ?>
+                <?php foreach ($mainComments as $comment): ?>
+                    <div class="comment-item" data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>">
+                        <p>
+                            <strong><?php echo htmlspecialchars($comment->getAuthor()); ?></strong>
+                            <span><?php echo htmlspecialchars($comment->getCreated()); ?></span>
+                        </p>
 
-                            <p><?php echo nl2br(htmlspecialchars($comment->getContent())); ?></p>
+                        <p><?php echo nl2br(htmlspecialchars($comment->getContent())); ?></p>
 
-                            <button type="button"
-                                    class="reply-button"
-                                    data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>"
-                                    data-author="<?php echo htmlspecialchars($comment->getAuthor()); ?>">
-                                Antworten
-                            </button>
+                        <button type="button"
+                                class="reply-button"
+                                data-comment-id="<?php echo htmlspecialchars($comment->getId()); ?>"
+                                data-author="<?php echo htmlspecialchars($comment->getAuthor()); ?>">
+                            Antworten
+                        </button>
 
-                            <div class="comment-replies">
-                                <?php foreach ($comments as $reply): ?>
-                                    <?php if ($reply->getParentCommentId() === $comment->getId()): ?>
-                                        <div class="comment-item comment-reply">
-                                            <p>
-                                                <strong><?php echo htmlspecialchars($reply->getAuthor()); ?></strong>
-                                                <span><?php echo htmlspecialchars($reply->getCreated()); ?></span>
-                                            </p>
+                        <div class="comment-replies">
+                            <?php if (isset($repliesByParent[$comment->getId()])): ?>
+                                <?php foreach ($repliesByParent[$comment->getId()] as $reply): ?>
+                                    <div class="comment-item comment-reply">
+                                        <p>
+                                            <strong><?php echo htmlspecialchars($reply->getAuthor()); ?></strong>
+                                            <span><?php echo htmlspecialchars($reply->getCreated()); ?></span>
+                                        </p>
 
-                                            <p><?php echo nl2br(htmlspecialchars($reply->getContent())); ?></p>
-                                        </div>
-                                    <?php endif; ?>
+                                        <p><?php echo nl2br(htmlspecialchars($reply->getContent())); ?></p>
+                                    </div>
                                 <?php endforeach; ?>
-                            </div>
+                            <?php endif; ?>
                         </div>
-                    <?php endif; ?>
+                    </div>
                 <?php endforeach; ?>
             <?php else: ?>
                 <p class="no-comments-message">
@@ -149,6 +164,7 @@ if (isset($_GET["id"])) {
                 <input type="hidden"
                        name="article_id"
                        value="<?php echo htmlspecialchars($_GET["id"] ?? ""); ?>">
+
                 <input type="hidden"
                        name="parent_comment_id"
                        id="parent-comment-id"