diff --git a/_layouts/announcement.html b/_layouts/announcement.html
index bd91b0a5d6aed42977ca977bbe443d4f0ffafb2c..d20bd206dacd9491554eb920f78cfbdcafee4527 100644
--- a/_layouts/announcement.html
+++ b/_layouts/announcement.html
@@ -1,6 +1,6 @@
 <div class="announcement">
+  <h2 class="announcement-header">{% if page.date %}<strong class="announcement-meta">{{ page.date | date: '%b %e' }}</strong> {% endif %}{{ page.title }}</h2>
   <div class="announcement-body">
-    <h2>{{ page.title }}{% if page.date %} <strong class="announcement-meta">{{ page.date | date: '%b %e' }}</strong>{% endif %}</h2>
     {{ content }}
   </div>
 </div>
diff --git a/_layouts/module.html b/_layouts/module.html
index 6e21f32b368fa108e3993add8df1602bd7c3c6da..0e71221071100460fe5d0bfe8c82b5f955eeb0fc 100644
--- a/_layouts/module.html
+++ b/_layouts/module.html
@@ -1,5 +1,5 @@
 <div class="module">
-  <h3 class="module-header"><strong class="module-meta">{{ page.week }}</strong> {{ page.title }}</h3>
+  <h2 class="module-header">{% if page.week %}<strong class="module-meta">Week {{ page.week }}</strong> {% endif %}{{ page.title }}</h2>
   {% if page.days %}
   <dl class="module-days">
     {% for day in page.days %}
diff --git a/_sass/custom/announcement.scss b/_sass/custom/announcement.scss
index a1f6804746b46c52911c906a43619fd5c16e24cb..ce5fd9f0fd955e7349bcc428799e77a9f3bd87c4 100644
--- a/_sass/custom/announcement.scss
+++ b/_sass/custom/announcement.scss
@@ -2,6 +2,10 @@
   @extend %card;
 }
 
+.announcement-header {
+  @extend %card-header;
+}
+
 .announcement-body {
   @extend %card-body;
 
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index bfe59a5437911686594dfc0e3461a6bd831585ff..34662227957c7fc90afab9dbe4c8b3f76a0cba96 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -19,6 +19,10 @@
   @include mq(lg) {
     flex: 1 0 0%;
   }
+
+  >:first-child {
+    border-top: none;
+  }
 }
 
 %card-header {
@@ -33,6 +37,7 @@
   @extend %card-header;
 
   flex: 1 1 auto;
+  border-top: $border $border-color;
 }
 
 %card-meta {
diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss
index 581c540434c29d5ec7ba94d04d5f1f7eaab380be..e853cef57bee955b39dac29cccab2f7572aceaeb 100644
--- a/_sass/custom/module.scss
+++ b/_sass/custom/module.scss
@@ -2,6 +2,7 @@
   @extend %card;
 
   .module-days {
+    border-top: $border $border-color;
     display: grid;
     grid-template-columns: max-content 1fr;
     margin: 0;
@@ -45,6 +46,14 @@
         border-top: $border $border-color;
       }
 
+      &:first-child {
+        border-top: none;
+
+        +.module-event {
+          border-top: none;
+        }
+      }
+
       &::after {
         content: ":";
       }