diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index c5f496f..c771193 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -1,6 +1,15 @@
 *, *::before, *::after { box-sizing: border-box; }
 
-html { height: 100%; }
+html, body { height: 100%; margin: 0; }
+
+body {
+    display: flex;
+    flex-direction: column;
+    background: var(--c-bg);
+    color: var(--c-text);
+    font-family: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
+    line-height: 1.5;
+}
 
 :root {
     --c-bg: #f8fafc;
@@ -32,31 +41,40 @@ html { height: 100%; }
     --c-badge-warn-text: #fcd34d;
 }
 
-body {
-    margin: 0;
-    background: var(--c-bg);
-    color: var(--c-text);
-    font-family: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
-    line-height: 1.5;
-}
-
 a { color: var(--c-text-link); }
 a:hover { color: var(--c-text-link-hover); }
 
+/* Layout */
+.page { display: flex; flex-direction: column; min-height: 100vh; }
+.page-header { position: sticky; top: 0; z-index: 10; border-bottom: 1px solid var(--c-border); background: var(--c-surface); }
+.page-header-inner { max-width: 1152px; margin: 0 auto; display: flex; align-items: center; justify-content: space-between; padding: 0.75rem 1.5rem; }
+.page-main { flex: 1; width: 100%; max-width: 1152px; margin: 0 auto; padding: 2rem 1.5rem; }
+.page-footer { border-top: 1px solid var(--c-border); padding: 1rem; text-align: center; font-size: 0.75rem; color: var(--c-text-muted); }
+
+/* Nav */
+.nav { display: flex; align-items: center; gap: 1rem; font-size: 0.875rem; }
+.nav-link { color: var(--c-text-link); text-decoration: none; }
+.nav-link:hover { color: var(--c-text-link-hover); }
+.nav-sep { color: var(--c-text-muted); }
+.logo { font-size: 1.125rem; font-weight: 600; color: var(--c-text); text-decoration: none; }
+
+/* Buttons */
 .btn {
     display: inline-flex; align-items: center; justify-content: center; gap: 0.5rem;
     border-radius: 0.5rem; padding: 0.5rem 1rem; font-size: 0.875rem; font-weight: 500;
     border: none; cursor: pointer; transition: opacity 0.15s;
 }
 .btn:active { opacity: 0.8; }
-.btn-primary { background: var(--c-accent); color: white; }
+.btn-sm { padding: 0.25rem 0.5rem; font-size: 0.75rem; }
+.btn-primary { background: var(--c-accent); color: white; text-decoration: none; }
 .btn-primary:hover { opacity: 0.9; }
 .btn-secondary {
-    background: var(--c-surface); color: var(--c-text);
+    background: var(--c-surface); color: var(--c-text); text-decoration: none;
     box-shadow: inset 0 0 0 1px var(--c-border);
 }
 .btn-secondary:hover { background: var(--c-border); }
 
+/* Forms */
 .input {
     width: 100%; border-radius: 0.5rem; background: var(--c-bg); color: var(--c-text);
     padding: 0.5rem 0.75rem; font-size: 0.875rem; border: 1px solid var(--c-border);
@@ -64,18 +82,92 @@ a:hover { color: var(--c-text-link-hover); }
 }
 .input:focus { border-color: var(--c-accent); box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.2); }
 .input::placeholder { color: var(--c-text-muted); }
-
 .label { display: block; margin-bottom: 0.25rem; font-size: 0.875rem; font-weight: 500; }
+.hint { margin-top: 0.25rem; font-size: 0.75rem; color: var(--c-text-muted); }
 
-.card {
-    border-radius: 0.75rem; background: var(--c-surface); border: 1px solid var(--c-border);
-}
+/* Cards */
+.card { border-radius: 0.75rem; background: var(--c-surface); border: 1px solid var(--c-border); }
+.card-flush { border-radius: 0.75rem; background: var(--c-surface); border: 1px solid var(--c-border); padding: 0; }
+.card-body { padding: 1.5rem; }
 
