diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index b41ce80433..eac7c1fc1f 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -276,7 +276,8 @@
     "twitter": "deborahkurata",
     "website": "http://blogs.msmvps.com/deborahk/",
     "bio": "Deborah is a software developer, author, and Google Developer Expert. She is author of several Pluralsight courses including: 'Angular 2: Getting Started' and ‘Angular Routing’",
-    "groups": ["Collaborators", "GDE"]
+    "groups": ["Collaborators", "GDE"],
+    "mentor": "kara"
   },
   "alyssa": {
     "name": "Alyssa Nicoll",
@@ -341,7 +342,8 @@
     "twitter": "ManfredSteyer",
     "website": "https://www.softwarearchitekt.at",
     "bio": "Trainer and Consultant with focus on Angular. Writes for O'Reilly, the German Java Magazine and Heise. Regularly speaks at conferences.",
-    "groups": ["GDE"]
+    "mentor": "mgechev",
+    "groups": ["GDE", "Collaborators"]
   },
   "maximsalnikov": {
     "name": "Maxim Salnikov",
@@ -773,7 +775,7 @@
   },
   "globegitter": {
     "name": "Markus Padourek",
-    "groups": ["Collaborator"],
+    "groups": ["Collaborators"],
     "mentor": "gregmagolan",
     "picture": "globegitter.jpg"
   }
diff --git a/aio/scripts/contributors/generate_org_chart.sh b/aio/scripts/contributors/generate_org_chart.sh
index 0299a9dbb9..936d656fd6 100755
--- a/aio/scripts/contributors/generate_org_chart.sh
+++ b/aio/scripts/contributors/generate_org_chart.sh
@@ -2,6 +2,7 @@
 (    
     cd $(dirname $0)
     echo "digraph {"
+    echo "rankdir=RL; splines=ortho; node [shape=box];"
     jq -f org_chart.jq --raw-output < ../../content/marketing/contributors.json
     echo "}"
 ) | dot -Tpng > org.png
\ No newline at end of file
diff --git a/aio/scripts/contributors/org_chart.jq b/aio/scripts/contributors/org_chart.jq
index 991745ea85..cbe0f38732 100644
--- a/aio/scripts/contributors/org_chart.jq
+++ b/aio/scripts/contributors/org_chart.jq
@@ -1,11 +1,17 @@
 # Produces a GraphViz Dot file from the data in the contributors.json file.
 # Documentation for this syntax at https://stedolan.github.io/jq/manual
 to_entries
-| map(select((.value.groups | index("Angular")) or (.value.groups | index("Collaborators"))))
-| map(.value |= {name: .name, lead: (.lead // .mentor // "")})
+| map(select(
+  (.value.groups | index("Angular")) or
+  (.value.groups | index("Collaborators"))))
+| map(.value |= {
+  name: .name,
+  lead: (.lead // .mentor // ""),
+  fillcolor: (if .groups | index("Collaborators") then "aquamarine" else "beige" end),
+})
 | map(
-   "\(.key|tojson) [ label = \(.value.name|tojson) ] ",
-   "\(.key|tojson) -> \(.value.lead|tojson)"
+   "\(.key|tojson) [ label=\(.value.name|tojson) fillcolor=\(.value.fillcolor|tojson) style=filled ] ",
+   (if .value.lead != "" then "\(.key|tojson) -> \(.value.lead|tojson)" else "" end)
   )
 []