diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc
index 3ff9165..3fed716 100644
Binary files a/areas/__pycache__/__init__.cpython-38.pyc and b/areas/__pycache__/__init__.cpython-38.pyc differ
diff --git a/areas/__pycache__/admin.cpython-38.pyc b/areas/__pycache__/admin.cpython-38.pyc
index c67ec55..f4e758a 100644
Binary files a/areas/__pycache__/admin.cpython-38.pyc and b/areas/__pycache__/admin.cpython-38.pyc differ
diff --git a/areas/__pycache__/apps.cpython-38.pyc b/areas/__pycache__/apps.cpython-38.pyc
index e7a6b78..9290f60 100644
Binary files a/areas/__pycache__/apps.cpython-38.pyc and b/areas/__pycache__/apps.cpython-38.pyc differ
diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc
index c9f46ac..b1a2c81 100644
Binary files a/areas/__pycache__/forms.cpython-38.pyc and b/areas/__pycache__/forms.cpython-38.pyc differ
diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc
index 83d08a8..04f8d72 100644
Binary files a/areas/__pycache__/models.cpython-38.pyc and b/areas/__pycache__/models.cpython-38.pyc differ
diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc
index ddff2d1..7683456 100644
Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ
diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc
index aae0ee2..0d77c06 100644
Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ
diff --git a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc
index 4b1a5c3..77c5047 100644
Binary files a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc and b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc differ
diff --git a/areas/migrations/__pycache__/__init__.cpython-38.pyc b/areas/migrations/__pycache__/__init__.cpython-38.pyc
index 1f7cdb4..2cd3248 100644
Binary files a/areas/migrations/__pycache__/__init__.cpython-38.pyc and b/areas/migrations/__pycache__/__init__.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc
index f932871..1ffa496 100644
Binary files a/digitaleagentur/__pycache__/__init__.cpython-38.pyc and b/digitaleagentur/__pycache__/__init__.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 1da520b..c2c88dc 100644
Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index ff46b4b..ccf04f6 100644
Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc
index ecd32fe..268c51d 100644
Binary files a/digitaleagentur/__pycache__/views.cpython-38.pyc and b/digitaleagentur/__pycache__/views.cpython-38.pyc differ
diff --git a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc
index 3e8074e..c66704f 100644
Binary files a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc and b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc differ
diff --git a/media/userprofilepics/Makris_Philipp_7zkFtau.jpg b/media/userprofilepics/Makris_Philipp_7zkFtau.jpg
index 17879a0..56f88cc 100644
Binary files a/media/userprofilepics/Makris_Philipp_7zkFtau.jpg and b/media/userprofilepics/Makris_Philipp_7zkFtau.jpg differ
diff --git a/orga/__pycache__/__init__.cpython-38.pyc b/orga/__pycache__/__init__.cpython-38.pyc
index 496d807..5fbb46a 100644
Binary files a/orga/__pycache__/__init__.cpython-38.pyc and b/orga/__pycache__/__init__.cpython-38.pyc differ
diff --git a/orga/__pycache__/admin.cpython-38.pyc b/orga/__pycache__/admin.cpython-38.pyc
index 6513846..52eca0c 100644
Binary files a/orga/__pycache__/admin.cpython-38.pyc and b/orga/__pycache__/admin.cpython-38.pyc differ
diff --git a/orga/__pycache__/apps.cpython-38.pyc b/orga/__pycache__/apps.cpython-38.pyc
index 52f5b45..bad2d21 100644
Binary files a/orga/__pycache__/apps.cpython-38.pyc and b/orga/__pycache__/apps.cpython-38.pyc differ
diff --git a/orga/__pycache__/models.cpython-38.pyc b/orga/__pycache__/models.cpython-38.pyc
index 96f69e5..0ceedb8 100644
Binary files a/orga/__pycache__/models.cpython-38.pyc and b/orga/__pycache__/models.cpython-38.pyc differ
diff --git a/orga/__pycache__/urls.cpython-38.pyc b/orga/__pycache__/urls.cpython-38.pyc
index 442122f..dbd2557 100644
Binary files a/orga/__pycache__/urls.cpython-38.pyc and b/orga/__pycache__/urls.cpython-38.pyc differ
diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc
index bdc046f..8f8bb8b 100644
Binary files a/orga/__pycache__/views.cpython-38.pyc and b/orga/__pycache__/views.cpython-38.pyc differ
diff --git a/orga/migrations/__pycache__/__init__.cpython-38.pyc b/orga/migrations/__pycache__/__init__.cpython-38.pyc
index c81252e..378acdf 100644
Binary files a/orga/migrations/__pycache__/__init__.cpython-38.pyc and b/orga/migrations/__pycache__/__init__.cpython-38.pyc differ
diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc
index 3efa48c..10c9914 100644
Binary files a/standards/__pycache__/__init__.cpython-38.pyc and b/standards/__pycache__/__init__.cpython-38.pyc differ
diff --git a/standards/__pycache__/admin.cpython-38.pyc b/standards/__pycache__/admin.cpython-38.pyc
index a4a2637..636f01b 100644
Binary files a/standards/__pycache__/admin.cpython-38.pyc and b/standards/__pycache__/admin.cpython-38.pyc differ
diff --git a/standards/__pycache__/apps.cpython-38.pyc b/standards/__pycache__/apps.cpython-38.pyc
index 4552384..4506211 100644
Binary files a/standards/__pycache__/apps.cpython-38.pyc and b/standards/__pycache__/apps.cpython-38.pyc differ
diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc
index 26a019c..a2f4a40 100644
Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ
diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc
index adaf8ca..d7f1d7e 100644
Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ
diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc
index 04657f0..ad0fdc8 100644
Binary files a/standards/__pycache__/urls.cpython-38.pyc and b/standards/__pycache__/urls.cpython-38.pyc differ
diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc
index c6ad04a..09985db 100644
Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ
diff --git a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc
index 8e4ffe6..7411eab 100644
Binary files a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc and b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc differ
diff --git a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc
index 176d9da..a457549 100644
Binary files a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc and b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc differ
diff --git a/standards/migrations/__pycache__/__init__.cpython-38.pyc b/standards/migrations/__pycache__/__init__.cpython-38.pyc
index 29deb7e..912f5d5 100644
Binary files a/standards/migrations/__pycache__/__init__.cpython-38.pyc and b/standards/migrations/__pycache__/__init__.cpython-38.pyc differ
diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index 1ddaa70..3d2bb95 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -30,31 +30,24 @@
     <div class="tab-content" id="area_contents">      
       {% for area in areas %}
         <div class="tab-pane fade" id="t_{{area.id}}" role="tabpanel" aria-labelledby="{{area.id}}">