+/* Grid */
+.grid { display: grid; gap: 1rem; }
+.grid-2 { grid-template-columns: repeat(auto-fill, minmax(22rem, 1fr)); }
+.grid-stats { grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr)); }
+
+/* Typography */
+.page-title { margin: 0 0 1.5rem; font-size: 1.5rem; font-weight: 600; }
+.section-title { margin: 0 0 0.75rem; font-size: 1.125rem; font-weight: 500; }
+.stat-value { margin: 0.5rem 0 0; font-size: 1.875rem; font-weight: 600; }
+.stat-title { font-size: 0.875rem; color: var(--c-text-muted); margin: 0; }
+.text-muted { color: var(--c-text-muted); }
+.opacity-30 { opacity: 0.3; }
+.text-center { text-align: center; }
+.text-sm { font-size: 0.875rem; }
+.font-mono { font-family: monospace; }
+
+/* Spacing */
+.mt-1 { margin-top: 0.25rem; }
+.mt-2 { margin-top: 0.5rem; }
+.mt-4 { margin-top: 1rem; }
+.mt-6 { margin-top: 1.5rem; }
+.mt-8 { margin-top: 2rem; }
+.mb-2 { margin-bottom: 0.5rem; }
+.mb-4 { margin-bottom: 1rem; }
+.mb-6 { margin-bottom: 1.5rem; }
+.ml-2 { margin-left: 0.5rem; }
+.p-0 { padding: 0; }
+.p-4 { padding: 1rem; }
+.p-6 { padding: 1.5rem; }
+.px-6 { padding-left: 1.5rem; padding-right: 1.5rem; }
+.py-3 { padding-top: 0.75rem; padding-bottom: 0.75rem; }
+.gap-2 { gap: 0.5rem; }
+.gap-4 { gap: 1rem; }
+
+/* Flex */
+.flex { display: flex; }
+.flex-wrap { flex-wrap: wrap; }
+.items-center { align-items: center; }
+.justify-between { justify-content: space-between; }
+.w-full { width: 100%; }
+.overflow-x-auto { overflow-x: auto; }
+
+/* Badges */
 .badge { display: inline-flex; align-items: center; border-radius: 9999px; padding: 0.125rem 0.625rem; font-size: 0.75rem; font-weight: 500; }
 .badge-ok { background: var(--c-badge-ok-bg); color: var(--c-badge-ok-text); }
 .badge-warn { background: var(--c-badge-warn-bg); color: var(--c-badge-warn-text); }
 
+/* Tables */
 table { width: 100%; font-size: 0.875rem; border-collapse: collapse; }
 th { text-align: left; font-weight: 500; color: var(--c-text-muted); padding: 0.75rem 1.5rem; border-bottom: 1px solid var(--c-border); }
 td { padding: 0.75rem 1.5rem; border-bottom: 1px solid var(--c-border); }
