diff --git a/_config.yml b/_config.yml
index e33ad351c0d8439d333ec030706cbfc1429ca578..58a0b70dfd7347582133b04dcfb8de3a8d430612 100644
--- a/_config.yml
+++ b/_config.yml
@@ -81,16 +81,16 @@ roles:
         name: Faculty
     -
         id: postdoc
-        name: Postdocs
+        name: Postdoc
     - 
         id: phd-student
-        name: "Phd Students"
+        name: "Phd Student"
     - 
         id: master-student
-        name: "Master Students"
+        name: "Master Student"
     -
         id: bachelor-student
-        name: "Bachelor Students"
+        name: "Bachelor Student"
   
 
 # default values -- the one for all **must** be first 
diff --git a/_includes/people_list.html b/_includes/people_list.html
index 6fe409c69ab69ccb84bd4d2e377884719a9032c8..ec52dffb8b81ca71a0365a5064d975a497de5741 100644
--- a/_includes/people_list.html
+++ b/_includes/people_list.html
@@ -8,23 +8,24 @@
     
     {% if rollers.size > 0 %}
         <ul class="collection with-header">
-            <li class="collection-header"><h4>{{role.name}}</h4></li>
+            <li class="collection-header"><h5>{{role.name}}(s)</h5></li>
             {% for person in rollers %}
                 <li class="collection-item avatar">
                     <img src="/{{person.pic}}" alt="" class="circle"/>
                     <a href="{{person.url}}" class="title">{{person.fullname}}</a>
                     <p>
                       {% if person.start_date %}
-                        from
+                        {% unless person.end_date %}
+                        since
+                        {% endunless %}
                         {% assign date = person.start_date %}
                         {% include date.html %}
-                        <br/>
-                      {% endif %}
-                      {% if person.end_date %}
-                          until
-                          {% assign date = person.end_date %}
-                          {% include date.html %}
-                          <br/>
+                        
+                        {% if person.end_date %}
+                            &nbsp;-&nbsp;
+                            {% assign date = person.end_date %}
+                            {% include date.html %}
+                        {% endif %}
                       {% endif %}
                     </p>
                 </li>
diff --git a/_layouts/person.html b/_layouts/person.html
index d76bdc64b6081d4eabb23f2c8a4474598af8e845..f98a9b96c4c65ae3f7b5568efec3ecb706d80370 100644
--- a/_layouts/person.html
+++ b/_layouts/person.html
@@ -3,22 +3,55 @@ layout: default
 ---
 
 <div class="row">
-  <div class="col s12 m5 right">
-    <div class="card">
-      <div class="card-image">
-        <img src="/{{page.pic}}" width="300"/>
-      </div>
-      <div class="card-content">
-        <span class="card-title">{{ page.fullname }}</span>
-        {% if page.fulltitle %}{{ page.fulltitle }}{% endif %}
-      </div>
-      <div class="card-action">
-        <a href="https://kwarc.info/{{ page.account }}/publications.html">Publications</a>
-        {% if page.cv %}&nbsp;<a href="/{{page.cv}}">CV</a>{% endif %}
-      </div>
+    
+    <div class="col s12 m5 right">
+        <div class="card">
+            <div class="card-image">
+                <img src="/{{page.pic}}" width="300"/>
+            </div>
+            <div class="card-content">
+                <span class="card-title">{{ page.fullname }}</span>
+                
+                <hr />
+                
+                {% assign role = site.roles | where: "id", page.role %}
+                {% assign role = role[0] %}
+                
+                {{role.name}}
+                {% if page.start_date %}
+                    <br />
+                    {% unless page.end_date %}
+                        since
+                    {% endunless %}
+                    
+                    {% assign date = page.start_date %}
+                    {% include date.html %}
+                    
+                    {% if page.end_date %}
+                        &nbsp;-&nbsp;
+                        {% assign date = page.end_date %}
+                        {% include date.html %}
+                    {% endif %}
+                {% endif %}
+                
+                {% if page.affiliation %}
+                    <hr />
+                    {{ page.affiliation }}
+                {% endif %}
+            </div>
+            <div class="card-action">
+                {% if page.website %}
+                <a target="_blank" href="{{page.website}}">Website</a>
+                &nbsp;
+                {% endif %}
+                
+                <a href="https://kwarc.info/{{ page.account }}/publications.html">Publications</a>
+            </div>
+        </div>
+        
     </div>
-  </div>
-  <p>
-    {{content}}
-  </p>
+    
+    <p>
+        {{content}}
+    </p>
 </div>
