diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss
index ce5fd9f0fd955e7349bcc428799e77a9f3bd87c4..3f1403ce0f5e0051a4b48b479f93fc9044373862 100644
--- a/_sass/custom/announcement.scss
+++ b/_sass/custom/announcement.scss
@@ -3,16 +3,9 @@
 }
 
 .announcement-header {
-  @extend %card-header;
 }
 
 .announcement-body {
-  @extend %card-body;
-
-  h1, h2, h3, h4, h5, h6 {
-    display: flex;
-    align-items: center;
-  }
 }
 
 .announcement-meta {
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index 34662227957c7fc90afab9dbe4c8b3f76a0cba96..43e1d5b7b570563f10e525b5d2f10a4969461262 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -13,6 +13,7 @@
   display: flex;
   flex-direction: column;
   min-width: 0;
+  padding: $sp-2 $sp-4 0;
   position: relative;
   word-wrap: break-word;
 
@@ -23,23 +24,12 @@
   >:first-child {
     border-top: none;
   }
-}
-
-%card-header {
-  padding: $sp-2 $sp-4;
 
-  p {
-    margin-bottom: $sp-2;
+  >:last-child {
+    border-bottom: none;
   }
 }
 
-%card-body {
-  @extend %card-header;
-
-  flex: 1 1 auto;
-  border-top: $border $border-color;
-}
-
 %card-meta {
   @extend .label;
   border-radius: $border-radius;
diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 82e39ae729aeb4510794171e1c7662b594b1cd2e..867bb8566f44c19b6c9c9db070fd8af8ad647d46 100644
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -27,6 +27,11 @@ details {
   margin-right: 40px;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  align-items: center;
+  display: flex;
+}
+
 iframe,
 summary {
   max-width: 100%;
diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss
index e853cef57bee955b39dac29cccab2f7572aceaeb..a057233ebbc7bd11820a94f5e54e2bddbb7d3872 100644
--- a/_sass/custom/module.scss
+++ b/_sass/custom/module.scss
@@ -2,16 +2,16 @@
   @extend %card;
 
   .module-days {
+    border-bottom: $border $border-color;
     border-top: $border $border-color;
     display: grid;
     grid-template-columns: max-content 1fr;
-    margin: 0;
+    margin: $sp-2 (-$sp-4);
 
     @include mq(lg) {
       grid-template-columns: 1fr 7fr;
     }
 
-
     .module-day,
     .module-event {
       margin: 0;
@@ -92,9 +92,7 @@
 }
 
 .module-header {
-  @extend %card-header;
 }
 
 .module-body {
-  @extend %card-body;
 }