-            <table class="table">
-                  <thead>
-                  <tr>                  
-                  {% for task in tasks %}
-                  
-                    {% if task.area == area %}
-                      <th scope="col">{{task.name}}</th>
-                    {% endif %}
-                  {% endfor %}
-                  </tr>
-                     {% for task in tasks %}
-                      {% for standard in standards_of_agency %}
-                      <tr>
-                      {% if standard.task == task %}
-                      <td>{{standard.name}}</td>
-                    {% endif %}
-                      </tr>                  
+            <h5 class="mt-3">Standards aus dem Bereich {{area.name}}</h5>
+            <hr>
 
-                    {% endfor %}
-                  {% endfor %}
-                  
+          {% for task in tasks %}
+            {% if task.area == area %}
+            <div class="card text-center mt-1 mr-3 mb-3" style="width: 18rem; float: left">
+                  <div class="card-body">
+                    <h5 class="card-title">{{task.name}}</h5>
+                    {% for standard in standards_of_agency %}
+                      {% if standard.task == task and standard.area == area %}
+                      <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name}}</a></p>
+                      {% endif %}
+                     {% endfor %}
+                   </div>
+                </div>
+          {% endif %}
+        {% endfor %}
 
-              </table>
-              <hr>
-            
            
        </div>        
       {% endfor %}
diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc
index 5761d3d..ba2b443 100644
Binary files a/tasks/__pycache__/__init__.cpython-38.pyc and b/tasks/__pycache__/__init__.cpython-38.pyc differ
diff --git a/tasks/__pycache__/admin.cpython-38.pyc b/tasks/__pycache__/admin.cpython-38.pyc
index 64cf5df..4785bcc 100644
Binary files a/tasks/__pycache__/admin.cpython-38.pyc and b/tasks/__pycache__/admin.cpython-38.pyc differ
diff --git a/tasks/__pycache__/apps.cpython-38.pyc b/tasks/__pycache__/apps.cpython-38.pyc
index 1b8289c..acb7215 100644
Binary files a/tasks/__pycache__/apps.cpython-38.pyc and b/tasks/__pycache__/apps.cpython-38.pyc differ
diff --git a/tasks/__pycache__/forms.cpython-38.pyc b/tasks/__pycache__/forms.cpython-38.pyc
index bfae0d8..7d05cbf 100644
Binary files a/tasks/__pycache__/forms.cpython-38.pyc and b/tasks/__pycache__/forms.cpython-38.pyc differ
diff --git a/tasks/__pycache__/models.cpython-38.pyc b/tasks/__pycache__/models.cpython-38.pyc
index 45cdb3b..d012e57 100644
Binary files a/tasks/__pycache__/models.cpython-38.pyc and b/tasks/__pycache__/models.cpython-38.pyc differ
diff --git a/tasks/__pycache__/urls.cpython-38.pyc b/tasks/__pycache__/urls.cpython-38.pyc
index fbe82ce..065fae8 100644
Binary files a/tasks/__pycache__/urls.cpython-38.pyc and b/tasks/__pycache__/urls.cpython-38.pyc differ
diff --git a/tasks/__pycache__/views.cpython-38.pyc b/tasks/__pycache__/views.cpython-38.pyc
index 869f6db..2d837b9 100644
Binary files a/tasks/__pycache__/views.cpython-38.pyc and b/tasks/__pycache__/views.cpython-38.pyc differ
diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc
index ff34734..decdf9d 100644
Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc differ
diff --git a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc
index d481111..3872823 100644
Binary files a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc and b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc differ
diff --git a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc
index 98ebf6a..212e6c2 100644
Binary files a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc and b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc differ
diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc
index ded374b..42a7700 100644
Binary files a/tasks/migrations/__pycache__/__init__.cpython-38.pyc and b/tasks/migrations/__pycache__/__init__.cpython-38.pyc differ
diff --git a/tasks/templates/tasks/tasks_management.html b/tasks/templates/tasks/tasks_management.html
index abe3669..3bb6477 100644
--- a/tasks/templates/tasks/tasks_management.html
+++ b/tasks/templates/tasks/tasks_management.html
@@ -11,8 +11,8 @@
       <a class="btn btn-primary" href="{% url 'tasks-addtask' %}">Neue Aufgabe anlegen</a>
     </div>
   </div>