-tr:last-child td { border-bottom: none; }
\ No newline at end of file
+tr:last-child td { border-bottom: none; }
+
+/* Alerts */
+.alert { padding: 0.75rem 1rem; border-radius: 0.5rem; font-size: 0.875rem; margin-bottom: 1rem; }
+.alert-error { background: #fef2f2; color: #991b1b; }
+.alert-success { background: #dcfce7; color: #166534; }
+.alert-warning { background: #fef3c7; color: #92400e; }
+
+.ml-2 { margin-left: 0.5rem; }
+.list-pad { padding-left: 1.25rem; }
+.import-card { border-color: rgba(16,185,129,0.4); }
+.mini-alert { padding: 0.5rem 0.75rem; border-radius: 0.25rem; margin-bottom: 0.5rem; }
+.font-semibold { font-weight: 600; }
+
+/* Theme toggle */
+.theme-btn { padding: 0.25rem 0.5rem; font-size: 0.75rem; }
+
+/* Empty state */
+.empty { text-align: center; color: var(--c-text-muted); padding: 1.5rem; }
+
+/* Mono inline code */
+code.code { padding: 0.125rem 0.5rem; border-radius: 0.25rem; font-family: monospace; background: var(--c-bg); }
+
+/* Containers */
+.container-sm { max-width: 28rem; margin: 0 auto; }
+.form-stack { display: flex; flex-direction: column; gap: 1rem; }
+.form-card { padding: 1.5rem; }
+
+/* Header logo */
+.link-inherit { font-size: 0.875rem; }
\ No newline at end of file
diff --git a/web/src/main/resources/templates/admin/dashboard.html b/web/src/main/resources/templates/admin/dashboard.html
index 3aebc9e..ce1829b 100644
--- a/web/src/main/resources/templates/admin/dashboard.html
+++ b/web/src/main/resources/templates/admin/dashboard.html
@@ -1,44 +1,25 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Панель — LMS</title></head>
 <body>
 <div id="content">
-    <h1 style="margin:0 0 1.5rem;font-size:1.5rem;font-weight:600;">Панель преподавателя</h1>
-
-    <div style="display:grid;gap:1rem;grid-template-columns:repeat(auto-fill,minmax(12rem,1fr));">
-        <div class="card" style="padding:1.5rem;">
-            <p style="font-size:0.875rem;color:var(--c-text-muted);margin:0;">Группы</p>
-            <p style="margin:0.5rem 0 0;font-size:1.875rem;font-weight:600;" th:text="${groupCount}">0</p>
-        </div>
-        <div class="card" style="padding:1.5rem;">
-            <p style="font-size:0.875rem;color:var(--c-text-muted);margin:0;">Студенты</p>
-            <p style="margin:0.5rem 0 0;font-size:1.875rem;font-weight:600;" th:text="${studentCount}">0</p>
-        </div>
-        <div class="card" style="padding:1.5rem;">
-            <p style="font-size:0.875rem;color:var(--c-text-muted);margin:0;">Лабораторные</p>
-            <p style="margin:0.5rem 0 0;font-size:1.875rem;font-weight:600;color:var(--c-text-muted);">скоро</p>
-        </div>
+    <h1 class="page-title">Панель преподавателя</h1>
+    <div class="grid grid-stats">
+        <div class="card card-body"><p class="stat-title">Группы</p><p class="stat-value" th:text="${groupCount}">0</p></div>
+        <div class="card card-body"><p class="stat-title">Студенты</p><p class="stat-value" th:text="${studentCount}">0</p></div>
+        <div class="card card-body"><p class="stat-title">Лабораторные</p><p class="stat-value text-muted">скоро</p></div>
     </div>
-
-    <div style="margin-top:2rem;">
-        <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:0.75rem;">
-            <h2 style="margin:0;font-size:1.125rem;font-weight:500;">Группы</h2>
-            <a th:href="@{/admin/groups}" style="font-size:0.875rem;">Все группы →</a>
+    <div class="mt-8">
+        <div class="flex items-center justify-between mb-4">
+            <h2 class="section-title">Группы</h2>
+            <a th:href="@{/admin/groups}" class="text-sm">Все группы →</a>
         </div>
-        <div class="card" style="padding:0;">
+        <div class="card card-flush">
             <table>
-                <thead>
-                <tr><th>Название</th><th>Студентов</th></tr>
-                </thead>
+                <thead><tr><th>Название</th><th>Студентов</th></tr></thead>
                 <tbody>
-                <tr th:each="group : ${groups}">
-                    <td><a th:href="@{/admin/groups/{id}(id=${group.id})}" th:text="${group.name}">—</a></td>
-                    <td th:text="${group.studentCount}">0</td>
-                </tr>
-                <tr th:if="${#lists.isEmpty(groups)}">
-                    <td colspan="2" style="text-align:center;color:var(--c-text-muted);padding:1.5rem;">Групп пока нет.</td>
-                </tr>
+                <tr th:each="group : ${groups}"><td><a th:href="@{/admin/groups/{id}(id=${group.id})}" th:text="${group.name}">—</a></td><td th:text="${group.studentCount}">0</td></tr>
+                <tr th:if="${#lists.isEmpty(groups)}"><td colspan="2" class="empty">Групп пока нет.</td></tr>
                 </tbody>
             </table>
         </div>
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index 9f1430b..e9f4d7b 100644
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -1,80 +1,40 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title th:text="${group.name} + ' — LMS'">Группа</title></head>
 <body>
 <div id="content">
-    <a th:href="@{/admin/groups}" style="font-size:0.875rem;">← Все группы</a>
-
-    <div style="margin-top:1rem;margin-bottom:1.5rem;display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:1rem;">
-        <div>
-            <h1 style="margin:0;font-size:1.5rem;font-weight:600;" th:text="${group.name}">Группа</h1>
-            <p style="margin:0.25rem 0 0;font-size:0.875rem;color:var(--c-text-muted);">
-                Студентов: <span th:text="${#lists.size(group.students)}">0</span>
-            </p>
-        </div>
-        <div style="display:flex;gap:0.5rem;">
-            <a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">Выгрузить XLSX</a>
-            <a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='csv')}">CSV</a>
+    <a th:href="@{/admin/groups}" class="text-sm">← Все группы</a>
+    <div class="mt-4 mb-6 flex flex-wrap items-center justify-between gap-4">
+        <div><h1 class="page-title" th:text="${group.name}">Группа</h1><p class="text-sm text-muted mt-1">Студентов: <span th:text="${#lists.size(group.students)}">0</span></p></div>
+        <div class="flex gap-2"><a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">Выгрузить XLSX</a><a class="btn btn-secondary" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='csv')}">CSV</a></div>
+    </div>
+    <div th:if="${notice}" class="alert alert-success" th:text="${notice}"></div>
+    <div th:if="${error}" class="alert alert-error" th:text="${error}"></div>
+    <div th:if="${resetPassword}" class="alert alert-warning">Новый пароль: <code class="code" th:text="${resetPassword}">password</code></div>
+    <div th:if="${importResult}" class="card import-card mb-4">
+        <div class="card-body">
+            <h2 class="section-title">Импорт: <span th:text="${importResult.groupName}">группа</span></h2>
+            <p class="text-sm text-muted">Новых студентов: <span th:text="${#lists.size(importResult.added)}">0</span>, обновлено: <span th:text="${#lists.size(importResult.updated)}">0</span>.</p>
+            <div th:if="${not #lists.isEmpty(importResult.added)}" class="mt-4 overflow-x-auto">
+                <p class="text-sm alert-warning mini-alert">Сохраните пароли — они показываются для выдачи студентам.</p>
+                <table><thead><tr><th>ФИО</th><th>Логин</th><th>Пароль</th></tr></thead>
+                    <tbody><tr th:each="credential : ${importResult.added}"><td th:text="${credential.fullName}">—</td><td class="font-mono" th:text="${credential.studentNo}">—</td><td class="font-mono font-semibold" th:text="${credential.password}">—</td></tr></tbody>
+                </table>
+            </div>
         </div>
     </div>
-
-    <div th:if="${notice}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#dcfce7;color:#166534;" th:text="${notice}"></div>
-    <div th:if="${error}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef2f2;color:#991b1b;" th:text="${error}"></div>
-
-    <div th:if="${resetPassword}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef3c7;color:#92400e;">
-        Новый пароль: <code style="padding:0.125rem 0.5rem;border-radius:0.25rem;font-family:monospace;" th:text="${resetPassword}">password</code>
-    </div>
-
-    <div th:if="${importResult}" class="card" style="margin-bottom:1.5rem;padding:1.5rem;">
-        <h2 style="margin:0 0 0.25rem;font-size:1.125rem;font-weight:500;">
-            Импорт: <span th:text="${importResult.groupName}">группа</span>
-        </h2>
-        <p style="margin:0;font-size:0.875rem;color:var(--c-text-muted);">
-            Новых студентов: <span th:text="${#lists.size(importResult.added)}">0</span>,
-            обновлено: <span th:text="${#lists.size(importResult.updated)}">0</span>.
-        </p>
-        <div th:if="${not #lists.isEmpty(importResult.added)}" style="margin-top:1rem;overflow-x:auto;">
-            <p style="margin:0 0 0.5rem;font-size:0.875rem;color:#92400e;">Сохраните пароли — они показываются для выдачи студентам.</p>
-            <table>
-                <thead>
-                <tr><th>ФИО</th><th>Логин</th><th>Пароль</th></tr>
-                </thead>
-                <tbody>
-                <tr th:each="credential : ${importResult.added}">
-                    <td th:text="${credential.fullName}">—</td>
-                    <td style="font-family:monospace;" th:text="${credential.studentNo}">—</td>
-                    <td style="font-family:monospace;font-weight:600;" th:text="${credential.password}">—</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <div class="card" style="padding:0;">
-        <table>
-            <thead>
-            <tr><th>№</th><th>ФИО</th><th>Логин</th><th>Основа</th><th>Пароль</th><th></th></tr>
-            </thead>
+    <div class="card card-flush">
+        <table><thead><tr><th>№</th><th>ФИО</th><th>Логин</th><th>Основа</th><th>Пароль</th><th></th></tr></thead>
             <tbody>
             <tr th:each="student, iter : ${group.students}">
-                <td style="color:var(--c-text-muted);" th:text="${iter.count}">1</td>
+                <td class="text-muted" th:text="${iter.count}">1</td>
                 <td th:text="${student.fullName}">—</td>
-                <td style="font-family:monospace;" th:text="${student.studentNo}">—</td>
-                <td style="color:var(--c-text-muted);" th:text="${student.basis}">—</td>
-                <td>
-                    <span th:if="${student.mustChangePassword}" class="badge badge-warn">временный</span>
-                    <span th:unless="${student.mustChangePassword}" class="badge badge-ok">изменён</span>
-                </td>
-                <td style="text-align:right;">
-                    <form th:action="@{/admin/groups/{gid}/students/{sid}/reset-password(gid=${group.id}, sid=${student.id})}" method="post">
-                        <button type="submit" style="font-size:0.875rem;border:none;background:none;cursor:pointer;color:var(--c-text-link);">Сбросить пароль</button>
-                    </form>
-                </td>
-            </tr>
-            <tr th:if="${#lists.isEmpty(group.students)}">
-                <td colspan="6" style="text-align:center;color:var(--c-text-muted);padding:1.5rem;">В группе пока нет студентов.</td>
+                <td class="font-mono" th:text="${student.studentNo}">—</td>
+                <td class="text-muted" th:text="${student.basis}">—</td>
+                <td><span th:if="${student.mustChangePassword}" class="badge badge-warn">временный</span><span th:unless="${student.mustChangePassword}" class="badge badge-ok">изменён</span></td>
+                <td class="text-center"><form th:action="@{/admin/groups/{gid}/students/{sid}/reset-password(gid=${group.id}, sid=${student.id})}" method="post"><button type="submit" class="nav-link">Сбросить</button></form></td>
             </tr>
+            <tr th:if="${#lists.isEmpty(group.students)}"><td colspan="6" class="empty">В группе пока нет студентов.</td></tr>
             </tbody>
         </table>
     </div>
diff --git a/web/src/main/resources/templates/admin/groups.html b/web/src/main/resources/templates/admin/groups.html
index 7b34f0d..26fca4b 100644
--- a/web/src/main/resources/templates/admin/groups.html
+++ b/web/src/main/resources/templates/admin/groups.html
@@ -1,59 +1,35 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Группы — LMS</title></head>
 <body>
 <div id="content">
-    <h1 style="margin:0 0 1.5rem;font-size:1.5rem;font-weight:600;">Группы</h1>
-
-    <div th:if="${notice}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#dcfce7;color:#166534;" th:text="${notice}"></div>
-    <div th:if="${error}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef2f2;color:#991b1b;" th:text="${error}"></div>
-
-    <div style="display:grid;gap:1rem;grid-template-columns:repeat(auto-fill,minmax(22rem,1fr));">
-        <form class="card" style="padding:1.5rem;display:flex;flex-direction:column;gap:1rem;" th:action="@{/admin/groups}" method="post">
-            <h2 style="margin:0;font-size:1.125rem;font-weight:500;">Создать группу</h2>
-            <div>
-                <label class="label" for="name">Название</label>
-                <input class="input" id="name" name="name" placeholder="ПИ-11БО" required>
-            </div>
+    <h1 class="page-title">Группы</h1>
+    <div th:if="${notice}" class="alert alert-success" th:text="${notice}"></div>
+    <div th:if="${error}" class="alert alert-error" th:text="${error}"></div>
+    <div class="grid grid-2">
+        <form class="card form-card form-stack" th:action="@{/admin/groups}" method="post">
+            <h2 class="section-title">Создать группу</h2>
+            <div><label class="label" for="name">Название</label><input class="input" id="name" name="name" placeholder="ПИ-11БО" required></div>
             <button class="btn btn-primary" type="submit">Создать</button>
         </form>
-
-        <form class="card" style="padding:1.5rem;display:flex;flex-direction:column;gap:1rem;" th:action="@{/admin/groups/import}" method="post" enctype="multipart/form-data">
-            <h2 style="margin:0;font-size:1.125rem;font-weight:500;">Импорт студентов</h2>
-            <p style="margin:0;font-size:0.875rem;color:var(--c-text-muted);">
-                Файл .xls, .xlsx или .csv со столбцами: студенческий номер, ФИО, основа обучения.
-            </p>
-            <div>
-                <label class="label" for="file">Файл со списком</label>
-                <input class="input" id="file" name="file" type="file" accept=".xls,.xlsx,.csv" required>
-            </div>
-            <div>
-                <label class="label" for="groupName">Название группы (необязательно)</label>
-                <input class="input" id="groupName" name="name" placeholder="Возьмём из файла">
-            </div>
+        <form class="card form-card form-stack" th:action="@{/admin/groups/import}" method="post" enctype="multipart/form-data">
+            <h2 class="section-title">Импорт студентов</h2>
+            <p class="text-sm text-muted">Файл .xls, .xlsx или .csv со столбцами: студенческий номер, ФИО, основа обучения.</p>
+            <div><label class="label" for="file">Файл со списком</label><input class="input" id="file" name="file" type="file" accept=".xls,.xlsx,.csv" required></div>
+            <div><label class="label" for="groupName">Название группы (необязательно)</label><input class="input" id="groupName" name="name" placeholder="Возьмём из файла"></div>
             <button class="btn btn-primary" type="submit">Импортировать</button>
         </form>
     </div>
-
-    <div class="card" style="margin-top:2rem;padding:0;">
+    <div class="card card-flush mt-8">
         <table>
-            <thead>
-            <tr><th>Название</th><th>Студентов</th><th>Выгрузка</th></tr>
-            </thead>
+            <thead><tr><th>Название</th><th>Студентов</th><th>Выгрузка</th></tr></thead>
             <tbody>
             <tr th:each="group : ${groups}">
                 <td><a th:href="@{/admin/groups/{id}(id=${group.id})}" th:text="${group.name}">—</a></td>
                 <td th:text="${group.studentCount}">0</td>
-                <td>
-                    <a th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">XLSX</a>
-                    <span style="margin:0 0.5rem;color:var(--c-text-muted);">·</span>
-                    <a th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='csv')}">CSV</a>
-                </td>
-            </tr>
-            <tr th:if="${#lists.isEmpty(groups)}">
-                <td colspan="3" style="text-align:center;color:var(--c-text-muted);padding:1.5rem;">Групп пока нет.</td>
+                <td><a th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='xlsx')}">XLSX</a><span class="nav-sep ml-2">·</span><a class="ml-2" th:href="@{/admin/groups/{id}/credentials(id=${group.id}, format='csv')}">CSV</a></td>
             </tr>
