diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py
index bd14b20..e61d018 100644
--- a/advlabdb/adminModelViews.py
+++ b/advlabdb/adminModelViews.py
@@ -1336,7 +1336,7 @@ class ImportView(SecureAdminBaseView):
except Exception as ex:
flash(str(ex), "error")
- return self.render("import.jinja.html", form=form)
+ return self.render("admin_import.jinja.html", form=form)
class ActionsView(SecureAdminBaseView):
@@ -1364,7 +1364,7 @@ class ActionsView(SecureAdminBaseView):
return redirect(self.url)
- return self.render("actions.jinja.html", form=form)
+ return self.render("admin_actions.jinja.html", form=form)
class AnalysisView(SecureAdminBaseView):
diff --git a/advlabdb/templates/actions.jinja.html b/advlabdb/templates/admin_actions.jinja.html
similarity index 68%
rename from advlabdb/templates/actions.jinja.html
rename to advlabdb/templates/admin_actions.jinja.html
index 2e82037..3041781 100644
--- a/advlabdb/templates/actions.jinja.html
+++ b/advlabdb/templates/admin_actions.jinja.html
@@ -1,11 +1,6 @@
-{% from "macros.jinja.html" import information %}
-{% extends "admin/master.html" %}
-
-{% block body %}
- {{ information(current_user, active_semester_str, role="admin") }}
-
-
Error! {{ error }}
@@ -243,6 +238,4 @@
assistant_email
-
- {{ footer|safe }}
-{% endblock body %}
+{% endblock %}
diff --git a/advlabdb/templates/admin_index.jinja.html b/advlabdb/templates/admin_index.jinja.html
index 03f745e..fac63ce 100644
--- a/advlabdb/templates/admin_index.jinja.html
+++ b/advlabdb/templates/admin_index.jinja.html
@@ -1,11 +1,6 @@
-{% from "macros.jinja.html" import information %}
-{% extends "admin/index.html" %}
-
-{% block body %}
- {{ information(current_user, active_semester_str, role="admin") }}
-
-
+{% extends "admin_base.jinja.html" %}
+{% block content %}
-
- {{ super() }}
-
- {{ footer|safe }}
{% endblock %}
diff --git a/advlabdb/templates/analysis/analysis.jinja.html b/advlabdb/templates/analysis/analysis.jinja.html
index 73e7097..e5164e9 100644
--- a/advlabdb/templates/analysis/analysis.jinja.html
+++ b/advlabdb/templates/analysis/analysis.jinja.html
@@ -1,11 +1,6 @@
-{% from "macros.jinja.html" import information %}
-{% extends "admin/master.html" %}
-
-{% block body %}
- {{ information(current_user, active_semester_str, role="admin")}}
-
-
+{% extends "admin_base.jinja.html" %}
+{% block content %}
-{% endblock body %}
+{% endblock %}
diff --git a/advlabdb/templates/analysis/assistant_marks.jinja.html b/advlabdb/templates/analysis/assistant_marks.jinja.html
index fb5bbf1..3489c25 100644
--- a/advlabdb/templates/analysis/assistant_marks.jinja.html
+++ b/advlabdb/templates/analysis/assistant_marks.jinja.html
@@ -1,11 +1,6 @@
-{% from "macros.jinja.html" import information %}
-{% extends "admin/master.html" %}
-
-{% block body %}
- {{ information(current_user, active_semester_str, role="admin")}}
-
-
+{% extends "admin_base.jinja.html" %}
+{% block content %}
Assistant's marks analysis
@@ -38,4 +33,4 @@
{% endfor %}
-{% endblock body %}
+{% endblock %}
diff --git a/advlabdb/templates/analysis/final_part_marks.jinja.html b/advlabdb/templates/analysis/final_part_marks.jinja.html
index e74d571..2558ff9 100644
--- a/advlabdb/templates/analysis/final_part_marks.jinja.html
+++ b/advlabdb/templates/analysis/final_part_marks.jinja.html
@@ -1,11 +1,6 @@
-{% from "macros.jinja.html" import information %}
-{% extends "admin/master.html" %}
-
-{% block body %}
- {{ information(current_user, active_semester_str, role="admin")}}
-
-
+{% extends "admin_base.jinja.html" %}
+{% block content %}
Final part marks analysis
@@ -34,4 +29,4 @@