diff --git a/biscuit/apps/chronos/forms.py b/biscuit/apps/chronos/forms.py
index fba3f647dbc467c366c2dcfcd0d2bad54f0fcead..4da10e1617f1af5a51b1671e3da3879d8b828df2 100644
--- a/biscuit/apps/chronos/forms.py
+++ b/biscuit/apps/chronos/forms.py
@@ -17,4 +17,4 @@ class HintForm(ModelForm):
 
     class Meta:
         model = Hint
-        fields = ("from_date", "to_date", "text", "classes")
+        fields = ("from_date", "to_date", "text", "classes", "teachers")
diff --git a/biscuit/apps/chronos/migrations/0004_auto_20190411_1219.py b/biscuit/apps/chronos/migrations/0004_auto_20190411_1219.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ddb7b934620a2571c81e052c529d6413589516a
--- /dev/null
+++ b/biscuit/apps/chronos/migrations/0004_auto_20190411_1219.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2 on 2019-04-11 10:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('timetable', '0003_auto_20190410_1634'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hint',
+            name='teachers',
+            field=models.BooleanField(default=False, verbose_name='Lehrer?'),
+        ),
+        migrations.AlterField(
+            model_name='hint',
+            name='classes',
+            field=models.ManyToManyField(related_name='hints', to='timetable.HintClass', verbose_name='Klassen'),
+        ),
+    ]
diff --git a/biscuit/apps/chronos/models.py b/biscuit/apps/chronos/models.py
index e332cc609546f03d997bb349c98ded30d26e837d..2ad830ce23c4e226a421f6a58d357a0443be75ea 100755
--- a/biscuit/apps/chronos/models.py
+++ b/biscuit/apps/chronos/models.py
@@ -35,16 +35,14 @@ class Hint(models.Model):
     text = MartorField(verbose_name="Hinweistext")
 
     # Relations
-    classes = ManyToManyField(HintClass, related_name="hints")
+    classes = models.ManyToManyField(HintClass, related_name="hints", verbose_name="Klassen")
+    teachers = models.BooleanField(verbose_name="Lehrer?", default=False)
 
     class Meta:
         verbose_name = "Hinweis"
         verbose_name_plural = "Hinweise"
 
 
-
-
-
 class Timetable(models.Model):
     class Meta:
         permissions = (
diff --git a/biscuit/apps/chronos/templates/timetable/addhint.html b/biscuit/apps/chronos/templates/timetable/addhint.html
index a983c1842872387007d7f1828042b6c3d86ed9c8..867b943a0316b5046808b7a455e37a2e1f4ca5a0 100755
--- a/biscuit/apps/chronos/templates/timetable/addhint.html
+++ b/biscuit/apps/chronos/templates/timetable/addhint.html
@@ -2,13 +2,41 @@
 {% load material_form %}
 {% load martortags %}
 {% load static %}
+{% load widget_tweaks %}
 
 <main>
     <h4>Neuen Hinweis erstellen</h4>
 
     <form method="post">
         {% csrf_token %}
-        {{ form }}
+        {{ form.non_field_errors }}
+        <h5>Ãœber welchen Zeitraum soll der Hinweis angezeigt werden? <span class="red-text">*</span></h5>
+
+        <div class="row">
+            <div class="col s12 m6">
+                {{ form.from_date.label_tag }}
+                {{ form.from_date|add_class:"datepicker" }}
+            </div>
+            <div class="col s12 m6">
+                {{ form.to_date.label_tag }}
+                {{ form.to_date|add_class:"datepicker" }}
+            </div>
+        </div>
+        <h5>Für wen soll der Hinweis angezeigt werden? <span class="red-text">*</span></h5>
+        {{ form.classes.label_tag }}
+        {{ form.classes }}
+
+        <p>
+            <label>
+                {{ form.teachers }}
+                <span>Für Lehrer anzeigen?</span>
+            </label>
+        </p>
+
+        <h5>Hinweistext <span class="red-text">*</span></h5>
+        {{ form.text }}
+
+
         <button type="submit" class="waves-effect waves-light btn green">
             <i class="material-icons left">add</i> Hinweis erstellen und veröffentlichen
         </button>