+            <tr th:if="${#lists.isEmpty(groups)}"><td colspan="3" class="empty">Групп пока нет.</td></tr>
             </tbody>
         </table>
     </div>
diff --git a/web/src/main/resources/templates/change_password.html b/web/src/main/resources/templates/change_password.html
index 86d91f1..55439cd 100644
--- a/web/src/main/resources/templates/change_password.html
+++ b/web/src/main/resources/templates/change_password.html
@@ -1,30 +1,16 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Смена пароля — LMS</title></head>
 <body>
 <div id="content">
-    <div style="max-width:28rem;margin:0 auto;">
-        <h1 style="margin:0 0 0.5rem;font-size:1.5rem;font-weight:600;">Смена пароля</h1>
-        <p style="margin:0 0 1.5rem;font-size:0.875rem;color:var(--c-text-muted);">При первом входе пароль нужно сменить.</p>
-
-        <div th:if="${error}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef2f2;color:#991b1b;"
-             th:text="${error}"></div>
-
-        <form class="card" style="padding:1.5rem;display:flex;flex-direction:column;gap:1rem;" th:action="@{/change-password}" method="post">
-            <div>
-                <label class="label" for="old">Текущий пароль</label>
-                <input class="input" id="old" name="old" type="password" required>
-            </div>
-            <div>
-                <label class="label" for="new">Новый пароль</label>
-                <input class="input" id="new" name="new" type="password" required>
-                <p style="margin-top:0.25rem;font-size:0.75rem;color:var(--c-text-muted);">Минимум 8 символов.</p>
-            </div>
-            <div>
-                <label class="label" for="new2">Повторите новый пароль</label>
-                <input class="input" id="new2" name="new2" type="password" required>
-            </div>
+    <div class="container-sm">
+        <h1 class="page-title">Смена пароля</h1>
+        <p class="text-sm text-muted mb-4">При первом входе пароль нужно сменить.</p>
+        <div th:if="${error}" class="alert alert-error" th:text="${error}"></div>
+        <form class="card form-card form-stack" th:action="@{/change-password}" method="post">
+            <div><label class="label" for="old">Текущий пароль</label><input class="input" id="old" name="old" type="password" required></div>
+            <div><label class="label" for="new">Новый пароль</label><input class="input" id="new" name="new" type="password" required><p class="hint">Минимум 8 символов.</p></div>
+            <div><label class="label" for="new2">Повторите новый пароль</label><input class="input" id="new2" name="new2" type="password" required></div>
             <button class="btn btn-primary" type="submit">Сохранить</button>
         </form>
     </div>
