diff --git a/src/Download/Framework/Entity/Download.php b/src/Download/Framework/Entity/Download.php
index c555273..e802dce 100644
--- a/src/Download/Framework/Entity/Download.php
+++ b/src/Download/Framework/Entity/Download.php
@@ -7,7 +7,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
-#[Broadcast]
+#[Broadcast(template: 'broadcast/Download.stream.html.twig')]
 class Download
 {
     #[ORM\Id]
diff --git a/templates/broadcast/Download.stream.html.twig b/templates/broadcast/Download.stream.html.twig
index bd2636e..4ee1c83 100644
--- a/templates/broadcast/Download.stream.html.twig
+++ b/templates/broadcast/Download.stream.html.twig
@@ -2,10 +2,16 @@
 {% block create %}
     <turbo-stream action="append" target="active_downloads">
         <template>
-            <twig:DownloadListRow
-                    id="ad_download_{{ entity.id }}"
-                    data="{{ entity.id }}">
-            </twig:DownloadListRow>
+            <tr id="ad_download_{{ entity.id }}">
+                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
+                    {{ entity.title }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
+                    <span class="p-1.5 bg-purple-600 rounded-full">
+                        <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
+                    </span>
+                </td>
+            </tr id="ad_download_{{ entity.id }}">
         </template>
     </turbo-stream>
 {% endblock %}
@@ -14,12 +20,16 @@
     {% if entity.status != "Complete" %}
         <turbo-stream action="update" target="ad_download_{{ id }}">
             <template>
-                <div class="title">{{ entity.title }}</div>
-                <div class="filename">{{ entity.filename }}</div>
-                <div class="status">
-                    <span class="pill {{ status_color_map[entity.status] }} status-badge">{{ entity.status }}</span>
-                    <span class="pill progress">{{ entity.progress }}%</span>
-                </div>
+                <tr id="ad_download_{{ entity.id }}">
+                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
+                        {{ entity.title }}
+                    </td>
+                    <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
+                        <span class="p-1.5 bg-purple-600 rounded-full">
+                            <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
+                        </span>
+                    </td>
+                </tr>
             </template>
         </turbo-stream>
     {% else %}
@@ -28,28 +38,26 @@
 
         <turbo-stream action="prepend" target="alert_list">
             <template>
-                <li class="alert alert-success alert-dismissible" id="alert_{{ entity.id }}" data-controller="alert">
-                    <span class="alert-filename">{{ entity.filename }}</span> has finished downloading.
-                </li>
+                <twig:Alert title="Finished downloading" message="{{ entity.title }}" alert_id="{{ entity.id }}" data-controller="alert" />
             </template>
         </turbo-stream>
 
-        <turbo-stream action="prepend" target="complete_downloads_list">
-            <template>
-                <div class="result_group download-item" id="cd_download_{{ entity.id }}">
-                    <div class="title">{{ entity.title }}</div>
-                    <div class="filename">{{ entity.filename }}</div>
-                    <div class="status">
-                        <span class="pill {{ status_color_map[entity.status] }} status-badge">{{ entity.status }}</span>
-                        <span class="pill progress">{{ entity.progress }}%</span>
-                    </div>
-                </div>
-            </template>
-        </turbo-stream>
+{#        <turbo-stream action="prepend" target="complete_downloads_list">#}
+{#            <template>#}
+{#                <div class="result_group download-item" id="cd_download_{{ entity.id }}">#}
+{#                    <div class="title">{{ entity.title }}</div>#}
+{#                    <div class="filename">{{ entity.filename }}</div>#}
+{#                    <div class="status">#}
+{#                        <span class="pill {{ status_color_map[entity.status] }} status-badge">{{ entity.status }}</span>#}
+{#                        <span class="pill progress">{{ entity.progress }}%</span>#}
+{#                    </div>#}
+{#                </div>#}
+{#            </template>#}
+{#        </turbo-stream>#}
     {% endif %}
 {% endblock %}
 
 {% block remove %}
     <turbo-stream action="remove" target="ad_download_{{ id }}"></turbo-stream>
-    <turbo-stream action="remove" target="cd_download_{{ id }}"></turbo-stream>
+{#    <turbo-stream action="remove" target="cd_download_{{ id }}"></turbo-stream>#}
 {% endblock %}
diff --git a/templates/components/ActiveDownloadList.html.twig b/templates/components/ActiveDownloadList.html.twig
index e9c4008..ec422e9 100644
--- a/templates/components/ActiveDownloadList.html.twig
+++ b/templates/components/ActiveDownloadList.html.twig
@@ -1,5 +1,5 @@
-<div{{ attributes }} class="min-w-48" data-poll="getDownloads">
-    <table class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed">
+<div{{ attributes }} class="min-w-48">
+    <table class="divide-y divide-gray-200 dark:divide-gray-50 dark:bg-gray-50 table-fixed" {{ turbo_stream_listen('App\\Download\\Framework\\Entity\\Download') }}>
         <thead>
         <tr class="dark:bg-gray-50">
             <th scope="col"
@@ -15,7 +15,7 @@
         <tbody class="divide-y divide-gray-200 dark:divide-gray-50">
         {% if this.getDownloads()|length > 0 %}
             {% for download in this.getDownloads() %}
-                <tr>
+                <tr  id="ad_download_{{ download.id }}">
                     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
                         {{ download.title }}
                     </td>
diff --git a/templates/components/Header.html.twig b/templates/components/Header.html.twig
index 3cef743..049e3de 100644
--- a/templates/components/Header.html.twig
+++ b/templates/components/Header.html.twig
@@ -15,7 +15,6 @@
     <div {{ turbo_stream_listen('alerts') }} class="absolute top-10 right-10 size-96">
         <div >
             <ul id="alert_list">
-                <twig:Alert title="Added to queue" message="Severance has been added to the queue." alert_id="alert_id" data-controller="alert" />
             </ul>
         </div>
     </div>