diff --git a/diploma.yaml b/diploma.yaml
index b5d1714..4f72525 100644
--- a/diploma.yaml
+++ b/diploma.yaml
@@ -27,10 +27,31 @@ nodes:
           fallback-lang: de-de-formal
           translations:
             en-eu: "Date of Announcement"
-      "student":
-        viewers: &view-alle
+      "student": &student-payload
+        viewers: *view-minimal
+        display-label: 
+          fallback: "Student:in"
+          fallback-lang: de-de-formal
+          translations:
+            en-eu: "Student"
+      "fach":
+        viewers:
+          - *PAmt
+        display-label:
+          fallback: "Fach"
+          fallback-lang: de-de-formal
+          translations:
+            en-eu: "Subject"
+      "kommunikation": &kommunikation-payload
+        viewers: *view-minimal
+        display-label: 
+          fallback: "Kommunikation"
+          fallback-lang: de-de-formal
+          translations:
+            en-eu: "Communication"
+      "notizen":
+        viewers: &view-internal
           - *PAmt
-          - *student
           - &PAvor-I  # Prüfungsausschussvorsitz Informatik
             tag: user
             user: "Dirk.Beyer@campus.lmu.de"
@@ -49,43 +70,13 @@ nodes:
           - &Sek-MI2  # Sekretariat Medieninformatik
             tag: user
             user: "Franziska.Schwamb@campus.lmu.de"
-          - {"tag": "initiator"}
-        display-label: 
-          fallback: "Student:in"
-          fallback-lang: de-de-formal
-          translations:
-            en-eu: "Student"
-      "fach":
-        viewers:
-          - *PAmt
-        display-label:
-          fallback: "Fach"
-          fallback-lang: de-de-formal
-          translations:
-            en-eu: "Subject"
-      "kommunikation":
-        viewers: *view-alle
-        display-label: 
-          fallback: "Kommunikation"
-          fallback-lang: de-de-formal
-          translations:
-            en-eu: "Communication"
-      "notizen":
-        viewers: &view-internal
-          - *PAmt
-          - *PAvor-I
-          - *PAvor-MI
-          - *Dek 
-          - *Sek-I
-          - *Sek-MI1
-          - *Sek-MI2
         display-label:
           fallback: "Interne Notizen"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Internal Notes"
-      "variante":
-        viewers: *view-alle
+      "variante": &variante-payload
+        viewers: *view-minimal
         display-label: 
           fallback: "Abschluss"
           fallback-lang: de-de-formal
@@ -151,15 +142,15 @@ nodes:
           fallback-lang: de-de-formal
           translations:
             en-eu: "Closing Report to Student Office"
-      "zustimmung":
-        viewers: *view-alle
+      "zustimmung": &zustimmung-payload
+        viewers: *view-minimal
         display-label:
           fallback: "Zustimmung zur Zeugniserstellung"
           fallback-lang: de-de-formal
           translations:
             en-eu: "Approval of Creation of Diploma"
-      "nebenfachabschluss":
-        viewers: *view-alle
+      "nebenfachabschluss": &nebenfach-payload
+        viewers: *view-minimal
         display-label:
           fallback: "Abschluss Nebenfach"
           fallback-lang: de-de-formal
@@ -887,7 +878,31 @@ nodes:
           en-eu: "Certificates Created"   
       viewers: *view-internal
 
-    payload-view: *payload-view
+    payload-view: &payload-view-2
+      <<: *payload-view
+      "student":
+        <<: *student-payload
+        viewers: &view-alle
+          - *PAmt
+          - *PAvor-I
+          - *PAvor-MI
+          - *Dek
+          - *Sek-I
+          - *Sek-MI1
+          - *Sek-MI2
+          - *student
+      "kommunikation":
+        <<: *kommunikation-payload
+        viewers: *view-alle
+      "variante":
+        <<: *variante-payload
+        viewers: *view-alle
+      "zustimmung":
+        <<: *zustimmung-payload
+        viewers: *view-alle
+      "nebenfach":
+        <<: *nebenfach-payload
+        viewers: *view-alle
 
     final: false
 
@@ -1073,7 +1088,7 @@ nodes:
         translations:
           en-eu: "Diploma Printed, Collection not Possible yet"
       viewers: *view-internal
-    payload-view: *payload-view
+    payload-view: *payload-view-2
     final: false
     messages:
       - *interne-bearbeitung-message
@@ -1142,7 +1157,7 @@ nodes:
         translations:
           en-eu: "Diploma Available for Signing"   
       viewers: *view-internal
-    payload-view: *payload-view
+    payload-view: *payload-view-2
     final: false
     messages:
       - *interne-bearbeitung-message
@@ -1216,7 +1231,7 @@ nodes:
         translations:
           en-eu: "Diploma Signed"   
       viewers: *view-internal
-    payload-view: *payload-view
+    payload-view: *payload-view-2
     final: false
     messages:
       - *interne-bearbeitung-message
@@ -1338,7 +1353,7 @@ nodes:
         translations:
           en-eu: "Diploma Posted"   
       viewers: *view-alle
-    payload-view: *payload-view
+    payload-view: *payload-view-2
     final: false
     messages: []
     edges:
@@ -1416,7 +1431,7 @@ nodes:
           en-eu: "Diploma Handed"   
       viewers: *view-alle
 
-    payload-view: *payload-view
+    payload-view: *payload-view-2
 
     final: true
 
@@ -1469,7 +1484,7 @@ nodes:
           en-eu: "Diploma Presumably Arrived"   
       viewers: *view-alle
 
-    payload-view: *payload-view
+    payload-view: *payload-view-2
 
     final: true
 
@@ -1507,7 +1522,7 @@ nodes:
           en-eu: "Creation of Diploma Aborted"   
       viewers: *view-alle
 
-    payload-view: *payload-view
+    payload-view: *payload-view-2
 
     final: not-ok