diff --git a/web/src/main/resources/templates/error.html b/web/src/main/resources/templates/error.html
index 03d66d6..515b9aa 100644
--- a/web/src/main/resources/templates/error.html
+++ b/web/src/main/resources/templates/error.html
@@ -1,13 +1,12 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Ошибка — LMS</title></head>
 <body>
 <div id="content">
-    <div style="max-width:28rem;margin:0 auto;text-align:center;">
-        <p style="font-size:4rem;font-weight:700;color:var(--c-text-muted);opacity:0.3;" th:text="${status}">500</p>
-        <p style="margin-top:1rem;" th:text="${message}">Что-то пошло не так</p>
-        <a class="btn btn-secondary" style="margin-top:1.5rem;display:inline-flex;" th:href="@{/}">На главную</a>
+    <div class="container-sm text-center">
+        <p class="stat-value text-muted opacity-30" th:text="${status}">500</p>
+        <p class="mt-4" th:text="${message}">Что-то пошло не так</p>
+        <a class="btn btn-secondary mt-6" th:href="@{/}">На главную</a>
     </div>
 </div>
 </body>
diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html
index 4b8d3a3..0d82be6 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/web/src/main/resources/templates/fragments/base.html
@@ -7,38 +7,33 @@
     <link rel="stylesheet" th:href="@{/css/app.css}">
     <script th:src="@{/js/htmx.min.js}" defer></script>
     <script>
-        (function(){
-            var t = localStorage.getItem('lms-theme') || 'light';
-            document.documentElement.setAttribute('data-theme', t);
-        })();
-        function toggleTheme() {
-            var e = document.documentElement;
-            var t = e.getAttribute('data-theme') === 'dark' ? 'light' : 'dark';
-            e.setAttribute('data-theme', t);
-            localStorage.setItem('lms-theme', t);
-        }
+        (function(){ var t = localStorage.getItem('lms-theme') || 'light'; document.documentElement.setAttribute('data-theme', t); })();
+        function toggleTheme(){ var e=document.documentElement; var t=e.getAttribute('data-theme')==='dark'?'light':'dark'; e.setAttribute('data-theme',t); localStorage.setItem('lms-theme',t); }
     </script>
 </head>
-<body class="flex flex-col" style="min-height:100vh">
-<header style="position:sticky;top:0;z-index:10;border-bottom:1px solid var(--c-border);background:var(--c-surface);">
-    <div style="max-width:1152px;margin:0 auto;display:flex;align-items:center;justify-content:space-between;padding:0.75rem 1.5rem;">
-        <a th:href="@{/}" style="font-size:1.125rem;font-weight:600;text-decoration:none;">LMS</a>
-        <nav style="display:flex;align-items:center;gap:1rem;font-size:0.875rem;" th:if="${currentUser != null}">
-            <a th:if="${currentUser.admin}" th:href="@{/admin}">Панель</a>
-            <a th:if="${currentUser.admin}" th:href="@{/admin/groups}">Группы</a>
-            <span style="color:var(--c-text-muted)" th:text="${currentUser.name}">—</span>
-            <button onclick="toggleTheme()" class="btn btn-secondary" style="padding:0.25rem 0.5rem;font-size:0.75rem;">☀/🌙</button>
-            <form th:action="@{/logout}" method="post">
-                <button class="btn btn-secondary" type="submit">Выйти</button>
-            </form>
-        </nav>
-    </div>
-</header>
-<main style="flex:1;width:100%;max-width:1152px;margin:0 auto;padding:2rem 1.5rem;">
-    <th:block th:replace="${content}" />
-</main>
-<footer style="border-top:1px solid var(--c-border);padding:1rem;text-align:center;font-size:0.75rem;color:var(--c-text-muted);">
-    LMS v0.1.1
-</footer>
+<body>
+<div class="page">
+    <header class="page-header">
+        <div class="page-header-inner">
+            <a th:href="@{/}" class="logo">LMS</a>
+            <nav class="nav" th:if="${currentUser != null}">
+                <a th:if="${currentUser.admin}" th:href="@{/admin}" class="nav-link">Панель</a>
+                <a th:if="${currentUser.admin}" th:href="@{/admin/groups}" class="nav-link">Группы</a>
+                <a th:if="${currentUser.admin}" th:href="@{/admin/labs}" class="nav-link">Лабораторные</a>
+                <span class="nav-sep" th:text="${currentUser.name}">—</span>
+                <button onclick="toggleTheme()" class="btn btn-secondary btn-sm">☀/🌙</button>
+                <form th:action="@{/logout}" method="post">
+                    <button class="btn btn-secondary" type="submit">Выйти</button>
+                </form>
+            </nav>
+        </div>
+    </header>
+    <main class="page-main">
+        <th:block th:replace="${content}" />
+    </main>
+    <footer class="page-footer">
+        LMS v0.1.1
+    </footer>
+</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/src/main/resources/templates/login.html b/web/src/main/resources/templates/login.html
index 6435176..c667244 100644
--- a/web/src/main/resources/templates/login.html
+++ b/web/src/main/resources/templates/login.html
@@ -1,29 +1,17 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Вход — LMS</title></head>
 <body>
 <div id="content">
