diff --git a/templates/moderation/partials/submission_list.html b/templates/moderation/partials/submission_list.html
index baf6d609..abd131d4 100644
--- a/templates/moderation/partials/submission_list.html
+++ b/templates/moderation/partials/submission_list.html
@@ -9,11 +9,7 @@
         category: '{{ submission.changes.category|default:"" }}',
         showCoasterFields: {% if submission.changes.category == 'RC' %}true{% else %}false{% endif %},
         init() {
-            this.$watch('status', value => {
-                this.status = value;
-            });
             this.$watch('category', value => {
-                this.category = value;
                 this.showCoasterFields = value === 'RC';
             });
         }
@@ -167,7 +163,7 @@
                   hx-target="#submission-{{ submission.id }}"
                   class="grid grid-cols-1 gap-3 md:grid-cols-2">
                 {% for field, value in submission.changes.items %}
-                {% if field != 'model_name' %}
+                {% if field != 'model_name' and field != 'stats' %}
                 <div class="p-4 bg-gray-100 border rounded-lg dark:bg-gray-900 border-gray-200/50 dark:border-gray-700/50"
                      {% if field == 'post_closing_status' %}x-show="status === 'CLOSING'"{% endif %}
                      {% if field == 'closing_date' %}x-show="['CLOSING', 'SBNO', 'CLOSED_PERM', 'DEMOLISHED', 'RELOCATED'].includes(status)"{% endif %}>
@@ -183,14 +179,6 @@
                             <option value="{{ choice.0 }}" {% if choice.0 == value %}selected{% endif %}>{{ choice.1 }}</option>
                             {% endfor %}
                         </select>
-                        <div id="coaster-fields-{{ submission.id }}" 
-                             class="mt-4"
-                             x-show="showCoasterFields"
-                             x-cloak>
-                            {% if value == 'RC' %}
-                                {% include 'moderation/partials/coaster_fields.html' with stats=submission.changes.stats %}
-                            {% endif %}
-                        </div>
                     {% elif field == 'status' %}
                         <select name="{{ field }}"
                                 x-model="status"
@@ -215,7 +203,6 @@
                                :required="status === 'CLOSING'"
                                {% endif %}>
                     {% else %}
-                        <!-- Keep existing field implementations -->
                         {% if field == 'park' %}
                             <div class="relative space-y-2">
                                 <input type="text"
@@ -341,6 +328,13 @@
                 {% endif %}
                 {% endfor %}
 
+                <!-- Coaster Fields -->
+                <div x-show="showCoasterFields" 
+                     x-cloak
+                     class="col-span-2">
+                    {% include 'moderation/partials/coaster_fields.html' with stats=submission.changes.stats %}
+                </div>
+
                 <div class="col-span-2 p-4 border rounded-lg bg-blue-50 dark:bg-blue-900/30 border-blue-200/50 dark:border-blue-700/50">
                     <label class="block mb-2 text-sm font-medium text-blue-900 dark:text-blue-300">
                         Notes (required):