diff --git a/adm/templates/adm/adm_agencys.html b/adm/templates/adm/adm_agencys.html
index da0e595..e13afc1 100644
--- a/adm/templates/adm/adm_agencys.html
+++ b/adm/templates/adm/adm_agencys.html
@@ -47,4 +47,9 @@
 	    }); 	
 	})
 </script>
+<!--
+		
+		TASK: Quota-Ansicht hier mit einbauen
+
+-->	
 {% endblock content %}
\ No newline at end of file
diff --git a/dasettings/templates/dasettings/profil_content.html b/dasettings/templates/dasettings/profil_content.html
index db7ec54..08a5514 100644
--- a/dasettings/templates/dasettings/profil_content.html
+++ b/dasettings/templates/dasettings/profil_content.html
@@ -36,7 +36,7 @@
 	     </div>
 	  </div>
 	</div>
-	<!-- Für das Speichern der Bilder enctype -->
+	<!-- TASK: Eigene Profil-Ansicht wie bei Mitarbeiter umbauen -->
 	<div class="col-8">
 	<form method="POST" enctype="multipart/form-data">		
 		{% csrf_token %}
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index b474d27..33991c0 100644
Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ
diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index f52383c..791f3e0 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -38,7 +38,7 @@ X_FRAME_OPTIONS = 'SAMEORIGIN'
 SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
 
 CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
-CRONAPIKEY_STATSTIC = "aiszdausd876asdtuzagshjdajgAHGJHSDSD67daiuhdj"
+CRONAPIKEY_STATSTIC = "gCddsaz6NOnE9QbXZM5LasdEk122D"
 MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak"
 # API KEY LEXOFFICE
 LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19"
diff --git a/timemanagement/templates/timemanagement/realtime_dropdown.html b/timemanagement/templates/timemanagement/realtime_dropdown.html
index a9b8304..1e0ed17 100644
--- a/timemanagement/templates/timemanagement/realtime_dropdown.html
+++ b/timemanagement/templates/timemanagement/realtime_dropdown.html
@@ -1,3 +1,6 @@
+<!-- TASK: Das Fenster soll nur einmal weggeklickt werden und dann nie wieder bis zum nächsten Login, wie bei der Erinnerung bzgl. der Vertretung -->
+
+
 {% load counter_tag %}
 <div class="mt-2 ml-2 text-center">
 
diff --git a/timemanagement/templates/timemanagement/timemanagement_add.html b/timemanagement/templates/timemanagement/timemanagement_add.html
index a8c093f..f1e4938 100644
--- a/timemanagement/templates/timemanagement/timemanagement_add.html
+++ b/timemanagement/templates/timemanagement/timemanagement_add.html
@@ -3,6 +3,8 @@
 {% load crispy_forms_tags %}
 {% load counter_tag %}
 {% if request.user.profile.agency.module_timemanagement %}
+<!-- TASK: Hier verhindern, dass der AN die Zielarbeitszeit nicht selber ändern kann sondern die geladen wird, die in den Vertragsdaten steht -->
+<!-- TASK: Unterschied manuelles Eintragen von Arbeitstagen -->
 <div class="content-section col-5">
 	<h3>Arbeitstag {% if team == 1 %} von {{user.get_full_name}} {% endif %} hinzufügen</h3>
 	<hr>
@@ -11,7 +13,7 @@
 		<form method="POST" class="">
 		{% csrf_token %}
 		{{form.media}}
-    {{form|crispy}}
+    	{{form|crispy}}
 	</div>	
 	<hr>
 <a class="btn" href="{% url 'tm-management' %} ">Abbrechen</a>
diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index 12d4950..5fd83db 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -17,7 +17,7 @@
   <li class="nav-item">
     <a class="nav-link" id="userown-tab" data-toggle="tab" href="#userown" role="tab" aria-controls="userown" aria-selected="false">Meine Zeiterfassung</a>
   </li>
-  <li class="nav-item">
+  <li class="nav-item ml-auto">
     <a class="nav-link" id="team-tab" data-toggle="tab" href="#team" role="tab" aria-controls="team" aria-selected="false">Mitarbeiterübersicht</a>
   </li>
 </ul>
diff --git a/users/models.py b/users/models.py
index 0167946..33bac76 100644
--- a/users/models.py
+++ b/users/models.py
@@ -120,7 +120,9 @@ class Agency(models.Model):
 	dynamicprofile = models.BooleanField(default=True)
 
 	module_messages = models.BooleanField(default=True)
-	module_chat = models.BooleanField(default=True)
+
+	# TASK: Modul Chat standardmäßig deaktiviert
+	module_chat = models.BooleanField(default=False)
 		
 	# KOSTENPFLICHTIGE MODULE
 	
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 9e641e8..6dd5a0f 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -100,6 +100,7 @@
       {%endif%}
         <a class="nav-link " href="{% url 'standards' %}" aria-expanded="true">
           <i class="fas fa-fw fa-lightbulb"></i>
+          <!-- TASK: Anzahl unveröffentlicher Standards als Bubble hier rein -->
           <span>Standards</span>
         </a>
       </li>
@@ -188,6 +189,7 @@
       {%endif%}
         <a class="nav-link " href="{% url 'tma-management' %}" aria-expanded="true">
           <i class="fas fa-umbrella-beach"></i>
+          <!-- TASK: Anzahl ausstehender Anträge hier rein -->
           <span>Abwesenheiten&nbsp;<sup>BETA</sup></span>
         </a>
       </li>