diff --git a/index.html b/index.html
index b994b26..a2b4f72 100644
--- a/index.html
+++ b/index.html
@@ -70,7 +70,7 @@
 <section id="header">
 <div class="container">
 <div class="jumbotron">
-<h1>SecPriv: Security and Privacy at EPFL</h1>
+<h1>Security at EPFL</h1>
 
 <p>This is the homepage of the Security and Privacy group in the <a href="https://ic.epfl.ch">School of Computer and Communication Sciences (IC)</a> at <a href="https://www.epfl.ch">EPFL</a> in Lausanne, Switzerland.</p>
 
@@ -78,18 +78,6 @@ <h1>SecPriv: Security and Privacy at EPFL</h1>
 
 <p>If you'd like to join the IC school as a graduate student, <a href="https://www.epfl.ch/education/phd/edic-computer-and-communication-sciences/edic-computer-and-communication-sciences/edic-how-to-apply/">apply to our PhD program</a> or our <a href="https://www.epfl.ch/schools/ic/education/master/">master program</a>, especially the <a href="https://www.epfl.ch/schools/ic/education/master/cyber-security/">Master in Cyber Security</a> could be of interest. If you're a recent PhD graduate, we're also looking for <a href="https://recruiting.epfl.ch/Vacancies/1970/Description/2">PostDocs</a>.</p>
 </div>
-
-<img src="secpriv.jpg" width="100%"/>
-</div>
-</section>
-
-<section id="events">
-<div class="container">
-<h2>Events</h2>
-<hr>
-<ul>
-<li>PrivaSec Seminar: semesterly gathering among all security and privacy folks</li>
-</ul>
 </div>
 </section>
 
@@ -102,13 +90,13 @@ <h2>People</h2>
 <div class="col">
 <h3>Faculty and Labs</h3>
 <ul>
+<li><a href="https://dslab.epfl.ch/people/candea/">George Candea</a> (<a href="https://dslab.epfl.ch/">DSLAB</a>)</li>
 <li><a href="https://ic-people.epfl.ch/~achiesa/">Alessandro Chiesa</a></li>
 <li><a href="https://bford.info/">Bryan Ford</a> (<a href="https://www.epfl.ch/labs/dedis/">DEDIS</a>)</li>
-<li><a href="http://carmelatroncoso.com/">Carmela Troncoso</a> (<a href="https://www.epfl.ch/labs/spring/">SPRING</a>)</li>
-<li><a href="https://dslab.epfl.ch/people/candea/">George Candea</a> (<a href="https://dslab.epfl.ch/">DSLAB</a>)</li>
 <li><a href="people.epfl.ch/jean-pierre.hubaux">Jean-Pierre Hubaux</a> (<a href="https://lds.epfl.ch/">LDS</a>)</li>
-<li><a href="https://nebelwelt.net">Mathias Payer</a> (<a href="https://hexhive.epfl.ch">HexHive</a>)</li>
 <li><a href="https://sanidhya.github.io/">Sanidhya Kashyap</a> (<a href="https://rs3lab.github.io/">RS3Lab</a>)</li>
+<li><a href="https://nebelwelt.net">Mathias Payer</a> (<a href="https://hexhive.epfl.ch">HexHive</a>)</li>
+<li><a href="http://carmelatroncoso.com/">Carmela Troncoso</a> (<a href="https://www.epfl.ch/labs/spring/">SPRING</a>)</li>
 <li><a href="https://lasec.epfl.ch/people/vaudenay/">Serge Vaudenay</a> (<a href="https://lasec.epfl.ch/">LASEC</a>)</li>
 </ul>
 </div>
@@ -129,21 +117,21 @@ <h3>Research Scientists</h3>
 <div class="col">
 <h3>PhD Students</h3>
 <ul>
-<li>Andrés Sanchez</li>
-<li>Atri Bhattacharyya</li>
-<li>Ahmad Hazimeh</li>
 <li>Nicolas Badoux</li>
+<li>Luca Di Bartolomeo</li>
+<li>Atri Bhattacharyya</li>
 <li>Ergys Dona</li>
+<li>Zhiyao Feng</li>
+<li>Ahmad Hazimeh</li>
 <li>Florian Hofhammer</li>
 <li>Lucio Romerio</li>
-<li>Luca Di Bartolomeo</li>
-<li>Zhiyao Feng</li>
+<li>Andrés Sanchez</li>
 </ul>
 
 <h3>MSc Researchers</h3>
 <ul>
-<li>Duo Xu</li>
 <li>Hossein Moghaddas</li>
+<li>Duo Xu</li>
 </ul>
 </div>
 </div>
@@ -153,6 +141,8 @@ <h3>MSc Researchers</h3>
 
 <section id="people">
 <div class="container">
+<div class="row align-items-start">
+<div class="col">
 <h2>Courses</h2>
 <hr>
 
@@ -161,19 +151,30 @@ <h3>Undergraduate Courses</h3>
 <li><a href="https://edu.epfl.ch/studyplan/en/bachelor/computer-science/coursebook/computer-security-COM-301">COM-301 Computer security</a></li>
 </ul>
 
-<h3>Graduate (MSc) Courses</h3>
+<h3>Graduate (MSc & PhD) Courses</h3>
 <ul>
 <li><a href="https://edu.epfl.ch/studyplan/en/master/computer-science-cybersecurity/coursebook/cryptography-and-security-COM-401">COM-401 Cryptography and security</a></li>
 <li><a href="https://edu.epfl.ch/coursebook/en/information-security-and-privacy-COM-402">COM-402 Information security and privacy</a></li>
 <li><a href="https://edu.epfl.ch/studyplan/en/master/computer-science-cybersecurity/coursebook/software-security-CS-412">CS-412 Software security</a></li>
 <li><a href="https://edu.epfl.ch/studyplan/en/master/computer-science-cybersecurity/coursebook/advanced-cryptography-COM-501">COM-501 Advanced cryptography</a></li>
+<li><a href="https://edu.epfl.ch/coursebook/en/topics-in-language-based-software-security-CS-725">CS-725 Topics in Language-based Software Security</a></li>
 </ul>
+</div>
 
-<h3>Graduate (PhD) Courses</h3>
+<div class="col">
+<h2>Events</h2>
+<hr>
 <ul>
-<li><a href="https://edu.epfl.ch/coursebook/en/topics-in-language-based-software-security-CS-725">CS-725 Topics in Language-based Software Security</a></li>
+<li>PrivaSec Seminar: semesterly gathering among all security and privacy folks</li>
 </ul>
 </div>
+</div>
+</div>
+
+<div class="container">
+<br/><br/><br/>
+<img src="secpriv.jpg" width="100%"/>
+</div>
 </section>
 
 </main>