diff --git a/public/app/themes/clarity/functions.php b/public/app/themes/clarity/functions.php
index f5e2bed2a..09d607081 100644
--- a/public/app/themes/clarity/functions.php
+++ b/public/app/themes/clarity/functions.php
@@ -125,10 +125,3 @@
 $search = new MOJ\Intranet\Search();
 $search->hooks();
 
-/// Prevent the Agency Switcher page from being overwritten
-add_action('save_post', function ($post_id, $post) {
-    if ($post->post_name === 'agency-switcher') {
-        update_post_meta($post_id, '_wp_page_template', 'agency-switcher.php');
-    }
-}, 99, 2);
-
diff --git a/public/app/themes/clarity/inc/admin/page.php b/public/app/themes/clarity/inc/admin/page.php
index e71d4f9e7..283fbbdb5 100644
--- a/public/app/themes/clarity/inc/admin/page.php
+++ b/public/app/themes/clarity/inc/admin/page.php
@@ -7,3 +7,10 @@ function add_page_excerpts()
 {
     add_post_type_support('page', 'excerpt');
 }
+
+// Prevent the Agency Switcher page from being overwritten
+add_action('save_post', function ($post_id, $post) {
+    if ($post->post_name === 'agency-switcher') {
+        update_post_meta($post_id, '_wp_page_template', 'agency-switcher.php');
+    }
+}, 99, 2);
diff --git a/public/app/themes/clarity/inc/admin/users/add-agency-admin.php b/public/app/themes/clarity/inc/admin/users/add-agency-admin.php
index fcbc1fcdd..7812df0bd 100644
--- a/public/app/themes/clarity/inc/admin/users/add-agency-admin.php
+++ b/public/app/themes/clarity/inc/admin/users/add-agency-admin.php
@@ -42,6 +42,7 @@
     'delete_resource_categories' => true,
     'opt_in_content' => true,
     'unfiltered_html' => true,
+    'manage_prior_party_banners' => true,
 
     // files
     'export' => true,
diff --git a/public/app/themes/clarity/inc/comments.php b/public/app/themes/clarity/inc/comments.php
index 666e10499..08696fee2 100644
--- a/public/app/themes/clarity/inc/comments.php
+++ b/public/app/themes/clarity/inc/comments.php
@@ -62,7 +62,14 @@ function is_valid_email_domain($login, $email, $errors)
 function format_comment($comment, $args, $depth)
 {
     $post_type = get_post_type();
-    $GLOBALS['comment'] = $comment; ?>
+    $GLOBALS['comment'] = $comment;
+    $options = get_option('maintenance_options', [
+        'maintenance_mode_status' => 0,
+        'maintenance_mode_message' => '',
+    ]);
+    $maintenance_mode = $options['maintenance_mode_status'] ?? false;
+    ?>
+    
 
     <li <?= comment_class() ?> id="comment-<?= comment_ID() ?>">
     <div class="comment-body" id="comment-<?= comment_ID() ?>">
@@ -74,7 +81,7 @@ function format_comment($comment, $args, $depth)
         </cite>
         <?php comment_text();
 
-        if ($post_type != 'condolences') { ?>
+        if ($post_type != 'condolences' && !$maintenance_mode) { ?>
             <div class="reply">
                 <?php
                 $args['depth'] = $depth;
diff --git a/public/app/themes/clarity/inc/post-types/event.php b/public/app/themes/clarity/inc/post-types/event.php
index 47b4b523b..082e33663 100644
--- a/public/app/themes/clarity/inc/post-types/event.php
+++ b/public/app/themes/clarity/inc/post-types/event.php
@@ -129,4 +129,10 @@ function mojintranet_sort_events($vars)
 function mojintranet_clear_events_cache() {
     global $wpdb;
     $wpdb->query( "DELETE FROM `$wpdb->options` WHERE `option_name` LIKE ('_transient_event_get_events_%')" );
+
+    // If using persistent object cache, clear the cache here.
+    if(function_exists('wp_cache_flush')) {
+        // As there is no function to clear cache by 'keys that start with', we have to flush the whole cache.
+        wp_cache_flush();
+    }
 }
diff --git a/public/app/themes/clarity/agency-switcher.php b/public/app/themes/clarity/page_agency-switcher.php
similarity index 100%
rename from public/app/themes/clarity/agency-switcher.php
rename to public/app/themes/clarity/page_agency-switcher.php
diff --git a/public/app/themes/clarity/page_media_grid.php b/public/app/themes/clarity/page_media_grid.php
index aa50fc7a9..bb0455c92 100644
--- a/public/app/themes/clarity/page_media_grid.php
+++ b/public/app/themes/clarity/page_media_grid.php
@@ -27,6 +27,8 @@
 
   <h1 class="o-title o-title--page"><?php echo the_title(); ?></h1>
 
+    <?php do_action('before_media_grid_content'); ?>
+
     <div class="l-full-page" role="main">
 
         <?php
diff --git a/public/app/themes/clarity/src/components/c-events-item-byline/view.php b/public/app/themes/clarity/src/components/c-events-item-byline/view.php
index 2186e19ab..2299c5e6a 100644
--- a/public/app/themes/clarity/src/components/c-events-item-byline/view.php
+++ b/public/app/themes/clarity/src/components/c-events-item-byline/view.php
@@ -8,8 +8,7 @@
 <article class="c-events-item-byline">
   <header>
 
-      <h3 class="c-events-item-byline__link"><a href="<?= $post_url ?? '' ?>"><?= $event_title ?? '' ?></a></h3>
-
+    <h3 class="c-events-item-byline__link"><a href="<?= $post_url ?? '' ?>"><?= $event_title ?? '' ?></a></h3>
 
     <?php
     if (empty($all_day)) {
@@ -47,3 +46,8 @@
   </header>
 </article>
 <!-- c-events-item-byline ends here -->
+
+<?php
+  // Unset variables to prevent leaking to following events in the loop.
+  unset($time);
+  unset($datetime);