-    <div style="max-width:28rem;margin:0 auto;">
-        <h1 style="margin:0 0 1.5rem;font-size:1.5rem;font-weight:600;">Вход</h1>
-
-        <div th:if="${error}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef2f2;color:#991b1b;"
-             th:text="${error}"></div>
-
-        <div th:if="${!adminExists}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef3c7;color:#92400e;">
-            Аккаунт администратора ещё не создан.
-            <a th:href="@{/setup}">Создать первый аккаунт</a>
+    <div class="container-sm">
+        <h1 class="page-title">Вход</h1>
+        <div th:if="${error}" class="alert alert-error" th:text="${error}"></div>
+        <div th:if="${!adminExists}" class="alert alert-warning">
+            Аккаунт администратора ещё не создан. <a th:href="@{/setup}">Создать первый аккаунт</a>
         </div>
-
-        <form class="card" style="padding:1.5rem;display:flex;flex-direction:column;gap:1rem;" th:action="@{/login}" method="post">
-            <div>
-                <label class="label" for="login">Логин</label>
-                <input class="input" id="login" name="login" th:value="${login}" autofocus required>
-            </div>
-            <div>
-                <label class="label" for="password">Пароль</label>
-                <input class="input" id="password" name="password" type="password" required>
-            </div>
+        <form class="card form-card form-stack" th:action="@{/login}" method="post">
+            <div><label class="label" for="login">Логин</label><input class="input" id="login" name="login" th:value="${login}" autofocus required></div>
+            <div><label class="label" for="password">Пароль</label><input class="input" id="password" name="password" type="password" required></div>
             <button class="btn btn-primary" type="submit">Войти</button>
         </form>
     </div>
