From 8b23a6301b8f810c9ec8383fb65b88443597acb9 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 21 Oct 2020 18:17:56 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Notfallhilfe,=20Bugs=20Fixed?=
 =?UTF-8?q?=20nach=20neuem=20Deck?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4709 -> 4709 bytes
 digitaleagentur/settings.py                   |   1 +
 recoverdir/forms.py                           |  45 +++----
 recoverdir/models.py                          |  33 +++---
 .../recoverdir/rd_areas/rd_area_1.html        |  10 +-
 .../recoverdir/rd_areas/rd_area_2.html        |   8 +-
 .../recoverdir/rd_areas/rd_area_3.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_4.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_5.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_6.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_7.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_8.html        |   4 +-
 .../recoverdir/rd_areas/rd_area_9.html        |   4 +-
 .../rd_elements_forms/rd_area_1_addfc.html    |   2 +-
 .../rd_elements_forms/rd_area_1_addhl.html    |   9 +-
 .../rd_area_1_contact_del.html                |   4 +-
 .../rd_area_1_contact_single.html             |   8 +-
 .../rd_area_1_hl_single.html                  |  10 +-
 .../rd_area_1_trust_del.html                  |   2 +-
 .../rd_area_1_trust_single.html               |   6 +-
 .../rd_elements_forms/rd_area_2_addhlvf.html  |   8 +-
 .../rd_area_2_hl_single.html                  |  18 +--
 .../rd_elements_forms/rd_mainlogin.html       |   2 +-
 .../templates/recoverdir/rd_external.html     | 110 +++++++++---------
 .../templates/recoverdir/rd_management.html   |  29 ++++-
 recoverdir/templates/recoverdir/rd_rd.html    |  55 +++++----
 .../templates/recoverdir/rd_settings.html     |   7 +-
 .../templates/recoverdir/rd_viewsettings.html |  34 +++---
 recoverdir/views.py                           |  21 +++-
 users/models.py                               |   5 +-
 users/templates/users/errors/404.html         |   2 +-
 users/templates/users/errors/500.html         |   2 +-
 users/views.py                                |   4 +-
 33 files changed, 263 insertions(+), 200 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 33991c0d820130b465c2b9c5c395a6b584e6947e..1dbeb6cc87259f7910f8f8120c5d326798a700fd 100644
GIT binary patch
delta 28
icmaE=@>GR4l$V!_0SNwdcEq=B<h2!IWSi_QBn1F?KnJM+

delta 28
icmaE=@>GR4l$V!_0SJ<BG{yUF<h2!IWS#6SBn1F))dwE{

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 791f3e0..328f000 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -207,6 +207,7 @@ STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),)
 ############################# FÜR COMMIT
 SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..'
 STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/'))
+#STATIC_ROOT = (os.path.join(BASE_DIR, 'users/static/'))
 
 #STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),)
 
diff --git a/recoverdir/forms.py b/recoverdir/forms.py
index 7c5fc38..46799f2 100644
--- a/recoverdir/forms.py
+++ b/recoverdir/forms.py
@@ -51,15 +51,16 @@ class HLForm(forms.ModelForm):
 
 	class Meta:
 		model = Handlungsleitfaden
-		fields = ['rd_main','rd_prename','rd_postname','rd_street','rd_plz','rd_city','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2']
+		fields = ['rd_main','rd_name','rd_adresse','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2']
 		
 		labels = {
 			'rd_main' : "Zuständige RD",
-			'rd_prename': "Vorname RD Leiter",
-			'rd_postname' : "Nachname RD Leiter",
-			'rd_street' : "RD Straße", 
-			'rd_plz' : "RD PLZ",
-			'rd_city' : "RD Stadt",
+			'rd_name': "Vor- und Nachname RD Leiter",
+			#'rd_prename': "Vorname RD Leiter",
+			#'rd_postname' : "Nachname RD Leiter",
+			'rd_adresse' : "RD Adresse", 
+			#'rd_plz' : "RD PLZ",
+			#'rd_city' : "RD Stadt",
 			'rd_tel' : "RD Telefon",
 			'rd_mail' : "RD E-Mail",
 			'bvk_number' : "BVK Nummer",
@@ -73,19 +74,21 @@ class HLFVForm(forms.ModelForm):
 
 	class Meta:
 		model = HandlungsleitfadenVF
-		fields = ['vf_ver_company','vf_ver_name','vf_ver_street','vf_ver_plzcity','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_street','vf_fb_plzcity','vf_fb_tel','vf_fb_mail','vf_rv_name','vf_rv_number','vf_rv_tel_1','vf_rv_tel_2']
+		fields = ['vf_ver_company','vf_ver_name','vf_ver_adresse','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_adresse','vf_fb_tel','vf_fb_mail','vf_rv_name','vf_rv_number','vf_rv_tel_1','vf_rv_tel_2']
 
 		labels = {
 			'vf_ver_company' : "Firma",
 			'vf_ver_name' : 'Name',
-			'vf_ver_street' : "Straße und Hausnummer",
-			'vf_ver_plzcity' : "PLZ und Ort",
+			'vf_ver_adresse' : 'Adresse',
+			#'vf_ver_street' : "Straße und Hausnummer",
+			#'vf_ver_plzcity' : "PLZ und Ort",
 			'vf_ver_tel' : "Telefon",
 			'vf_ver_mail' : "E-Mail",
 			'vf_fb_company' : "Firma",
 			'vf_fb_name' : "Name",
-			'vf_fb_street' : "Straße und Hausnummer",
-			'vf_fb_plzcity': "PLZ und Ort",
+			'vf_fb_adresse' : "Adresse",
+			#'vf_fb_street' : "Straße und Hausnummer",
+			#'vf_fb_plzcity': "PLZ und Ort",
 			'vf_fb_tel' : "Telefon",
 			'vf_fb_mail' : "E-Mail",
 			'vf_rv_name' : "Name",
@@ -179,15 +182,17 @@ class RDContactF(forms.ModelForm):
 	class Meta:
 		model = RDContact
 
-		fields = ['rd_prename','rd_postname','rd_rel','rd_adresse','rd_tel']
-
+		fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail']
+		
+		
 		labels = {
-			'rd_prename' : "Vorname",
-			'rd_postname' : "Nachname", 
+			'rd_name' : "Vor- und Nachname",
 			'rd_rel' : "Beziehung",
 			'rd_adresse' : "Adresse",
+			'rd_mail' : "E-Mailadresse",
 			'rd_tel' : "Telefon"
 		}	
+		
 
 # ERgo Digitaler Versicherungsordern
 class ErgoVerDirF(forms.ModelForm):
@@ -243,16 +248,16 @@ class RDTrustPersonF(forms.ModelForm):
 
 	class Meta:
 		model = RDTrustPerson
-
-		fields = ['rd_prename','rd_postname','rd_company','rd_adresse','rd_tel']
-
+		
+		fields = ['rd_name','rd_company','rd_adresse','rd_tel', 'rd_mail']
 		labels = {
-			'rd_prename' : "Vorname",
-			'rd_postname' : "Nachname", 
+			'rd_name' : "Vor- und Nachname",			
 			'rd_company' : "Firma",
 			'rd_adresse' : "Adresse",
+			'rd_mail' : "E-Mailadresse",
 			'rd_tel' : "Telefon"
 		}	
+		
 
 # Banken usw.
 class DepositVollmachtF(forms.ModelForm):
diff --git a/recoverdir/models.py b/recoverdir/models.py
index e15c6dc..9de7752 100644
--- a/recoverdir/models.py
+++ b/recoverdir/models.py
@@ -39,11 +39,13 @@ class PersLetter(models.Model):
 class Handlungsleitfaden(models.Model):
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
 	rd_main = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))
 	bvk_number = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
