diff --git a/memberPlumbing/upcomingEvents.py b/memberPlumbing/upcomingEvents.py
index acbb1c3..cd7e4e3 100644
--- a/memberPlumbing/upcomingEvents.py
+++ b/memberPlumbing/upcomingEvents.py
@@ -86,9 +86,9 @@ def generate_post():
 
 <strong>Class policies</strong> (liability waiver, withdrawal, cancellation, etc.) can be found <a href="https://claremontmakerspace.org/class-policies/" data-wpel-link="internal">here</a>.
 
-<strong>Instructors:</strong> Interested in teaching a class at CMS? Please fill out our <a href="https://docs.google.com/forms/d/e/1FAIpQLSdJyEVRJxzIczG784VkOm_DsNyv-VXRXYzlis8qlMdEOvHGpQ/viewform" target="_blank" rel="noreferrer noopener external" data-wpel-link="external">Class Proposal Form</a><a href="https://docs.google.com/forms/d/e/1FAIpQLSdJyEVRJxzIczG784VkOm_DsNyv-VXRXYzlis8qlMdEOvHGpQ/viewform" target="_blank" rel="noreferrer noopener external" data-wpel-link="external">.</a>
+<strong>Instructors:</strong> Interested in teaching a class at CMS? Please fill out our <a href="https://claremontmakerspace.org/cms-class-proposal-form/" data-wpel-link="internal">Class Proposal Form</a>.
 
-<strong>Tours:</strong> Want to see what the Claremont MakerSpace is all about? Tours are by appointment only due to COVID-19 restrictions. <a href="https://tickets.claremontmakerspace.org/open.php" target="_blank" rel="noreferrer noopener external" data-wpel-link="external">Contact Us</a> to schedule your tour where you can learn about all the awesome tools that the CMS offers access to, as well as how membership, classes, and studio spaces work.
+<strong>Tours:</strong> Want to see what the Claremont MakerSpace is all about? Tours are by appointment only. <a href="https://tickets.claremontmakerspace.org/open.php" target="_blank" rel="noreferrer noopener external" data-wpel-link="external">Contact Us</a> to schedule your tour where you can learn about all the awesome tools that the CMS offers access to, as well as how membership, classes, and studio spaces work.
 
 <hr />
 """
@@ -110,15 +110,15 @@ def generate_post():
     )
 
     yield format_section(
-        "Just Missed",
+        "<hr />Just Missed",
         "These classes are currently full at time of writing. If you are interested, please check the event's page; spots occasionally open up. Keep an eye on this newsletter to see when these classes are offered again.",
         full_events,
         truncate=True,
     )
 
     yield format_section(
-        "Ongoing",
-        "These classes are ongoing. Registration is closed, but they may be offered again in the future.",
+        "<hr />Ongoing Events",
+        "These events are ongoing. Registration is currently closed, but these events may be offered again in the future.",
         ongoing_events,
         truncate=True,
     )