diff --git a/AUTHORS.md b/AUTHORS.md
index b31cad8bc9..092cf8d5d6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -2,22 +2,25 @@
 
 ## Current Maintainers
 
-- Steven M. Gallo
 - Jeffrey T. Palmer
 - Nikolay Simakov
 - Joseph White
-- Thomas Yearke
 - Jeanette Sperhac
 - Ryan Rathsam
-- Ben Plessinger
+- Gregary Dean
 
 ## Previous Maintainers
 
+- Steven M. Gallo
+- Ben Plessinger
+- Rudra Chakraborty
+- Thomas Yearke
 - Amin Ghadersohi
 - Ryan Gentner
 
 ## Contributors
 
+- Trey Dockendorf
 - Julien Eid
 - Jesse Becker
 - Nathan Rini
diff --git a/html/about/team.html b/html/about/team.html
index 9cf806ae2d..acf1d69ec4 100644
--- a/html/about/team.html
+++ b/html/about/team.html
@@ -1,10 +1,8 @@
 
-<p><b><font size="5">XMS Team</font></b></p>
+<p><h1>XMS Team</h1></p>
 <br>
-<p><b><font size="3">University at Buffalo</font></b></p>
-<p>Dr. Thomas R. Furlani: PI, Oversees XMS Program</p>
+<p><h2>University at Buffalo</h2></p>
 <p>Dr. Matthew D. Jones: coPI, XMS Technical Project Manager</p>
-<p>Mr. Steven M. Gallo: coPI, Oversees development and implementation of the XDMoD portal infrastructure</p>
 <p>Dr. Robert L. DeLeon: XMS Project Manager</p>
 <p>Dr. Joseph P. White: Job level performance data integration &amp; analytics and XDMoD data warehouse</p>
 <p>Mr. Jeffrey T. Palmer: Open XDMoD development, XDMoD portal development and XDMoD data warehouse development</p>
@@ -12,14 +10,18 @@
 <p>Mr. Gregary Dean: XDMoD portal development</p>
 <p>Ms. Jeanette Sperhac: XDMoD portal development</p>
 <p>Mr. Ryan Rathsam: XDMoD portal development and XDMoD data warehouse development</p>
-<p>Mr. Benjamin D. Plessinger: XDMoD development, systems architecture, and automation</p>
-<p>Mr. Rudra Chakraborty: XDMoD portal development</p>
+<br>
+<p><h2>Roswell Park Cancer Institute</h2></p>
+<p>Dr. Thomas R. Furlani: PI, Oversees XMS Program</p>
+<p>Mr. Steven M. Gallo: coPI, Oversees development and implementation of the XDMoD portal infrastructure</p>
+<br>
+<p><h2>Tufts University</h2></p>
 <p>Dr. Abani Patra: coPI</p>
 <br>
-<p><b><font size="3">Indiana University</font></b></p>
+<p><h2>Indiana University</h2></p>
 <p>Dr. Gregor von Laszewski: coPI, Scientific Impact Analysis</p>
 <p>Mr. Fugang Wang: Scientific Impact Analysis</p>
 <br>
-<p><b><font size="3">Texas Advanced Computing Center</font></b></p>
+<p><h2>Texas Advanced Computing Center</h2></p>
 <p>Dr. Todd Evans: Job level performance data integration</p>
 <p>Dr. Bill Barth: Job level performance data integration</p>