diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index ba94721..a77bbdf 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -260,8 +260,8 @@ html.modal-open body { padding-right: var(--modal-scrollbar, 0); }
     margin-top: auto;
     align-self: flex-end;
 }
-.modal-body > #defense-actions { margin-top: auto; }
-.modal-body > #defense-actions .flex { justify-content: flex-end; }
+.defense-footer { margin-top: auto; justify-content: flex-end; align-items: center; }
+.modal-body > #defense-status:empty { display: none; }
 
 /* Двухуровневые формы уровней лабы */
 .level-row { display: flex; gap: 0.5rem; align-items: center; margin-bottom: 0.5rem; }
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index 5dc73cc..5e745af 100644
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -209,16 +209,15 @@
                 </select></div>
             <div><label class="label" for="defense-md">Задание (markdown)</label>
                 <textarea class="input" id="defense-md" name="assignmentMd" rows="10" required></textarea></div>
-            <button class="btn btn-primary" type="submit">Сохранить задание</button>
         </form>
-        <div id="defense-actions" class="mt-4" hidden>
-            <p id="defense-status" class="text-sm text-muted mb-2"></p>
-            <div class="flex flex-wrap gap-2">
+        <p id="defense-status" class="text-sm text-muted mt-4"></p>
+        <div class="flex flex-wrap gap-2 defense-footer">
+            <div id="defense-actions" class="flex flex-wrap gap-2" hidden>
                 <form class="inline-form" id="defense-issue-form" method="post">
                     <input type="hidden" name="_csrf" th:value="${csrfToken}">
                     <input type="hidden" name="labId" id="defense-action-lab">
                     <input type="hidden" name="groupId" th:value="${group.id}">
-                    <button class="btn btn-primary" type="submit">Выдать код</button>
+                    <button class="btn btn-secondary" type="submit">Выдать код</button>
                 </form>
                 <form class="inline-form" id="defense-reset-form" method="post"
                       onsubmit="return confirm('Открыть защиту заново для нового (дополнительного) задания?')">
@@ -228,6 +227,7 @@
                     <button class="btn btn-danger" type="submit">Начать заново</button>
                 </form>
             </div>
+            <button class="btn btn-primary" type="submit" form="defense-form">Сохранить</button>
         </div>
     </div>
 </dialog>