diff --git a/tests/config.defaults.json b/tests/config.defaults.json
index 78262cb..0588ef8 100644
--- a/tests/config.defaults.json
+++ b/tests/config.defaults.json
@@ -11,6 +11,7 @@
     "TASK_BASE_URL": "http://sovietov.com/kispython",
     "FINAL_TASKS": null,
     "ENABLE_REGISTRATION": false,
+    "HIDE_GROUPS": false,
     "IMAP_LOGIN": "example@example.com",
     "IMAP_PASSWORD": "CHANGE_ME",
     "ENABLE_LKS_OAUTH": false,
diff --git a/tests/ui/test_auth.py b/tests/ui/test_auth.py
index a117943..6064281 100644
--- a/tests/ui/test_auth.py
+++ b/tests/ui/test_auth.py
@@ -116,20 +116,6 @@ def test_register_off_get(db: AppDatabase, client: FlaskClient):
     assert response.status_code == 302
 
 
-def test_login_off_post(client: FlaskClient, db: AppDatabase):
-    create_student(db)
-
-    response = client.post("/login")
-    assert response.status_code == 302
-
-
-def test_login_off_get(client: FlaskClient, db: AppDatabase):
-    create_student(db)
-
-    response = client.get("/login")
-    assert response.status_code == 302
-
-
 @mode('registration')
 @pytest.mark.parametrize("password, message", [
     ("1234", "Пароль содержит как минимум 8 символов."),
diff --git a/tests/ui/test_teacher.py b/tests/ui/test_teacher.py
index e91c0be..6374086 100644
--- a/tests/ui/test_teacher.py
+++ b/tests/ui/test_teacher.py
@@ -12,13 +12,13 @@ def test_login_logout(db: AppDatabase, client: FlaskClient):
     assert "login" not in response.request.path
     assert "Выгрузка всех присланных сообщений" in response.get_data(as_text=True)
 
-    response = client.get("/teacher/logout", follow_redirects=True)
+    response = client.get("/logout", follow_redirects=True)
 
-    assert "login" in response.request.path
+    assert response.request.path == "/"
 
 
 def test_false_login(db: AppDatabase, client: FlaskClient):
-    response = client.post("/teacher/login", data={
+    response = client.post("/login", data={
         "login": "badLogin",
         "password": "evenWorsePassword"
     }, follow_redirects=True)
@@ -93,7 +93,7 @@ def test_anonymous_submission(db: AppDatabase, client: FlaskClient):
 
     assert db.groups.get_by_id(gid).title in response.get_data(as_text=True)
     assert code in response.get_data(as_text=True)
-    assert "студент" not in response.get_data(as_text=True)
+    assert ", студент" not in response.get_data(as_text=True)
 
 
 def test_invalid_page_redirect(db: AppDatabase, client: FlaskClient):
diff --git a/tests/utils.py b/tests/utils.py
index 7fd7f19..008a46d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -9,7 +9,7 @@
 
 from flask.testing import FlaskClient
 
-from webapp.managers import TeacherManager
+from webapp.managers import StudentManager
 from webapp.repositories import AppDatabase
 
 
@@ -57,12 +57,13 @@ def get_tags(
 
 
 def teacher_login(db: AppDatabase, client: FlaskClient):
-    login = unique_str()
+    email = f'{unique_str()}@{unique_str()}.ru'
     password = unique_str()
-    tm = TeacherManager(db.teachers)
-    tm.create(login, password)
-    return client.post("/teacher/login", data={
-        "login": login,
+    students = StudentManager(None, db.students, db.mailers)
+    students.create(email, password, True)
+    db.students.confirm(email)
+    return client.post("/login", data={
+        "login": email,
         "password": password
     }, follow_redirects=True)
 
diff --git a/webapp/alembic/versions/20240514.22-12.students_as_teachers.py b/webapp/alembic/versions/20240514.22-12.students_as_teachers.py
new file mode 100644
index 0000000..99960ab
--- /dev/null
+++ b/webapp/alembic/versions/20240514.22-12.students_as_teachers.py
@@ -0,0 +1,31 @@
+"""
+
+Revision ID: 0ed9e0bfabcb
+Revises: 30b579748cec
+Create Date: 2024-05-14 22:12:06.014972
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0ed9e0bfabcb'
+down_revision = '30b579748cec'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column("students", sa.Column("teacher", sa.Boolean, nullable=True))
+    op.drop_table("teachers")
+
+
+def downgrade():
+    op.drop_column("students", "teacher")
+    op.create_table(
+        'teachers',
+        sa.Column("id", sa.Integer, primary_key=True, nullable=False),
+        sa.Column("login", sa.String, nullable=False),
+        sa.Column("password_hash", sa.String, nullable=False),
+    )
diff --git a/webapp/config.defaults.json b/webapp/config.defaults.json
index 1a9d2f7..c37d381 100644
--- a/webapp/config.defaults.json
+++ b/webapp/config.defaults.json
@@ -9,6 +9,7 @@
     "READONLY": false,
     "TASK_BASE_URL": "http://kispython.ru/docs",
     "ENABLE_REGISTRATION": false,
+    "HIDE_GROUPS": false,
     "IMAP_LOGIN": null,
     "IMAP_PASSWORD": null,
     "FINAL_TASKS": {
diff --git a/webapp/dto.py b/webapp/dto.py
index f27a224..a93ca2e 100644
--- a/webapp/dto.py
+++ b/webapp/dto.py
@@ -27,6 +27,7 @@ def __init__(self, config: Config):
         self.places_in_group: int = config["PLACES_IN_GROUP"]
         self.groups: dict = config["GROUPS"]
         self.allow_ip: list[str] = config["ALLOW_IP"]
+        self.hide_groups: bool = config["HIDE_GROUPS"]
 
     @property
     def exam(self) -> bool:
diff --git a/webapp/forms.py b/webapp/forms.py
index 6027c3e..d3e552a 100644
--- a/webapp/forms.py
+++ b/webapp/forms.py
@@ -15,15 +15,21 @@ class StudentMessageForm(FlaskForm):
     ])
 
 
-class TeacherLoginForm(FlaskForm):
-    login = StringField('login', [DataRequired(message="Данное поле не может быть пустым!")])
+class StudentLoginForm(FlaskForm):
+    def __init__(self, lks_oauth_enabled: bool = False, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.lks_oauth_enabled = lks_oauth_enabled
+
+    login = StringField('email', [
+        DataRequired(message="Данное поле не может быть пустым!"),
+    ])
+
     password = PasswordField('password', [
         DataRequired(message="Данное поле не может быть пустым!"),
-        Length(min=8, message="Пароль содержит как минимум 8 символов."),
     ])
 
 
-class StudentLoginForm(FlaskForm):
+class StudentRegisterForm(FlaskForm):
     def __init__(self, lks_oauth_enabled: bool = False, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.lks_oauth_enabled = lks_oauth_enabled
@@ -35,14 +41,13 @@ def __init__(self, lks_oauth_enabled: bool = False, *args, **kwargs):
             "Убедитесь, что строка не включает пробелы."
         ))
     ])
+
     password = PasswordField('password', [
         DataRequired(message="Данное поле не может быть пустым!"),
         Length(min=8, message="Пароль содержит как минимум 8 символов."),
         NoneOf(["12345678", "password"], message="Не используйте такие пароли, как 12345678 и password.")
     ])
 
-
-class StudentRegisterForm(StudentLoginForm):
     confirm = PasswordField('password', [
         DataRequired(message="Данное поле не может быть пустым!"),
         EqualTo('password', message="Пароли не совпадают!")
diff --git a/webapp/managers.py b/webapp/managers.py
index fb91d5e..affcb15 100644
--- a/webapp/managers.py
+++ b/webapp/managers.py
@@ -19,7 +19,7 @@
     TaskStatusDto,
     VariantDto
 )
-from webapp.models import FinalSeed, Group, Message, MessageCheck, Student, Task, TaskStatus, Teacher, Variant
+from webapp.models import FinalSeed, Group, Message, MessageCheck, Student, Task, TaskStatus, Variant
 from webapp.repositories import (
     FinalSeedRepository,
     GroupRepository,
@@ -29,7 +29,6 @@
     StudentRepository,
     TaskRepository,
     TaskStatusRepository,
-    TeacherRepository,
     VariantRepository
 )
 
@@ -482,10 +481,10 @@ def email_allowed(self, email: str) -> bool:
         exists = self.mailers.exists(domain)
         return exists
 
-    def create(self, email: str, password: str) -> int:
+    def create(self, email: str, password: str, teacher=False) -> int:
         given = password.encode('utf8')
         hashed = bcrypt.hashpw(given, bcrypt.gensalt())
-        student = self.students.create(email, hashed.decode('utf8'))
+        student = self.students.create(email, hashed.decode('utf8'), teacher)
         return student.id
 
 
@@ -599,22 +598,3 @@ def __create_csv(self, table: list[list[str]], delimiter: str):
         bom = u"\uFEFF"
         value = bom + si.getvalue()
         return value
-
-
-class TeacherManager:
-    def __init__(self, teachers: TeacherRepository):
-        self.teachers = teachers
-
-    def check_password(self, login: str, password: str) -> Teacher | None:
-        teacher = self.teachers.find_by_login(login)
-        if teacher:
-            given = password.encode('utf8')
-            actual = teacher.password_hash.encode('utf8')
-            if bcrypt.checkpw(given, actual):
-                return teacher
-
-    def create(self, login: str, password: str):
-        given = password.encode('utf8')
-        hashed = bcrypt.hashpw(given, bcrypt.gensalt())
-        teacher = self.teachers.create(login, hashed.decode('utf8'))
-        return teacher.id
diff --git a/webapp/models.py b/webapp/models.py
index 01dbe58..673bff7 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -122,13 +122,6 @@ class FinalSeed(Base):
     group = sa.Column("group", sa.Integer, sa.ForeignKey('groups.id'), primary_key=True, nullable=False)
 
 
-class Teacher(Base):
-    __tablename__ = "teachers"
-    id = sa.Column("id", sa.Integer, primary_key=True, nullable=False)
-    login = sa.Column("login", sa.String, nullable=False)
-    password_hash = sa.Column("password_hash", sa.String, nullable=False)
-
-
 class Student(Base):
     __tablename__ = "students"
     id = sa.Column("id", sa.Integer, primary_key=True, nullable=False)
@@ -139,6 +132,7 @@ class Student(Base):
     password_hash = sa.Column("password_hash", sa.String, nullable=True)
     unconfirmed_hash = sa.Column("unconfirmed_hash", sa.String, nullable=True)
     blocked = sa.Column("blocked", sa.Boolean, nullable=False)
+    teacher = sa.Column("teacher", sa.Boolean, nullable=True)
 
 
 class Mailer(Base):
diff --git a/webapp/repositories.py b/webapp/repositories.py
index 8bd1522..e85f22b 100644
--- a/webapp/repositories.py
+++ b/webapp/repositories.py
@@ -15,7 +15,6 @@
     Student,
     Task,
     TaskStatus,
-    Teacher,
     Variant,
     create_session_maker
 )
@@ -457,30 +456,6 @@ def delete_final_seed(self, group: int):
                 .delete()
 
 
-class TeacherRepository:
-    def __init__(self, db: DbContextManager):
-        self.db = db
-
-    def get_by_id(self, id: int) -> Teacher | None:
-        with self.db.create_session() as session:
-            teacher = session.query(Teacher).get(id)
-            return teacher
-
-    def find_by_login(self, login: str) -> Teacher | None:
-        with self.db.create_session() as session:
-            teacher = session.query(Teacher) \
-                .filter_by(login=login) \
-                .first()
-            return teacher
-
-    def create(self, login: str, password: str):
-        with self.db.create_session() as session:
-            teacher = Teacher(login=login,
-                              password_hash=password)
-            session.add(teacher)
-            return teacher
-
-
 class StudentRepository:
     def __init__(self, db: DbContextManager):
         self.db = db
@@ -524,10 +499,10 @@ def confirm(self, email: str):
                     unconfirmed_hash=None,
                 ))
 
-    def create(self, email: str, password: str) -> Student:
+    def create(self, email: str, password: str, teacher=False) -> Student:
         email = email.lower()
         with self.db.create_session() as session:
-            student = Student(email=email, unconfirmed_hash=password, blocked=False)
+            student = Student(email=email, unconfirmed_hash=password, teacher=teacher, blocked=False)
             session.add(student)
             return student
 
@@ -580,6 +555,5 @@ def __init__(self, get_connection: Callable[[], str]):
         self.messages = MessageRepository(db)
         self.checks = MessageCheckRepository(db)
         self.seeds = FinalSeedRepository(db)
-        self.teachers = TeacherRepository(db)
         self.students = StudentRepository(db)
         self.mailers = MailerRepository(db)
diff --git a/webapp/templates/error.jinja b/webapp/templates/error.jinja
index 204395f..32fa4a8 100644
--- a/webapp/templates/error.jinja
+++ b/webapp/templates/error.jinja
@@ -13,4 +13,4 @@
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/layout.jinja b/webapp/templates/layout.jinja
index e87bdad..9eed1e7 100644
--- a/webapp/templates/layout.jinja
+++ b/webapp/templates/layout.jinja
@@ -1,73 +1,159 @@
 <!doctype html>
 <html>
+
 <head>
   <title>Цифровой ассистент преподавателя</title>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover"/>
-  <meta name="theme-color" content="#ffffff"/>
-  <link rel="icon" href="{{ url_for('static', filename='logo.svg') }}"/>
-  <link rel="stylesheet"
-        href="{{ url_for('static', filename='css/bootstrap.min.css') }}"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
+  <meta name="theme-color" content="#ffffff" />
+  <link rel="icon" href="{{ url_for('static', filename='logo.svg') }}" />
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" />
   <script src="{{ url_for('static', filename='js/bootstrap.bundle.min.js') }}"></script>
   <link rel="stylesheet" href="{{ url_for('static', filename='css/codemirror.min.css') }}">
   <style>
-  .logo {
-    width: 44px;
-    height: 44px;
-    position: absolute;
-    top: -28px;
-    background-color: white;
-    border-radius: 22px;
-    border: solid 1px #9ca9b5;
-  }
-  .logo-img {
-    width: 28px;
-    height: 28px;
-    margin-left: 7px;
-    margin-top: 8px;
-  }
-  .logo-container {
-    width: 24px;
-    position: relative;
-    margin-right: 30px;
-    display: inline-block;
-  }
-  .callout {
-    padding: 8px 20px;
-    margin: 10px 0;
-    border: 1px solid #eee;
-    border-left-width: 7px;
-    border-radius: 3px;
-  }
-  .callout p:last-child {
-    margin-bottom: 0;
-  }
-  .callout code {
-    border-radius: 3px;
-  }
-  .callout-success {
-    border-left-color: #28a745;
-  }
-  .callout-success div {
-    color: #28a745;
-    font-weight: bold;
-  }
-  .achievements-counter {
-    position: absolute;
-    font-size: 12px;
-    opacity: 0.7;
-    padding-left: 8px;
-    padding-top: 4px;
-  }
-  .department-img {
-    width: 150px;
-    margin-bottom: -20px;
-  }
+    .logo {
+      width: 44px;
+      height: 44px;
+      position: absolute;
+      top: -28px;
+      background-color: white;
+      border-radius: 22px;
+      border: solid 1px #9ca9b5;
+    }
+
+    .logo-img {
+      width: 28px;
+      height: 28px;
+      margin-left: 7px;
+      margin-top: 8px;
+    }
+
+    .logo-container {
+      width: 24px;
+      position: relative;
+      margin-right: 30px;
+      display: inline-block;
+    }
+
+    .callout {
+      padding: 8px 20px;
+      margin: 10px 0;
+      border: 1px solid #eee;
+      border-left-width: 7px;
+      border-radius: 3px;
+    }
+
+    .callout p:last-child {
+      margin-bottom: 0;
+    }
+
+    .callout code {
+      border-radius: 3px;
+    }
+
+    .callout-success {
+      border-left-color: #28a745;
+    }
+
+    .callout-success div {
+      color: #28a745;
+      font-weight: bold;
+    }
+
+    .achievements-counter {
+      position: absolute;
+      font-size: 12px;
+      opacity: 0.7;
+      padding-left: 8px;
+      padding-top: 4px;
+    }
+
+    .department-img {
+      width: 150px;
+      margin-bottom: -20px;
+    }
   </style>
-    {% block head %}{% endblock %}
+  {% block head %}{% endblock %}
 </head>
+
 <body>
-{% block content %}{% endblock %}
-{% block footer %}{% endblock %}
+  {% block content %}
+  <nav class="navbar navbar-expand-lg navbar-light bg-light">
+    <div class="collapse navbar-collapse container">
+      <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
+        <li>
+          <a class="logo-container text-decoration-none" href="/">
+            <div class="logo">
+              <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
+            </div>
+          </a>
+        </li>
+        {% block header %} {% endblock %}
+      </ol>
+      <div class="d-block gap-3 col-12 col-lg-3 col-md-5 mt-2 mt-md-0">
+        <div class="dropdown">
+          <button class="btn btn-sm btn-outline-secondary dropdown-toggle w-100" id="dLabel" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+            {% if student is defined and student is not none %}
+            {{ student.email | hide }}
+            {% elif registration %}
+            Войти
+            {% else %}
+            Меню
+            {% endif %}
+          </button>
+          <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel">
+            {% if student is defined and student is not none and student.teacher %}
+            <li>
+              <a class="dropdown-item" href="/teacher">
+                <div>Преподавательская 📕</div>
+                <small class="opacity-50">
+                  Решения студентов, зачёты, ...
+                </small>
+              </a>
+            </li>
+            {% endif %}
+            <li>
+              <a class="dropdown-item d-block" target="__blank" href="https://github.com/true-grue/kispython">
+                <div>Материалы курса 📖</div>
+                <small class="opacity-50">
+                  Программирование на языке Python
+                </small>
+              </a>
+            </li>
+            {% if registration %}
+            <li><a class="dropdown-item" href="/rating">Рейтинг студентов</a></li>
+            {% if group_rating %}
+            <li><a class="dropdown-item" href="/rating/groups">Рейтинг групп</a></li>
+            {% endif %}
+            {% if student is defined and student is not none %}
+            <li><a class="dropdown-item" target="__blank" href="https://t.me/kispython">Telegram для оповещений</a></li>
+            <li><a class="dropdown-item" href="/submissions">Отправленные решения</a></li>
+            <li>
+              <hr class="dropdown-divider">
+            </li>
+            {% else %}
+            <li>
+              <hr class="dropdown-divider">
+            </li>
+            <li><a class="dropdown-item" href="/login">Войти</a></li>
+            {% endif %}
+            {% endif %}
+            {% if exam or not registration %}
+            <li><a class="dropdown-item" href="/submissions">Отправленные решения</a></li>
+            {% endif %}
+            {% if student is defined and student is not none %}
+            <li><a class="dropdown-item" href="/logout">Выйти</a></li>
+            {% endif %}
+          </ul>
+        </div>
+      </div>
+    </div>
+  </nav>
+  <div class="container mt-3">
+    {% block main %} {% endblock %}
+  </div>
+  {% endblock %}
+  {% block footer %}{% endblock %}
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/webapp/templates/student/dashboard.jinja b/webapp/templates/student/dashboard.jinja
index b3f47d3..e3354d8 100644
--- a/webapp/templates/student/dashboard.jinja
+++ b/webapp/templates/student/dashboard.jinja
@@ -1,32 +1,31 @@
-{% extends 'student/student_layout.jinja' %}
-
+{% extends 'layout.jinja' %}
 {% block header %}
-    <li class="breadcrumb-item active" aria-current="page">
-         Цифровой ассистент преподавателя
-    </li>
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
 {% endblock %}
 
 {% block main %}
-  <h5 class="card-title fw-bold">
-    {% if exam %} Режим зачёта {% else %} Перечень групп {% endif %}
-  </h5>
-  <h6 class="card-subtitle mb-2 text-muted">
-    Нажмите на группу, чтобы перейти к вариантам заданий группы.
-  </h6>
+<h5 class="card-title fw-bold">
+  {% if exam %} Режим зачёта {% else %} Перечень групп {% endif %}
+</h5>
+<h6 class="card-subtitle mb-2 text-muted">
+  Нажмите на группу, чтобы перейти к вариантам заданий группы.
+</h6>
+<div>
+  {% for key, grouping in groupings.items() %}
   <div>
-    {% for key, grouping in groupings.items() %}
-      <div>
-        <small class="mb-2 text-muted d-block">
-          <span>{{ key }}</span>
-        </small>
-        {% for group in grouping %}
-          <a class="btn btn-outline-primary mb-2 mr-3" href="/group/{{ group.id }}">
-            {{ group.title }}
-          </a>
-        {% endfor %}
-      </div>
+    <small class="mb-2 text-muted d-block">
+      <span>{{ key }}</span>
+    </small>
+    {% for group in grouping %}
+    <a class="btn btn-outline-primary mb-2 mr-3" href="/group/{{ group.id }}">
+      {{ group.title }}
+    </a>
     {% endfor %}
   </div>
+  {% endfor %}
+</div>
 {% endblock %}
 
 {% block footer %}
diff --git a/webapp/templates/student/group.jinja b/webapp/templates/student/group.jinja
index 58ada92..702df04 100644
--- a/webapp/templates/student/group.jinja
+++ b/webapp/templates/student/group.jinja
@@ -1,71 +1,113 @@
-{% extends 'student/student_layout.jinja' %}
+{% extends 'layout.jinja' %}
+{% block head %}
+<style>
+  .blurred-table {
+    pointer-events: none;
+    filter: blur(40px);
+    opacity: 0.8;
+  }
+
+  .blurred-table-hint {
+    position: absolute;
+    top: 350px;
+    left: 50%;
+    transform: translate(-50%, 50%);
+  }
+
+  .blurred-logo {
+    position: absolute;
+    background-color: white;
+    border-radius: 50%;
+    border: solid 2px #AcB9C5;
+    padding: 27px 25px 23px 25px;
+    top: -230px;
+    left: 50%;
+    transform: translate(-50%, 50%);
+  }
+
+  .blurred-logo-img {
+    width: 90px;
+    height: 90px;
+  }
+</style>
+{% endblock %}
 
 {% block header %}
-    <li class="breadcrumb-item active" aria-current="page">
-         {{ group.title }}
-    </li>
+<li class="breadcrumb-item active" aria-current="page">
+  {{ group.title }}
+</li>
 {% endblock %}
 
 {% block main %}
-  {% if blocked %}
-    <h5 class="card-title fw-bold">
-      Зачёт ещё не начат
-    </h5>
-    <h6 class="card-subtitle mb-2 text-muted mt-2">
-      Зачёт для группы {{ group.title }} ещё не начат.
-    </h6>
-  {% else %}
-    <h5 class="card-title fw-bold">
-      Варианты заданий группы
-      <span class="text-primary" style="font-size: inherit">
-        {{ group.title }}
-      </span>
-    </h5>
-    <h6 class="card-subtitle mb-3 text-muted">
-      Список вариантов. Нажмите на соответствующую Вашему варианту ячейку, чтобы перейти к отправке.
-    </h6>
-    <div class="mb-5" style="overflow-x:auto">
-      <table class="table table-sm table-bordered table-hover mb-0" style="min-width:650px">
-        <thead>
-          <tr>
-            <th scope="col" style="width:100px">Вариант</th>
-            {% for task in group.tasks %}
-              <td scope="col" class="text-center">
-                <a class="text-decoration-none"
-                  target="__blank"
-                  href="{{ task.url }}">
-                  №{{ task.formulation if task.formulation else task.id + 1 }}
-                </a>
-              </td>
-            {% endfor %}
-          </tr>
-        </thead>
-        <tbody style="border-top: 0px">
-          {% for variant in group.variants %}
-            <tr>
-              <td scope="col" style="border-bottom: 0; width:100px; padding: 0">
-                <span class="p-1 d-block" title="{{ variant.earned }}">
-                  {{ variant.id + 1 }}
-                </span>
-              </td>
-              {% for status in variant.statuses %}
-                <td scope="col" style="border-bottom: 0; padding: 0">
-                  <a class="d-block text-center text-decoration-none p-1 position-relative"
-                    style="background-color:{{ status.cell_background }}"
-                    href="{{ status.submission_url }}">
-                    {{ status.code }}
-                    {% if status.earned > 1 %}
-                      <span class="achievements-counter">
-                        {{ status.earned }}
-                      </span>
-                    {% endif %}
-                  </a>
-                </td>
-              {% endfor %}
-            </tr>
+{% if blocked %}
+<h5 class="card-title fw-bold">
+  Зачёт ещё не начат
+</h5>
+<h6 class="card-subtitle mb-2 text-muted mt-2">
+  Зачёт для группы {{ group.title }} ещё не начат.
+</h6>
+{% else %}
+<h5 class="card-title fw-bold">
+  Варианты заданий группы
+  <span class="text-primary" style="font-size: inherit">
+    {{ group.title }}
+  </span>
+</h5>
+<h6 class="card-subtitle mb-3 text-muted">
+  Список вариантов. Нажмите на соответствующую Вашему варианту ячейку, чтобы перейти к отправке.
+</h6>
+<div class="position-relative">
+  <div class="{{ 'blurred-table' if hide_groups and registration and not student }} mb-5" style="overflow-x:auto">
+    <table class="table table-sm table-bordered table-hover mb-0" style="min-width:650px">
+      <thead>
+        <tr>
+          <th scope="col" style="width:100px">Вариант</th>
+          {% for task in group.tasks %}
+          <td scope="col" class="text-center">
+            <a class="text-decoration-none" target="__blank" href="{{ task.url }}">
+              №{{ task.formulation if task.formulation else task.id + 1 }}
+            </a>
+          </td>
+          {% endfor %}
+        </tr>
+      </thead>
+      <tbody style="border-top: 0px">
+        {% for variant in group.variants %}
+        <tr>
+          <td scope="col" style="border-bottom: 0; width:100px; padding: 0">
+            <span class="p-1 d-block" title="{{ variant.earned }}">
+              {{ variant.id + 1 }}
+            </span>
+          </td>
+          {% for status in variant.statuses %}
+          <td scope="col" style="border-bottom: 0; padding: 0">
+            <a class="d-block text-center text-decoration-none p-1 position-relative"
+              style="background-color:{{ status.cell_background }}" href="{{ status.submission_url }}">
+              {{ status.code }}
+              {% if status.earned > 1 %}
+              <span class="achievements-counter">
+                {{ status.earned }}
+              </span>
+              {% endif %}
+            </a>
+          </td>
           {% endfor %}
-        </tbody>
-      </table>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  {% if hide_groups and registration and not student %}
+  <div class="blurred-table-hint text-center">
+    <div class="blurred-logo">
+      <img class="blurred-logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
     </div>
+    <div class="mb-3">Для просмотра страницы необходимо:</div>
+    <a class="btn btn-primary" href="/login">
+      Войти на сайт
+    </a>
+  </div>
   {% endif %}
-{% endblock %}
+</div>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/groups_rating.jinja b/webapp/templates/student/groups_rating.jinja
index 43c1501..11b17be 100644
--- a/webapp/templates/student/groups_rating.jinja
+++ b/webapp/templates/student/groups_rating.jinja
@@ -1,40 +1,39 @@
-{% extends 'student/student_layout.jinja' %}
+{% extends 'layout.jinja' %}
 {% block header %}
-    <li class="breadcrumb-item active" aria-current="page">
-        Цифровой ассистент преподавателя
-    </li>
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
 {% endblock %}
 
 {% block main %}
-    {% if blocked %}
-        <h5 class="card-title fw-bold">
-            Зачёт ещё не начат
-        </h5>
-    {% else %}
-        <h5 class="card-title fw-bold">
-            Рейтинг групп
-        </h5>
-        <h6 class="card-subtitle mb-3 text-muted">
-            Рейтинг групп на основании количества полученных допусков студентами группы.
-        </h6>
-        <div class="container">
-            {% for score, groups in groupings.items() %}
-                <div class="row">
-                    {% for group in groups %}
-                        <div class="col-sm-12 col-md-4 col-xl-2 p-1">
-                            <div class="border rounded p-2 d-flex justify-content-between align-items-start">
-                                <a class="text-decoration-none w-100 text-start"
-                                    href="/group/{{ group.group.id }}">
-                                    <div class="ms-2 me-auto">
-                                        {{ group.group.title }}
-                                    </div>
-                                </a>
-                                <span class="badge bg-primary rounded-pill ">{{ group.earned }}</span>
-                            </div>
-                        </div>
-                    {% endfor %}
-                </div>
-            {% endfor %}
-        </div>
-    {% endif %}
-{% endblock %}
+{% if blocked %}
+<h5 class="card-title fw-bold">
+  Зачёт ещё не начат
+</h5>
+{% else %}
+<h5 class="card-title fw-bold">
+  Рейтинг групп
+</h5>
+<h6 class="card-subtitle mb-3 text-muted">
+  Рейтинг групп на основании количества полученных допусков студентами группы.
+</h6>
+<div class="container">
+  {% for score, groups in groupings.items() %}
+  <div class="row">
+    {% for group in groups %}
+    <div class="col-sm-12 col-md-4 col-xl-2 p-1">
+      <div class="border rounded p-2 d-flex justify-content-between align-items-start">
+        <a class="text-decoration-none w-100 text-start" href="/group/{{ group.group.id }}">
+          <div class="ms-2 me-auto">
+            {{ group.group.title }}
+          </div>
+        </a>
+        <span class="badge bg-primary rounded-pill ">{{ group.earned }}</span>
+      </div>
+    </div>
+    {% endfor %}
+  </div>
+  {% endfor %}
+</div>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/login.jinja b/webapp/templates/student/login.jinja
index 1e20271..4898c31 100644
--- a/webapp/templates/student/login.jinja
+++ b/webapp/templates/student/login.jinja
@@ -1,87 +1,76 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
+{% block header %}
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
+{% endblock %}
+
+{% block main %}
+<div class="row mt-4">
+  <div class="col-12 col-md-9 col-lg-6">
+    <div class="card">
+      <form class="card-body" action="/login" method="POST">
+        <b class="card-title d-block">Авторизация</b>
+        <div class="form-group mb-2">
+          <label>Электронная почта</label>
+          <input name="login" type="text" class="form-control" placeholder="Адрес электронной почты"
+            value="{{ form.login.data if form.login.data }}">
+          <small class="form-text text-muted">Введите адрес электронной почты.</small>
+        </div>
+        {% if form.login.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.login.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        <div class="form-group mb-2">
+          <label>Пароль</label>
+          <input name="password" type="password" class="form-control" placeholder="Пароль">
+          <small class="form-text text-muted">Введите пароль.</small>
+        </div>
+        {% if form.password.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.password.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        {{ form.csrf_token }}
+        <div class="row">
+          <div class="col-md-6 mb-3">
+            <button type="submit" class="btn btn-primary w-100 d-block">
+              Войти
+            </button>
           </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Цифровой ассистент преподавателя
-      </li>
-    </ol>
-  </div>
-</nav>
-<div class="container">
-  <div class="row mt-4">
-    <div class="col-12 col-md-9 col-lg-6">
-      <div class="card">
-        <form class="card-body" action="/login" method="POST">
-          <b class="card-title d-block">Авторизация</b>
-          <div class="form-group mb-2">
-            <label>Электронная почта</label>
-            <input name="login" type="text" class="form-control"
-                   placeholder="Адрес электронной почты"
-                   value="{{ form.login.data if form.login.data }}">
-            <small class="form-text text-muted">Введите адрес электронной почты.</small>
+          {% if registration %}
+          <div class="col-md-6 mb-3">
+            <a href="/register" class="btn btn-outline-primary w-100 d-block">
+              Зарегистрироваться
+            </a>
           </div>
-          {% if form.login.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.login.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Пароль</label>
-            <input name="password" type="password" class="form-control" placeholder="Пароль">
-            <small class="form-text text-muted">Введите пароль.</small>
+          <div class="col-md-12">
+            <a href="/change-password" class="btn btn-outline-primary w-100 d-block">
+              Сменить пароль
+            </a>
           </div>
-          {% if form.password.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.password.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
           {% endif %}
-          {{ form.csrf_token }}
-          <div class="row">
-            <div class="col-md-6 mb-3">
-              <button type="submit" class="btn btn-primary w-100 d-block">
-                Войти
-              </button>
-            </div>
-            <div class="col-md-6 mb-3">
-              <a href="/register" class="btn btn-outline-primary w-100 d-block">
-                Зарегистрироваться
-              </a>
-            </div>
-            <div class="col-md-12">
-              <a href="/change-password" class="btn btn-outline-primary w-100 d-block">
-                Сменить пароль
-              </a>
-            </div>
+        </div>
+        {% if form.lks_oauth_enabled %}
+        <div class="row mt-0">
+          <div class="col-12">
+            <hr>
           </div>
-          {% if form.lks_oauth_enabled %}
-          <div class="row mt-0">
-            <div class="col-12">
-              <hr>
-            </div>
-            <div class="col-12">
-              <a href="/login/lks" class="btn btn-outline-primary w-100 d-block">
-                <img src="{{ url_for('static', filename='mirea.ico') }}" alt="Иконка ЛКС" width="16" height="16">
-                Войти через Единую систему аутентификации РТУ МИРЭА
-              </a>
-            </div>
+          <div class="col-12">
+            <a href="/login/lks" class="btn btn-outline-primary w-100 d-block">
+              <img src="{{ url_for('static', filename='mirea.ico') }}" alt="Иконка ЛКС" width="16" height="16">
+              Войти через Единую систему аутентификации РТУ МИРЭА
+            </a>
           </div>
-          {% endif %}
-        </form>
-      </div>
+        </div>
+        {% endif %}
+      </form>
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/password.jinja b/webapp/templates/student/password.jinja
index 9022dac..a23d3ac 100644
--- a/webapp/templates/student/password.jinja
+++ b/webapp/templates/student/password.jinja
@@ -1,81 +1,68 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Цифровой ассистент преподавателя
-      </li>
-    </ol>
-  </div>
-</nav>
-<div class="container">
-  <div class="row mt-4">
-    <div class="col-12 col-md-9 col-lg-6">
-      <div class="card">
-        <form class="card-body" action="/change-password" method="POST">
-          <b class="card-title d-block">Сброс пароля</b>
-          <div class="form-group mb-2">
-            <label>Электронная почта</label>
-            <input name="login" type="text" class="form-control"
-                   placeholder="Адрес электронной почты"
-                   value="{{ form.login.data if form.login.data }}">
-            <small class="form-text text-muted">Введите адрес электронной почты.</small>
-          </div>
-          {% if form.login.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.login.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Пароль</label>
-            <input name="password" type="password" class="form-control" placeholder="Пароль">
-            <small class="form-text text-muted">Введите пароль.</small>
-          </div>
-          {% if form.password.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.password.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Подтверждение пароля</label>
-            <input name="confirm" type="password" class="form-control" placeholder="Подтверждение пароля">
-            <small class="form-text text-muted">Подтвердите пароль.</small>
+{% block header %}
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
+{% endblock %}
+
+{% block main %}
+<div class="row mt-4">
+  <div class="col-12 col-md-9 col-lg-6">
+    <div class="card">
+      <form class="card-body" action="/change-password" method="POST">
+        <b class="card-title d-block">Сброс пароля</b>
+        <div class="form-group mb-2">
+          <label>Электронная почта</label>
+          <input name="login" type="text" class="form-control" placeholder="Адрес электронной почты"
+            value="{{ form.login.data if form.login.data }}">
+          <small class="form-text text-muted">Введите адрес электронной почты.</small>
+        </div>
+        {% if form.login.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.login.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        <div class="form-group mb-2">
+          <label>Пароль</label>
+          <input name="password" type="password" class="form-control" placeholder="Пароль">
+          <small class="form-text text-muted">Введите пароль.</small>
+        </div>
+        {% if form.password.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.password.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        <div class="form-group mb-2">
+          <label>Подтверждение пароля</label>
+          <input name="confirm" type="password" class="form-control" placeholder="Подтверждение пароля">
+          <small class="form-text text-muted">Подтвердите пароль.</small>
+        </div>
+        {% if form.confirm.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.confirm.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        {{ form.csrf_token }}
+        <div class="row">
+          <div class="col-md-6 mb-3">
+            <button type="submit" class="btn btn-primary w-100 d-block">
+              Сбросить пароль
+            </button>
           </div>
-          {% if form.confirm.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.confirm.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          {{ form.csrf_token }}
-          <div class="row">
-            <div class="col-md-6 mb-3">
-              <button type="submit" class="btn btn-primary w-100 d-block">
-                Сбросить пароль
-              </button>
-            </div>
-            <div class="col-md-6 mb-3">
-              <a href="/login" class="btn btn-outline-primary w-100 d-block">
-                Войти
-              </a>
-            </div>
+          <div class="col-md-6 mb-3">
+            <a href="/login" class="btn btn-outline-primary w-100 d-block">
+              Войти
+            </a>
           </div>
-        </form>
-      </div>
+        </div>
+      </form>
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/rating.jinja b/webapp/templates/student/rating.jinja
index cdf8a7c..62661a4 100644
--- a/webapp/templates/student/rating.jinja
+++ b/webapp/templates/student/rating.jinja
@@ -1,53 +1,52 @@
-{% extends 'student/student_layout.jinja' %}
+{% extends 'layout.jinja' %}
 {% block header %}
-    <li class="breadcrumb-item active" aria-current="page">
-        Цифровой ассистент преподавателя
-    </li>
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
 {% endblock %}
 
 {% block main %}
-    {% if blocked %}
-        <h5 class="card-title fw-bold">
-            Зачёт ещё не начат
-        </h5>
-    {% else %}
-        <h5 class="card-title fw-bold">
-            Рейтинг студентов
-        </h5>
-        <h6 class="card-subtitle mb-3 text-muted">
-            Рейтинг студентов на основании количества решенных разными способами задач.
-        </h6>
-        <div class="container">
-            {% for score, students in groupings.items() %}
-                <div>
-                    <small class="mt-2 text-muted d-block">
-                        {% if loop.index == 1 %}
-                            🥇 Топ 1
-                        {% elif loop.index == 2 %}
-                            🥈 Топ 2
-                        {% elif loop.index == 3 %}
-                            🥉 Топ 3
-                        {% else %}
-                            Топ {{ loop.index }}
-                        {% endif %}
-                    </small>
-                    <div class="row">
-                        {% for student in students %}
-                            <div class="col-sm-12 col-md-6 col-xl-3 p-1">
-                                <div class="border rounded p-2 d-flex justify-content-between align-items-start">
-                                    <a class="text-decoration-none w-100 text-start"
-                                       href="/group/{{ student.group.id }}">
-                                        <div class="ms-2 me-auto">
-                                            {{ student.group.title }}, вар. {{ student.variant + 1 }}
-                                        </div>
-                                    </a>
-                                    <span class="badge bg-primary rounded-pill ">{{ student.earned }}</span>
-                                </div>
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endfor %}
+{% if blocked %}
+<h5 class="card-title fw-bold">
+  Зачёт ещё не начат
+</h5>
+{% else %}
+<h5 class="card-title fw-bold">
+  Рейтинг студентов
+</h5>
+<h6 class="card-subtitle mb-3 text-muted">
+  Рейтинг студентов на основании количества решенных разными способами задач.
+</h6>
+<div class="container">
+  {% for score, students in groupings.items() %}
+  <div>
+    <small class="mt-2 text-muted d-block">
+      {% if loop.index == 1 %}
+      🥇 Топ 1
+      {% elif loop.index == 2 %}
+      🥈 Топ 2
+      {% elif loop.index == 3 %}
+      🥉 Топ 3
+      {% else %}
+      Топ {{ loop.index }}
+      {% endif %}
+    </small>
+    <div class="row">
+      {% for student in students %}
+      <div class="col-sm-12 col-md-6 col-xl-3 p-1">
+        <div class="border rounded p-2 d-flex justify-content-between align-items-start">
+          <a class="text-decoration-none w-100 text-start" href="/group/{{ student.group.id }}">
+            <div class="ms-2 me-auto">
+              {{ student.group.title }}, вар. {{ student.variant + 1 }}
+            </div>
+          </a>
+          <span class="badge bg-primary rounded-pill ">{{ student.earned }}</span>
         </div>
-    {% endif %}
-{% endblock %}
+      </div>
+      {% endfor %}
+    </div>
+  </div>
+  {% endfor %}
+</div>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/register.jinja b/webapp/templates/student/register.jinja
index 16d9bdf..75741ba 100644
--- a/webapp/templates/student/register.jinja
+++ b/webapp/templates/student/register.jinja
@@ -1,94 +1,81 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Цифровой ассистент преподавателя
-      </li>
-    </ol>
-  </div>
-</nav>
-<div class="container">
-  <div class="row mt-4">
-    <div class="col-12 col-md-9 col-lg-6">
-      <div class="card">
-        <form class="card-body" action="/register" method="POST">
-          <b class="card-title d-block">Регистрация</b>
-          <div class="form-group mb-2">
-            <label>Электронная почта</label>
-            <input name="login" type="text" class="form-control"
-                   placeholder="Адрес электронной почты"
-                   value="{{ form.login.data if form.login.data }}">
-            <small class="form-text text-muted">Введите адрес электронной почты.</small>
-          </div>
-          {% if form.login.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.login.errors %}
-              <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Пароль</label>
-            <input name="password" type="password" class="form-control" placeholder="Пароль">
-            <small class="form-text text-muted">Введите пароль.</small>
+{% block header %}
+<li class="breadcrumb-item active" aria-current="page">
+  Цифровой ассистент преподавателя
+</li>
+{% endblock %}
+
+{% block main %}
+<div class="row mt-4">
+  <div class="col-12 col-md-9 col-lg-6">
+    <div class="card">
+      <form class="card-body" action="/register" method="POST">
+        <b class="card-title d-block">Регистрация</b>
+        <div class="form-group mb-2">
+          <label>Электронная почта</label>
+          <input name="login" type="text" class="form-control" placeholder="Адрес электронной почты"
+            value="{{ form.login.data if form.login.data }}">
+          <small class="form-text text-muted">Введите адрес электронной почты.</small>
+        </div>
+        {% if form.login.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.login.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        <div class="form-group mb-2">
+          <label>Пароль</label>
+          <input name="password" type="password" class="form-control" placeholder="Пароль">
+          <small class="form-text text-muted">Введите пароль.</small>
+        </div>
+        {% if form.password.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.password.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        <div class="form-group mb-2">
+          <label>Подтверждение пароля</label>
+          <input name="confirm" type="password" class="form-control" placeholder="Подтверждение пароля">
+          <small class="form-text text-muted">Подтвердите пароль.</small>
+        </div>
+        {% if form.confirm.errors %}
+        <small class="d-block alert alert-danger">
+          {% for error in form.confirm.errors %}
+          <div>{{ error }}</div>
+          {% endfor %}
+        </small>
+        {% endif %}
+        {{ form.csrf_token }}
+        <div class="row">
+          <div class="col-md-6">
+            <button type="submit" class="btn btn-primary w-100 d-block">
+              Зарегистрироваться
+            </button>
           </div>
-          {% if form.password.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.password.errors %}
-              <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Подтверждение пароля</label>
-            <input name="confirm" type="password" class="form-control" placeholder="Подтверждение пароля">
-            <small class="form-text text-muted">Подтвердите пароль.</small>
+          <div class="col-md-6">
+            <a href="/login" class="btn btn-outline-primary w-100 d-block">
+              Войти
+            </a>
           </div>
-          {% if form.confirm.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.confirm.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          {{ form.csrf_token }}
-          <div class="row">
-            <div class="col-md-6">
-              <button type="submit" class="btn btn-primary w-100 d-block">
-                Зарегистрироваться
-              </button>
-            </div>
-            <div class="col-md-6">
-              <a href="/login" class="btn btn-outline-primary w-100 d-block">
-                Войти
-              </a>
-            </div>
+        </div>
+        {% if form.lks_oauth_enabled %}
+        <div class="row">
+          <div class="col-12">
+            <hr>
           </div>
-          {% if form.lks_oauth_enabled %}
-          <div class="row">
-            <div class="col-12">
-              <hr>
-            </div>
-            <div class="col-12">
-              <a href="/login/lks" class="btn btn-outline-primary w-100 d-block">
-                <img src="{{ url_for('static', filename='mirea.ico') }}" alt="Иконка ЛКС" width="16" height="16">
-                Войти через Единую систему аутентификации РТУ МИРЭА
-              </a>
-            </div>
+          <div class="col-12">
+            <a href="/login/lks" class="btn btn-outline-primary w-100 d-block">
+              <img src="{{ url_for('static', filename='mirea.ico') }}" alt="Иконка ЛКС" width="16" height="16">
+              Войти через Единую систему аутентификации РТУ МИРЭА
+            </a>
           </div>
-          {% endif %}
-        </form>
-      </div>
+        </div>
+        {% endif %}
+      </form>
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/student_layout.jinja b/webapp/templates/student/student_layout.jinja
deleted file mode 100644
index 14b7def..0000000
--- a/webapp/templates/student/student_layout.jinja
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends 'layout.jinja' %}
-{% block content %}
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <div class="collapse navbar-collapse container">
-            <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-                <li>
-                    <a class="logo-container text-decoration-none" href="/">
-                        <div class="logo">
-                            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}"/>
-                        </div>
-                    </a>
-                </li>
-                {% block header %} {% endblock %}
-            </ol>
-            <div class="d-block gap-3 col-12 col-lg-3 col-md-5 mt-2 mt-md-0">
-                <div class="dropdown">
-                    <button class="btn btn-sm btn-outline-secondary dropdown-toggle w-100" id="dLabel" type="button"
-                            data-bs-toggle="dropdown" aria-expanded="false">
-                        {% if student is not none %}
-                            {{ student.email | hide }}
-                        {% elif registration %}
-                            Войти
-                        {% else %}
-                            Меню
-                        {% endif %}
-                    </button>
-                    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel">
-                        <li>
-                            <a class="dropdown-item d-block" target="__blank" href="https://github.com/true-grue/kispython">
-                                <div>Материалы курса 📖</div>
-                                <small class="opacity-50">
-                                    Программирование на языке Python
-                                </small>
-                            </a>
-                        </li>
-                        {% if registration %}
-                            <li><a class="dropdown-item" href="/rating">Рейтинг студентов</a></li>
-                            {% if group_rating %}
-                                <li><a class="dropdown-item" href="/rating/groups">Рейтинг групп</a></li>
-                            {% endif %}
-                            {% if student is not none %}
-                                <li><a class="dropdown-item" target="__blank" href="https://t.me/kispython">Telegram для оповещений</a></li>
-                                <li><a class="dropdown-item" href="/submissions">Отправленные решения</a></li>
-                                <li><hr class="dropdown-divider"></li>
-                                <li><a class="dropdown-item" href="/logout">Выйти</a></li>
-                            {% else %}
-                                <li><hr class="dropdown-divider"></li>
-                                <li><a class="dropdown-item" href="/login">Войти</a></li>
-                            {% endif %}
-                        {% endif %}
-                        {% if exam or not registration %}
-                            <li><a class="dropdown-item" href="/submissions">Отправленные решения</a></li>
-                        {% endif %}
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </nav>
-    <div class="container mt-3">
-        {% block main %} {% endblock %}
-    </div>
-{% endblock %}
diff --git a/webapp/templates/student/submissions.jinja b/webapp/templates/student/submissions.jinja
index 4f5dd88..2f137f7 100644
--- a/webapp/templates/student/submissions.jinja
+++ b/webapp/templates/student/submissions.jinja
@@ -1,86 +1,79 @@
-{% extends 'student/student_layout.jinja' %}
-
+{% extends 'layout.jinja' %}
 {% block head %}
-    <style>
-        .CodeMirror-cursor {
-            display: none;
-        }
-        .CodeMirror {
-            height: auto;
-            font-size: 14px;
-        }
-    </style>
+<style>
+  .CodeMirror-cursor {
+    display: none;
+  }
+
+  .CodeMirror {
+    height: auto;
+    font-size: 14px;
+  }
+</style>
 {% endblock %}
 
 {% block header %}
-    <li class="breadcrumb-item active" aria-current="page">
-        Решения
-    </li>
+<li class="breadcrumb-item active" aria-current="page">
+  Отправленные решения
+</li>
 {% endblock %}
 
 {% block main %}
-    <h5 class="card-title fw-bold mb-2">
-        Отправленные решения
-    </h5>
-    <h6 class="card-subtitle mb-3 text-muted">
-        Новые решения показаны сверху. Страница {{ page + 1 }}.
-    </h6>
-    {% if submissions is defined and submissions|length > 0 %}
-        {% for submission in submissions %}
-            <article class="mb-4">
-                <h6 class="card-title fw-bold mb-1">
-                    Задача <a href="{{ submission.status.submission_url }}" class="badge alert-primary"
-                                style="font-size: inherit; text-decoration: none">№{{ submission.status.task + 1 }}</a>,
-                    вариант <span class="badge alert-secondary"
-                                    style="font-size: inherit">№{{ submission.status.variant + 1 }}</span>,
-                    группа <a href="/group/{{ submission.status.group }}" class="badge alert-primary"
-                                style="font-size: inherit; text-decoration: none">{{ submission.status.group_title }}</a>
-                </h6>
-                <div class="mb-2 text-uppercase">
-                    <span class="badge alert-{{ submission.status.color }}">{{ submission.status.name }}</span>
-                    <span class="badge alert-light">Отправлено: {{ submission.sent.strftime('%d.%m.%Y %H:%M') }}</span>
-                    <span class="badge alert-light">Проверено: {{ submission.checked.strftime('%d.%m.%Y %H:%M') }}</span>
-                </div>
-                {% if submission.status.error_message is not none and submission.status.error_message %}
-                    <div>Подробные сведения об ошибке:</div>
-                    <div class="text-muted mb-2" style="white-space: pre-wrap">{{ submission.status.error_message | e }}</div>
-                {% else %}
-                    <div class="mb-2"></div>
-                {% endif %}
-                <textarea
-                        name="code"
-                        type="text"
-                        class="form-control"
-                        disabled
-                        rows="{{ submission.linesCount }}"
-                        placeholder="Ответ на задание"
-                        style="font-family: monospace;">{{ submission.code }}</textarea>
-            </article>
-        {% endfor %}
+<h5 class="card-title fw-bold mb-2">
+  Отправленные решения
+</h5>
+<h6 class="card-subtitle mb-3 text-muted">
+  Новые решения показаны сверху. Страница {{ page + 1 }}.
+</h6>
+{% if submissions is defined and submissions|length > 0 %}
+{% for submission in submissions %}
+<article class="mb-4">
+  <h6 class="card-title fw-bold mb-1">
+    Задача <a href="{{ submission.status.submission_url }}" class="badge alert-primary"
+      style="font-size: inherit; text-decoration: none">№{{ submission.status.task + 1 }}</a>,
+    вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ submission.status.variant + 1 }}</span>,
+    группа <a href="/group/{{ submission.status.group }}" class="badge alert-primary"
+      style="font-size: inherit; text-decoration: none">{{ submission.status.group_title }}</a>
+  </h6>
+  <div class="mb-2 text-uppercase">
+    <span class="badge alert-{{ submission.status.color }}">{{ submission.status.name }}</span>
+    <span class="badge alert-light">Отправлено: {{ submission.sent.strftime('%d.%m.%Y %H:%M') }}</span>
+    <span class="badge alert-light">Проверено: {{ submission.checked.strftime('%d.%m.%Y %H:%M') }}</span>
+  </div>
+  {% if submission.status.error_message is not none and submission.status.error_message %}
+  <div>Подробные сведения об ошибке:</div>
+  <div class="text-muted mb-2" style="white-space: pre-wrap">{{ submission.status.error_message | e }}</div>
+  {% else %}
+  <div class="mb-2"></div>
+  {% endif %}
+  <textarea name="code" type="text" class="form-control" disabled rows="{{ submission.linesCount }}"
+    placeholder="Ответ на задание" style="font-family: monospace;">{{ submission.code }}</textarea>
+</article>
+{% endfor %}
 
-        {{ pagination.links }}
-    {% else %}
-        Список отправленных решений пуст
-    {% endif %}
+{{ pagination.links }}
+{% else %}
+Список отправленных решений пуст
+{% endif %}
 
-    {% if highlight %}
-        <script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
-        <script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
-        <script type="text/javascript">
-        codeElements = document.getElementsByName("code")
-        for (codeElement of codeElements) {
-            const editor = CodeMirror.fromTextArea(
-                codeElement,
-                {
-                    mode: 'python',
-                    lineNumbers: true,
-                    indentUnit: 4,
-                    readOnly: true,
-                    height: 'auto',
-                    viewportMargin: Infinity
-                }
-            )
-        }
-        </script>
-    {% endif %}
-{% endblock %}
+{% if highlight %}
+<script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
+<script type="text/javascript">
+  codeElements = document.getElementsByName("code")
+  for (codeElement of codeElements) {
+    const editor = CodeMirror.fromTextArea(
+      codeElement,
+      {
+        mode: 'python',
+        lineNumbers: true,
+        indentUnit: 4,
+        readOnly: true,
+        height: 'auto',
+        viewportMargin: Infinity
+      }
+    )
+  }
+</script>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/success.jinja b/webapp/templates/student/success.jinja
index 0596f4d..6f7b91d 100644
--- a/webapp/templates/student/success.jinja
+++ b/webapp/templates/student/success.jinja
@@ -1,31 +1,30 @@
-{% extends 'student/student_layout.jinja' %}
-
+{% extends 'layout.jinja' %}
 {% block header %}
-    <li class="breadcrumb-item">
-      <a class="text-decoration-none" href="/group/{{ status.group }}">
-          {{ status.group_title }}
-      </a>
-    </li>
-    <li class="breadcrumb-item">
-        <a class="text-decoration-none" href="{{ status.submission_url }}">
-          №{{ status.task + 1 }}, вариант №{{ status.variant + 1 }}
-        </a>
-    </li>
-    <li class="breadcrumb-item active" aria-current="page">
-      Уведомление
-    </li>
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/group/{{ status.group }}">
+    {{ status.group_title }}
+  </a>
+</li>
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="{{ status.submission_url }}">
+    №{{ status.task + 1 }}, вариант №{{ status.variant + 1 }}
+  </a>
+</li>
+<li class="breadcrumb-item active" aria-current="page">
+  Уведомление
+</li>
 {% endblock %}
 
 {% block main %}
-  <h6 class="card-title fw-bold">
-    Задача <span class="badge alert-secondary" style="font-size: inherit">№{{ status.task + 1 }}</span>,
-    вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ status.variant + 1 }}</span>,
-    группа <span class="badge alert-secondary" style="font-size: inherit">{{ status.group_title }}</span>
-  </h6>
-  <h6 class="card-subtitle mb-2 mt-2 text-muted">
-    Ответ на задание успешно отправлен. Результат проверки вскоре отобразится на странице задания.
-  </h6>
-  <a class="btn btn-outline btn-primary" href="{{ status.submission_url }}">
-    Вернуться на страницу задания
-  </a>
-{% endblock %}
+<h6 class="card-title fw-bold">
+  Задача <span class="badge alert-secondary" style="font-size: inherit">№{{ status.task + 1 }}</span>,
+  вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ status.variant + 1 }}</span>,
+  группа <span class="badge alert-secondary" style="font-size: inherit">{{ status.group_title }}</span>
+</h6>
+<h6 class="card-subtitle mb-2 mt-2 text-muted">
+  Ответ на задание успешно отправлен. Результат проверки вскоре отобразится на странице задания.
+</h6>
+<a class="btn btn-outline btn-primary" href="{{ status.submission_url }}">
+  Вернуться на страницу задания
+</a>
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/student/task.jinja b/webapp/templates/student/task.jinja
index ac80bad..d467e9d 100644
--- a/webapp/templates/student/task.jinja
+++ b/webapp/templates/student/task.jinja
@@ -1,134 +1,137 @@
-{% extends 'student/student_layout.jinja' %}
-
+{% extends 'layout.jinja' %}
 {% block header %}
-    <li class="breadcrumb-item">
-      <a class="text-decoration-none" href="/group/{{ status.group }}">
-        {{ status.group_title }}
-      </a>
-    </li>
-    <li class="breadcrumb-item active" aria-current="page">
-        №{{ status.formulation if status.formulation else status.task + 1 }}, вариант №{{ status.variant + 1 }}
-    </li>
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/group/{{ status.group }}">
+    {{ status.group_title }}
+  </a>
+</li>
+<li class="breadcrumb-item active" aria-current="page">
+  №{{ status.formulation if status.formulation else status.task + 1 }}, вариант №{{ status.variant + 1 }}
+</li>
 {% endblock %}
 
 {% block main %}
+<h6 class="card-title fw-bold">
+  Задача <span class="badge alert-secondary" style="font-size: inherit">№{{ status.formulation if status.formulation
+    else status.task + 1 }}</span>,
+  вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ status.variant + 1 }}</span>,
+  группа <a href="/group/{{ status.group }}" class="badge alert-primary"
+    style="font-size: inherit; text-decoration: none">{{ status.group_title }}</a>
+</h6>
+<h6 class="card-subtitle mb-2 text-muted">
+  Здесь Вы можете отправить ответ на задание №{{ status.formulation if status.formulation else status.task + 1 }} для
+  варианта №{{ status.variant + 1 }}.
+</h6>
+<div class="card-subtitle mb-4 mt-2">
+  <a class="text-decoration-none btn btn-primary" target="__blank" href="{{ status.formulation_url }}">
+    Перейти к задаче №{{ status.external.task + 1 }} варианта №{{ status.external.variant + 1 }} группы {{
+    status.external.group_title }}
+  </a>
+</div>
+<div>
   <h6 class="card-title fw-bold">
-    Задача <span class="badge alert-secondary" style="font-size: inherit">№{{ status.formulation if status.formulation else status.task + 1 }}</span>,
-    вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ status.variant + 1 }}</span>,
-    группа <a href="/group/{{ status.group }}" class="badge alert-primary" style="font-size: inherit; text-decoration: none">{{ status.group_title }}</a>
+    Состояние задачи
   </h6>
   <h6 class="card-subtitle mb-2 text-muted">
-    Здесь Вы можете отправить ответ на задание №{{ status.formulation if status.formulation else status.task + 1 }} для варианта №{{ status.variant + 1 }}.
+    В данной секции Вы можете отслеживать состояние отправленного задания.
   </h6>
-  <div class="card-subtitle mb-4 mt-2">
-  <a class="text-decoration-none btn btn-primary"
-     target="__blank"
-     href="{{ status.formulation_url }}">
-    Перейти к задаче №{{ status.external.task + 1 }} варианта №{{ status.external.variant + 1 }} группы {{ status.external.group_title }}
-  </a>
+  {% if status.status == 4 %}
+  <div class="mb-4">После отправки выполненного задания Вы сможете отслеживать его состояние здесь.</div>
+  {% else %}
+  <div class="badge alert-{{ status.color }} mt-2 mb-2" style="font-size: inherit">
+    {{ status.name }}
   </div>
-  <div>
-    <h6 class="card-title fw-bold">
-      Состояние задачи
-    </h6>
-    <h6 class="card-subtitle mb-2 text-muted">
-      В данной секции Вы можете отслеживать состояние отправленного задания.
-    </h6>
-    {% if status.status == 4 %}
-      <div class="mb-4">После отправки выполненного задания Вы сможете отслеживать его состояние здесь.</div>
-    {% else %}
-      <div class="badge alert-{{ status.color }} mt-2 mb-2" style="font-size: inherit">
-        {{ status.name }}
-      </div>
-      {% if status.error_message is not none and status.error_message %}
-        <div>Подробные сведения об ошибке:</div>
-        <div class="text-muted mb-2" style="white-space: pre-wrap">{{ status.error_message | e }}</div>
-      {% else %}
-        <div class="mb-2"></div>
-      {% endif %}
-    {% endif %}
+  {% if status.error_message is not none and status.error_message %}
+  <div>Подробные сведения об ошибке:</div>
+  <div class="text-muted mb-2" style="white-space: pre-wrap">{{ status.error_message | e }}</div>
+  {% else %}
+  <div class="mb-2"></div>
+  {% endif %}
+  {% endif %}
+</div>
+{% if status.show_achievements %}
+<div>
+  <h6 class="card-title fw-bold">
+    Разблокированные достижения
+    <small class="text-muted">
+      {{ status.earned }} из {{ status.achievements | length }}
+    </small>
+  </h6>
+  <h6 class="card-subtitle mb-2 text-muted">
+    Сможете ли Вы решить задачу всеми способами, известными <a class="text-decoration-none"
+      href="https://github.com/true-grue/kispython/blob/main/contrib/elm.ipynb">искусственной нейронной сети</a>?
+  </h6>
+  {% if status.achievements %}
+  {% for dto in status.achievements %}
+  <div class="callout callout-{{ 'success' if dto.active else 'default text-muted' }}">
+    <div>{{ dto.title }} {{ '✓' if dto.active else '' }}</div>
+    <small>{{ dto.description }}</small>
   </div>
-  {% if status.show_achievements %}
-    <div>
-      <h6 class="card-title fw-bold">
-        Разблокированные достижения
-        <small class="text-muted">
-          {{ status.earned }} из {{ status.achievements | length }}
-        </small>
-      </h6>
-      <h6 class="card-subtitle mb-2 text-muted">
-        Сможете ли Вы решить задачу всеми способами, известными <a class="text-decoration-none" href="https://github.com/true-grue/kispython/blob/main/contrib/elm.ipynb">искусственной нейронной сети</a>?
-      </h6>
-      {% if status.achievements %}
-        {% for dto in status.achievements %}
-          <div class="callout callout-{{ 'success' if dto.active else 'default text-muted' }}">
-            <div>{{ dto.title }} {{ '✓' if dto.active else '' }}</div>
-            <small>{{ dto.description }}</small>
-          </div>
-        {% endfor %}
-      {% endif %}
-    </div>
+  {% endfor %}
   {% endif %}
-  <div class="card m-auto mt-3 mb-5">
-    <form class="card-body" action="{{ status.submission_url }}" method="POST">
-      <h6 class="card-title fw-bold mb-0">Добавить новый ответ</h6>
-      <div class="text-muted mb-2">
-        Во избежание утери данных рекомендуется сохранять отправляемые программы локально.
+</div>
+{% endif %}
+<div class="card m-auto mt-3 mb-5">
+  <form class="card-body" action="{{ status.submission_url }}" method="POST">
+    <h6 class="card-title fw-bold mb-0">Добавить новый ответ</h6>
+    <div class="text-muted mb-2">
+      Во избежание утери данных рекомендуется сохранять отправляемые программы локально.
+    </div>
+    {% if registration and not student %}
+    <div class="row">
+      <div class="col-md-8">
+        <a class="btn btn-outline-danger w-100 d-block" href="/login">
+          Войдите или зарегистрируйтесь, чтобы отправить решение на проверку
+        </a>
       </div>
-      {% if registration and not student %}
-        <div class="row">
-          <div class="col-md-8">
-            <a class="btn btn-outline-danger w-100 d-block" href="/login">
-              Войдите или зарегистрируйтесь, чтобы отправить решение на проверку
-            </a>
-          </div>
-        </div>
-      {% else %}
-        <div class="form-group mb-2">
-          <textarea
-            id="code-textarea"
-            name="code"
-            type="text"
-            class="form-control"
-            {% if status.disabled or registration and not student %}disabled{%endif%}
-            placeholder="Ответ на задание"
-            style="min-height: 250px;font-family: monospace, monospace;">{{ form.code.data if form.code.data }}</textarea>
-          <small class="form-text text-muted">
-            <div>
-              Введите ответ в поле выше. В отправляемом коде на языке программирования Python должна присутствовать функция
-              <code class="font-weight-bold">main</code> и не должно быть какого-либо ввода/вывода. Поддерживается
-              использование модулей только из стандартной библиотеки Python.
-            </div>
-          </small>
-        </div>
-        {% if form.code.errors %}
-          <ul class="errors">
-            {% for error in form.code.errors %}
-              <li class="text-danger">{{ error }}</li>
-            {% endfor %}
-          </ul>
-        {% endif %}
-        {{ form.csrf_token }}
-        <div class="row">
-          <div class="col-md-8">
-            <button
-              type="submit"
-              class="btn btn-primary w-100 d-block"
-              {% if status.disabled or registration and not student %}disabled{%endif%}>
-              Отправить решение на проверку
-            </button>
-          </div>
+    </div>
+    {% else %}
+    <div class="form-group mb-2">
+      <textarea id="code-textarea" name="code" type="text" class="form-control" {% if status.disabled or registration
+        and not student %}disabled{%endif%} placeholder="Ответ на задание"
+        style="min-height: 250px;font-family: monospace, monospace;">{{ form.code.data if form.code.data }}</textarea>
+      <small class="form-text text-muted">
+        <div>
+          Введите ответ в поле выше. В отправляемом коде на языке программирования Python должна присутствовать функция
+          <code class="font-weight-bold">main</code> и не должно быть какого-либо ввода/вывода. Поддерживается
+          использование модулей только из стандартной библиотеки Python.
         </div>
+      </small>
+    </div>
+    {% if form.code.errors %}
+    <ul class="errors">
+      {% for error in form.code.errors %}
+      <li class="text-danger">{{ error }}</li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+    {{ form.csrf_token }}
+    <div class="row">
+      <div class="col-md-8">
+        <button type="submit" class="btn btn-primary w-100 d-block" {% if status.disabled or registration and not
+          student %}disabled{%endif%}>
+          Отправить решение на проверку
+        </button>
+      </div>
+      {% if student and student.teacher %}
+      <div class="col-md-4">
+        <a class="btn btn-outline-primary w-100 d-block"
+           href="/teacher/submissions/group/{{ status.group }}/variant/{{ status.variant }}/task/{{ status.task }}">
+          История решений 📕
+        </a>
+      </div>
       {% endif %}
-    </form>
-  </div>
+    </div>
+    {% endif %}
+  </form>
+</div>
 
 {% if highlight and not (status.disabled or registration and not student) %}
-  <script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
-  <script type="text/javascript">
-    CodeMirror.fromTextArea(document.querySelector('#code-textarea'), { mode: 'python', lineNumbers: true, indentUnit: 4 })
-  </script>
+<script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
+<script type="text/javascript">
+  CodeMirror.fromTextArea(document.querySelector('#code-textarea'), { mode: 'python', lineNumbers: true, indentUnit: 4 })
+</script>
 {% endif %}
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/teacher/dashboard.jinja b/webapp/templates/teacher/dashboard.jinja
index ad920e1..096d4ba 100644
--- a/webapp/templates/teacher/dashboard.jinja
+++ b/webapp/templates/teacher/dashboard.jinja
@@ -1,107 +1,92 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/teacher">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Преподавательская
-      </li>
-    </ol>
-    <a class="breadcrumb-item text-decoration-none" href="/teacher/logout">
-      Выйти
-    </a>
+{% block header %}
+<li class="breadcrumb-item active" aria-current="page">
+  Преподавательская
+</li>
+{% endblock %}
+
+{% block main %}
+<div class="row">
+  {% if groups is not none %}
+  <div class="col-12 mb-3">
+    <b class="card-title d-block">Управление группами</b>
+    <form action="/teacher/group/select" method="GET" class="w-100">
+      <select class="form-select mb-2" name="group">
+        {% for group in groups %}
+        <option value="{{ group.id }}">
+          {{ group.title }}
+        </option>
+        {% endfor %}
+      </select>
+      <button type="submit" class="btn btn-outline-primary w-100 d-block">
+        Далее
+      </button>
+    </form>
   </div>
-</nav>
-<div class="container">
-  <div class="row">
-    {% if groups is not none %}
-      <div class="col-12 mt-3">
-        <b class="card-title d-block">Управление группами</b>
-        <form action="/teacher/group/select" method="GET" class="w-100">
-          <select class="form-select mb-2" name="group">
-            {% for group in groups %}
-              <option value="{{ group.id }}">
-                {{ group.title }}
-              </option>
-            {% endfor %}
-          </select>
-          <button type="submit" class="btn btn-outline-primary w-100 d-block">
-            Далее
-          </button>
-        </form>
-      </div>
-    {% endif %}
-    <div class="col-12 mt-3">
-      <b class="card-title d-block">Выгрузка всех присланных сообщений</b>
-      <form action="/teacher/messages" method="GET" class="w-100">
-        <select class="form-select mb-2" name="separator">
-            <option value=";">Точка с запятой</option>
-            <option value=",">Запятая</option>
-        </select>
-        <select class="form-select mb-2" name="count">
-            <option value="10">10 сообщений</option>
-            <option value="100">100 сообщений</option>
-            <option value="500">500 сообщений</option>
-            <option value="1000">1000 сообщений</option>
-            <option value="10000">10 000 сообщений</option>
-        </select>
-        <button type="submit" class="btn btn-outline-primary w-100 d-block">
-          Выгрузить статистику
-        </button>
-      </form>
-    </div>
-    <div class="col-12 mt-3">
-      <b class="card-title d-block">Просмотр решений студентов</b>
-      <form action="/teacher/submissions" method="GET" class="w-100">
-        <select class="form-select mb-2" name="gid">
-            {% for g in glist %}
-                <option value="{{ g.id }}">Группа {{ g.title }}</option>
-            {% endfor %}
-        </select>
-        <select class="form-select mb-2" name="vid">
-            {% for v in vlist %}
-                <option value="{{ v.id }}">Вариант №{{ v.id + 1   }}</option>
-            {% endfor %}
-        </select>
-        <select class="form-select mb-2" name="tid">
-            {% for t in tlist %}
-                <option value="{{ t.id }}">Задание №{{ t.id + 1 }}</option>
-            {% endfor %}
-        </select>
-        <button type="submit" class="btn btn-outline-primary w-100 d-block">
-          Перейти к решениям
-        </button>
-      </form>
-    </div>
-    {% if exam %}
-      <div class="col-12 mt-3">
-        <b class="card-title d-block">Действия с группами</b>
-        <form action="/teacher/exam/start" method="GET" class="w-100">
-          <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">
-            Начать зачёт у всех групп
-          </button>
-        </form>
-        <form action="/teacher/exam/end" method="GET" class="w-100">
-          <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">
-            Завершить зачёт у всех групп
-          </button>
-        </form>
-        {% if clearable %}
-          <form action="/teacher/exam/delete" method="GET" class="w-100">
-            <button class="btn btn-outline-danger w-100 mb-2 d-block" type="submit">
-              Очистить таблицы всех групп
-            </button>
-          </form>
-        {% endif %}
-      </div>
+  {% endif %}
+  <div class="col-12 mb-3">
+    <b class="card-title d-block">Выгрузка всех присланных сообщений</b>
+    <form action="/teacher/messages" method="GET" class="w-100">
+      <select class="form-select mb-2" name="separator">
+        <option value=";">Точка с запятой</option>
+        <option value=",">Запятая</option>
+      </select>
+      <select class="form-select mb-2" name="count">
+        <option value="10">10 сообщений</option>
+        <option value="100">100 сообщений</option>
+        <option value="500">500 сообщений</option>
+        <option value="1000">1000 сообщений</option>
+        <option value="10000">10 000 сообщений</option>
+      </select>
+      <button type="submit" class="btn btn-outline-primary w-100 d-block">
+        Выгрузить статистику
+      </button>
+    </form>
+  </div>
+  <div class="col-12 mb-3">
+    <b class="card-title d-block">Просмотр решений студентов</b>
+    <form action="/teacher/submissions" method="GET" class="w-100">
+      <select class="form-select mb-2" name="gid">
+        {% for g in glist %}
+        <option value="{{ g.id }}">Группа {{ g.title }}</option>
+        {% endfor %}
+      </select>
+      <select class="form-select mb-2" name="vid">
+        {% for v in vlist %}
+        <option value="{{ v.id }}">Вариант №{{ v.id + 1 }}</option>
+        {% endfor %}
+      </select>
+      <select class="form-select mb-2" name="tid">
+        {% for t in tlist %}
+        <option value="{{ t.id }}">Задание №{{ t.id + 1 }}</option>
+        {% endfor %}
+      </select>
+      <button type="submit" class="btn btn-outline-primary w-100 d-block">
+        Перейти к решениям
+      </button>
+    </form>
+  </div>
+  {% if exam %}
+  <div class="col-12 mb-3">
+    <b class="card-title d-block">Действия с группами</b>
+    <form action="/teacher/exam/start" method="GET" class="w-100">
+      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">
+        Начать зачёт у всех групп
+      </button>
+    </form>
+    <form action="/teacher/exam/end" method="GET" class="w-100">
+      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">
+        Завершить зачёт у всех групп
+      </button>
+    </form>
+    {% if clearable %}
+    <form action="/teacher/exam/delete" method="GET" class="w-100">
+      <button class="btn btn-outline-danger w-100 mb-2 d-block" type="submit">
+        Очистить таблицы всех групп
+      </button>
+    </form>
     {% endif %}
   </div>
+  {% endif %}
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/teacher/exam.jinja b/webapp/templates/teacher/exam.jinja
index ae9e64e..1f1fc3b 100644
--- a/webapp/templates/teacher/exam.jinja
+++ b/webapp/templates/teacher/exam.jinja
@@ -1,86 +1,71 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/teacher">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item">
-        <a class="text-decoration-none" href="/teacher">
-          Преподавательская
-        </a>
-      </li>
-      <li class="breadcrumb-item">
-        <a class="text-decoration-none" href="/teacher/group/{{ group.id }}/exam">
-          {{ group.title }}
-        </a>
-      </li>
-      <li class="breadcrumb-item active">
-        Зачёт
-      </li>
-    </ol>
-    <a class="breadcrumb-item text-decoration-none" href="/teacher/logout">
-      Выйти
-    </a>
-  </div>
-</nav>
-<div class="flex-row container mt-3">
-  {% if seed == None %}
-    <h6 class="d-block fw-bold">Зачёт ещё не начат</h6>
-    <form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
-      <label class="mx-auto mb-2 breadcrumb-item active d-block">
-        Зачёт для группы {{ group.title }} ещё не начат, студенты не могут отправлять решения.
-      </label>
-      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Начать</button>
-    </form>
-  {% elif seed.active == false %}
-    <h6 class="d-block fw-bold">Зачёт завершён</h6>
-    <div class="mx-auto mb-2 breadcrumb-item active d-block">
-      Студенты группы {{ group.title }} больше не могут отправлять решения.
-    </div>
-    <h6 class="d-block mt-3">Выгрузка результатов</h6>
-    <form action="/teacher/group/{{ group.id }}/exam/csv" method="GET" class="w-100">
-      <label class="mx-auto mb-2 breadcrumb-item active d-block">Разделитель CSV</label>
-      <select class="form-select mb-2" name="delimiter">
-          <option value="semicolon">Точка с запятой</option>
-          <option value="comma">Запятая</option>
-      </select>
-      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Получить результаты</button>
-    </form>
-    <h6 class="d-block mt-3">Продолжить зачёт</h6>
-    <div class="mx-auto mb-2 breadcrumb-item active d-block">
-      После продолжения зачёта студенты вновь смогут отправлять решения.
-    </div>
-    <form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
-      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Продолжить зачёт</button>
-    </form>
-  {% else %}
-    <h6 class="d-block fw-bold">Зачёт начат</h6>
-    <form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
-      <label class="mx-auto mb-2 breadcrumb-item active d-block">
-        Зачёт для группы {{ group.title }} начат, студенты могут отправлять решения.
-      </label>
-      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Завершить</button>
-    </form>
-    <h6 class="d-block mt-3">Выгрузка промежуточных результатов</h6>
-    <form action="/teacher/group/{{ group.id }}/exam/csv" method="GET" class="w-100">
-      <label class="mx-auto mb-2 breadcrumb-item active d-block">Разделитель CSV</label>
-      <select class="form-select mb-2" name="delimiter">
-          <option value="semicolon">Точка с запятой</option>
-          <option value="comma">Запятая</option>
-      </select>
-      <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Получить результаты</button>
-    </form>
-  {% endif %}
-  {% if seed == None or seed.active == false %}
-  <form action="/teacher/group/{{ group.id }}/exam/delete" method="GET" class="w-100">
-    <button class="btn btn-outline-danger w-100 d-block" type="submit">Очистить таблицу</button>
-  </form>
-  {% endif %}
+{% block header %}
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/teacher">
+    Преподавательская
+  </a>
+</li>
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/teacher/group/{{ group.id }}/exam">
+    {{ group.title }}
+  </a>
+</li>
+<li class="breadcrumb-item active">
+  Зачёт
+</li>
+{% endblock %}
+
+{% block main %}
+{% if seed == None %}
+<h6 class="d-block fw-bold">Зачёт ещё не начат</h6>
+<form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
+  <label class="mx-auto mb-2 breadcrumb-item active d-block">
+    Зачёт для группы {{ group.title }} ещё не начат, студенты не могут отправлять решения.
+  </label>
+  <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Начать</button>
+</form>
+{% elif seed.active == false %}
+<h6 class="d-block fw-bold">Зачёт завершён</h6>
+<div class="mx-auto mb-2 breadcrumb-item active d-block">
+  Студенты группы {{ group.title }} больше не могут отправлять решения.
 </div>
+<h6 class="d-block mt-3">Выгрузка результатов</h6>
+<form action="/teacher/group/{{ group.id }}/exam/csv" method="GET" class="w-100">
+  <label class="mx-auto mb-2 breadcrumb-item active d-block">Разделитель CSV</label>
+  <select class="form-select mb-2" name="delimiter">
+    <option value="semicolon">Точка с запятой</option>
+    <option value="comma">Запятая</option>
+  </select>
+  <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Получить результаты</button>
+</form>
+<h6 class="d-block mt-3">Продолжить зачёт</h6>
+<div class="mx-auto mb-2 breadcrumb-item active d-block">
+  После продолжения зачёта студенты вновь смогут отправлять решения.
+</div>
+<form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
+  <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Продолжить зачёт</button>
+</form>
+{% else %}
+<h6 class="d-block fw-bold">Зачёт начат</h6>
+<form action="/teacher/group/{{ group.id }}/exam/toggle" method="GET" class="w-100">
+  <label class="mx-auto mb-2 breadcrumb-item active d-block">
+    Зачёт для группы {{ group.title }} начат, студенты могут отправлять решения.
+  </label>
+  <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Завершить</button>
+</form>
+<h6 class="d-block mt-3">Выгрузка промежуточных результатов</h6>
+<form action="/teacher/group/{{ group.id }}/exam/csv" method="GET" class="w-100">
+  <label class="mx-auto mb-2 breadcrumb-item active d-block">Разделитель CSV</label>
+  <select class="form-select mb-2" name="delimiter">
+    <option value="semicolon">Точка с запятой</option>
+    <option value="comma">Запятая</option>
+  </select>
+  <button class="btn btn-outline-primary w-100 mb-2 d-block" type="submit">Получить результаты</button>
+</form>
+{% endif %}
+{% if seed == None or seed.active == false %}
+<form action="/teacher/group/{{ group.id }}/exam/delete" method="GET" class="w-100">
+  <button class="btn btn-outline-danger w-100 d-block" type="submit">Очистить таблицу</button>
+</form>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/teacher/login.jinja b/webapp/templates/teacher/login.jinja
deleted file mode 100644
index 8a4ea03..0000000
--- a/webapp/templates/teacher/login.jinja
+++ /dev/null
@@ -1,64 +0,0 @@
-{% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/teacher/login">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Преподавательская
-      </li>
-    </ol>
-  </div>
-</nav>
-<div class="container">
-  <div class="row mt-4">
-    <div class="col-12 col-md-9 col-lg-6">
-      <div class="card">
-        <form class="card-body" action="/teacher/login" method="POST">
-          <b class="card-title d-block">Авторизация</b>
-          <div class="form-group mb-2">
-            <label>Имя пользователя</label>
-            <input name="login" type="text" class="form-control"
-                   placeholder="Имя пользователя"
-                   value="{{ form.login.data if form.login.data }}">
-            <small class="form-text text-muted">Введите имя пользователя.</small>
-          </div>
-          {% if form.login.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.login.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          <div class="form-group mb-2">
-            <label>Пароль</label>
-            <input name="password" type="password" class="form-control" placeholder="Пароль">
-            <small class="form-text text-muted">Введите пароль.</small>
-          </div>
-          {% if form.password.errors %}
-            <small class="d-block alert alert-danger">
-              {% for error in form.password.errors %}
-                <div>{{ error }}</div>
-              {% endfor %}
-            </small>
-          {% endif %}
-          {{ form.csrf_token }}
-          <div class="row">
-            <div class="col-md-6">
-              <button type="submit" class="btn btn-primary w-100 d-block">
-                Войти
-              </button>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock %}
diff --git a/webapp/templates/teacher/queue.jinja b/webapp/templates/teacher/queue.jinja
index 1ff6627..9547cfb 100644
--- a/webapp/templates/teacher/queue.jinja
+++ b/webapp/templates/teacher/queue.jinja
@@ -1,75 +1,52 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="collapse navbar-collapse container">
-    <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-      <li>
-        <a class="logo-container text-decoration-none" href="/teacher">
-          <div class="logo">
-            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}" />
-          </div>
-        </a>
-      </li>
-      <li class="breadcrumb-item">
-        <a class="text-decoration-none" href="/teacher">
-          Преподавательская
-        </a>
-      </li>
-      <li class="breadcrumb-item">
-        <a class="text-decoration-none" href="/teacher/group/{{ group.id }}">
-          {{ group.title }}
-        </a>
-      </li>
-      <li class="breadcrumb-item active">
-        Очередь сообщений
-      </li>
-    </ol>
-    <a class="breadcrumb-item text-decoration-none" href="/teacher/logout">
-      Выйти
-    </a>
+{% block header %}
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/teacher">
+    Преподавательская
+  </a>
+</li>
+<li class="breadcrumb-item">
+  <a class="text-decoration-none" href="/teacher/group/{{ group.id }}">
+    {{ group.title }}
+  </a>
+</li>
+<li class="breadcrumb-item active">
+  Очередь сообщений
+</li>
+{% endblock %}
+
+{% block main %}
+<div class="row">
+  {% if message is not none %}
+  <div class="col-12 col-md-8">
+    <textarea type="text" class="form-control" disabled placeholder="Ответ на задание"
+      style="min-height: 550px;font-family: monospace, monospace;">{{ message.code }}</textarea>
   </div>
-</nav>
-<div class="container mt-3">
-  <div class="row">
-    {% if message is not none %}
-    <div class="col-12 col-md-8">
-      <textarea
-          type="text"
-          class="form-control"
-          disabled
-          placeholder="Ответ на задание"
-          style="min-height: 550px;font-family: monospace, monospace;">{{ message.code }}</textarea>
+  <div class="col-12 col-md-4">
+    <form action="/teacher/group/{{ group.id }}/queue/{{ message.id }}/accept" method="GET" class="w-100">
+      <button class="btn btn-outline-success d-block mb-2 w-100" type="submit">
+        Принять
+      </button>
+    </form>
+    <form action="/teacher/group/{{ group.id }}/queue/{{ message.id }}/reject" method="GET" class="w-100">
+      <button class="btn btn-outline-danger d-block mb-2 w-100" type="submit">
+        Отклонить
+      </button>
+      <textarea type="text" class="form-control mb-3" name="comment" placeholder="Причина отклонения"
+        style="min-height: 100px;font-family: monospace, monospace;"></textarea>
+    </form>
+    <div class="mb-2">
+      <b class="card-title d-block">Сведения о сообщении</b>
+      <div>Группа: {{ group.title }}</div>
+      <div>Вариант: {{ message.variant + 1 }}</div>
+      <div>Задача: {{ message.task + 1 }}</div>
+      <div>Прислано: {{ message.time }}</div>
     </div>
-    <div class="col-12 col-md-4">
-      <form action="/teacher/group/{{ group.id }}/queue/{{ message.id }}/accept" method="GET" class="w-100">
-        <button class="btn btn-outline-success d-block mb-2 w-100" type="submit">
-          Принять
-        </button>
-      </form>
-      <form action="/teacher/group/{{ group.id }}/queue/{{ message.id }}/reject" method="GET" class="w-100">
-        <button class="btn btn-outline-danger d-block mb-2 w-100" type="submit">
-          Отклонить
-        </button>
-        <textarea
-            type="text"
-            class="form-control mb-3"
-            name="comment"
-            placeholder="Причина отклонения"
-            style="min-height: 100px;font-family: monospace, monospace;"></textarea>
-      </form>
-      <div class="mb-2">
-        <b class="card-title d-block">Сведения о сообщении</b>
-        <div>Группа: {{ group.title }}</div>
-        <div>Вариант: {{ message.variant + 1 }}</div>
-        <div>Задача: {{ message.task + 1 }}</div>
-        <div>Прислано: {{ message.time }}</div>
-      </div>
-    </div>
-    {% else %}
-    <div class="col-12">
-      Новых сообщений нет
-    </div>
-    {% endif %}
   </div>
+  {% else %}
+  <div class="col-12">
+    Новых сообщений нет
+  </div>
+  {% endif %}
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/webapp/templates/teacher/submissions.jinja b/webapp/templates/teacher/submissions.jinja
index c4d2555..3f855c1 100644
--- a/webapp/templates/teacher/submissions.jinja
+++ b/webapp/templates/teacher/submissions.jinja
@@ -1,101 +1,70 @@
 {% extends 'layout.jinja' %}
-{% block content %}
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <div class="collapse navbar-collapse container">
-            <ol class="breadcrumb bg-light pt-2 pb-2 m-0">
-                <li>
-                    <a class="logo-container text-decoration-none" href="/teacher">
-                        <div class="logo">
-                            <img class="logo-img" src="{{ url_for('static', filename='logo.svg') }}"/>
-                        </div>
-                    </a>
-                </li>
-                <li class="breadcrumb-item active" aria-current="page">
-                    Преподавательская
-                </li>
-            </ol>
-            <a class="breadcrumb-item text-decoration-none" href="/teacher/logout">
-                Выйти
-            </a>
-        </div>
-    </nav>
-    <div class="container">
-        <div class="row">
-            <div class="col-12 mt-3">
-                <h5 class="card-title fw-bold mb-2">
-                    Отправленные решения
-                </h5>
-                <h6 class="card-subtitle mb-3 text-muted">
-                    Новые решения показаны сверху. Страница {{ page + 1 }}.
-                </h6>
-            </div>
-            {% if submissions is defined and submissions|length > 0 %}
-                {% for submission in submissions %}
-                    <article class="mb-4">
-                        <h6 class="card-title fw-bold mb-1">
-                            Задача <a href="{{ submission.status.submission_url }}" class="badge alert-primary"
-                                      style="font-size: inherit; text-decoration: none">№{{ submission.status.task + 1 }}</a>,
-                            вариант <span class="badge alert-secondary"
-                                          style="font-size: inherit">№{{ submission.status.variant + 1 }}</span>,
-                            группа <a href="/group/{{ submission.status.group }}" class="badge alert-primary"
-                                      style="font-size: inherit; text-decoration: none">{{ submission.status.group_title }}</a>
-                            {% if submission.student %}
-                            ,
-                            студент <span class="badge alert-secondary"
-                                          style="font-size: inherit">{{ submission.student.email | hide }}</span>,
-                            id <span class="badge alert-secondary"
-                                     style="font-size: inherit">{{ submission.student.id }}</span>
-
-                            {% endif %}
-                        </h6>
-                        <div class="mb-2 text-uppercase">
-                            <span class="badge alert-{{ submission.status.color }}">{{ submission.status.name }}</span>
-                            <span class="badge alert-light">Отправлено: {{ submission.sent.strftime('%d.%m.%Y %H:%M') }}</span>
-                            <span class="badge alert-light">Проверено: {{ submission.checked.strftime('%d.%m.%Y %H:%M') }}</span>
-                        </div>
-                        {% if submission.status.error_message is not none and submission.status.error_message %}
-                            <div>Подробные сведения об ошибке:</div>
-                            <div class="text-muted mb-2"
-                                 style="white-space: pre-wrap">{{ submission.status.error_message | e }}</div>
-                        {% else %}
-                            <div class="mb-2"></div>
-                        {% endif %}
-                        <textarea
-                                name="code"
-                                type="text"
-                                class="form-control"
-                                disabled
-                                rows="{{ submission.linesCount }}"
-                                placeholder="Ответ на задание"
-                                style="font-family: monospace;">{{ submission.code }}</textarea>
-                    </article>
-                {% endfor %}
-
-                {{ pagination.links }}
-            {% else %}
-                Список отправленных решений пуст
-            {% endif %}
-        </div>
+{% block header %}
+<li class="breadcrumb-item active" aria-current="page">
+  Преподавательская
+</li>
+{% endblock %}
 
-        {% if highlight %}
-            <script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
-            <script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
-            <script type="text/javascript">
-                codeElements = document.getElementsByName("code")
-                for (codeElement of codeElements) {
-                    const editor = CodeMirror.fromTextArea(
-                        codeElement,
-                        {
-                            mode: 'python',
-                            lineNumbers: true,
-                            indentUnit: 4,
-                            readOnly: true,
-                            height: 'auto',
-                            viewportMargin: Infinity
-                        }
-                    )
-                }
-            </script>
-        {% endif %}
+{% block main %}
+<div class="row">
+  <div class="col-12">
+    <h5 class="card-title fw-bold mb-2">
+      Отправленные решения
+    </h5>
+    <h6 class="card-subtitle mb-3 text-muted">
+      Новые решения показаны сверху. Страница {{ page + 1 }}.
+    </h6>
+  </div>
+  {% if submissions is defined and submissions|length > 0 %}
+  {% for submission in submissions %}
+  <article class="mb-4">
+    <h6 class="card-title fw-bold mb-1">
+      Задача <a href="{{ submission.status.submission_url }}" class="badge alert-primary" style="font-size: inherit; text-decoration: none">№{{ submission.status.task + 1 }}</a>,
+      вариант <span class="badge alert-secondary" style="font-size: inherit">№{{ submission.status.variant + 1 }}</span>,
+      группа <a href="/group/{{ submission.status.group }}" class="badge alert-primary" style="font-size: inherit; text-decoration: none">{{ submission.status.group_title }}</a>
+      {% if submission.student %}
+      , студент <span class="badge alert-secondary" style="font-size: inherit">{{ submission.student.email | hide }}</span>,
+      id <span class="badge alert-secondary" style="font-size: inherit">{{ submission.student.id }}</span>
+      {% endif %}
+    </h6>
+    <div class="mb-2 text-uppercase">
+      <span class="badge alert-{{ submission.status.color }}">{{ submission.status.name }}</span>
+      <span class="badge alert-light">Отправлено: {{ submission.sent.strftime('%d.%m.%Y %H:%M') }}</span>
+      <span class="badge alert-light">Проверено: {{ submission.checked.strftime('%d.%m.%Y %H:%M') }}</span>
     </div>
-{% endblock %}
+    {% if submission.status.error_message is not none and submission.status.error_message %}
+    <div>Подробные сведения об ошибке:</div>
+    <div class="text-muted mb-2" style="white-space: pre-wrap">{{ submission.status.error_message | e }}</div>
+    {% else %}
+    <div class="mb-2"></div>
+    {% endif %}
+    <textarea name="code" type="text" class="form-control" disabled rows="{{ submission.linesCount }}" placeholder="Ответ на задание" style="font-family: monospace;">{{ submission.code }}</textarea>
+  </article>
+  {% endfor %}
+  {{ pagination.links }}
+  {% else %}
+  Список отправленных решений пуст
+  {% endif %}
+</div>
+
+{% if highlight %}
+<script src="{{ url_for('static', filename='js/codemirror.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/python.min.js') }}"></script>
+<script type="text/javascript">
+  codeElements = document.getElementsByName("code")
+  for (codeElement of codeElements) {
+    const editor = CodeMirror.fromTextArea(
+      codeElement,
+      {
+        mode: 'python',
+        lineNumbers: true,
+        indentUnit: 4,
+        readOnly: true,
+        height: 'auto',
+        viewportMargin: Infinity
+      }
+    )
+  }
+</script>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/webapp/utils.py b/webapp/utils.py
index c75eb65..977ab05 100644
--- a/webapp/utils.py
+++ b/webapp/utils.py
@@ -4,21 +4,21 @@
 import traceback
 from functools import wraps
 
-from flask_jwt_extended import get_jwt, get_jwt_identity, unset_jwt_cookies, verify_jwt_in_request
+from flask_jwt_extended import get_jwt_identity, unset_jwt_cookies, verify_jwt_in_request
 from jwt import PyJWTError
 
 from flask import Request, redirect
 
 from webapp.managers import AppConfigManager
-from webapp.repositories import StudentRepository, TeacherRepository
+from webapp.repositories import StudentRepository
 
 
-def student_jwt_reset(config: AppConfigManager, path: str):
+def student_jwt_reset(config: AppConfigManager, path: str, auth_redirect=True):
     def wrapper(function):
         @wraps(function)
         def decorator(*args, **kwargs):
-            if not config.config.registration:
-                return redirect('/')
+            if not config.config.registration and auth_redirect:
+                return redirect("/")
             if verify_jwt_in_request(True):
                 response = redirect(path)
                 unset_jwt_cookies(response)
@@ -36,27 +36,21 @@ def decorator(*args, **kwargs):
             identity = get_jwt_identity()
             if identity is None:
                 return function(None, *args, **kwargs)
-            claims = get_jwt()
-            if "teacher" in claims:
-                return function(None, *args, **kwargs)
             student = students.get_by_id(identity)
             return function(student, *args, **kwargs)
         return decorator
     return wrapper
 
 
-def teacher_jwt_required(teachers: TeacherRepository):
+def teacher_jwt_required(students: StudentRepository):
     def wrapper(function):
         @wraps(function)
         def decorator(*args, **kwargs):
             verify_jwt_in_request()
-            claims = get_jwt()
-            if "teacher" in claims:
-                identity = get_jwt_identity()
-                teacher = teachers.get_by_id(identity)
-                if teacher:
-                    return function(teacher, *args, **kwargs)
-                raise PyJWTError()
+            identity = get_jwt_identity()
+            student = students.get_by_id(identity)
+            if student.teacher:
+                return function(student, *args, **kwargs)
             raise PyJWTError()
         return decorator
     return wrapper
diff --git a/webapp/views/student.py b/webapp/views/student.py
index 31f7295..8106c13 100644
--- a/webapp/views/student.py
+++ b/webapp/views/student.py
@@ -101,6 +101,7 @@ def group(student: Student | None, group_id: int):
         "student/group.jinja",
         group=group,
         blocked=blocked,
+        hide_groups=config.config.hide_groups,
         registration=config.config.registration,
         group_rating=config.config.groups,
         exam=config.config.exam,
@@ -188,17 +189,26 @@ def submit_task(student: Student | None, gid: int, vid: int, tid: int):
 
 
 @blueprint.route("/login", methods=['GET', 'POST'])
-@student_jwt_reset(config, "/login")
+@student_jwt_reset(config, "/login", False)
 def login():
     form = StudentLoginForm(lks_oauth_enabled=config.config.enable_lks_oauth)
     if not form.validate_on_submit():
-        return render_template("student/login.jinja", form=form)
+        return render_template(
+            "student/login.jinja",
+            registration=config.config.registration,
+            group_rating=config.config.groups,
+            form=form
+        )
     error = students.login(form.login.data, form.password.data)
     if error:
         form.login.errors.append(error)
-        return render_template("student/login.jinja", form=form)
-    response = redirect("/")
+        return render_template(
+            "student/login.jinja",
+            registration=config.config.registration,
+            group_rating=config.config.groups,
+            form=form)
     student = db.students.find_by_email(form.login.data)
+    response = redirect("/teacher" if student.teacher else "/")
     set_access_cookies(response, create_access_token(identity=student.id))
     return response
 
@@ -250,7 +260,12 @@ def register():
     form = StudentRegisterForm(lks_oauth_enabled=config.config.enable_lks_oauth)
     if form.validate_on_submit():
         form.login.errors.append(students.register(form.login.data, form.password.data))
-    return render_template("student/register.jinja", form=form)
+    return render_template(
+        "student/register.jinja",
+        registration=config.config.registration,
+        group_rating=config.config.groups,
+        form=form
+    )
 
 
 @blueprint.route("/change-password", methods=['GET', 'POST'])
@@ -259,7 +274,12 @@ def change_password():
     form = StudentChangePasswordForm()
     if form.validate_on_submit():
         form.login.errors.append(students.change_password(form.login.data, form.password.data))
-    return render_template("student/password.jinja", form=form)
+    return render_template(
+        "student/password.jinja",
+        registration=config.config.registration,
+        group_rating=config.config.groups,
+        form=form
+    )
 
 
 @blueprint.route("/logout", methods=['GET'])
diff --git a/webapp/views/teacher.py b/webapp/views/teacher.py
index a450cc0..a6ee866 100644
--- a/webapp/views/teacher.py
+++ b/webapp/views/teacher.py
@@ -1,4 +1,4 @@
-from flask_jwt_extended import create_access_token, set_access_cookies, unset_jwt_cookies, verify_jwt_in_request
+from flask_jwt_extended import unset_jwt_cookies
 from flask_jwt_extended.exceptions import JWTExtendedException
 from flask_paginate import Pagination
 from jwt.exceptions import PyJWTError
@@ -7,10 +7,9 @@
 from flask import current_app as app
 from flask import make_response, redirect, render_template, request
 
-from webapp.forms import TeacherLoginForm
-from webapp.managers import AppConfigManager, ExportManager, StatusManager, StudentManager, TeacherManager
-from webapp.models import Group, Message, Status, Task, Teacher, Variant
-from webapp.repositories import AppDatabase, DbContextManager
+from webapp.managers import AppConfigManager, ExportManager, StatusManager, StudentManager
+from webapp.models import Message, Student
+from webapp.repositories import AppDatabase
 from webapp.utils import get_exception_info, teacher_jwt_required
 
 
@@ -21,13 +20,12 @@
 students = StudentManager(config, db.students, db.mailers)
 statuses = StatusManager(db.tasks, db.groups, db.variants, db.statuses, config, db.seeds, db.checks)
 exports = ExportManager(db.groups, db.messages, statuses, db.variants, db.tasks, db.students, students)
-teachers = TeacherManager(db.teachers)
 
 
 @blueprint.route("/teacher/submissions/group/<gid>/variant/<vid>/task/<tid>", methods=["GET"], defaults={'page': 0})
 @blueprint.route("/teacher/submissions/group/<gid>/variant/<vid>/task/<tid>/<int:page>", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def teacher_submissions(teacher: Teacher, gid: int, vid: int, tid: int, page: int):
+@teacher_jwt_required(db.students)
+def teacher_submissions(teacher: Student, gid: int, vid: int, tid: int, page: int):
     size = 5
     submissions_statuses = statuses.get_submissions_statuses_by_info(gid, vid, tid, (page - 1) * size, size)
     if not submissions_statuses and page > 0:
@@ -48,15 +46,18 @@ def teacher_submissions(teacher: Teacher, gid: int, vid: int, tid: int, page: in
         "teacher/submissions.jinja",
         submissions=submissions_statuses,
         highlight=config.config.highlight_syntax,
+        registration=config.config.registration,
+        group_rating=config.config.groups,
         page=page,
         info=(gid, vid, tid),
         pagination=pagination,
+        student=teacher,
     )
 
 
 @blueprint.route("/teacher/submissions", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def select_submissions(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def select_submissions(teacher: Student):
     gid = request.args.get('gid')
     vid = request.args.get('vid')
     tid = request.args.get('tid')
@@ -64,15 +65,18 @@ def select_submissions(teacher: Teacher):
 
 
 @blueprint.route("/teacher", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def dashboard(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def dashboard(teacher: Student):
     groups = db.groups.get_all() if config.config.no_background_worker or config.config.final_tasks else None
     glist = db.groups.get_all()
     vlist = db.variants.get_all()
     tlist = db.tasks.get_all()
     return render_template(
         "teacher/dashboard.jinja",
+        student=teacher,
         clearable=config.config.clearable_database,
+        registration=config.config.registration,
+        group_rating=config.config.groups,
         exam=config.config.exam,
         groups=groups,
         glist=glist,
@@ -82,8 +86,8 @@ def dashboard(teacher: Teacher):
 
 
 @blueprint.route("/teacher/group/select", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def select_group(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def select_group(teacher: Student):
     group = request.args.get('group')
     if config.config.exam:
         return redirect(f'/teacher/group/{group}/exam')
@@ -91,16 +95,23 @@ def select_group(teacher: Teacher):
 
 
 @blueprint.route("/teacher/group/<group_id>/exam", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam(teacher: Teacher, group_id: int):
+@teacher_jwt_required(db.students)
+def exam(teacher: Student, group_id: int):
     group = db.groups.get_by_id(group_id)
     seed = db.seeds.get_final_seed(group_id)
-    return render_template("teacher/exam.jinja", group=group, seed=seed)
+    return render_template(
+        "teacher/exam.jinja",
+        registration=config.config.registration,
+        group_rating=config.config.groups,
+        group=group,
+        seed=seed,
+        student=teacher
+    )
 
 
 @blueprint.route("/teacher/group/<group_id>/exam/toggle", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_toggle(teacher: Teacher, group_id: int):
+@teacher_jwt_required(db.students)
+def exam_toggle(teacher: Student, group_id: int):
     seed = db.seeds.get_final_seed(group_id)
     if seed is None and config.config.final_tasks:
         db.seeds.begin_final_test(group_id)
@@ -112,8 +123,8 @@ def exam_toggle(teacher: Teacher, group_id: int):
 
 
 @blueprint.route("/teacher/exam/start", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_startall(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def exam_startall(teacher: Student):
     groups = db.groups.get_all()
     for group in groups:
         seed = db.seeds.get_final_seed(group.id)
@@ -125,8 +136,8 @@ def exam_startall(teacher: Teacher):
 
 
 @blueprint.route("/teacher/exam/end", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_endall(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def exam_endall(teacher: Student):
     groups = db.groups.get_all()
     for group in groups:
         db.seeds.end_final_test(group.id)
@@ -134,8 +145,8 @@ def exam_endall(teacher: Teacher):
 
 
 @blueprint.route("/teacher/exam/delete", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_deleteall(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def exam_deleteall(teacher: Student):
     if not config.config.final_tasks or not config.config.clearable_database:
         return redirect('/teacher')
     groups = db.groups.get_all()
@@ -146,8 +157,8 @@ def exam_deleteall(teacher: Teacher):
 
 
 @blueprint.route("/teacher/group/<group_id>/exam/delete", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_delete(teacher: Teacher, group_id: int):
+@teacher_jwt_required(db.students)
+def exam_delete(teacher: Student, group_id: int):
     if not config.config.final_tasks or not config.config.clearable_database:
         return redirect(f'/teacher/group/{group_id}/exam')
     db.statuses.delete_group_task_statuses(group_id)
@@ -156,8 +167,8 @@ def exam_delete(teacher: Teacher, group_id: int):
 
 
 @blueprint.route("/teacher/group/<group_id>/exam/csv", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def exam_csv(teacher: Teacher, group_id: int):
+@teacher_jwt_required(db.students)
+def exam_csv(teacher: Student, group_id: int):
     delimiter = request.args.get('delimiter')
     value = exports.export_exam_results(group_id, delimiter)
     output = make_response(value)
@@ -167,8 +178,8 @@ def exam_csv(teacher: Teacher, group_id: int):
 
 
 @blueprint.route("/teacher/messages", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def messages(teacher: Teacher):
+@teacher_jwt_required(db.students)
+def messages(teacher: Student):
     separator = request.args.get('separator')
     count = request.args.get('count')
     value = exports.export_messages(count, separator)
@@ -179,19 +190,26 @@ def messages(teacher: Teacher):
 
 
 @blueprint.route("/teacher/group/<group_id>", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def queue(teacher: Teacher, group_id: int):
+@teacher_jwt_required(db.students)
+def queue(teacher: Student, group_id: int):
     group = db.groups.get_by_id(group_id)
     message = db.messages.get_next_pending_message()
     matches = message is None or group.id == message.group
     if matches and config.config.no_background_worker:
-        return render_template("teacher/queue.jinja", group=group, message=message)
+        return render_template(
+            "teacher/queue.jinja",
+            registration=config.config.registration,
+            group_rating=config.config.groups,
+            group=group,
+            message=message,
+            student=teacher
+        )
     return redirect(f'/teacher')
 
 
 @blueprint.route("/teacher/group/<group_id>/queue/<message_id>/accept", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def accept(teacher: Teacher, group_id: int, message_id: int):
+@teacher_jwt_required(db.students)
+def accept(teacher: Student, group_id: int, message_id: int):
     group = db.groups.get_by_id(group_id)
     message = db.messages.get_by_id(message_id)
     if group.id == message.group and config.config.no_background_worker:
@@ -200,8 +218,8 @@ def accept(teacher: Teacher, group_id: int, message_id: int):
 
 
 @blueprint.route("/teacher/group/<group_id>/queue/<message_id>/reject", methods=["GET"])
-@teacher_jwt_required(db.teachers)
-def reject(teacher: Teacher, group_id: int, message_id: int):
+@teacher_jwt_required(db.students)
+def reject(teacher: Student, group_id: int, message_id: int):
     group = db.groups.get_by_id(group_id)
     message = db.messages.get_by_id(message_id)
     if group.id == message.group and config.config.no_background_worker:
@@ -210,31 +228,6 @@ def reject(teacher: Teacher, group_id: int, message_id: int):
     return redirect(f"/teacher/group/{group_id}")
 
 
-@blueprint.route("/teacher/login", methods=['GET', 'POST'])
-def login():
-    if verify_jwt_in_request(True):
-        response = redirect('/teacher/login')
-        unset_jwt_cookies(response)
-        return response
-    form = TeacherLoginForm()
-    if not form.validate_on_submit():
-        return render_template("teacher/login.jinja", form=form)
-    teacher = teachers.check_password(form.login.data, form.password.data)
-    if teacher is None:
-        return render_template("teacher/login.jinja", form=form)
-    access = create_access_token(identity=teacher.id, additional_claims={"teacher": True})
-    response = redirect("/teacher")
-    set_access_cookies(response, access)
-    return response
-
-
-@blueprint.route("/teacher/logout", methods=['GET'])
-def logout():
-    response = redirect("/teacher/login")
-    unset_jwt_cookies(response)
-    return response
-
-
 @blueprint.errorhandler(Exception)
 def handle_view_errors(e):
     print(get_exception_info())
@@ -244,7 +237,7 @@ def handle_view_errors(e):
 @blueprint.errorhandler(JWTExtendedException)
 @blueprint.errorhandler(PyJWTError)
 def handle_authorization_errors(e):
-    response = redirect('/teacher/login')
+    response = redirect('/login')
     unset_jwt_cookies(response)
     return response