diff --git a/web/src/main/resources/templates/setup.html b/web/src/main/resources/templates/setup.html
index 74bc7a8..4a55d65 100644
--- a/web/src/main/resources/templates/setup.html
+++ b/web/src/main/resources/templates/setup.html
@@ -1,32 +1,16 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Первый запуск — LMS</title></head>
 <body>
 <div id="content">
-    <div style="max-width:28rem;margin:0 auto;">
-        <h1 style="margin:0 0 0.5rem;font-size:1.5rem;font-weight:600;">Создание администратора</h1>
-        <p style="margin:0 0 1.5rem;font-size:0.875rem;color:var(--c-text-muted);">
-            Это разовая настройка. Аккаунт преподавателя создаётся один раз.
-        </p>
-
-        <div th:if="${error}" style="margin-bottom:1rem;padding:0.75rem 1rem;border-radius:0.5rem;font-size:0.875rem;background:#fef2f2;color:#991b1b;"
-             th:text="${error}"></div>
-
-        <form class="card" style="padding:1.5rem;display:flex;flex-direction:column;gap:1rem;" th:action="@{/setup}" method="post">
-            <div>
-                <label class="label" for="login">Логин</label>
-                <input class="input" id="login" name="login" th:value="${login}" autofocus required>
-            </div>
-            <div>
-                <label class="label" for="password">Пароль</label>
-                <input class="input" id="password" name="password" type="password" required>
-                <p style="margin-top:0.25rem;font-size:0.75rem;color:var(--c-text-muted);">Минимум 8 символов.</p>
-            </div>
-            <div>
-                <label class="label" for="password2">Повторите пароль</label>
-                <input class="input" id="password2" name="password2" type="password" required>
-            </div>
+    <div class="container-sm">
+        <h1 class="page-title">Создание администратора</h1>
+        <p class="text-sm text-muted mb-4">Это разовая настройка. Аккаунт преподавателя создаётся один раз.</p>
+        <div th:if="${error}" class="alert alert-error" th:text="${error}"></div>
+        <form class="card form-card form-stack" th:action="@{/setup}" method="post">
+            <div><label class="label" for="login">Логин</label><input class="input" id="login" name="login" th:value="${login}" autofocus required></div>
+            <div><label class="label" for="password">Пароль</label><input class="input" id="password" name="password" type="password" required><p class="hint">Минимум 8 символов.</p></div>
+            <div><label class="label" for="password2">Повторите пароль</label><input class="input" id="password2" name="password2" type="password" required></div>
             <button class="btn btn-primary" type="submit">Создать и войти</button>
         </form>
     </div>
diff --git a/web/src/main/resources/templates/student/dashboard.html b/web/src/main/resources/templates/student/dashboard.html
index 48d3797..593a6f8 100644
--- a/web/src/main/resources/templates/student/dashboard.html
+++ b/web/src/main/resources/templates/student/dashboard.html
@@ -1,19 +1,13 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org"
-      th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
+<html lang="ru" xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/base :: layout(~{::title}, ~{::#content})}">
 <head><title>Кабинет студента — LMS</title></head>
 <body>
 <div id="content">
-    <h1 style="margin:0 0 0.5rem;font-size:1.5rem;font-weight:600;">
-        Здравствуйте, <span th:text="${currentUser.name}">студент</span>
-    </h1>
-    <p style="margin:0 0 1.5rem;font-size:0.875rem;color:var(--c-text-muted);">
-        Здесь появятся лабораторные работы, условия вашего варианта и материалы занятий.
-    </p>
-
-    <div class="card" style="padding:1.5rem;">
+    <h1 class="page-title">Здравствуйте, <span th:text="${currentUser.name}">студент</span></h1>
+    <p class="text-sm text-muted mb-6">Здесь появятся лабораторные работы, условия вашего варианта и материалы занятий.</p>
+    <div class="card card-body">
         <p>Разделы в разработке:</p>
-        <ul style="margin-top:0.75rem;padding-left:1.25rem;font-size:0.875rem;color:var(--c-text-muted);">
+        <ul class="text-sm text-muted mt-2 list-pad">
             <li>список лабораторных и сроки сдачи;</li>
             <li>условие закреплённого за вами варианта;</li>
             <li>статьи и материалы занятий;</li>