diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 94c227f195fb9157ea44ba88e6df978860afedb9..c883d61a08f8242127f5324f1e6204f732942c78 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Changed
 ~~~~~~~
 
 * Use a more speaking name for preference section ("Timetables" instead of "Chronos").
+* Use semantically correct html elements for headings and alerts.
 
 Fixed
 ~~~~~
diff --git a/aleksis/apps/chronos/templates/chronos/all.html b/aleksis/apps/chronos/templates/chronos/all.html
index bedf5ca129d781ff2f13e198714871bf2c4b7b1c..992689bdf99a8564f922b45783b8437f1752c0c5 100644
--- a/aleksis/apps/chronos/templates/chronos/all.html
+++ b/aleksis/apps/chronos/templates/chronos/all.html
@@ -14,7 +14,7 @@
 {% block content %}
   <div class="row">
     <div class="col s12 m4">
-      <h5>{% trans "Teachers" %}</h5>
+      <h2>{% trans "Teachers" %}</h2>
 
       {% for teacher in teachers %}
         <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
@@ -25,7 +25,7 @@
     </div>
 
     <div class="col s12 m4">
-      <h5>{% trans "Groups" %}</h5>
+      <h2>{% trans "Groups" %}</h2>
 
       {% for class in classes %}
         <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
@@ -36,7 +36,7 @@
     </div>
 
     <div class="col s12 m4">
-      <h5>{% trans "Rooms" %}</h5>
+      <h2>{% trans "Rooms" %}</h2>
 
       {% for room in rooms %}
         <a class="waves-effect waves-light btn btn-timetable-quicklaunch primary"
diff --git a/aleksis/apps/chronos/templates/chronos/lessons_day.html b/aleksis/apps/chronos/templates/chronos/lessons_day.html
index 46feace7d131e3cee51163e43bdbd548c40db120..660878facda7ef348ff3d2ac47cc122518a20c36 100644
--- a/aleksis/apps/chronos/templates/chronos/lessons_day.html
+++ b/aleksis/apps/chronos/templates/chronos/lessons_day.html
@@ -16,7 +16,7 @@
 
   <div class="row no-margin">
     <div class="col s12 m6 l8 no-padding">
-      <h4>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h4>
+      <h1>{% blocktrans %}Lessons{% endblocktrans %} {{ day|date:"l" }}, {{ day }}</h1>
     </div>
     <div class="col s12 m6 l4 no-padding">
       {% include "chronos/partials/datepicker.html" %}
diff --git a/aleksis/apps/chronos/templates/chronos/my_timetable.html b/aleksis/apps/chronos/templates/chronos/my_timetable.html
index 10175bfa4530c7a8016c6397308c5727086eb7a7..1408ec233161f4e14c2022a34447526f7cb3dbb2 100644
--- a/aleksis/apps/chronos/templates/chronos/my_timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/my_timetable.html
@@ -14,10 +14,10 @@
 {% block content %}
   <div class="row no-margin">
     <div class="col s12">
-      <h4>
+      <h1>
         {% trans "My timetable" %} <i>{{ el }}</i>
         <span class="badge new primary-color ">{% trans "SMART PLAN" %}</span>
-      </h4>
+      </h1>
       <a class="btn-flat waves-effect waves-light" href="{% url "timetable" super.type.value super.el.pk %}">
         {% trans "Show week timetable for" %} {{ super.el.short_name }}
       </a>
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index 82e5d40313828032d46a8ece311ab132f60ae388..7da7f610a857b8d4816e7b48b2a83f0ceff76e59 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -14,7 +14,7 @@
 {% block content %}
   <div class="row no-margin">
     <div class="col s10 m6 no-padding">
-      <h4>{% trans "Substitutions" %}</h4>
+      <h1>{% trans "Substitutions" %}</h1>
     </div>
     <div class="col s2 m6 right align-right print-icon">
       <a class="waves-effect waves-teal btn-flat btn-flat-medium right"
@@ -35,7 +35,7 @@
     </div>
   </div>
 
-  <h5 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h5>
+  <h2 class="hide-on-small-and-down">{{ day|date:"l" }}, {{ day }}</h2>
 
   <table class="substitutions striped responsive-table">
     <thead>
diff --git a/aleksis/apps/chronos/templates/chronos/timetable.html b/aleksis/apps/chronos/templates/chronos/timetable.html
index 9f015f8f65e86a02d1736c4c8f7c7786ec1c04a5..a8bb2bd4bf1f6935b377ec21cbb2c4ef2d5dadd9 100644
--- a/aleksis/apps/chronos/templates/chronos/timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/timetable.html
@@ -9,6 +9,7 @@
 {% endblock %}
 
 {% block browser_title %}{% blocktrans %}Timetable{% endblocktrans %}{% endblock %}
+{% block no_page_title %}{% endblock %}
 {% block content %}
 
   {% if smart %}
@@ -19,20 +20,20 @@
 
   <div class="row no-margin">
     <div class="col s8 m6 l8 xl9">
-      <h4>
+      <h1>
         {% trans "Timetable" %} <i>{{ el }}</i>
-      </h4>
+      </h1>
 
       {# Show class teacher and deputy class teacher #}
       {% if type.value == "group" and el.owners.all %}
-        <h5>{% trans "Group teachers:" %}
+        <h2>{% trans "Group teachers:" %}
           {% for teacher in el.owners.all %}
             <span data-position="bottom" class="tooltipped"
                   data-tooltip="{{ teacher }}">
                             <a href="{% url "timetable" "teacher" teacher.pk %}">
                                 {{ teacher.short_name }}</a></span>{% if not forloop.last %},{% endif %}
           {% endfor %}
-        </h5>
+        </h2>
       {% endif %}
     </div>
     <div class="col s4 m6 l4 xl3 right align-right no-print">
diff --git a/aleksis/apps/chronos/templates/chronos/widget.html b/aleksis/apps/chronos/templates/chronos/widget.html
index 7c4e112bd4c599d8e93df363588005467379bde3..acc6b9901803124200bb80db44d9428262c0f882 100644
--- a/aleksis/apps/chronos/templates/chronos/widget.html
+++ b/aleksis/apps/chronos/templates/chronos/widget.html
@@ -13,14 +13,12 @@
       {% if has_plan %}
         {% include "chronos/partials/lessons_col.html" with lesson_periods=lesson_periods %}
       {% else %}
-        <div class="alert warning">
-          <p>
-            <i class="material-icons left">info</i>
-            {% blocktrans %}
-              There is no timetable linked to your person.
-            {% endblocktrans %}
-          </p>
-        </div>
+        <figure class="alert warning">
+          <i class="material-icons left">info</i>
+          {% blocktrans %}
+          There is no timetable linked to your person.
+          {% endblocktrans %}
+        </figure>
       {% endif %}
     </div>
   </div>