diff --git a/people/README.md b/people/README.md
deleted file mode 100644
index 8fb3ef99c16ac228b4e11b8f7e496463a4a77d04..0000000000000000000000000000000000000000
--- a/people/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Technical directions on adding a page
-------------------------------------------
-
-To add a new page, create a file of the form `<first initial><surname>.md` in this
-directory, taking the existing files as examples. Any auxiliary files (e.g. CV, ... should
-have form `<first initial><surname>-<aux>.<ext>`.
-
-Each file  needs some specific parameters:
-
- * **layout** use *person* 
- * **menu_title** (optional) the slot title  in the menu, use your full name, leave out
-   for auxiliary pages. 
- * **fullname** 
- * **fulltitle**
- * **affiliation** the academic affiliation 
- * **account** (the base name of the file)
- * **cv** (optionall) ink to a CV.
- * **start_date** (optional) a start date (YYYY-MM) 
- * **end_date** (optional) an end date (YYYY-MM) 
- * **role** one of *master-student*, *bachelor-student*, *phd-student*, *postdoc*, *faculty* or *guest* 
- * **crossref** (optional) if the home page is outside this web site.
-
-A person is considered as 'active' (i.e. a current member) if and only if their `end_date` is unset. 
\ No newline at end of file
diff --git a/people/akohlhase.md b/people/akohlhase.md
index f4bcd7b7669ace349b627b27331761429be717a1..90959d93a82fe6635c3714a9a14cdd9a35a919d7 100644
--- a/people/akohlhase.md
+++ b/people/akohlhase.md
@@ -1,14 +1,19 @@
 ---
 layout: person
+
 title: Andrea Kohlhase
 fullname: Prof. Dr. Andrea Kohlhase
-role: postdoc
 pic: public/images/akohlhase.jpg
+
+role: postdoc
 start_date: 2005-12
 end_date: 2014-08
+
+affiliation: Hochschule Neu-Ulm
+website: https://www.hs-neu-ulm.de/andrea-kohlhase/
 ---
-### Description
 
+### Description
 After having been associated with the KWARC research group at Jacobs University Bremen
 under guidance of Prof.Dr. Michael Kohlhase (I know the name coincidence is amazing ...)
 for a couple of years, since July 2011 I'm actually a working member of the group. Before
@@ -20,6 +25,7 @@ I am still very fond of my previous research group [dimeb](http://www.dimeb.de)
 (Digital Media in Education) at the University of Bremen under guidance of Prof. Dr. Heidi
 Schelhowe.
 
+### Research Focus
 My research interest lies in the intersection between the fields of "Semantic
 Web" and "Human-Computer-Interaction", especially Interaction Design for semantic data
 ("Semantic Interaction Design"), with a focus on educational environments. I have
@@ -38,8 +44,4 @@ human-spreadsheet interactions and decouple our semantic services from specific
 spreadsheet players like MS Excel.
 
 At the end of last year I started to make use of Kelly's Repertory Grid Technique. The
-example data set for the MathUI'13 paper you can find [here](http://www.kwarc.info/ako/ProcrustesAnalysis).
-
-### Current Affiliation
-Hochschule Neu-Ulm [Current Home Page](https://www.hs-neu-ulm.de/andrea-kohlhase/)
-
+example data set for the MathUI'13 paper you can find [here](http://www.kwarc.info/ako/ProcrustesAnalysis).
\ No newline at end of file
diff --git a/people/blaubner.md b/people/blaubner.md
index 1ed2529fe4e60364ff4ffc3ee56d1fd2d74e2bed..dd3d36ab02750b6f212c3500059a37eca52fa464 100644
--- a/people/blaubner.md
+++ b/people/blaubner.md
@@ -1,15 +1,16 @@
 ---
 layout: person
+
 title: Bastian Laubner
-fullname: Bastian Laubner
+fullname: M.Sc. Bastian Laubner
+
 role: master-student
 start_date: 2005-09
 end_date: 2007-08
 ---
 
-### Research Focus:
+### Research Focus
 My interests are in the fields of logic, graph theory, computation theory, and the design of algorithms.
 
- 
- ### Thesis Title:
- Mapping Mathematics with Theory Graphs A Case Study and a Prototype
+### Thesis Title
+Mapping Mathematics with Theory Graphs A Case Study and a Prototype
\ No newline at end of file
diff --git a/people/cdavid.md b/people/cdavid.md
index 6eaa32d93ae60d2d75267b611943f87f19b8be97..a69939bbd30dbbe0ba8411ebe1ff95bd6bcf06f9 100644
--- a/people/cdavid.md
+++ b/people/cdavid.md
@@ -1,15 +1,16 @@
 ---
 layout: person
+
 title: Catalin David
-fullname: Catalin David
-role: master-student
+fullname: M.Sc. Catalin David
 pic: public/images/cdavid.jpeg
+
+role: master-student
 start_date: 2008-09
 end_date: 2012-02
 ---
 
 ### Description
-
 I have graduated in June 2012 with a thesis within the SiSsi project, regarding the
 software framework behind the project: Semantic Alliance Framework: Integrating Documents
 and Semantic Services.
@@ -19,10 +20,9 @@ My work has started with projects regarding knowledge representation and underst
 mainly, user interaction and user experience in the field of semantic data (JOBAD and
 Planetary). Lately I have also had an interest in bridging the gap between desktop and web
 systems, bringing semantic web concepts in everyday desktop software (SiSsi).
-
  
-### Research Focus:
+### Research Focus
 I am interested in representation of mathematics on the Internet, as well as User Interaction (UI) and eXperience (UX).
 	
-###Thesis Title:
+### Thesis Title
 Semantic Alliance Framework: Integrating Documents and Semantic Service 
diff --git a/people/cjucovschi.md b/people/cjucovschi.md
index ab5d2fc047b1f6d6068cffae4d8fbcfaa31378d3..731723dd20f87995681f95500eb174ab1a115e49 100644
--- a/people/cjucovschi.md
+++ b/people/cjucovschi.md
@@ -1,16 +1,17 @@
 ---
 layout: person
+
 title: Constantin Jucovschi
-fullname: Constantin Jucovschi
-affiliation: Computer Science, FAU Erlangen-Nürnberg
-account: cjucovschi
-role: phd-student
+fullname: M.Sc. Constantin Jucovschi
 pic: public/images/cjucovschi.jpeg
+
+role: phd-student
 start_date: 2007-10
----
 
-### Description: 
+affiliation: Computer Science, FAU Erlangen-Nürnberg
+---
 
+### Description
 Constantin Jucovschi Ph.D. Student of Computer Science at FAU Erlangen supervised by
 Prof. Michael Kohlhase. 
 
diff --git a/people/clange.md b/people/clange.md
index 0d3ac1c128f7987a17b408902eb2428a7f9a4cc4..8b194db212887260c4e75acd34c0260ae050dd67 100644
--- a/people/clange.md
+++ b/people/clange.md
@@ -1,15 +1,17 @@
 ---
 layout: person
+
 title: Christoph Lange
 fullname: Dr. Christoph Lange
-role: phd-student
 pic: public/images/clange.jpg
+
+role: phd-student
 start_date: 2008-07
 end_date: 2012-08
+
+website: https://langec.wordpress.com/about/
+affiliation: Enterprise Information Systems, Fraunhofer IAIS Bonn
 ---
-### Thesis Title:
-Enabling Collaboration on Semiformal Mathematical Knowledge by Semantic Web Integration 
-### Current Affiliation?
-Enterprise Information Systems, Fraunhofer IAIS Bonn
-### Current Home Page
-https://langec.wordpress.com/about/
+
+### Thesis Title
+Enabling Collaboration on Semiformal Mathematical Knowledge by Semantic Web Integration
diff --git a/people/cmueller.md b/people/cmueller.md
index e7c3e45378b31a299825fa3e7573fa3dc60de8b6..cdc1449cdfdaf76ca725d080e7cc130242b2374f 100644
--- a/people/cmueller.md
+++ b/people/cmueller.md
@@ -1,15 +1,19 @@
 ---
 layout: person
+
 title: Christine Müller
 fullname: Dr. Christine Müller
-role: phd-student
 pic: public/images/cmueller.jpg
+
+role: phd-student
 start_date: 2006-09
 end_date: 2010-05
+
+affiliation: ti&m Frankfurt
 ---
+
 ### Description
-In May 2010 I have received my PhD in computer science at the Jacobs  University.
-### Thesis Title:
-Thesis Title: Adaptation of Mathematical Documents
-### Current Affiliation?
-ti&m Frankfurt
+In May 2010 I have received my PhD in computer science at the Jacobs University.
+
+### Thesis Title
+Adaptation of Mathematical Documents
\ No newline at end of file
diff --git a/people/cprodescu.md b/people/cprodescu.md
index 037e0480a59f80b219cb5ce8f4cbc74a14eb3f1e..26cb9ef3e0a8b420810fb43376370bf06fc5e1ab 100644
--- a/people/cprodescu.md
+++ b/people/cprodescu.md
@@ -1,10 +1,15 @@
 ---
 layout: person
+
 title: Corneliu Claudiu Prodescu 
-fullname: Corneliu Claudiu Prodescu 
+fullname: M.Sc. Corneliu Claudiu Prodescu
+
 role: master-student
 start_date: 2008-09
 end_date: 2014-08
+
+affiliation: Twitter
 ---
-### Thesis Title:
+
+### Thesis Title
 Text and Formula Search on arXiv Documents
diff --git a/people/dginev.md b/people/dginev.md
index 5d1ffd7195c59ee00e23bedaa99175e9f8e1ee8e..41adf3ec185b24af09862d46962442820b886a00 100644
--- a/people/dginev.md
+++ b/people/dginev.md
@@ -1,13 +1,17 @@
 ---
 layout: person
+
 title: Deyan Ginev
-fullname: Deyan Ginev
-affiliation: Computer Science, FAU Erlangen-Nürnberg
-account: dginev
+fullname: M.Sc. Deyan Ginev
+pic: public/images/dginev.jpeg
+
 role: phd-student
 start_date: 2007-02
-pic: public/images/dginev.jpeg
+
+website: http://prodg.org
+affiliation: Computer Science, FAU Erlangen-Nürnberg
 ---
+
 ### Contact
 d D@T ginev A?T jacobs DASH university D0T ДЕ (Д is a cyrillic D in case you're wondering)
 
@@ -30,16 +34,9 @@ All of my research work is released as Free Libre Open Source Software, so feel
 
 My supervisor is Prof. [Michael Kohlhase](http://kwarc.info/kohlhase), head of the [KWARC](http://kwarc.info/) research group (Knowledge Adaptation and Reasoning for Content).
 
-
 ### Research Focus
 My primary interest lies in Mathematical Knowledge Management and Computational Semantics of Natural Language, with a focus on Underspecification and Ambiguity in the Math domain.
 
 I am also involved in and excited by the problems of Scalable Software Architectures, Data Mining, Processing in the Large and the Semantic Web.
 
 My current work is targeting large-scale Semantic Enrichment of informal mathematical documents, based on the [arXiv](https://arxiv.org) corpus. For a more detailed view, feel free to read my [PhD Proposal](https://svn.kwarc.info/repos/dginev/public/DeyanGinev_PhD_proposal.pdf).
-
-
-###non-academic professional profile
-please visit my [personal website](http://prodg.org).
-
-
diff --git a/people/dmueller.md b/people/dmueller.md
index 003304eb5c1029e4b2155db8dfedff89f2e0a7bd..d6af816a94bbdf6e59ff3c07832be1a903da89af 100644
--- a/people/dmueller.md
+++ b/people/dmueller.md
@@ -1,16 +1,16 @@
 ---
 layout: person
+
 title: Dennis Müller
-fullname: Dennis Müller
-affiliation: Computer Science, FAU Erlangen-Nürnberg
-account: dmueller
+fullname: M.Sc. Dennis Müller
+pic: public/images/dmueller.jpg
+
 role: phd-student
 start_date: 2015-04
-pic: public/images/dmueller.jpg
----
- Ph.D. Student at KWARC
 
-### Contact Details: 
-Email: "d." + lastname.replace("ü","ue") + "@" + this.domain
+affiliation: Computer Science, FAU Erlangen-Nürnberg
+website: http://blog.logicalphalluses.net/
+---
 
-[My blog](http://blog.logicalphalluses.net/)
+### Contact
+Email: "d." + lastname.replace("ü","ue") + "@" + this.domain
\ No newline at end of file
diff --git a/people/fhorozal.md b/people/fhorozal.md
index 5d7e68d8f124dc0ef1381428b981c26cf1c30686..19c6dc1bcd9baaa8df15cfedcfe9bc19eb07bfa6 100644
--- a/people/fhorozal.md
+++ b/people/fhorozal.md
@@ -1,12 +1,14 @@
 ---
 layout: person
+
 title: Fulya Horozal
 fullname: Dr. Fulya Horozal
-role: phd-student
 pic: public/images/fhorozal.jpg
+
+role: phd-student
 start_date: 2010-05
 end_date: 2014-12
 ---
-### Thesis Title:
-Framework for Defining Declarative Languages 
-### Current Affiliation?
+
+### Thesis Title
+Framework for Defining Declarative Languages 
\ No newline at end of file
diff --git a/people/fihorozal.md b/people/fihorozal.md
index c607edc0b0b70be819fc9d8d40d442198e2c8616..586f631988299aea6495c7c6958fcfa491dd452a 100644
--- a/people/fihorozal.md
+++ b/people/fihorozal.md
@@ -1,10 +1,13 @@
 ---
 layout: person
+
 title: Figen Fusun Horozal
-fullname: Figen Fusun Horozal
+fullname: M.Sc. Figen Fusun Horozal
+
 role: master-student
 start_date: 2009-09
 end_date: 2012-02
 ---
-###Thesis Title:
+
+### Thesis Title
 Management of Change in OWL Ontologies
diff --git a/people/frabe.md b/people/frabe.md
index e5f720c3c3866b010e58cf406e5e250f57954a67..70232183aeda57305c1edc71f5e49e951c91e59e 100644
--- a/people/frabe.md
+++ b/people/frabe.md
@@ -1,9 +1,11 @@
 ---
 layout: person
+
 title: Florian Rabe
 fullname: PD Dr. Florian Rabe
-account: frabe
+
 role: postdoc
 start_date: 2005-09
----
-to be decided how to integrate his stuff
+
+affiliation: Jacobs University Bremen
+---
\ No newline at end of file
diff --git a/people/hstamerjohanns.md b/people/hstamerjohanns.md
index 762da703239f3dd94ade87d082fc3845dc1978cb..bd03cadfd31aabcf66fefc94ea00275399f5d9a2 100644
--- a/people/hstamerjohanns.md
+++ b/people/hstamerjohanns.md
@@ -1,11 +1,13 @@
 ---
 layout: person
+
 title: Heinrich Stamerjohanns
 fullname: Dr. Heinrich Stamerjohanns
-role: postdoc
 pic: public/images/hstamerjohanns.jpg
+
+role: postdoc
 start_date: 2005-09
 end_date: 2014-03
-crossref: http://www.eecs.jacobs-university.de/wiki/index.php/Heinrich_Stamerjohanns
----
 
+website: http://www.eecs.jacobs-university.de/wiki/index.php/Heinrich_Stamerjohanns
+---
diff --git a/people/inormann.md b/people/inormann.md
index b9219dd0869055efdc22f0fcc36e9dd4e8a786aa..70efe055deb23cc6bc9bceced3b5d4a079da5814 100644
--- a/people/inormann.md
+++ b/people/inormann.md
@@ -1,15 +1,19 @@
 ---
 layout: person
+
 title: Immanuel Normann
 fullname: Dr. Immanuel Normann
-role: phd-student
 pic: public/images/inormann.jpg
+
+role: phd-student
 start_date: 2004-01
 end_date: 2008-12
+
+affiliation: Pagina GmbH
 ---
+
 ### Description
-Immanuel Normann was a Ph.D. student at KWARC,
-### Thesis Title:
-Automated Theory Interpretation
-### Current Affiliation?
-Pagina GmbH. 
+Immanuel Normann was a Ph.D. student at KWARC. 
+
+### Thesis Title
+Automated Theory Interpretation
\ No newline at end of file
diff --git a/people/jbetzendal.md b/people/jbetzendal.md
index a25ec135b2005d40192b1b386e18e9e191dab58d..2fd199ce5dd2ae89840b5714047213750fbeed28 100644
--- a/people/jbetzendal.md
+++ b/people/jbetzendal.md
@@ -1,15 +1,17 @@
 ---
 layout: person
+
 title: Jonas Betzendal
 fullname: B.Sc. Jonas Betzendal
-affiliation: Data Engineering, Jacobs University
-account: twiesing
+pic: public/images/jbetzendal.jpg
+
 role: master-student
 start_date: 2016-08
-pic: public/images/jbetzendal.jpg
+
+affiliation: University Bielefeld
 ---
 
-### Description: 
+### Description
 Hi, my name is Jonas Betzendal and I am finishing my Master's degree at Bielefeld.
 
 My topic is the transportation of the library of the IMPS theorem prover into OMDOC format.
diff --git a/people/ksojakova.md b/people/ksojakova.md
index 124d1b6deb5474da70b066700fa8449b98a11a0b..51974b6f7b15f02905ef08befc6e072dfceae249 100644
--- a/people/ksojakova.md
+++ b/people/ksojakova.md
@@ -1,12 +1,16 @@
 ---
 layout: person
+
 title: Kristina Sojakova 
-fullname: Kristina Sojakova 
+fullname: M.Sc. Kristina Sojakova 
+
 role: master-student
 start_date: 2008-09
 end_date: 2010-08
+
+website: http://www.cs.cmu.edu/~ksojakov/
+affiliation: Carnegie Mellon University
 ---
+
 ### Thesis Title
 Mechanically Verifying Logic Translations
-### Home Page
-http://www.cs.cmu.edu/~ksojakov/
diff --git a/people/meta/README.md b/people/meta/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..bf7a232560dd36aac0bb7dd1bec8ade0416681e4
--- /dev/null
+++ b/people/meta/README.md
@@ -0,0 +1,30 @@
+Technical directions on adding a page
+------------------------------------------
+
+To add a new page, create a file of the form `<first initial><surname>.md` in this
+directory, taking the existing files as examples. 
+
+Each file needs some specific parameters:
+
+ * **layout** use *person*
+ 
+ * **title** Name of the person, doubles as the page title
+ * **fullname** Full name of the person, to be used in references
+ * **pic** Relative link to a picture of the person
+ 
+ * **role** one of *master-student*, *bachelor-student*, *phd-student*, *postdoc*, *faculty* or *guest*
+ * **start_date** (optional) a start date (YYYY-MM) 
+ * **end_date** (optional) an end date (YYYY-MM)
+ 
+  * **website** (optional) the (current) website
+  * **affiliation** (optional) the (current) affiliation
+
+A person is considered as 'active' (i.e. a current member) if and only if their `end_date` is unset. 
+
+By convention, section headings are:
+1. Contact
+2. Description
+3. Research Focus
+4. Thesis Title
+
+**DO NOT put colons after section titles**
diff --git a/people/index.html b/people/meta/current.html
similarity index 74%
rename from people/index.html
rename to people/meta/current.html
index 44745eba633ab1202f5ad3f6babab63929ac9774..021c2bf2790cf214ece7b32377af7dd2d24ef1b1 100644
--- a/people/index.html
+++ b/people/meta/current.html
@@ -1,9 +1,8 @@
 ---
 layout: default
-title: KWARC People
+title: KWARC Members
+permalink: /people/
 ---
 
-<h2>Current Members of the KWARC Group</h2>
-
 {% assign people = site.pages | where: "layout", "person" | where_exp: "person", "person.end_date == null" | sort: "start_date" %}
 {% include people_list.html %}
\ No newline at end of file
diff --git a/people/former.html b/people/meta/former.html
similarity index 83%
rename from people/former.html
rename to people/meta/former.html
index a4bef44e94cf3dd9ba1c71b6e3a55672b66aa181..42c566f4d9d92e618b7fd427348c5f90922f2e3d 100644
--- a/people/former.html
+++ b/people/meta/former.html
@@ -1,9 +1,8 @@
 ---
 layout: default
 title: Former KWARC Members
+permalink: /people/former/
 ---
 
-<h2>Former Members of the KWARC Group</h2>
-
 {% assign people = site.pages | where: "layout", "person" | where_exp: "person", "person.end_date != null" | sort: "start_date" %}
 {% include people_list.html %}
diff --git a/people/mgrigore.md b/people/mgrigore.md
index 754397a3411870f072936bc1e126e1f207a103c9..d9160c0975c4326d5912322ab30030ce6bf96190 100644
--- a/people/mgrigore.md
+++ b/people/mgrigore.md
@@ -1,10 +1,13 @@
 ---
 layout: person
+
 title: Mihai Grigore
-fullname: Mihai Grigore
+fullname: M.Sc. Mihai Grigore
+
 role: master-student
 start_date: 2008-09
 end_date: 2010-08
 ---
-### Thesis Title:
+
+### Thesis Title
 Knowledge-poor Interpretation of Mathematical Expressions in Context
diff --git a/people/miancu.md b/people/miancu.md
index ce6394caca615ae5bc0ead9fb3e9ea4344b556da..09a5b4c132a1cc4c54964219b5958035f1a04cc7 100644
--- a/people/miancu.md
+++ b/people/miancu.md
@@ -1,16 +1,17 @@
 ---
 layout: person
+
 title: Mihnea Iancu
 fullname: Dr. Mihnea Iancu
-affiliation: Computer Science, FAU Erlangen-Nürnberg
-account: miancu
-role: phd-student
 pic: public/images/miancu.png
+
+role: phd-student
 start_date: 2012-04
 end_date: 2017-01
 ---
-### Description:
+
+### Description
 working on various projects within the KWARC group in the direction of iMMT and OMDoc2.
 
-### Thesis Title:
+### Thesis Title
 Towards Flexiformal Mathematics
diff --git a/people/mkohlhase.md b/people/mkohlhase.md
index e30ac338abc923cf31e882f8f806571085953ede..f5f4c049b48494b2d28163fb3ba2fa56edbcb753 100644
--- a/people/mkohlhase.md
+++ b/people/mkohlhase.md
@@ -1,21 +1,23 @@
 ---
 layout: person
+
 title: Michael Kohlhase
 fullname: Prof. Dr. Michael Kohlhase
-fulltitle: Professur für Wissensrepräsentation und -verarbeitung
-affiliation: Computer Science, FAU Erlangen-Nürnberg
-account: mkohlhase
+
 role: faculty
 pic: public/images/mkohlhase.jpg
+
+affiliation: Computer Science, FAU Erlangen-Nürnberg
 ---
-### Contact Details: 
+
+### Contact
 **Office**: Martensstraße 3, 91058 Erlangen, Room11.139, tel/fax: (49) 9131-85-64052/55, <michael.kohlhase@fau.de>
 
 **Secretary**: Gabriele Schönberger, Room 11.158, tel/fax: (49) 9131-85-64057/55, <gabriele.schoenberger@fau.de>
 
 **Office at Jacobs University Bremen**: Room 169 Research I, tel/fax: +49 421 200 3140/493140,  <m.kohlhase@jacobs-university.de>
 
-### Description: 
+### Description
 I am also an adjunct associate professor at the School of Computer Science Carnegie Mellon University and an adjunct professor at [Jacobs University Bremen](http://jacobs-university.de). My research is conducted in the context of the KWARC group (Knowledge Adaptation and Reasoning for Content) [go there for an overview](http://kwarc.info).
 
 <!--  LocalWords:  fulltitle mkohlhase Martensstraße Schönberger
diff --git a/people/mmakaveeva.md b/people/mmakaveeva.md
index 7047771e578658c40a68296724cb43ae92582869..ded3fea9b3c405ee4258d8c1332a3b7b1e00d75e 100644
--- a/people/mmakaveeva.md
+++ b/people/mmakaveeva.md
@@ -1,10 +1,13 @@
 ---
 layout: person
+
 title: Milena Makaveeva
-fullname: Milena Makaveeva 
+fullname: Ms.C. Milena Makaveeva 
+
 role: master-student
 start_date: 2007-09
 end_date: 2009-08
 ---
-### Thesis Title:
+
+### Thesis Title
 Management of Change in Common Criteria IT Security Documentation
diff --git a/people/nmueller.md b/people/nmueller.md
index cddab1448a12cb41d8e61d5110a88d4c780fee37..a10940a00ef8ffcb7a694aac6d46a4164889e5e4 100644
--- a/people/nmueller.md
+++ b/people/nmueller.md
@@ -1,16 +1,19 @@
 ---
 layout: person
+
 title: Normen Müller
 fullname: Dr. Normen Müller
-role: phd-student
 pic: public/images/nmueller.jpg
+
+role: phd-student
 start_date: 2005-09
 end_date: 2010-07
+
+affiliation: BearingPoint Software Solutions GmbH
 ---
+
 ### Description
 In May 2010 I have received my PhD in computer science at the Jacobs  University.
-### Thesis Title:
-Thesis Title: Adaptation of Mathematical Documents
-### Current Affiliation?
-BearingPoint Software Solutions GmbH
 
+### Thesis Title
+Adaptation of Mathematical Documents
diff --git a/people/sanca.md b/people/sanca.md
index c252fc37f67f76be40d1ee3fa77aaf5c9eda2e92..b1b4714b481c86542827bcfc9d900547af3c81fa 100644
--- a/people/sanca.md
+++ b/people/sanca.md
@@ -1,10 +1,13 @@
 ---
 layout: person
+
 title: Stefan Anca
-fullname: Stefan Anca
+fullname: M.Sc. Stefan Anca
+
 role: master-student
 start_date: 2007-09
 end_date: 2009-08
 ---
-###Thesis Title:
+
+### Thesis Title
 Recovering content from Scientific Documents for Search
diff --git a/people/sdumbrava.md b/people/sdumbrava.md
index 993b8418f7ca1a6eaf20de326e084ea51be04102..59a17fc73fbe138c1c9a7a2bae5c3fe8d577f8de 100644
--- a/people/sdumbrava.md
+++ b/people/sdumbrava.md
@@ -1,17 +1,22 @@
 ---
 layout: person
+
 title: Stefania Dumbrava
-fullname: Stefania Dumbrava
-role: master-student
+fullname: M.Sc. Stefania Dumbrava
 pic: public/images/sdumbrava.jpeg
+
+role: master-student
 start_date: 2010-09
 end_date: 2012-09
----
-### Research interests:
-foundations of mathematics (category theory, type theory, logic), automated reasoning (formalization and computer-aided formal verification of mathematics).
 
-###Thesis Title:
-Towards a Type Theory with Reflection
+affiliation: Université Paris-Sud XI
+---
 
-### UPDATE:
+### Description
 As of October 1st 2012, I am a PhD student at Université Paris-Sud XI, working in the Toccata INRIA-LRI group, under the supervision of Véronique Benzaken and Évelyne Contejean, on the certification of data-centric systems.
+
+### Research Focus
+Foundations of mathematics (category theory, type theory, logic), automated reasoning (formalization and computer-aided formal verification of mathematics).
+
+### Thesis Title
+Towards a Type Theory with Reflection
\ No newline at end of file
diff --git a/people/tpollinger.md b/people/tpollinger.md
index 9288d945a4ee478c3437f0892acf3304eb5b0487..009517aaad6de5468e372445900385d9d5494da2 100644
--- a/people/tpollinger.md
+++ b/people/tpollinger.md
@@ -1,12 +1,15 @@
 ---
 layout: person
+
 title: Theresa Pollinger
-fullname: Theresa Pollinger
-affiliation: Computational Engineering, FAU Erlangen-Nürnberg
+fullname: B.Sc. Theresa Pollinger
 pic: public/images/tpollinger.jpg
-account: tpollinger
+
 role: master-student
 start_date: 2017-05
 
+affiliation: Computational Engineering, FAU Erlangen-Nürnberg
 ---
- I am doing my Master's thesis at the KWARC group, somewhere in the field between Mathematical Knowledge Representation and High Performance Simulations. If you are interested in the current status of the topic, feel free to contact me.
+
+### Description
+I am doing my Master's thesis at the KWARC group, somewhere in the field between Mathematical Knowledge Representation and High Performance Simulations. If you are interested in the current status of the topic, feel free to contact me.
diff --git a/people/twiesing.md b/people/twiesing.md
index afb337efd0c0bae35ac61e849878070a7f16cc78..37681d45d3bac21c008bc96d2c4d30c52fd5c8fe 100644
--- a/people/twiesing.md
+++ b/people/twiesing.md
@@ -1,15 +1,18 @@
 ---
 layout: person
+
 title: Tom Wiesing
 fullname: B.Sc. Tom Wiesing
-affiliation: Data Engineering, Jacobs University
-account: twiesing
-role: master-student
 pic: public/images/twiesing.jpg
+
+role: master-student
 start_date: 2013-02
+
+website: https://tkw01536.de
+affiliation: Data Engineering, Jacobs University
 ---
 
-### Description: 
+### Description
 Hi, my name is Tom Wiesing and I am a German guy who is currently a _Data Engineering_ master student at _Jacobs University Bremen_ in my 4th and final semester.
 
 I am working for _KWARC_ mostly on _localmh_, a cross-repository administration tool for the local authoring of MathHub.info content.
diff --git a/people/urabenstein.md b/people/urabenstein.md
index d75952278c3e294c182b8d77564d18188212e61a..d86e9887fb9e9e5bfeb6b153676dc52f43323d58 100644
--- a/people/urabenstein.md
+++ b/people/urabenstein.md
@@ -1,12 +1,16 @@
 ---
 layout: person
+
 title: Ulrich Rabenstein
-fullname: Ulrich Rabenstein
-affiliation: Computer Science, FAU Erlangen-Nürnberg
+fullname: M.Sc. Ulrich Rabenstein
 pic: public/images/urabenstein.jpg
-account: urabenstein
+
 role: master-student
 start_date: 2016-10
 end_date: 2017-07
+
+affiliation: Computer Science, FAU Erlangen-Nürnberg
 ---
- I have written my master thesis as a member of the KWARC group. My task was to detect quantity expressions in STEM-documents and to build useful semantic services.
+
+### Description
+I have written my master thesis as a member of the KWARC group. My task was to detect quantity expressions in STEM-documents and to build useful semantic services.
diff --git a/people/vzholudev.md b/people/vzholudev.md
index 437e768a4ed5bee6e1cea700a79ce79742df4e3a..ce78c8211ada0005eaa42d097aaf887db14db95b 100644
--- a/people/vzholudev.md
+++ b/people/vzholudev.md
@@ -1,15 +1,19 @@
 ---
 layout: person
+
 title: Vyacheslav Zholudev
 fullname: Dr. Vyacheslav Zholudev
-role: phd-student
 pic: public/images/vzholudev.jpeg
+
+role: phd-student
 start_date: 2007-09
 end_date: 2012-07
+
+affiliation: ResearchGate
 ---
+
 ### Description
 In July 2012 I have received my PhD in computer science at the Jacobs  University.
-### Thesis Title:
-Enhancing XML Preservation and Workflows
-### Current Affiliation?
-ResearchGate
+
+### Thesis Title
+Enhancing XML Preservation and Workflows
\ No newline at end of file