diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index f102192b2..fe40d2e3d 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -3,71 +3,71 @@
   <div .scrolltable>
     <table .table.table--striped.table--hover.table--vertical>
       <tr.table__row>
-        <th> _{MsgName}
-        <td> #{display userDisplayName}
+        <th .table__th> _{MsgName}
+        <td .table__td> #{display userDisplayName}
       <tr.table__row>
-        <th> _{MsgMatrikelNr}
-        <td> #{display userMatrikelnummer}
+        <th .table__th> _{MsgMatrikelNr}
+        <td .table__td> #{display userMatrikelnummer}
       <tr.table__row>
-        <th> _{MsgEMail}
-        <td> #{display userEmail}
+        <th .table__th> _{MsgEMail}
+        <td .table__td> #{display userEmail}
       <tr.table__row>
-        <th> _{MsgIdent}
-        <td> #{display userIdent}
+        <th .table__th> _{MsgIdent}
+        <td .table__td> #{display userIdent}
       <tr.table__row>
-        <th> _{MsgPlugin}
-        <td> #{display userPlugin}
+        <th .table__th> _{MsgPlugin}
+        <td .table__td> #{display userPlugin}
       $if not $ null admin_rights
         <tr.table__row>
-          <th> Administrator
-          <td>
+          <th .table__th> Administrator
+          <td .table__td>
             <ul>
               $forall institute <- admin_rights
                 <li>#{display institute}
       $if not $ null lecturer_rights
         <tr.table__row>
-          <th> Lehrberechtigt
-          <td>
+          <th .table__th> Lehrberechtigt
+          <td .table__td>
             <ul>
               $forall institute <- lecturer_rights
                 <li>#{display institute}
       $if not $ null lecture_owner
         <tr.table__row>
-          <th> Eigene Kurse
-          <td>
+          <th .table__th> Eigene Kurse
+          <td .table__td>
             <ul>
               $forall (E.Value csh, E.Value tid) <- lecture_owner
                 <li>
                   <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
       $if not $ null lecture_corrector
         <tr.table__row>
-          <th> Korrektor
-          <td>
+          <th .table__th> Korrektor
+          <td .table__td>
             <ul>
               $forall (E.Value csh, E.Value tid) <- lecture_corrector
                 <li>
                   <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
       $if not $ null studies
         <tr.table__row>
-          <th> Studiengänge
-          <td>
+          <th .table__th> Studiengänge
+          <td .table__td>
             <table .table .table-striped .table-hover>
               <tr.table__row>
-                <th> Abschluss
-                <th> Studiengang
-                <th> Studienart
-                <th> Semester
+                <th .table__th> Abschluss
+                <th .table__th> Studiengang
+                <th .table__th> Studienart
+                <th .table__th> Semester
 
               $forall (degree,field,fieldtype,semester) <- studies
                 <tr.table__row>
-                  <td> #{display degree}
-                  <td> #{display field}
-                  <td> #{display fieldtype}
-                  <td> #{display semester}
+                  <td .table__td> #{display degree}
+                  <td .table__td> #{display field}
+                  <td .table__td> #{display fieldtype}
+                  <td .table__td> #{display semester}
       $if not $ null participant
         <tr.table__row>
-          <th> Teilnehmer
-          <td>
+          <th .table__th> Teilnehmer
+          <td .table__td>
             <ul>
               $forall (E.Value csh, E.Value tid, regSince) <- participant
                 <li>