diff --git a/cards.md b/cards.md
index 80435bd9851efda319fc3b37efe21c28a5d1590a..26f0cff243ce754250967f16ab0579d9dd39ae33 100644
--- a/cards.md
+++ b/cards.md
@@ -93,21 +93,33 @@ order: -1
 
 		</ul>
 	</div>
-	<div class="index-box noborderbox" id="lab-card">
-		<h3>Lab</h3>
+	<div class="index-box noborderbox" id="lab-equipment-card">
+		<h3>Lab: Equipment</h3>
 		<ul>
-			<li><a href="{{ 'external/lab/book-lab-equipment' | relative_url }}">How to book a Lab Equipment in Quarks</a></li>
-			<li><a href="{{ 'external/lab/dishwasher-utilization-and-maintenance' | relative_url }}">Dishwasher utilization and maintenance</a></li>
-			<li><a href="{{ 'external/lab/handwashing' | relative_url }}">Handwashing</a></li>
-			<li><a href="{{ 'external/lab/lab-coats' | relative_url }}">Lab coats</a></li>
-			<li><a href="{{ 'external/lab/maintenance-of-fridges' | relative_url }}">Maintenance of fridges and freezers</a></li>
-			<li><a href="{{ 'external/lab/maintenance_of_cold_traps' | relative_url }}">Maintenance of cold traps  </a></li>
-			<li><a href="{{ 'external/lab/personal-alert-safety-system' | relative_url }}">Personal alert safety system (PASS)</a></li>
-			<li><a href="{{ 'external/lab/quarks-general' | relative_url }}">Quarks - General information</a></li>
-			<li><a href="{{ 'external/lab/utilization-of-autoclaves' | relative_url }}">Utilization of autoclaves</a></li>
-			<li><a href="{{ 'external/lab/utilization-of-balances' | relative_url }}">Utilization of balances</a></li>
-			<li><a href="{{ 'external/lab/utilization-of-bsc' | relative_url }}">Utilization of BSC</a></li>
-			<li><a href="{{ 'external/lab/utilization-of-pH-meter' | relative_url }}">Utilization of pH meter</a></li>
+			<li><a href="{{ 'external/lab-equipment/dishwasher-utilization-and-maintenance' | relative_url }}">Dishwasher utilization and maintenance</a></li>
+			<li><a href="{{ 'external/lab-equipment/maintenance-of-fridges' | relative_url }}">Maintenance of fridges and freezers</a></li>
+			<li><a href="{{ 'external/lab-equipment/maintenance_of_cold_traps' | relative_url }}">Maintenance of cold traps  </a></li>
+			<li><a href="{{ 'external/lab-equipment/utilization-of-autoclaves' | relative_url }}">Utilization of autoclaves</a></li>
+			<li><a href="{{ 'external/lab-equipment/utilization-of-balances' | relative_url }}">Utilization of balances</a></li>
+			<li><a href="{{ 'external/lab-equipment/utilization-of-bsc' | relative_url }}">Utilization of BSC</a></li>
+			<li><a href="{{ 'external/lab-equipment/utilization-of-pH-meter' | relative_url }}">Utilization of pH meter</a></li>
+
+		</ul>
+	</div>
+	<div class="index-box noborderbox" id="lab-hsa-card">
+		<h3>Lab: Health & Safety, Access</h3>
+		<ul>
+			<li><a href="{{ 'external/lab-hsa/handwashing' | relative_url }}">Handwashing</a></li>
+			<li><a href="{{ 'external/lab-hsa/lab-coats' | relative_url }}">Lab coats</a></li>
+			<li><a href="{{ 'external/lab-hsa/personal-alert-safety-system' | relative_url }}">Personal alert safety system (PASS)</a></li>
+
+		</ul>
+	</div>
+	<div class="index-box noborderbox" id="lab-software-card">
+		<h3>Lab: Software</h3>
+		<ul>
+			<li><a href="{{ 'external/lab-software/book-lab-equipment' | relative_url }}">How to book a Lab Equipment in Quarks</a></li>
+			<li><a href="{{ 'external/lab-software/quarks-general' | relative_url }}">Quarks - General information</a></li>
 
 		</ul>
 	</div>