-These are the people who actively maintain and develop Condor:
+These are the people who are currently maintain, develop, and/or support Condor; if you are active in the project, please feel free to add yourself a homepage.
 
-*Principal Investigator*
+*UW-Madison Faculty*
 |*Name*|*Login*|*Email*|
 |MironLivny|{wiki: MironLivny livny}|livny@cs.wisc.edu|
 
-*Administrative Staff*
+*UW-Madison Administrative Staff*
 |*Name*|*Login*|*Email*|
 |HallieSavage|{wiki: HallieSavage savage}|savage@cs.wisc.edu|
 |SarahCushing|{wiki: SarashCushing cushing}|cushing@cs.wisc.edu|
 
-*Graduate Students*
-|*Name*|*Login*|*Email*|
-|FeiChen|{wiki: FeiChen feichen}|feichen@cs.wisc.edu|
-|MengmengChen|{wiki: MengmengChen mchen}|mchen@cs.wisc.edu|
-|FaisalKahn|{wiki: FaisalKahn faisal}|faisal@cs.wisc.edu|
-|VargheseMathew|{wiki: VargheseMathew vmathew}|vmathew@cs.wisc.edu|
-|JoeMeehean|{wiki: JoeMeehean jmeehean}|jmeehean@cs.wisc.edu|
-|VidhyaMurali|{wiki: VidhyaMurali vidhyam}|vidhyam@cs.wisc.edu|
-|IanRae|{wiki: IanRae ian}|ian@cs.wisc.edu|
-
-
-*Academic Staff*
+*UW-Madison Research Staff*
 |*Name*|*Login*|*Email*|
 |AlanDeSmet| {wiki: AlanDeSmet adesmet}| adesmet@cs.wisc.edu|
 |AlainRoy| {wiki: AlainRoy roy}| roy@cs.wisc.edu|
@@ -44,8 +33,17 @@
 |ToddTannenbaum|{wiki: ToddTannenbaum tannenba}|tannenba@cs.wisc.edu|
 |ZachMiller|{wiki: ZachMiller zmiller}|zmiller@cs.wisc.edu|
 
+*UW-Madison Graduate Students*
+|*Name*|*Login*|*Email*|
+|FeiChen|{wiki: FeiChen feichen}|feichen@cs.wisc.edu|
+|MengmengChen|{wiki: MengmengChen mchen}|mchen@cs.wisc.edu|
+|FaisalKahn|{wiki: FaisalKahn faisal}|faisal@cs.wisc.edu|
+|VargheseMathew|{wiki: VargheseMathew vmathew}|vmathew@cs.wisc.edu|
+|JoeMeehean|{wiki: JoeMeehean jmeehean}|jmeehean@cs.wisc.edu|
+|VidhyaMurali|{wiki: VidhyaMurali vidhyam}|vidhyam@cs.wisc.edu|
+|IanRae|{wiki: IanRae ian}|ian@cs.wisc.edu|
 
-*Student Hourlies*
+*UW-Madison Undergraduate Students*
 |*Name*|*Login*|*Email*|
 |MichaelBethencourt|{wiki: MichaelBethencourt michaelb}|michaelb@cs.wisc.edu|
 |WillMcCardell|{wiki: WillMcCardell mccardel}|mccardel@cs.wisc.edu|