-  <hr>
-  <div class="row">
+  
+  <div class="row mt-3">
 
     <table class="table">
           <thead>
@@ -30,7 +30,6 @@
               <td>{{ item.area.name }}</td>
               <td>{{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }}</td>
               <td>{{ item.created_area_date }}</td>
-              <td>{{standard.created_standard_by.first_name}} {{standard.created_standard_by.last_name}}</td>
               <td>
                 <div class="dropdown no-arrow">
                   <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/tasks/views.py b/tasks/views.py
index 79229b8..9bea89e 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -18,7 +18,7 @@ class TasksManagement(LoginRequiredMixin, ListView):
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 	#	# Get all Users of the Same Agency as logged user
-		tasks_of_agency = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk)
+		tasks_of_agency = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')
 		context.update({'active_link' : 'tasksmanagement', 'tasks_of_agency':tasks_of_agency})
 		return context
 
diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc
index 1988400..09287f9 100644
Binary files a/users/__pycache__/__init__.cpython-38.pyc and b/users/__pycache__/__init__.cpython-38.pyc differ
diff --git a/users/__pycache__/admin.cpython-38.pyc b/users/__pycache__/admin.cpython-38.pyc
index 407ba3c..131dcf0 100644
Binary files a/users/__pycache__/admin.cpython-38.pyc and b/users/__pycache__/admin.cpython-38.pyc differ
diff --git a/users/__pycache__/apps.cpython-38.pyc b/users/__pycache__/apps.cpython-38.pyc
index cea3da8..e12f316 100644
Binary files a/users/__pycache__/apps.cpython-38.pyc and b/users/__pycache__/apps.cpython-38.pyc differ
diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc
index 9777db5..4d0e60d 100644
Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ
diff --git a/users/__pycache__/priomodel.cpython-38.pyc b/users/__pycache__/priomodel.cpython-38.pyc
index f822ee2..e0c5566 100644
Binary files a/users/__pycache__/priomodel.cpython-38.pyc and b/users/__pycache__/priomodel.cpython-38.pyc differ
diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc
index a854aad..46f1761 100644
Binary files a/users/__pycache__/signals.cpython-38.pyc and b/users/__pycache__/signals.cpython-38.pyc differ
diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc
index 481f925..d28ce66 100644
Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ
diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc
index eff3788..e972567 100644
Binary files a/users/__pycache__/usersforms.cpython-38.pyc and b/users/__pycache__/usersforms.cpython-38.pyc differ
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index 2f2dd81..5ecbd0c 100644
Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ
diff --git a/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc
index 86fdee3..ae1f439 100644
Binary files a/users/migrations/__pycache__/0001_initial.cpython-38.pyc and b/users/migrations/__pycache__/0001_initial.cpython-38.pyc differ
diff --git a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc
index ffe61ff..095b6ca 100644
Binary files a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc and b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc differ
diff --git a/users/migrations/__pycache__/0003_prio.cpython-38.pyc b/users/migrations/__pycache__/0003_prio.cpython-38.pyc
index eb2c2c2..1a17aa4 100644
Binary files a/users/migrations/__pycache__/0003_prio.cpython-38.pyc and b/users/migrations/__pycache__/0003_prio.cpython-38.pyc differ
diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc
index e100748..d799506 100644
Binary files a/users/migrations/__pycache__/__init__.cpython-38.pyc and b/users/migrations/__pycache__/__init__.cpython-38.pyc differ