diff --git a/_layouts/module.html b/_layouts/module.html
index 8c7d0710469f3efb3142e8938d062a77b3c401e1..1ace16ddb78bbb0ba68184371fe3d096657cfcc4 100644
--- a/_layouts/module.html
+++ b/_layouts/module.html
@@ -1,30 +1,4 @@
 <div class="module">
-  <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 %}
-    {% assign date = day | first %}
-    {% assign events = day | last %}
-    <dt class="module-day">{{ date | date: '%b %e' }}</dt>
-    {% for event in events %}
-    {% assign main = event | first %}
-    {% assign info = event | last %}
-    {% capture main %}{% include eval.liquid content=main %}{% endcapture %}
-    {% capture info %}{% include eval.liquid content=info %}{% endcapture %}
-    <dd class="module-event">{{ main | markdownify }}{{ info | markdownify }}</dd>
-    {% endfor %}
-    {% endfor %}
-  </dl>
-  {% endif %}
-  {% assign content_strip = content | strip %}
-  {% if content_strip != "" %}
-  <div class="module-body">
-    {{ content }}
-  </div>
-  {% endif %}
+  <h2>{{ page.title }}</h2>
+  {{ content }}
 </div>
diff --git a/_modules/week-01.md b/_modules/week-01.md
index c7286936680862f064bda9e5269d97a521bfbf57..9af2bd488ce46b372efb98a7293eafb96b7d30f4 100644
--- a/_modules/week-01.md
+++ b/_modules/week-01.md
@@ -1,24 +1,23 @@
 ---
-week: 1
 title: Introduction to Java
-days:
-  2019-04-01:
-    "[Java & Git](#)":
-      "[1.1](#)"
-    "**HW 1 out**{: .label .label-hw-out }":
-      null
-  2019-04-02:
-    "**Section**{: .label .label-section }[Intro to Java](#)":
-      "Solution"
-  2019-04-03:
-    "[Variables & Objects](#)":
-      "[1.2](#), [2.1](#)"
-  2019-04-04:
-    "**Lab**{: .label } [Intro to Java](#)":
-      null
-  2019-04-05:
-    "[Tracing, IntLists, & Recursion](#)":
-      "[2.1](#)"
-    "**HW 1 due**{: .label .label-hw-due }":
-      null
 ---
+
+Sep 28
+: [Java & Git](#)
+  : [1.1](#)
+
+Sep 29
+: **Section**{: .label .label-purple }[Intro to Java](#)
+  : [Solution](#)
+
+Sep 30
+: [Variables & Objects](#)
+  : [1.2](#), [2.1](#)
+
+Oct 1
+: **Lab**{: .label .label-purple } [Intro to Java](#)
+
+Oct 2
+: [Tracing, IntLists, & Recursion](#)
+  : [2.1](#)
+: **HW 1 due**{: .label .label-red }
diff --git a/_modules/week-02.md b/_modules/week-02.md
index 164506675af20fdb568d0a06bab97ea1d5ac812a..86b8eb35053c0453e3d60eff44d06b8815aa0c5f 100644
--- a/_modules/week-02.md
+++ b/_modules/week-02.md
@@ -1,24 +1,23 @@
 ---
-week: 2
 title: Basic Data Structures
-days:
-  2019-04-08:
-    "[Linked Lists & Encapsulation](#)":
-      "[3.1](#), [2.2](#), [2.3](#)"
-    "**HW 2 out**{: .label .label-hw-out }":
-      null
-  2019-04-09:
-    "**Section**{: .label .label-section }[Linked Lists](#)":
-      "Solution"
-  2019-04-10:
-    "[Resizing Arrays](#)":
-      "[2.4](#), [2.5](#)"
-  2019-04-11:
-    "**Lab**{: .label } [Resizing Arrays](#)":
-      null
-  2019-04-12:
-    "[Runtime Analysis](#)":
-      "[8.1](#), [8.2](#), [8.3](#), [8.4](#)"
-    "**HW 2 due**{: .label .label-hw-due }":
-      null
 ---
+
+Oct 5
+: [Linked Lists & Encapsulation](#)
+  : [3.1](#), [2.2](#), [2.3](#)
+
+Oct 6
+: **Section**{: .label .label-purple }[Linked Lists](#)
+  : [Solution](#)
+
+Oct 7
+: [Resizing Arrays](#)
+  : [2.4](#), [2.5](#)
+
+Oct 8
+: **Lab**{: .label .label-purple } [Resizing Arrays](#)
+
+Oct 9
+: [Runtime Analysis](#)
+  : [8.1](#), [8.2](#), [8.3](#), [8.4](#)
+: **HW 2 due**{: .label .label-red }
diff --git a/_sass/custom/card.scss b/_sass/custom/card.scss
index a3d4495ea9ba316534c3da0540b63fdb8a8ab920..f20c3bf568a2c1238af288eccd8bfdc5d52aa65f 100644
--- a/_sass/custom/card.scss
+++ b/_sass/custom/card.scss
@@ -31,7 +31,6 @@
 }
 
 %card-meta {
-  @extend .label;
   border-radius: $border-radius;
   padding-bottom: 0;
   user-select: none;
diff --git a/_sass/custom/module.scss b/_sass/custom/module.scss
index e20759b7296ea9d345ae205c35d519d84aba6100..7c28cf9dbfc958538045399fdede3812d5925bdf 100644
--- a/_sass/custom/module.scss
+++ b/_sass/custom/module.scss
@@ -1,7 +1,17 @@
+.main-content .module,
 .module {
   @extend %card;
 
-  .module-days {
+  h1, h2 {
+    @extend .text-gamma;
+  }
+
+  .label {
+    @extend %card-meta;
+    margin-left: 0;
+  }
+
+  >dl {
     border-bottom: $border $border-color;
     border-top: $border $border-color;
     display: grid;
@@ -25,21 +35,20 @@
       }
     }
 
-    .module-day {
+    >dt {
       @extend %module-item;
       border-top: $border $border-color;
       font-weight: normal;
-      grid-column-start: 1;
       text-align: right;
 
-      +.module-event {
+      +dd {
         border-top: $border $border-color;
       }
 
       &:first-child {
         border-top: none;
 
-        +.module-event {
+        +dd {
           border-top: none;
         }
       }
@@ -49,63 +58,32 @@
       }
     }
 
-    .module-event {
+    >dd {
       @extend %module-item;
-      display: flex;
-      flex-direction: column;
-      grid-column-start: 2;
-
-      @include mq(sm) {
-        flex-direction: row;
-      }
+      font-weight: 700;
 
-      +.module-event {
+      +dd {
         padding-top: 0;
       }
 
-      p,
-      ol,
-      ul,
       dl {
+        display: flex;
+        flex-direction: column;
         margin: 0;
-        flex: 1 0 62.5%;
-      }
-
-      p {
-        font-weight: 500;
 
-        +p {
-          flex-shrink: 1;
+        @include mq(sm) {
+          flex-direction: row;
         }
-      }
-    }
-
-    .label {
-      @extend %card-meta;
-      margin-left: 0;
 
-      &.label-hw-out {
-        @extend .label-yellow;
-      }
-
-      &.label-hw-due {
-        @extend .label-red;
-      }
+        dt {
+          flex: 0 0 62.5%;
+          margin: 0;
+        }
 
-      &.label-section {
-        @extend .label-purple;
+        dd {
+          margin: 0;
+        }
       }
     }
   }
 }
-
-.module-meta {
-  @extend %card-meta, .text-grey-dk-100, .bg-grey-lt-200;
-}
-
-.module-header {
-  @extend .text-gamma;
-}
-
-.module-body {
-}