diff --git a/themes/cp_app/episode/_partials/comment_actions.php b/themes/cp_app/episode/_partials/comment_actions.php
index 245ced85..bb4c9ed7 100644
--- a/themes/cp_app/episode/_partials/comment_actions.php
+++ b/themes/cp_app/episode/_partials/comment_actions.php
@@ -29,7 +29,7 @@
 ) ?>"><?= icon('heart', 'text-xl mr-1 text-gray-500') . $comment->likes_count ?></button>
         <?php if ($comment->replies_count): ?>
             <?= anchor(
-    route_to('episode-comment', $comment->episode->podcast->handle, $episode->slug, $comment->id),
+    route_to('episode-comment', $comment->episode->podcast->handle, $comment->episode->slug, $comment->id),
     icon('caret-down', 'text-xl mr-1') . lang('Comment.view_replies', [
         'numberOfReplies' => $comment->replies_count,
     ]),
diff --git a/themes/cp_app/episode/comments.php b/themes/cp_app/episode/comments.php
index a90b4644..33e9c9b4 100644
--- a/themes/cp_app/episode/comments.php
+++ b/themes/cp_app/episode/comments.php
@@ -55,12 +55,14 @@
     </form>
 <?php endif; ?>
 
-<?php foreach ($episode->comments as $comment): ?>
-    <?= view('episode/_partials/comment', [
+<div class="flex flex-col gap-y-2">
+    <?php foreach ($episode->comments as $comment): ?>
+        <?= view('episode/_partials/comment', [
     'comment' => $comment,
-        'podcast' => $podcast,
+            'podcast' => $podcast,
 ]) ?>
-<?php endforeach; ?>
+    <?php endforeach; ?>
+</div>
 
 <?= $this->endSection()
 ?>
diff --git a/themes/cp_app/post/_partials/reply_actions.php b/themes/cp_app/post/_partials/reply_actions.php
index 1c15ae81..8567805b 100644
--- a/themes/cp_app/post/_partials/reply_actions.php
+++ b/themes/cp_app/post/_partials/reply_actions.php
@@ -1,5 +1,7 @@
-<footer>
-    <?php if (can_user_interact()): ?>
+<?php declare(strict_types=1);
+
+if (can_user_interact()): ?>
+    <footer>
         <form action="<?= route_to('post-attempt-action', interact_as_actor()->username, $reply->id) ?>" method="POST" class="flex items-start gap-x-6">
             <?= csrf_field() ?>
             <?= anchor(
@@ -85,7 +87,9 @@
                 </form>
             <?php endif; ?>
         </nav>
-    <?php else: ?>
+    </footer>
+<?php else: ?>
+    <footer class="flex gap-x-6">
         <?= anchor(
             route_to('post', $podcast->handle, $reply->id),
             icon('chat', 'text-lg mr-1 text-gray-400') . $reply->replies_count,
@@ -120,5 +124,5 @@
                 ]),
             ],
         ) ?>
-    <?php endif; ?>
-</footer>
+    </footer>
+<?php endif; ?>
diff --git a/themes/cp_app/post/remote_action.php b/themes/cp_app/post/remote_action.php
index 29a2b98e..3a885e9e 100644
--- a/themes/cp_app/post/remote_action.php
+++ b/themes/cp_app/post/remote_action.php
@@ -38,7 +38,11 @@
         ) ?></h1>
     </header>
     <main class="flex-1 max-w-xl px-4 pb-8 mx-auto -mt-24">
-        <?= $this->include('post/_partials/card') ?>
+        <?= view('post/_partials/card', [
+            'index' => 1,
+            'podcast' => $podcast,
+            'post' => $post,
+        ]) ?>
 
         <form action="<?= route_to('post-attempt-remote-action', $post->id, $action) ?>" method="POST" class="flex flex-col mt-8">
             <?= csrf_field() ?>