@@ -56,21 +58,24 @@ class Handlungsleitfaden(models.Model):
 # Contacts
 class RDContact(models.Model):
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
-	rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_rel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))	
 	rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_mail = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	history = HistoricalRecords()
 
 # Vertrauensperson
 class RDTrustPerson(models.Model):
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
-	rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	rd_mail = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	history = HistoricalRecords()
 
 # DOKUMENTE ALLGEMEIN
@@ -90,15 +95,17 @@ class HandlungsleitfadenVF(models.Model):
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
 	vf_ver_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_ver_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	vf_ver_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	vf_ver_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	vf_ver_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#vf_ver_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#vf_ver_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_ver_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_ver_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))
 
 	vf_fb_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_fb_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	vf_fb_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
-	vf_fb_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	vf_fb_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#vf_fb_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	#vf_fb_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_fb_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	vf_fb_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True))
 	
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html
index 9c04da6..30b4427 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html
@@ -6,7 +6,7 @@
 {% endif %}
 
 <hr>
-<h4>Familie und Freunde
+<h4>Familie & Freunde {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie Kontakdaten von Familien und Freunden." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a1-addfamily' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Kontakt</a>
 </h4>
 <table class="table table-hover" id="a1_fc" >
@@ -16,16 +16,18 @@
         <th scope="col">Beziehung</th>
         <th scope="col">Adresse</th>
         <th scope="col">Telefon</th>
+        <th scope="col">E-Mail</th>
         <th scope="col">&nbsp;</th>
       </tr>
     </thead>
     <tbody >
     	{% for familyc in area_1_fc %}
     	<tr>
-    		<td><a href="{% url 'rd-a1-viewcontact' familyc.pk %}">{{familyc.rd_prename|default:""}} {{familyc.rd_postname|default:""}}</a></td>
+    		<td><a href="{% url 'rd-a1-viewcontact' familyc.pk %}">{{familyc.rd_name|default:""}}</a></td>
     		<td>{{familyc.rd_rel|default:""}}</td>
     		<td>{{familyc.rd_adresse|default:""}}</td>
     		<td>{{familyc.rd_tel|default:""}}</td>
+        <td>{{familyc.rd_mail|default:""}}</td>
     		<td>
           <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a1-viewcontact' familyc.pk %}"><i class="far fa-eye"></i></a>&nbsp;
           <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a1-updatecontact' familyc.pk %}"><small><i class="fas fa-pen"></i></small></a>&nbsp;
@@ -37,7 +39,7 @@
   </table>
 
 <hr>
-<h4>Vertrauensperson
+<h4>Vertrauensperson {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie Kontakdaten Personen, denen Sie alle Daten anvertrauen." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a1-addtrust' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vertrauensperson</a>
 </h4>
 <table class="table table-hover" id="a1_trust" >
@@ -68,7 +70,7 @@
   </table>
 
 <hr>
-<h4>Vorsorgedokumente
+<h4>Vorsorgedokumente {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie hier Vorsorgedokumente." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a1-adddoc' 1 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vorsorgedokument</a>
 </h4>
 <table class="table table-hover" id="a1_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html
index 1a0a14f..3c340c4 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html
@@ -5,7 +5,7 @@
 {% endif %}
 
 <hr>
-<h4>Bank-, Konto- & Depot-Vollmachten
+<h4>Bank-, Konto- & Depot-Vollmachten{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Laden Sie hier Bank-, Konto- und Depotvollmachen hoch." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a2-adddeposit' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vollmacht</a>
 </h4>
 <table class="table table-hover" id="a2_deposit" >
@@ -34,7 +34,7 @@
   </table>
 
 <hr>
-<h4>Digitaler Versicherungsordner
+<h4>Digitaler Versicherungsordner{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier die Zugangsdaten zum Ergo-Versicherungsordner." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a2-addergo' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Zugangsdaten</a>
 </h4>
 <table class="table table-hover" id="a2_ergo" >
@@ -60,7 +60,7 @@
 
 
 <hr>
-<h4>Online-Banking
+<h4>Online-Banking{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie hier Zugänge zu Online-Banking-Diensten." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a2-addonlinebank' 2 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Banking</a>
 </h4>
 <table class="table table-hover" id="area_2_onlinebank" >
@@ -86,7 +86,7 @@
 
 
 <hr>
-<h4>Wertpapiere, Versicherungsscheine & Altersvorsorge 
+<h4>Wertpapiere, Versicherungsscheine & Altersvorsorge{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Dokumente Ihrer Wertpapiere, Versicherungsscheine sowie Dokumente für Ihre Altersvorsorge." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a1-adddoc' 2 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a2_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html
index 3bff7c3..afddb05 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html
@@ -1,4 +1,4 @@
-<h4>Streaming Abonnements
+<h4>Streaming Abonnements{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie Login-Daten für Streaming-Dienste wie Netflix usw.." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a3-addstreaming' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Streaming-Abo</a>
 </h4>
 <table class="table table-hover" id="a3_abos" >
@@ -24,7 +24,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Verträge 
+<h4>Verträge{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Dokumente für weitere Vertärge aller Art, z.B. Webseiten, Handyverträge usw.." class="far fa-question-circle"></i></small>{% endif %}
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 3 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a3_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html
index d7966e6..9807552 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html
@@ -1,4 +1,4 @@
-<h4>Online-Accounts (Messenger, E-Mail-Accounts, Social-Media etc.)
+<h4>Online-Accounts{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie hier Zugänge für Online-Accounts, z.B. Messenger, E-Mail-Accounts, Social-Media etc.." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a4-adddigitalaccount' 4 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Account</a>
 </h4>
 <table class="table table-hover" id="a4_digitalaccount" >
@@ -26,7 +26,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Dokumente 
+<h4>Dokumente {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinerlegen Sie hier weitere Dokumente für diesen Bereich." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 4 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a4_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html
index 3de1714..cbd72ee 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html
@@ -1,4 +1,4 @@
-<h4>Personal, interne und externe Partner inkl. Funktionen usw.
+<h4>Personal, interne & externe Partner inkl. Funktionen usw.{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hinterlegen Sie hier Kontaktdaten der Mitarbeiter sowie interne und externe Partner. Das Organigramm wird immer dynamisch generiert." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a5-addpersonal' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Personal</a>
 </h4>
 <hr>
@@ -42,7 +42,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Dokumente, Vertretungsregeln & Zugriffsberechtigungen 
+<h4>Dokumente, Vertretungsregeln & Zugriffsberechtigungen {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier weitere Dokumente bzgl. Vertretungsregeln und Zugriffsberechtigungen." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 5 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a5_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html
index f5c94ed..bbc0e2b 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html
@@ -1,4 +1,4 @@
-<h4>Bankkonten und Online-Bankzugänge
+<h4>Bankkonten & Online-Bankzugänge{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Zugänge zu Online-Diensten Ihrer Agentur." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a2-addonlinebank' 6 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Banking</a>
 </h4>
 <table class="table table-hover" id="area_6_onlinebank" >
@@ -22,7 +22,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Dokumente 
+<h4>Dokumente {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Laden Sie hier weitere Dokumente bzgl. weiterer Dienste hoch." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 6 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a6_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html
index e7aa046..38ce011 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html
@@ -1,4 +1,4 @@
-<h4>Verträge 
+<h4>Verträge {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Verträge für Ihre Agentur." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a7-addcontract' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vertrag</a>
 </h4>
 <table class="table table-hover" id="a7_contract" >
@@ -23,7 +23,7 @@
     {% endfor %}
    </tbody>
 </table>
-<h4>Dokumente 
+<h4>Dokumente {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Laden Sie hier weitere Dokumente hoch." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 7 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a7_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html
index caad609..861b312 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html
@@ -1,4 +1,4 @@
-<h4>Digitale Accounts (Webseiten, E-Mail etc.)
+<h4>Digitale Accounts{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie hier Zugänge zu Webseiten, E-Mailkonten usw. für Ihre Agentur an." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a4-adddigitalaccount' 8 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Account</a>
 </h4>
 <table class="table table-hover" id="a8_digitalaccount" >
@@ -26,7 +26,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Dokumente 
+<h4>Dokumente{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Laden Sie hier weitere Dokumente hoch." class="far fa-question-circle"></i></small>{% endif %}  
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 8 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a8_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html
index d628930..faa5734 100644
--- a/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html
+++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html
@@ -1,4 +1,4 @@
-<h4>Sonstige Datenelemente
+<h4>Sonstige Datenelemente{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hier können Sie weitere Daten hochladen, die für die Notfallhilfe relevant, aber nicht weiter zugeordnet werden können." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a9-addelse'%}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Information</a>
 </h4>
 <table class="table table-hover" id="area_6_else" >
@@ -24,7 +24,7 @@
     </tbody>
   </table>
 <hr>
-<h4>Dokumente 
+<h4>Dokumente {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier weitere Dokumente für die Notfallhilfe, die nicht weiter zugeordnet werden können." class="far fa-question-circle"></i></small>{% endif %} 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 9 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
 <table class="table table-hover" id="a9_docs" >
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html
index 9e8f59b..31f8738 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html
@@ -3,7 +3,7 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-9">
-  <h3>Familien/Freundekontakt bearbeiten</h3>
+  <h3>Familien & Freundekontakt bearbeiten</h3>
   <hr>  
   <form method="POST"  enctype="multipart/form-data">
       {% csrf_token %}
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html
index 408ea21..c288c52 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html
@@ -11,18 +11,15 @@
       
       <h4>Daten der Regionaldirektion</h4>
       {{form.rd_main|as_crispy_field}}
-      {{form.rd_prename|as_crispy_field}}
-      {{form.rd_postname|as_crispy_field}}
-      {{form.rd_street|as_crispy_field}} 
-      {{form.rd_plz|as_crispy_field}} 
-      {{form.rd_city|as_crispy_field}}  
+      {{form.rd_name|as_crispy_field}}
+      {{form.rd_adresse|as_crispy_field}} 
       {{form.rd_tel|as_crispy_field}} 
       {{form.rd_mail|as_crispy_field}} 
     <hr>
     <h4>BVK Mitgliedsnummer</h4>
     {{form.bvk_number|as_crispy_field}} 
     <hr>   
-    <h4>Rechtsschutzersicherungsdaten</h4>
+    <h4>Rechtsschutzversicherungsdaten</h4>
     {{form.rv_name|as_crispy_field}} 
     {{form.rv_number|as_crispy_field}} 
     {{form.rv_tel_1|as_crispy_field}} 
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html
index 255b43e..f926bbe 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html
@@ -3,12 +3,12 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-9">
-  <h3>Familien- und Freundekontakt löschen</h3>
+  <h3>Familien- & Freundekontakt löschen</h3>
   <hr>  
   <form method="POST"  enctype="multipart/form-data">
       {% csrf_token %}
       {{ form|crispy }} 
-      Möchten Sie den Kontakt <i>{{contact.rd_prename}} {{contact.rd_postname}}</i> wirklich endgültig löschen?
+      Möchten Sie den Kontakt <i>{{contact.rd_name}}</i> wirklich endgültig löschen?
     <hr>   
     <a class="btn" href="{% url 'recoverdir' %} ">Abbrechen</a>
     <button type="submit" class="btn btn-primary" style="float: right;">Kontakt endgültig löschen</button>&nbsp;
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html
index 3692386..c5f6926 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html
@@ -2,7 +2,7 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-12">
-    <h3>Familien- und Freundekontakt {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %}
+    <h3>Familien- & Freundekontakt {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %}
       <span style="float: right">
           <a href="{% url 'recoverdir'%}" style="float: right"  class="btn btn-secondary btn-sm "><small><i class="fas fa-chevron-circle-left"></i></small></a>
       </span>
@@ -12,7 +12,7 @@
     <table>
       <tr>
         <td>Name:</td>
-        <td>{{contact.rd_prename}} {{contact.rd_postname}}</td>
+        <td>{{contact.rd_name}}</td>
       </tr>
       <tr>
         <td>Beziehung:</td>
@@ -26,6 +26,10 @@
         <td>Telefonnummer:</td>
         <td>{{contact.rd_tel}}</td>
       </tr>
+      <tr>
+        <td>E-Mail:</td>
+        <td>{{contact.rd_mail}}</td>
+      </tr>
 
     </table>
     <hr>
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html
index c74bcc2..0492c96 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html
@@ -16,15 +16,11 @@
       </tr>
       <tr>
         <td>Name des RD-Leiters</td>
-        <td>{{hl.rd_prename|default:""}} {{hl.rd_postname|default:""}}</td>
+        <td>{{hl.rd_name|default:""}}</td>
       </tr>
       <tr>
-        <td>Straße RD</td>
-        <td>{{hl.rd_street|default:""}}</td>
-      </tr>
-      <tr>
-        <td>PLZ Ort</td>
-        <td>{{hl.rd_plz|default:""}} {{hl.rd_city|default:""}}</td>
+        <td>Adresse RD</td>
+        <td>{{hl.rd_adresse|default:""}}</td>
       </tr>
       <tr>
         <td>Telefon</td>
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html
index 9a82e8f..a4aa0d5 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html
@@ -8,7 +8,7 @@
   <form method="POST"  enctype="multipart/form-data">
       {% csrf_token %}
       {{ form|crispy }} 
-      Möchten Sie die Vertrauensperson <i>{{contact.rd_prename}} {{contact.rd_postname}}</i> wirklich endgültig löschen?
+      Möchten Sie die Vertrauensperson <i>{{contact.rd_name}}</i> wirklich endgültig löschen?
     <hr>   
     <a class="btn" href="{% url 'recoverdir' %} ">Abbrechen</a>
     <button type="submit" class="btn btn-primary" style="float: right;">Vertrauensperson endgültig löschen</button>&nbsp;
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html
index f57857f..9f05a45 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html
@@ -12,7 +12,7 @@
     <table>
       <tr>
         <td>Name:</td>
-        <td>{{contact.rd_prename}} {{contact.rd_postname}}</td>
+        <td>{{contact.rd_name}}</td>
       </tr>
       <tr>
         <td>Firma:</td>
@@ -26,6 +26,10 @@
         <td>Telefonnummer:</td>
         <td>{{contact.rd_tel}}</td>
       </tr>
+      <tr>
+        <td>Telefonnummer:</td>
+        <td>{{contact.rd_mail}}</td>
+      </tr>
 
     </table>
     <hr>
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html
index 6ae9603..6ffa611 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html
@@ -3,7 +3,7 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-9">
-  <h3>Handlungsleitfaden Vorsroge und Finanzen bearbeiten</h3>
+  <h3>Handlungsleitfaden Vorsorge & Finanzen bearbeiten</h3>
   <hr>  
   <form method="POST"  enctype="multipart/form-data">
       {% csrf_token %}
@@ -12,16 +12,14 @@
       <h4>1. Daten des zuständigen Versicherungsberaters</h4>
       {{form.vf_ver_company|as_crispy_field}}
       {{form.vf_ver_name|as_crispy_field}}
-      {{form.vf_ver_street|as_crispy_field}}
-      {{form.vf_ver_plzcity|as_crispy_field}}
+      {{form.vf_ver_adresse|as_crispy_field}}
       {{form.vf_ver_tel|as_crispy_field}}
       {{form.vf_ver_mail|as_crispy_field}}
       <hr>
       <h4>2. Daten des zuständigen Finanzberaters</h4>
       {{form.vf_fb_company|as_crispy_field}}
       {{form.vf_fb_name|as_crispy_field}}
-      {{form.vf_fb_street|as_crispy_field}}
-      {{form.vf_fb_plzcity|as_crispy_field}}
+      {{form.vf_fb_adresse|as_crispy_field}}
       {{form.vf_fb_tel|as_crispy_field}}
       {{form.vf_fb_mail|as_crispy_field}}
       <hr>
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html
index 08a8332..20d7f94 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html
@@ -19,12 +19,8 @@
         <td>{{hlvf.vf_ver_name|default:""}}</td>
       </tr>
       <tr>
-        <td>Straße Nr.</td>
-        <td>{{hlvf.vf_ver_street|default:""}}</td>
-      </tr>
-      <tr>
-        <td>PLZ Ort</td>
-        <td>{{hlvf.vf_ver_plzcity|default:""}}</td>
+        <td>Adresse</td>
+        <td>{{hlvf.vf_ver_adresse|default:""}}</td>
       </tr>
       <tr>
         <td>Telefon</td>
@@ -47,14 +43,10 @@
         <td>{{hlvf.vf_fb_name|default:""}}</td>
       </tr>
       <tr>
-        <td>Straße Nr.</td>
-        <td>{{hlvf.vf_fb_street|default:""}}</td>
+        <td>Adresse</td>
+        <td>{{hlvf.vf_fb_adresse|default:""}}</td>
       </tr>
-      <tr>
-        <td>PLZ Ort</td>
-        <td>{{hlvf.vf_fb_plzcity|default:""}}</td>
-      </tr>
-      <tr>
+     <tr>
         <td>Telefon</td>
         <td>{{hlvf.vf_fb_tel|default:""}}</td>
       </tr>
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html
index d1bac55..6b14e59 100644
--- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html
+++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html
@@ -4,7 +4,7 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-12">
-  <h3>Notfallhilfe{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie hier die wichtigsten Dokumente für sich und Ihre Agentur an." class="far fa-question-circle"></i></small>{% endif %}
+  <h3>Notfallhilfe {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie hier die wichtigsten Dokumente für sich und Ihre Agentur an." class="far fa-question-circle"></i></small>{% endif %}
   <!-- TASK: Video für Notfallhilfe <small><i onclick="javascript:$('#youtubevideoinformation').modal('toggle');" class="far fa-play-circle"></i></small>-->
 </h3>  
   <hr>
diff --git a/recoverdir/templates/recoverdir/rd_external.html b/recoverdir/templates/recoverdir/rd_external.html
index e5d5368..f2e02a6 100644
--- a/recoverdir/templates/recoverdir/rd_external.html
+++ b/recoverdir/templates/recoverdir/rd_external.html
@@ -4,26 +4,31 @@
 <style type="text/css">
 .square_private_arrow {
   float: right;
-  margin-right: 0px;
-    width: 65px;
-    height: 65px;
-    background-color: red;
+  margin-right: -20px;
+  margin-top: -13px;
+  margin-bottom: -13px;
+    width: 35px;
+    height: 83px;
+    background-color: #ee1b3b;
     color: #ffffff;
-    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%, 25% 50%);
+    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
 }
 
 .square_company_arrow {
   float: right;
-  margin-right: 0px;
-    width: 65px;
-    height: 65px;
-    background-color: black;
+  margin-right: -20px;
+  margin-top: -13px;
+  margin-bottom: -13px;
+    width: 35px;
+    height: 83px;
+    background-color: #5c5554;
     color: #ffffff;
-    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%, 25% 50%);
+    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
 }
 .h2_in_arrow {
-  margin-left: 23px;
-  margin-top:  13px;
+  margin-left: 12px;
+  margin-top:  2px;
+  font-size: 16pt;
 }
 
 .tabelement {
@@ -43,7 +48,8 @@
   <h2>Notfallhilfe für die Agentur {{agencydata.name}}
     <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'closeexternalrecoverdir' agencydata.pk %}"><i class="fas fa-lock"></i></a>
   </h2>
-  
+  <hr>
+  <h3 style="color: #ee1b3b; font-style: bold;">Private Unterlagen</h3>
 <!-- ACCORDION START -->
 <div id="accordion">
   <!-- 1. NOTFALLLEITFADEN -->
@@ -54,7 +60,7 @@
           <h4 style="margin-top: 11px;">1. Handlungsleitfaden & Vorsorgedokumente</h4>
         </button>
         <span style="float: right;">
-          <span class="square_private_arrow"><h2 class="h2_in_arrow">#1</h2></span>
+          <span class="square_private_arrow"><h2 class="h2_in_arrow">1</h2></span>
         </span>
       </h5>
     </div>
@@ -87,15 +93,11 @@
                     </tr>
                     <tr>
                       <td>Name des RD-Leiters</td>
-                      <td>{{hl.rd_prename|default:""}} {{hl.rd_postname|default:""}}</td>
+                      <td>{{hl.rd_name|default:""}}</td>
                     </tr>
                     <tr>
-                      <td>Straße RD</td>
-                      <td>{{hl.rd_street|default:""}}</td>
-                    </tr>
-                    <tr>
-                      <td>PLZ Ort</td>
-                      <td>{{hl.rd_plz|default:""}} {{hl.rd_city|default:""}}</td>
+                      <td>Adresse</td>
+                      <td>{{hl.rd_adresse|default:""}}</td>
                     </tr>
                     <tr>
                       <td>Telefon</td>
@@ -166,15 +168,17 @@
               <th scope="col">Beziehung</th>
               <th scope="col">Adresse</th>
               <th scope="col">Telefon</th>
+              <th scope="col">E-Mail</th>
             </tr>
           </thead>
           <tbody >
             {% for familyc in area_1_fc %}
             <tr>
-              <td><a href="/#" data-toggle="modal" data-target="#familyc_{{familyc.pk}}">{{familyc.rd_prename|default:""}} {{familyc.rd_postname|default:""}}</a></td>
+              <td><a href="/#" data-toggle="modal" data-target="#familyc_{{familyc.pk}}">{{familyc.rd_name|default:""}}</a></td>
               <td>{{familyc.rd_rel|default:""}}</td>
               <td>{{familyc.rd_adresse|default:""}}</td>
               <td>{{familyc.rd_tel|default:""}}</td>
+              <td>{{familyc.rd_mail|default:""}}</td>
             </tr>
             {% endfor %}
           </tbody>
@@ -190,15 +194,17 @@
                 <th scope="col">Firma</th>
                 <th scope="col">Adresse</th>
                 <th scope="col">Telefon</th>
+                <th scope="col">E-Mail</th>
               </tr>
             </thead>
             <tbody >
               {% for trust in area_1_trust %}
               <tr>
-                <td><a href="/#" data-toggle="modal" data-target="#trust_{{trust.pk}}">{{trust.rd_prename|default:""}} {{trust.rd_postname|default:""}}</a></td>
+                <td><a href="/#" data-toggle="modal" data-target="#trust_{{trust.pk}}">{{trust.rd_name|default:""}}</a></td>
                 <td>{{trust.rd_company|default:""}}</td>
                 <td>{{trust.rd_adresse|default:""}}</td>
                 <td>{{trust.rd_tel|default:""}}</td>
+                <td>{{trust.rd_mail|default:""}}</td>
               </tr>
               {% endfor %}
             </tbody>
@@ -248,7 +254,7 @@
           <table>
           <tr>
             <td>Name:</td>
-            <td>{{familyc.rd_prename|default:""}} {{familyc.rd_postname|default:""}}</td>
+            <td>{{familyc.rd_name|default:""}}</td>
           </tr>
           <tr>
             <td>Beziehung:</td>
@@ -262,7 +268,10 @@
             <td>Telefonnummer:</td>
             <td>{{familyc.rd_tel|default:""}}</td>
           </tr>
-
+          <tr>
+            <td>E-Mailadresse:</td>
+            <td>{{familyc.rd_mail|default:""}}</td>
+          </tr>
         </table>
 
 
@@ -290,7 +299,7 @@
         <table>
           <tr>
             <td>Name:</td>
-            <td>{{trust.rd_prename}} {{trust.rd_postname}}</td>
+            <td>{{trust.rd_name}}</td>
           </tr>
           <tr>
             <td>Firma:</td>
@@ -304,6 +313,10 @@
             <td>Telefonnummer:</td>
             <td>{{trust.rd_tel}}</td>
           </tr>
+          <tr>
+            <td>E-Mailadresse:</td>
+            <td>{{trust.rd_mail|default:""}}</td>
+          </tr>
         </table>
       </div>
       <div class="modal-footer">
@@ -322,7 +335,7 @@
         <h4 style="margin-top: 11px;">2. Absicherung, Vermögen & Immobilien</h4>
       </button>
   <span style="float: right;">
-        <span class="square_private_arrow"><h2 class="h2_in_arrow">#2</h2></span>
+        <span class="square_private_arrow"><h2 class="h2_in_arrow">2</h2></span>
       </span>
     </h5>
   </div>
@@ -441,12 +454,8 @@
               <td>{{hlvf.vf_ver_name|default:""}}</td>
             </tr>
             <tr>
-              <td>Straße Nr.</td>
-              <td>{{hlvf.vf_ver_street|default:""}}</td>
-            </tr>
-            <tr>
-              <td>PLZ Ort</td>
-              <td>{{hlvf.vf_ver_plzcity|default:""}}</td>
+              <td>Adresse</td>
+              <td>{{hlvf.vf_ver_adresse|default:""}}</td>
             </tr>
             <tr>
               <td>Telefon</td>
@@ -469,19 +478,15 @@
               <td>{{hlvf.vf_fb_name|default:""}}</td>
             </tr>
             <tr>
-              <td>Straße Nr.</td>
-              <td>{{hlvf.vf_fb_street|default:""}}</td>
-            </tr>
-            <tr>
-              <td>PLZ Ort</td>
-              <td>{{hlvf.vf_fb_plzcity|default:""}}</td>
-            </tr>
+              <td>Adresse</td>
+              <td>{{hlvf.vf_fb_adresse|default:""}}</td>
+            </tr>            
             <tr>
               <td>Telefon</td>
               <td>{{hlvf.vf_fb_tel|default:""}}</td>
             </tr>
             <tr>
-              <td>PE-Mail</td>
+              <td>E-Mail</td>
               <td>{{hlvf.vf_fb_mail|default:""}}</td>
             </tr>
           </table>
@@ -673,7 +678,7 @@
         <h4 style="margin-top: 11px;">3. Verträge</h4>
       </button>
   <span style="float: right;">
-        <span class="square_private_arrow"><h2 class="h2_in_arrow">#3</h2></span>
+        <span class="square_private_arrow"><h2 class="h2_in_arrow">3</h2></span>
       </span>
     </h5>
   </div>
@@ -781,7 +786,7 @@
         <h4 style="margin-top: 11px;">4. Digitale Konten & Passwörter</h4>
       </button>
   <span style="float: right;">
-        <span class="square_private_arrow"><h2 class="h2_in_arrow">#4</h2></span>
+        <span class="square_private_arrow"><h2 class="h2_in_arrow">4</h2></span>
       </span>
     </h5>
   </div>
@@ -880,10 +885,6 @@
             <td>{{account.accountactivity|default:""}}</td>
           </tr>
         </table>
-
-
-
-
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
@@ -892,7 +893,8 @@
   </div>
 </div>
 {% endfor %}
-
+  <br />
+  <h3 style="color: #5c5554; font-style: bold;">Gewerbliche Unterlagen</h3>
   <!-- GEWERBE -->
   <!-- 5. Vorsorgedokumente -->
   <div class="card">
@@ -902,7 +904,7 @@
           <h4 style="margin-top: 11px;">5. Vorsorgedokumente</h4>
         </button>
     <span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#5</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">5</h2></span>
         </span>
       </h5>
     </div>
@@ -1094,10 +1096,10 @@
   <div class="card-header" id="headingOne">
     <h5 class="mb-0">
       <button class="btn btn-link tabelement"  data-toggle="collapse" data-target="#rd_6" aria-expanded="true" aria-controls="rd_6">
-        <h4 style="margin-top: 11px;">6. Vorsorge und Finanzen</h4>
+        <h4 style="margin-top: 11px;">6. Vorsorge & Finanzen</h4>
       </button>
   <span style="float: right;">
-        <span class="square_company_arrow"><h2 class="h2_in_arrow">#6</h2></span>
+        <span class="square_company_arrow"><h2 class="h2_in_arrow">6</h2></span>
       </span>
     </h5>
   </div>
@@ -1209,7 +1211,7 @@
         <h4 style="margin-top: 11px;">7. Immobilien</h4>
       </button>
   <span style="float: right;">
-        <span class="square_company_arrow"><h2 class="h2_in_arrow">#7</h2></span>
+        <span class="square_company_arrow"><h2 class="h2_in_arrow">7</h2></span>
       </span>
     </h5>
   </div>
@@ -1336,7 +1338,7 @@
         <h4 style="margin-top: 11px;">8. Verträge</h4>
       </button>
   <span style="float: right;">
-        <span class="square_company_arrow"><h2 class="h2_in_arrow">#8</h2></span>
+        <span class="square_company_arrow"><h2 class="h2_in_arrow">8</h2></span>
       </span>
     </h5>
   </div>
@@ -1456,7 +1458,7 @@
         <h4 style="margin-top: 11px;">9. Sonstiges</h4>
       </button>
   <span style="float: right;">
-        <span class="square_company_arrow"><h2 class="h2_in_arrow">#9</h2></span>
+        <span class="square_company_arrow"><h2 class="h2_in_arrow">9</h2></span>
       </span>
     </h5>
   </div>
diff --git a/recoverdir/templates/recoverdir/rd_management.html b/recoverdir/templates/recoverdir/rd_management.html
index ab6b39b..24c4dd4 100644
--- a/recoverdir/templates/recoverdir/rd_management.html
+++ b/recoverdir/templates/recoverdir/rd_management.html
@@ -7,6 +7,10 @@
   <!-- TASK: Video für Notfallhilfe <small><i onclick="javascript:$('#youtubevideoinformation').modal('toggle');" class="far fa-play-circle"></i></small>-->
   <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'closerecoverdir' %}"><i class="fas fa-lock"></i></a>
 </h3>  
+  <hr>
+  <div class="progress mb-2" style="height: 15px;">
+  <div class="progress-bar" role="progressbar" aria-valuenow="{{rd_level}}" style="width: {{rd_level}}%;" aria-valuemin="0" aria-valuemax="100"><b style="color: #ffffff; padding-left: 5px">Hinterleger Datenbestand {{rd_level}}/100</b></div>
+</div>
   <hr>
   <div class="row">
     <div class="col-12">
@@ -24,7 +28,7 @@
           <a class="nav-link " id="pers" style="" data-toggle="tab" href="#t_pers" role="tab" aria-controls="t_pers" aria-selected="false"> Persönliches Schreiben</a>
       </li>
       <li class="nav-item ml-auto" >
-          <a class="nav-link" id="settings" data-toggle="tab" href="#t_settings" role="tab" aria-controls="t_settings" aria-selected="false">Einstellungen</a>
+          <a class="nav-link" id="settings" data-toggle="tab" href="#t_settings" role="tab" aria-controls="t_settings" aria-selected="false">Sicherheit</a>
       </li>
       <li class="nav-item " >
           <a class="nav-link" id="help" data-toggle="tab" href="#t_help" role="tab" aria-controls="t_help" aria-selected="false">Hilfe & Kontakt</a>
@@ -64,7 +68,7 @@
       </div>
 
       <div class="tab-pane fade" id="t_settings" role="tabpanel" aria-labelledby="settings">
-        <h5 class="mt-3">Einstellungen{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier die Einstellungen für den Zugang zur Notfallhilfe." class="far fa-question-circle"></i></small>{% endif %}</h5>
+        <h5 class="mt-3">Sicherheit{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Sehen Sie hier die Zugangsdaten für den externen Zugang ein." class="far fa-question-circle"></i></small>{% endif %}</h5>
         {% block settings_content %}
            {% include "recoverdir/rd_viewsettings.html" %}
         {% endblock %}
@@ -88,6 +92,27 @@
           </div>
         </div>
         <hr>
+        <div class="card">  
+        <div class="card-body">
+            <p class="card-text">
+            Bei rechtlichen Fragen melden Sie sich bitte bei dem BVK.
+            <br />
+            <b>Bundesverband Deutscher Versicherungskaufleute e.V.</b><br />
+            Kikuléstraße 12<br />
+            53115 Bonn<br /><br />
+            Telefon: 0228/228050<br />
+            E-Mail: bvk@bvk.de<br />
+            </p>
+          </div>
+        </div>
+        <hr>
+        <div class="card">  
+        <div class="card-body">
+            <p class="card-text">
+            Bei technischen Fragen nutzen Sie bitte das <a href="{% url 'supportda' %}">Supportformular</a>.
+          </div>
+        </div>
+        <hr>
       </div>
     </div>
   </div>
diff --git a/recoverdir/templates/recoverdir/rd_rd.html b/recoverdir/templates/recoverdir/rd_rd.html
index 9dc0398..83f98b4 100644
--- a/recoverdir/templates/recoverdir/rd_rd.html
+++ b/recoverdir/templates/recoverdir/rd_rd.html
@@ -2,32 +2,38 @@
 	
 .square_private_arrow {
 	float: right;
-	margin-right: 0px;
-    width: 65px;
-    height: 65px;
-    background-color: red;
+	margin-right: -20px;
+  margin-top: -13px;
+  margin-bottom: -13px;
+    width: 35px;
+    height: 83px;
+    background-color: #ee1b3b;
     color: #ffffff;
-    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%, 25% 50%);
+    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
 }
 
 .square_company_arrow {
 	float: right;
-	margin-right: 0px;
-    width: 65px;
-    height: 65px;
-    background-color: black;
+  margin-right: -20px;
+  margin-top: -13px;
+  margin-bottom: -13px;
+    width: 35px;
+    height: 83px;
+    background-color: #5c5554;
     color: #ffffff;
-    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%, 25% 50%);
+    -webkit-clip-path:polygon(0% 0%, 100% 0%, 100% 100%, 0% 100%);
 }
 .h2_in_arrow {
-	margin-left: 23px;
-	margin-top:  13px;
+	margin-left: 12px;
+	margin-top:  2px;
+  font-size: 16pt;
 }
 
 .tabelement {
 
 }
 </style>
+<h3 style="color: #ee1b3b; font-style: bold;">Private Unterlagen</h3>
 <div id="accordion">
 	<!-- 1. NOTFALLLEITFADEN -->
 	<div class="card">
@@ -37,7 +43,7 @@
           <h4 style="margin-top: 11px;">1. Notfallleitfaden & Vorsorgedokumente</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_private_arrow"><h2 class="h2_in_arrow">#1</h2></span>
+          <span class="square_private_arrow"><h2 class="h2_in_arrow">1</h2></span>
       	</span>
       </h5>
     </div>
@@ -60,7 +66,7 @@
           <h4 style="margin-top: 11px;">2. Absicherung, Vermögen & Immobilien</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_private_arrow"><h2 class="h2_in_arrow">#2</h2></span>
+          <span class="square_private_arrow"><h2 class="h2_in_arrow">2</h2></span>
       	</span>
       </h5>
     </div>
@@ -82,7 +88,7 @@
           <h4 style="margin-top: 11px;">3. Verträge</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_private_arrow"><h2 class="h2_in_arrow">#3</h2></span>
+          <span class="square_private_arrow"><h2 class="h2_in_arrow">3</h2></span>
       	</span>
       </h5>
     </div>
@@ -104,7 +110,7 @@
           <h4 style="margin-top: 11px;">4. Digitale Konten & Passwörter</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_private_arrow"><h2 class="h2_in_arrow">#4</h2></span>
+          <span class="square_private_arrow"><h2 class="h2_in_arrow">4</h2></span>
       	</span>
       </h5>
     </div>
@@ -117,8 +123,9 @@
       </div>
     </div>
   </div>
-
-
+  <br />
+  <h3 style="color: #5c5554; font-style: bold;">Gewerbliche Unterlagen</h3>
+  
   <!-- GEWERBE -->
   <!-- 5. Vorsorgedokumente -->
 	<div class="card">
@@ -128,7 +135,7 @@
           <h4 style="margin-top: 11px;">5. Vorsorgedokumente</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#5</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">5</h2></span>
       	</span>
       </h5>
     </div>
@@ -147,10 +154,10 @@
     <div class="card-header" id="headingOne">
       <h5 class="mb-0">
         <button class="btn btn-link tabelement" onclick="javascript:newTabOpen(6)" data-toggle="collapse" data-target="#rd_6" aria-expanded="true" aria-controls="rd_6">
-          <h4 style="margin-top: 11px;">6. Vorsorge und Finanzen</h4>
+          <h4 style="margin-top: 11px;">6. Vorsorge & Finanzen</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#6</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">6</h2></span>
       	</span>
       </h5>
     </div>
@@ -172,7 +179,7 @@
           <h4 style="margin-top: 11px;">7. Immobilien</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#7</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">7</h2></span>
       	</span>
       </h5>
     </div>
@@ -194,7 +201,7 @@
           <h4 style="margin-top: 11px;">8. Verträge</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#8</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">8</h2></span>
       	</span>
       </h5>
     </div>
@@ -216,7 +223,7 @@
           <h4 style="margin-top: 11px;">9. Sonstiges</h4>
         </button>
 		<span style="float: right;">
-          <span class="square_company_arrow"><h2 class="h2_in_arrow">#9</h2></span>
+          <span class="square_company_arrow"><h2 class="h2_in_arrow">9</h2></span>
       	</span>
       </h5>
     </div>
diff --git a/recoverdir/templates/recoverdir/rd_settings.html b/recoverdir/templates/recoverdir/rd_settings.html
index 6762b31..10ccac7 100644
--- a/recoverdir/templates/recoverdir/rd_settings.html
+++ b/recoverdir/templates/recoverdir/rd_settings.html
@@ -3,7 +3,7 @@
 {% block content %}
 {% if request.user.profile.agency.module_recoverdir %}
 <div class="content-section col-9">
-  <h3>Einstellungen verwalten</h3>
+  <h3>Sicherheit</h3>
   <hr>  
   <form method="POST"  enctype="multipart/form-data">
     <small>Beachten Sie bitte, dass dieses Passwort allen Personen sicher zugänglich gemacht werden muss, die auf die Notfallhilfe zugreifen können! Zusätzlich benötigen diese Personen den Sicherheitssschlüssel. Dieser wird automatisch generiert und kann nicht geändert werden. Sie finden den Sicherheitsschlüssel unter Notfallhilfe, Einstellungen.</small>
@@ -19,3 +19,8 @@
 <h3>Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.</h3>  
 {% endif %}
 {% endblock content %}
+<!-- 
+
+  TASK: Externer Zugriff einrichten mit kleinem Text: Ihre Notfallhilfe ist über folgenden Link extern zu erreichen. Geben Sie in die Maske Sicherheitsschlüssel und Passwort ein.
+
+-->
diff --git a/recoverdir/templates/recoverdir/rd_viewsettings.html b/recoverdir/templates/recoverdir/rd_viewsettings.html
index 0edabcc..91ae452 100644
--- a/recoverdir/templates/recoverdir/rd_viewsettings.html
+++ b/recoverdir/templates/recoverdir/rd_viewsettings.html
@@ -2,21 +2,25 @@
 <div class="card">  
       <div class="card-body">
           <p class="card-text">
-<table>
-	<tr>
-		<td>Sicherheitsschlüssel (nicht veränderbar):</td><td><b>{{rd_settings.recoverkey}}</b></td>
-	</tr>
-	<tr>
-		<td>Passwort für die Notfallhilfe:</td><td><span id="pw_hidden">***************</span><span id="pw" style="display: none;"><b>{{rd_settings.logpass}}</b></span></td>
-		<td>
-			<button style="float: right" class="btn btn-secondary btn-sm mr-2 " onclick="javascript:showPW()"><i class="far fa-eye"></i></button>&nbsp;
-          <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'recoverdir-updatesettings' rd_settings.pk %}"><small><i class="fas fa-pen"></i></small></a>&nbsp;
-		</td>
-	</tr>
-	</tr>
-</table>
-</p>
-</div>
+          	<h4>Zugangsdaten</h4>
+			<table>
+				<tr>
+					<td>Sicherheitsschlüssel (nicht veränderbar):</td><td><b>{{rd_settings.recoverkey}}</b></td>
+				</tr>
+				<tr>
+					<td>Passwort für die Notfallhilfe:</td><td><span id="pw_hidden">***************</span><span id="pw" style="display: none;"><b>{{rd_settings.logpass}}</b></span></td>
+					<td>
+						<button style="float: right" class="btn btn-secondary btn-sm mr-2 " onclick="javascript:showPW()"><i class="far fa-eye"></i></button>&nbsp;
+			          <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'recoverdir-updatesettings' rd_settings.pk %}"><small><i class="fas fa-pen"></i></small></a>&nbsp;
+					</td>
+				</tr>
+				</tr>
+			</table>
+			<hr>
+			<h4>Externer Zugang</h4>
+			<p>Um die Notfallhilfe Außenstehenden zur Verfügung zu stellen, leiten Sie diesen Link weiter: <a href="https://digitale-agentur.com/rd/recover" target="_blank">https://digitale-agentur.com/rd/recover</a>. Geben Sie dort den Sicherheitsschlüssel und das Passwort ein! Stellen Sie sicher, dass diese Daten an einem sicheren Ort in Kopie vorliegen!</p>
+		</p>
+	</div>
 </div>
 <script type="text/javascript">
 function showPW(){
diff --git a/recoverdir/views.py b/recoverdir/views.py
index 5dc82fe..7d0b206 100644
--- a/recoverdir/views.py
+++ b/recoverdir/views.py
@@ -58,7 +58,7 @@ def checkForLogin(self):
 	if(self.request.user.profile.rd_login == None or minutes > 30):
 		self.request.user.profile.rd_login = None
 		self.request.user.profile.save()
-		messages.warning(self.request, f'Bitte login Sie erneut ein!')
+		messages.warning(self.request, f'Bitte login Sie sich erneut ein.')
 		return False
 	else:
 		self.request.user.profile.rd_login = now
@@ -120,7 +120,7 @@ class LoadExternalData(TemplateView):
 			return redirect('load-rd-external')
 
 		if settings.lastlogg == None:
-			messages.warning(self.request, f'Bitte loggen Sie sich erneut ein!')
+			messages.warning(self.request, f'Bitte loggen Sie sich erneut ein.')
 			return redirect('load-rd-external')
 		else:
 			now = datetime.now()	
@@ -136,7 +136,7 @@ class LoadExternalData(TemplateView):
 				# LOGIN TO OLD - SET LASTLOGG TO NONE AND SEND MESSAGE
 				settings.lastlogg = None
 				settings.save()
-				messages.warning(self.request, f'Bitte loggen Sie sich erneut ein!')
+				messages.warning(self.request, f'Bitte loggen Sie sich erneut ein.')
 				return redirect('load-rd-external')
 
 	def get_context_data(self, **kwargs):
@@ -370,6 +370,17 @@ class RecoverDirManagement(LoginRequiredMixin, ListView):
 		# Load Settings
 		context.update({'rd_settings' : RecoverDirSetting.objects.filter(agency=self.request.user.profile.agency)[0]})		
 
+
+		# PROGRESS
+		summe_prog  = len(persletters) + len(handlungsleitfaden) + len(contactfc) + len(contactstrust) + len(depistvollmacht) + len(ergodigi) + len(onlinebank) + len(onlinebank6) + len(streamingabo) + len(digitalaccount) + len(digitalaccount8) + len(personal) + len(rdcontract) + len(handlungsleitfadenvf) 
+		final_prog_stat = 0
+
+		if summe_prog > 20:
+			final_prog_stat = 100
+		else:
+			final_prog_stat = (int)(100/20) * summe_prog 
+		context.update({'rd_level' : final_prog_stat})				
+
 		return context
 
 def CloseRecoverDir(request):
@@ -425,7 +436,7 @@ class RecoverDirAddSettings(CreateView):
 			if(form.cleaned_data.get('logpass') == form.cleaned_data.get('logpass_check')):
 				messages.warning(self.request, f'Daten gespeichert!')			
 			else:
-				messages.warning(self.request, f'Die Passwörter stimmen nicht überein. Bitte neu eingeben!')			
+				messages.warning(self.request, f'Die Passwörter stimmen nicht überein. Bitte neu eingeben.')			
 				return redirect('recoverdir-addsettings')
 
 		return super().form_valid(form)
@@ -454,7 +465,7 @@ class RecoverDirUpdateSettings(UpdateView):
 		if(form.cleaned_data.get('logpass') == form.cleaned_data.get('logpass_check')):
 			messages.warning(self.request, f'Daten gespeichert!')			
 		else:
-			messages.warning(self.request, f'Die Passwörter stimmen nicht überein. Bitte neu eingeben!')			
+			messages.warning(self.request, f'Die Passwörter stimmen nicht überein. Bitte neu eingeben.')			
 			return redirect('recoverdir-addsettings')
 		return super().form_valid(form)
 
diff --git a/users/models.py b/users/models.py
index 33bac76..573773a 100644
--- a/users/models.py
+++ b/users/models.py
@@ -268,7 +268,10 @@ class Profile(models.Model):
 	rd_login = models.DateTimeField(null=True, blank=True, default=None)
 
 	def __str__(self):
-		return f'{self.user.last_name}'
+		if(self.user != None):
+			return f'{self.user.last_name}'
+		else:
+			return f'Nicht vergeben'
 
 	# Hier Path für Templates des Models mit Parametern
 	def get_absolute_url(self):
diff --git a/users/templates/users/errors/404.html b/users/templates/users/errors/404.html
index 069b22f..60db5fd 100644
--- a/users/templates/users/errors/404.html
+++ b/users/templates/users/errors/404.html
@@ -1,6 +1,6 @@
 {% extends "users/base.html" %}
 {% block content %}
 <div class="content-section col-md-5">
-	<h3>Hopala! Fehler 404 - Die aufgerufene Seite existiert nicht.</h3>
+	<h3>Fehler 404 - Die aufgerufene Seite existiert nicht. Sollten Sie diesen Fehler öfter sehen, kontaktieren Sie bitte den Support!</h3>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/errors/500.html b/users/templates/users/errors/500.html
index 1534fae..1c3b091 100644
--- a/users/templates/users/errors/500.html
+++ b/users/templates/users/errors/500.html
@@ -1,6 +1,6 @@
 {% extends "users/base.html" %}
 {% block content %}
 <div class="content-section col-md-5">
-	<h3>Hopala! Fehler 500 - Interner Serverfehler. Bitte kontaktieren Sie den Support!</h3>
+	<h3>Fehler 500 - Die aufgerufene Seite existiert nicht. Sollten Sie diesen Fehler öfter sehen, kontaktieren Sie bitte den Support!</h3>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index 8423d96..92ab6da 100644
--- a/users/views.py
+++ b/users/views.py
@@ -317,8 +317,8 @@ def dashboard(request):
 	standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).exclude(area=None).exclude(task=None).order_by('-last_modified_on')[:5]
 
 	filterdate = datetime.now()
-	news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-go_online_on')[:4]
-
+	#news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__let=filterdate).filter(go_offline_on__get=filterdate).order_by('-go_online_on')[:4]
+	news = news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') | News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__isnull=True).order_by('-created_date') 
 	context.update({'active_link' : 'dashboard', 'standards_of_agency' : standards_of_agency, 'news' : news})
 	
 	# GET ACUTAL ABSENCES