diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 804ce17ff..fa894fe67 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -177,6 +177,10 @@ h4 {
     margin: 20px 0;
   }
 
+  a {
+    text-decoration: underline;
+  }
+
   p {
     margin: 10px 0;
   }
@@ -243,7 +247,7 @@ h4 {
 input[type="submit"],
 input[type="button"],
 button,
-.btn, a.btn {
+.btn {
   outline: 0;
   border: 0;
   box-shadow: 0;
@@ -255,10 +259,7 @@ button,
   font-size: 16px;
   cursor: pointer;
   display: inline-block;
-
-  a {
-    color: white;
-  }
+  text-decoration: none;
 
   a:hover {
     color: white;
@@ -268,7 +269,6 @@ button,
 input[type="submit"][disabled],
 input[type="button"][disabled],
 button[disabled],
-a.btn[disabled],
 .btn[disabled] {
   opacity: 0.3;
   background-color: var(--color-grey);
@@ -278,32 +278,28 @@ a.btn[disabled],
 input[type="submit"]:not([disabled]):hover,
 input[type="button"]:not([disabled]):hover,
 button:not([disabled]):hover,
-a.btn:not([disabled]):hover,
 .btn:not([disabled]):hover {
   background-color: var(--color-light);
   text-decoration: underline;
   color: white;
 }
 
-input.btn-primary,
-button.btn-primary,
-a.btn.btn-primary,
-.btn.btn-primary {
+.btn-primary {
   background-color: var(--color-primary);
 }
 
-input.btn-info,
-button.btn-info,
-a.btn.btn-info,
-.btn.btn-info {
+.btn-info {
   background-color: var(--color-info)
 }
 
+.btn--small {
+  padding: 4px 7px;
+  background-color: var(--color-darker);
+}
+
 input[type="submit"].btn-info:hover,
 input[type="button"].btn-info:hover,
-button.btn-info:hover,
-a.btn.btn-info:hover,
-.btn.btn-info:hover {
+.btn-info:hover {
   background-color: var(--color-grey)
 }
 
@@ -311,6 +307,10 @@ a.btn.btn-info:hover,
 .table {
   margin: 21px 0;
   width: 100%;
+
+  a {
+    text-decoration: none;
+  }
 }
 
 .table--striped {
@@ -407,3 +407,65 @@ a.btn.btn-info:hover,
     color: var(--color-font);
   }
 }
+
+.table--condensed {
+  margin: 0;
+
+  .table__th,
+  .table__td {
+    padding: 4px 8px;
+  }
+}
+
+/* UNORDERED LIST */
+.list-ul__item {
+  // padding: 4px 0;
+  line-height: 25px;
+}
+
+/* DEFINITION LIST */
+.deflist {
+  display: grid;
+  grid-template-columns: 100% ;
+}
+.deflist__dt,
+.deflist__dd {
+  padding: 4px 0;
+}
+
+.deflist__dt {
+  font-weight: 600;
+  font-size: 20px;
+
+  /* bad. avoid this. */
+  > a {
+    font-size: 16px;
+  }
+}
+
+.deflist__dd {
+  margin-bottom: 13px;
+}
+
+@media (min-width: 768px) {
+
+  .deflist {
+    grid-template-columns: repeat(2, max-content);
+  }
+
+  .deflist__dt,
+  .deflist__dd {
+    border-bottom: 1px solid #d3d3d3;
+    padding: 12px 0;
+    margin: 0;
+
+    &:last-of-type {
+      border: 0;
+    }
+  }
+
+  .deflist__dt {
+    padding-right: 24px;
+    font-size: 16px;
+  }
+}
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index fe40d2e3d..094c4aedb 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -1,77 +1,97 @@
 <div .profile>
 
-  <div .scrolltable>
-    <table .table.table--striped.table--hover.table--vertical>
-      <tr.table__row>
-        <th .table__th> _{MsgName}
-        <td .table__td> #{display userDisplayName}
-      <tr.table__row>
-        <th .table__th> _{MsgMatrikelNr}
-        <td .table__td> #{display userMatrikelnummer}
-      <tr.table__row>
-        <th .table__th> _{MsgEMail}
-        <td .table__td> #{display userEmail}
-      <tr.table__row>
-        <th .table__th> _{MsgIdent}
-        <td .table__td> #{display userIdent}
-      <tr.table__row>
-        <th .table__th> _{MsgPlugin}
-        <td .table__td> #{display userPlugin}
-      $if not $ null admin_rights
-        <tr.table__row>
-          <th .table__th> Administrator
-          <td .table__td>
-            <ul>
-              $forall institute <- admin_rights
-                <li>#{display institute}
-      $if not $ null lecturer_rights
-        <tr.table__row>
-          <th .table__th> Lehrberechtigt
-          <td .table__td>
-            <ul>
-              $forall institute <- lecturer_rights
-                <li>#{display institute}
-      $if not $ null lecture_owner
-        <tr.table__row>
-          <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 .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 .table__th> Studiengänge
-          <td .table__td>
-            <table .table .table-striped .table-hover>
-              <tr.table__row>
-                <th .table__th> Abschluss
-                <th .table__th> Studiengang
-                <th .table__th> Studienart
-                <th .table__th> Semester
+  <dl .deflist.profile-dl>
+      <dt .deflist__dt> _{MsgName}
+      <dd .deflist__dd> #{display userDisplayName}
+      <dt .deflist__dt> _{MsgMatrikelNr}
+      <dd .deflist__dd> #{display userMatrikelnummer}
+      <dt .deflist__dt> _{MsgEMail}
+      <dd .deflist__dd> #{display userEmail}
+      <dt .deflist__dt> _{MsgIdent}
+      <dd .deflist__dd> #{display userIdent}
+      <dt .deflist__dt> _{MsgPlugin}
+      <dd .deflist__dd> #{display userPlugin}
+    $if not $ null admin_rights
+      <dt .deflist__dt> Administrator
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall institute <- admin_rights
+            <li .list-ul__item>#{display institute}
+    $if not $ null lecturer_rights
+      <dt .deflist__dt> Lehrberechtigt
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall institute <- lecturer_rights
+            <li .list-ul__item>#{display institute}
+    $if not $ null lecture_owner
+      <dt .deflist__dt> Eigene Kurse
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall (E.Value csh, E.Value tid) <- lecture_owner
+            <li .list-ul__item>
+              <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
+    $if not $ null lecture_corrector
+      <dt .deflist__dt> Korrektor
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall (E.Value csh, E.Value tid) <- lecture_corrector
+            <li .list-ul__item>
+              <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
+    $if not $ null studies
+      <dt .deflist__dt> Studiengänge
+      <dd .deflist__dd>
+        <div .scrolltable>
+          <table .table.table--striped.table--hover.table--condensed>
+            <tr .table__row>
+              <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 .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 .table__th> Teilnehmer
-          <td .table__td>
-            <ul>
-              $forall (E.Value csh, E.Value tid, regSince) <- participant
-                <li>
-                  <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
-                  seit #{display regSince}
+            $forall (degree,field,fieldtype,semester) <- studies
+              <tr.table__row>
+                <td .table__td> #{display degree}
+                <td .table__td> #{display field}
+                <td .table__td> #{display fieldtype}
+                <td .table__td> #{display semester}
+
+    <dt .deflist__dt> Studiengänge
+    <dd .deflist__dd>
+      <div .scrolltable>
+        <table .table.table--striped.table--hover.table--condensed>
+          <tr .table__row>
+            <th .table__th> Abschluss
+            <th .table__th> Studiengang
+            <th .table__th> Studienart
+            <th .table__th> Semester
+
+          <tr.table__row>
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+
+          <tr.table__row>
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+
+          <tr.table__row>
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+            <td .table__td> Zelle
+
+
+    $if not $ null participant
+      <dt .deflist__dt> Teilnehmer
+      <dd .deflist__dd>
+        <dl .deflist>
+          $forall (E.Value csh, E.Value tid, regSince) <- participant
+            <dt .deflist__dt>
+              <a href=@{CourseR tid csh CShowR}>#{display tid} - #{csh}
+            <dd .deflist__dd>
+              seit #{display regSince}
 
   ^{settingsForm}