diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index b4a6b8679..20eeeb623 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -55,6 +55,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
+// ---------------------------------------------------------------------------
+// Dropdown
+// ---------------------------------------------------------------------------
+
 .dropdown-menu {
   font-size: 15px;
   color: pvar(--mainForegroundColor);
@@ -83,6 +87,14 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
+.dropdown-divider {
+  margin: 0.3rem 0;
+}
+
+// ---------------------------------------------------------------------------
+// Modal
+// ---------------------------------------------------------------------------
+
 @media screen and (min-width: #{breakpoint(md)}) {
   .modal::before {
     vertical-align: middle;
@@ -178,7 +190,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-// Nav customizations
+// ---------------------------------------------------------------------------
+// Nav
+// ---------------------------------------------------------------------------
+
 .nav .nav-link {
   display: flex !important;
   align-items: center;
@@ -231,6 +246,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
+// ---------------------------------------------------------------------------
+// Card, collapse and accordion
+// ---------------------------------------------------------------------------
+
 .card {
   background-color: pvar(--mainBackgroundColor);
   border-color: #dee2e6;
@@ -249,9 +268,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-.dropdown-divider {
-  margin: 0.3rem 0;
-}
+// ---------------------------------------------------------------------------
+// Buttons & form controls
+// ---------------------------------------------------------------------------
 
 .btn-outline-secondary {
   border-color: $input-border-color;
@@ -292,13 +311,13 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-// input box-shadow on focus
 .form-control {
   font-size: 15px;
   color: pvar(--mainForegroundColor);
   background-color: pvar(--inputBackgroundColor);
   outline: none;
 
+  // Input box-shadow on focus
   &:focus-within,
   &:focus {
     box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest);