diff --git a/www/docs/style/sass/pages/_alert.scss b/www/docs/style/sass/pages/_alert.scss
index cf865b5b35..bab7197d39 100644
--- a/www/docs/style/sass/pages/_alert.scss
+++ b/www/docs/style/sass/pages/_alert.scss
@@ -87,48 +87,34 @@
   }
 }
 
-.alerts-form {
-  max-width: 14em;
-  margin: 0 auto;
-
-  label {
-    width: 100%;
-    text-align: left;
-    color: inherit;
-    font-size: 0.8em;
-    margin-bottom: 0.4em;
-  }
-
-  .button {
-    margin: 0;
-  }
-
-  input[type="text"] {
-    border-color: #999;
-    margin: 0;
-    height: auto; // allow input to be sized by content's default height
-    font-size: 1.4em;
-    line-height: 1em;
-    padding: 0.2em 0.4em;
-    border-radius: 3px;
+// Alert form
+.alert-form__section {
+  margin-bottom: 2.5rem;
+  :last-child {
+      margin-bottom: 0;
   }
+}
 
-  @media (min-width: $medium-screen) {
-    max-width: none; // let the form fill the whole width of the parent
+.alert-form__subtitle {
+  margin-bottom: 0.5rem;
+}
 
-    p {
-      display: inline-block;
-      vertical-align: bottom; // line up the bottom of the three inputs
-      margin: 0;
-    }
+.alert-form__label {
+  display: inline;
+  margin-left: 0.5em;
+}
 
-    p + p {
-      margin-left: 1em;
-    }
+.alert__controls {
+  margin-bottom: 2rem;
+  form {
+      display: inline;
+  }
 
-    .button {
-      vertical-align: bottom; // line up with bottom of parent
-    }
+  button {
+      margin-bottom: 0;
+      span {
+          margin-right: 0.2rem;
+      }
   }
 }
 
@@ -187,6 +173,51 @@
   padding: 2em 0;
 }
 
+.alerts-form {
+  label {
+      color: $body-font-color;
+      font-size: 1.1rem;
+      line-height: 1.2;
+      margin-bottom: 0.75rem;
+  }
+
+  input[type="checkbox"], input[type="radio"] {
+      display: inline-block;
+      height: 1.5rem;
+      width: 1.5rem;
+      margin: 0 0.25rem 0 0;
+      vertical-align: middle;
+
+       + label {
+           display: inline-block;
+           margin-bottom: 0;
+           line-height: 1.5rem;
+           vertical-align: middle;
+       }
+  }
+
+  input[type="text"], select {
+      max-width: 400px;
+      height: 40px;
+      border-color: $body-font-color;
+  }
+
+  .checkbox-wrapper {
+      display: flex;
+      flex-direction: row;
+      
+      input[type="checkbox"], input[type="radio"] {
+          flex-shrink: 0;
+      }
+  }
+
+  .checkbox-group  {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+      gap: 1rem;
+  }
+}
+
 // If browser supports background-size,
 // and we have space, give the message an icon
 @media (min-width: $medium-screen) {
@@ -224,6 +255,25 @@
     background-color: white;
 }
 
+.alert-section__header {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 0.5rem;
+
+  button, h2 {
+      margin-bottom: 0;
+      margin-top: 0;
+  }
+}
+
+.alert-section__message {
+  background-color: #FFFCD9; // very light yellow
+  padding: 1rem;
+}
+
 .alert-section__primary {
     @include grid-column(12, $collapse: true);
     padding: 1.5em;
@@ -283,11 +333,6 @@
     }
 }
 
-.alert-section--message {
-  background-color: #FFFCD9; // very light yellow
-  padding: 1rem;
-}
-
 .alert-section--disambiguation {
     li {
         margin: 1em 0;
@@ -305,54 +350,6 @@
     }
 }
 
-.alert-page-main-inputs {
-    font-size: 1.2em;
-    @include clearfix();
-    margin: 0.5em 0;
-
-    input[type="text"],
-    input[type="email"] {
-        width: 100%;
-        height: 2.49em;
-        padding-left: 0.8em;
-        padding-right: 0.8em;
-    }
-
-    input[type="text"] {
-        float: left;
-        width: 60%;
-        @include border-radius(3px 0 0 3px);
-    }
-
-    .button {
-        float: left;
-        height: 2.8em;
-        width: 40%;
-        @include border-radius(0 3px 3px 0);
-        margin-bottom: 0;
-        padding-left: 0;
-        padding-right: 0;
-    }
-
-    @media (min-width: 24em) {
-        input[type="text"] {
-            width: 70%;
-        }
-        .button {
-            width: 30%;
-        }
-    }
-
-    @media (min-width: 36em) {
-        input[type="text"] {
-            width: 80%;
-        }
-        .button {
-            width: 20%;
-        }
-    }
-}
-
 .alert-page-error {
     display: block;
     color: $colour_pale_red;
@@ -407,20 +404,6 @@
     }
 }
 
-.alert-section__page-header {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.5rem;
-
-  button, h2 {
-      margin-bottom: 0;
-      margin-top: 0;
-  }
-}
-
 .alert-meta {
   .alert-meta__results {
       display: flex;
@@ -477,7 +460,7 @@
 }
 
 .keyword-alert-accordion__keyword-list,
-.alert-creation-steps {
+.keyword-list {
   margin-bottom: 2.5rem;
   ul {
       list-style: none;
diff --git a/www/includes/easyparliament/templates/html/alert/_alert_form.php b/www/includes/easyparliament/templates/html/alert/_alert_form.php
index 01625b2ced..2f57c86ff8 100644
--- a/www/includes/easyparliament/templates/html/alert/_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_alert_form.php
@@ -1,311 +1,308 @@
           <div class="alert-section">
             <div class="alert-section__primary">
-              <div class="alert-creation-steps">
-                <h1><?php if ($token) { ?>
-                  <?= gettext('Edit Alert') ?>
-                <?php } else { ?>
-                  <?= gettext('Create Alert') ?>
-                <?php } ?>
-                </h1>
+              <h1><?php if ($token) { ?>
+                <?= gettext('Edit Alert') ?>
+              <?php } else { ?>
+                <?= gettext('Create Alert') ?>
+              <?php } ?>
+              </h1>
 
-                <form action="<?= $actionurl ?>" method="POST" id="create-alert-form">
-                  <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                <?php if (!$step or $step == "define") { ?>
+              <form action="<?= $actionurl ?>" method="POST" class="alerts-form">
+                <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
+              <?php if (!$step or $step == "define") { ?>
 
-                  <input type="hidden" name="this_step" value="define">
-                  <div class="alert-step" id="step1" role="region" aria-labelledby="step1-header">
-                  <h2 id="step1-header"><?= gettext('Define alert') ?></h2>
+                <input type="hidden" name="this_step" value="define">
+                <div class="alert-step" id="step1" role="region" aria-labelledby="step1-header">
+                <h2 id="step1-header"><?= gettext('Define alert') ?></h2>
 
-                    <?php if (!$email_verified) { ?>
-                    <div class="alert-page-subsection">
-                      <?php if (isset($errors['email'])) { ?>
-                        <span class="alert-page-error"><?= $errors['email'] ?></span>
-                      <?php } ?>
-                      <label for="email"><?= gettext('Your email address') ?></label>
-                      <input type="email" class="form-control" placeholder="<?= gettext('Your email address') ?>" name="email" id="email" value="<?= _htmlentities($email) ?>">
-                    </div>
+                  <?php if (!$email_verified) { ?>
+                  <div class="alert-form__section">
+                    <?php if (isset($errors['email'])) { ?>
+                      <span class="alert-page-error"><?= $errors['email'] ?></span>
                     <?php } ?>
+                    <label for="email"><?= gettext('Your email address') ?></label>
+                    <input type="email" class="form-control" placeholder="<?= gettext('Your email address') ?>" name="email" id="email" value="<?= _htmlentities($email) ?>">
+                  </div>
+                  <?php } ?>
 
-                    <div class="alert-page-subsection">
-                    <label for="words[]"><?= gettext('What word or phrase would you like to receive alerts about?') ?></label>
-                      <?php if (isset($errors['alertsearch']) && $submitted) { ?>
-                        <span class="alert-page-error"><?= $errors['alertsearch'] ?></span>
-                      <?php } ?>
-                      <input type="text" id="words0" name="words[]" aria-required="true" value="<?= count($keywords) > 0 ? _htmlspecialchars($keywords[0]) : '' ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
-                      <?php foreach (array_slice($keywords, 1) as $index => $word) { ?>
-                        <input type="text" id="words<?= $index + 1 ?>" name="words[]" value="<?= _htmlspecialchars($word) ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
-                      <?php } ?>
-                      <?php if ($addword) { ?>
-                      <input type="text" id="words<?= count($words) ?>" name="words[]" value="" placeholder="Eg. 'Freedom of Information', 'FOI'">
-                      <?php } ?>
-                      <button class="button" type="submit" name="addword" value="add">
-                        <i aria-hidden="true" class="fi-save"></i>
-                        <span><?= gettext('Add word') ?></span>
-                      </button>
-                    </div>
+                  <div class="alert-form__section">
+                  <label for="words[]"><?= gettext('What word or phrase would you like to receive alerts about?') ?></label>
+                    <?php if (isset($errors['alertsearch']) && $submitted) { ?>
+                      <span class="alert-page-error"><?= $errors['alertsearch'] ?></span>
+                    <?php } ?>
+                    <input type="text" id="words0" name="words[]" aria-required="true" value="<?= count($keywords) > 0 ? _htmlspecialchars($keywords[0]) : '' ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
+                    <?php foreach (array_slice($keywords, 1) as $index => $word) { ?>
+                      <input type="text" id="words<?= $index + 1 ?>" name="words[]" value="<?= _htmlspecialchars($word) ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
+                    <?php } ?>
+                    <?php if ($addword) { ?>
+                    <input type="text" id="words<?= count($words) ?>" name="words[]" value="" placeholder="Eg. 'Freedom of Information', 'FOI'">
+                    <?php } ?>
+                    <button class="button" type="submit" name="addword" value="add">
+                      <i aria-hidden="true" class="fi-save"></i>
+                      <span><?= gettext('Add word') ?></span>
+                    </button>
+                  </div>
 
-                    <div class="alert-page-subsection">
-                      <div class="checkbox-wrapper">
-                        <input type="checkbox" id="match_all" name="match_all"<?= $match_all ? ' checked' : ''?>>
-                        <label for="match_all"><?= gettext('Only alert if all words present, default is if any word is present') ?></label>
-                      </div>
+                  <div class="alert-form__section">
+                    <div class="checkbox-wrapper">
+                      <input type="checkbox" id="match_all" name="match_all"<?= $match_all ? ' checked' : ''?>>
+                      <label for="match_all"><?= gettext('Only alert if all words present, default is if any word is present') ?></label>
                     </div>
+                  </div>
 
-                    <div class="alert-page-subsection">
-                      <label for="exclusions"><?= gettext('Is there anything you would not like to receive alerts about? (optional)') ?></label>
-                      <input type="text" id="exclusions" name="exclusions" aria-required="true" value="<?= _htmlspecialchars($exclusions) ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
-                    </div>
+                  <div class="alert-form__section">
+                    <label for="exclusions"><?= gettext('Is there anything you would not like to receive alerts about? (optional)') ?></label>
+                    <input type="text" id="exclusions" name="exclusions" aria-required="true" value="<?= _htmlspecialchars($exclusions) ?>" placeholder="Eg. 'Freedom of Information', 'FOI'">
+                  </div>
 
-                    <div class="alert-page-subsection">
-                    <label for="select-section"><?= gettext('Would you like to limit which Parliaments and Assemblies we alert about?') ?></label>
-                      <select name="search_section" id="select-section">
-                      <option value=""><?= gettext('Send alerts for everywhere.') ?></option>
-                        <optgroup label="<?= gettext('UK Parliament') ?>">
-                            <option value="uk"<?= $search_section == 'uk' ? ' selected' : '' ?>><?= gettext('All UK') ?></option>
-                            <option value="debates"<?= $search_section == 'debates' ? ' selected' : '' ?>><?= gettext('House of Commons debates') ?></option>
-                            <option value="whalls"<?= $search_section == 'whalls' ? ' selected' : '' ?>><?= gettext('Westminster Hall debates') ?></option>
-                            <option value="lords"<?= $search_section == 'lords' ? ' selected' : '' ?>><?= gettext('House of Lords debates') ?></option>
-                            <option value="wrans"<?= $search_section == 'wrans' ? ' selected' : '' ?>><?= gettext('Written answers') ?></option>
-                            <option value="wms"<?= $search_section == 'wms' ? ' selected' : '' ?>><?= gettext('Written ministerial statements') ?></option>
-                            <option value="standing"<?= $search_section == 'standing' ? ' selected' : '' ?>><?= gettext('Bill Committees') ?></option>
-                            <option value="future"<?= $search_section == 'future' ? ' selected' : '' ?>><?= gettext('Future Business') ?></option>
-                        </optgroup>
-                        <optgroup label="<?= gettext('Northern Ireland Assembly') ?>">
-                            <option value="ni"<?= $search_section == 'ni' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
-                        </optgroup>
-                        <optgroup label="<?= gettext('Scottish Parliament') ?>">
-                            <option value="scotland"<?= $search_section == 'scotland' ? ' selected' : '' ?>><?= gettext('All Scotland') ?></option>
-                            <option value="sp"<?= $search_section == 'sp' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
-                            <option value="spwrans"<?= $search_section == 'spwrans' ? ' selected' : '' ?>><?= gettext('Written answers') ?></option>
-                        </optgroup>
-                        <optgroup label="<?= gettext('Senedd / Welsh Parliament') ?>">
-                            <option value="wales"<?= $search_section == 'wales' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
-                        </optgroup>
-                        <optgroup label="<?= gettext('London Assembly') ?>">
-                            <option value="lmqs"<?= $search_section == 'lmqs' ? ' selected' : '' ?>><?= gettext('Questions to the Mayor') ?></option>
-                        </optgroup>
-                      </select>
-                    </div>
+                  <div class="alert-form__section">
+                  <label for="select-section"><?= gettext('Would you like to limit which Parliaments and Assemblies we alert about?') ?></label>
+                    <select name="search_section" id="select-section">
+                    <option value=""><?= gettext('Send alerts for everywhere.') ?></option>
+                      <optgroup label="<?= gettext('UK Parliament') ?>">
+                          <option value="uk"<?= $search_section == 'uk' ? ' selected' : '' ?>><?= gettext('All UK') ?></option>
+                          <option value="debates"<?= $search_section == 'debates' ? ' selected' : '' ?>><?= gettext('House of Commons debates') ?></option>
+                          <option value="whalls"<?= $search_section == 'whalls' ? ' selected' : '' ?>><?= gettext('Westminster Hall debates') ?></option>
+                          <option value="lords"<?= $search_section == 'lords' ? ' selected' : '' ?>><?= gettext('House of Lords debates') ?></option>
+                          <option value="wrans"<?= $search_section == 'wrans' ? ' selected' : '' ?>><?= gettext('Written answers') ?></option>
+                          <option value="wms"<?= $search_section == 'wms' ? ' selected' : '' ?>><?= gettext('Written ministerial statements') ?></option>
+                          <option value="standing"<?= $search_section == 'standing' ? ' selected' : '' ?>><?= gettext('Bill Committees') ?></option>
+                          <option value="future"<?= $search_section == 'future' ? ' selected' : '' ?>><?= gettext('Future Business') ?></option>
+                      </optgroup>
+                      <optgroup label="<?= gettext('Northern Ireland Assembly') ?>">
+                          <option value="ni"<?= $search_section == 'ni' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
+                      </optgroup>
+                      <optgroup label="<?= gettext('Scottish Parliament') ?>">
+                          <option value="scotland"<?= $search_section == 'scotland' ? ' selected' : '' ?>><?= gettext('All Scotland') ?></option>
+                          <option value="sp"<?= $search_section == 'sp' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
+                          <option value="spwrans"<?= $search_section == 'spwrans' ? ' selected' : '' ?>><?= gettext('Written answers') ?></option>
+                      </optgroup>
+                      <optgroup label="<?= gettext('Senedd / Welsh Parliament') ?>">
+                          <option value="wales"<?= $search_section == 'wales' ? ' selected' : '' ?>><?= gettext('Debates') ?></option>
+                      </optgroup>
+                      <optgroup label="<?= gettext('London Assembly') ?>">
+                          <option value="lmqs"<?= $search_section == 'lmqs' ? ' selected' : '' ?>><?= gettext('Questions to the Mayor') ?></option>
+                      </optgroup>
+                    </select>
+                  </div>
 
-                      <div class="alert-page-subsection">
-                      <label for="representative"><?= gettext('Would you like to only alert when a particular person speaks? (optional)') ?></label>
-                        <?php if (isset($errors["representative"])) { ?>
-                          <?php if (count($members) > 0) { ?>
-                            <span class="alert-page-error"><?= $errors["representative"] ?></span>
-                          <?php foreach ($members as $index => $member) {
-                              $name = member_full_name($member['house'], $member['title'], $member['given_name'], $member['family_name'], $member['lordofname']);
-                              if ($member['constituency']) {
-                                  $name .= ' (' . gettext($member['constituency']) . ')';
-                              } ?>
-                            <input type="radio" name="pid" id="representative_<?= $index ?>" value="<?= $member['person_id'] ?>">
-                            <label class="alert-page-option-label" for="representative_<?= $index ?>"><?= $name ?></label><br>
-                          <?php } ?>
+                    <div class="alert-form__section">
+                    <label for="representative"><?= gettext('Would you like to only alert when a particular person speaks? (optional)') ?></label>
+                      <?php if (isset($errors["representative"])) { ?>
+                        <?php if (count($members) > 0) { ?>
+                          <span class="alert-page-error"><?= $errors["representative"] ?></span>
+                        <?php foreach ($members as $index => $member) {
+                            $name = member_full_name($member['house'], $member['title'], $member['given_name'], $member['family_name'], $member['lordofname']);
+                            if ($member['constituency']) {
+                                $name .= ' (' . gettext($member['constituency']) . ')';
+                            } ?>
+                          <input type="radio" name="pid" id="representative_<?= $index ?>" value="<?= $member['person_id'] ?>">
+                          <label class="alert-form__label" for="representative_<?= $index ?>"><?= $name ?></label><br>
                         <?php } ?>
-                        <p><?= gettext("Or edit the name") ?></p>
                       <?php } ?>
-                        <input type="text" id="representative" name="representative" value="<?= _htmlspecialchars($representative) ?>" aria-required="true">
-                        <div class="checkbox-wrapper">
-                          <input type="checkbox" id="ignore_speaker_votes" name="ignore_speaker_votes"<?= $ignore_speaker_votes ? ' checked' : ''?>>
-                          <label for="ignore_speaker_votes"><?= gettext('Do not include votes') ?></label>
-                        </div>
-                    </div>
+                      <p><?= gettext("Or edit the name") ?></p>
+                    <?php } ?>
+                      <input type="text" id="representative" name="representative" value="<?= _htmlspecialchars($representative) ?>" aria-required="true">
+                      <div class="checkbox-wrapper">
+                        <input type="checkbox" id="ignore_speaker_votes" name="ignore_speaker_votes"<?= $ignore_speaker_votes ? ' checked' : ''?>>
+                        <label for="ignore_speaker_votes"><?= gettext('Do not include votes') ?></label>
+                      </div>
+                  </div>
 
 
-                    <button type="submit" name="step" value="review" class="next" aria-label="Go to Step 2">Next</button>
-                    <button type="submit" class="button button--red" name="action" value="Abandon">
-                      <i aria-hidden="true" class="fi-trash"></i>
-                      <span><?= gettext('Abandon changes') ?></span>
-                    </button>
+                  <button type="submit" name="step" value="review" class="next" aria-label="Go to Step 2">Next</button>
+                  <button type="submit" class="button button--red" name="action" value="Abandon">
+                    <i aria-hidden="true" class="fi-trash"></i>
+                    <span><?= gettext('Abandon changes') ?></span>
+                  </button>
+                </div>
+              <?php } elseif ($step == "add_vector_related") { ?>
+
+                <input type="hidden" name="shown_related" value="1">
+                <?php foreach ($keywords as $word) {
+                    if (!in_array($word, $skip_keyword_terms)) { ?>
+                  <input type="hidden" name="words[]" value="<?= _htmlspecialchars($word) ?>">
+                <?php }
+                    } ?>
+                <input type="hidden" name="this_step" value="add_vector_related">
+                <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
+                <input type="hidden" name="exclusions" value="<?= _htmlspecialchars($exclusions) ?>">
+                <input type="hidden" name="representative" value="<?= _htmlspecialchars($representative) ?>">
+                <input type="hidden" name="search_section" value="<?= _htmlspecialchars($search_section) ?>">
+                <input type="hidden" name="email" id="email" value="<?= _htmlentities($email) ?>">
+                <input type="hidden" name="match_all" value="<?= $match_all ? 'on' : ''?>">
+                <div class="alert-step" id="step2" role="region" aria-labelledby="step2-header">
+                <h2 id="step2-header"><?= gettext('Adding some extras') ?></h2>
+                  <div class="keyword-list alert-form__section">
+                  <h3><?= gettext('Current keywords in this alert:') ?></h3>
+                    <ul>
+                      <?php foreach ($keywords as $word) {
+                          if (!in_array($word, $skip_keyword_terms)) { ?>
+                          <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
+                      <?php }
+                          } ?>
+                    </ul>
                   </div>
-                <?php } elseif ($step == "add_vector_related") { ?>
 
-                  <input type="hidden" name="shown_related" value="1">
-                  <?php foreach ($keywords as $word) {
-                      if (!in_array($word, $skip_keyword_terms)) { ?>
-                    <input type="hidden" name="words[]" value="<?= _htmlspecialchars($word) ?>">
-                  <?php }
-                      } ?>
-                  <input type="hidden" name="this_step" value="add_vector_related">
-                  <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
-                  <input type="hidden" name="exclusions" value="<?= _htmlspecialchars($exclusions) ?>">
-                  <input type="hidden" name="representative" value="<?= _htmlspecialchars($representative) ?>">
-                  <input type="hidden" name="search_section" value="<?= _htmlspecialchars($search_section) ?>">
-                  <input type="hidden" name="email" id="email" value="<?= _htmlentities($email) ?>">
-                  <input type="hidden" name="match_all" value="<?= $match_all ? 'on' : ''?>">
-                  <div class="alert-step" id="step2" role="region" aria-labelledby="step2-header">
-                  <h2 id="step2-header"><?= gettext('Adding some extras') ?></h2>
-                    <div class="keyword-list alert-page-subsection">
-                    <h3><?= gettext('Current keywords in this alert:') ?></h3>
-                      <ul>
-                        <?php foreach ($keywords as $word) {
-                            if (!in_array($word, $skip_keyword_terms)) { ?>
-                            <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
-                        <?php }
-                            } ?>
-                      </ul>
+                  <p><?= gettext('We have also found the following related terms. Pick the ones you’d like to include alert?') ?></p>
+
+                  <fieldset>
+                    <legend><?= gettext('Related Terms') ?></legend>
+                    <div class="checkbox-group">
+                      <label><input type="checkbox" name="add_all_related" id="add-all"<?= $add_all_related == 'on' ? ' checked' : '' ?>><?= gettext('Add all related terms') ?></label>
+                      <?php foreach ($suggestions as $suggestion) { ?>
+                        <input type="hidden" name="related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>">
+                        <label>
+                          <?php if ($add_all_related == 'on') { ?>
+                          <input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>" checked disabled>
+                          <?php } else { ?>
+                          <input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>"<?= in_array($suggestion, $selected_related_terms) ? ' checked' : '' ?>>
+                          <?php } ?>
+                          <?= _htmlspecialchars($suggestion) ?>
+                        </label>
+                      <?php } ?>
                     </div>
+                  </fieldset>
 
-                    <p><?= gettext('We have also found the following related terms. Pick the ones you’d like to include alert?') ?></p>
+                  <dl class="alert-meta">
+                    <?php if ($search_result_count > 0) { ?>
+                      <div class="alert-meta__item">
+                        <dt><?= gettext('This week') ?></dt>
+                        <dd><?= sprintf(gettext('%d mentions'), $search_result_count) ?></dd>
+                      </div>
+                    <?php } ?>
 
-                    <fieldset>
-                      <legend><?= gettext('Related Terms') ?></legend>
-                      <div class="checkbox-group">
-                        <label><input type="checkbox" name="add_all_related" id="add-all"<?= $add_all_related == 'on' ? ' checked' : '' ?>><?= gettext('Add all related terms') ?></label>
-                        <?php foreach ($suggestions as $suggestion) { ?>
-                          <input type="hidden" name="related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>">
-                          <label>
-                            <?php if ($add_all_related == 'on') { ?>
-                            <input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>" checked disabled>
-                            <?php } else { ?>
-                            <input type="checkbox" name="selected_related_terms[]" value="<?= _htmlspecialchars($suggestion) ?>"<?= in_array($suggestion, $selected_related_terms) ? ' checked' : '' ?>>
-                            <?php } ?>
-                            <?= _htmlspecialchars($suggestion) ?>
-                          </label>
-                        <?php } ?>
+                    <?php if (isset($lastmention)) { ?>
+                      <div class="alert-meta__item">
+                      <dt><?= gettext('Date of last mention') ?></dt>
+                        <dd>30 May 2024</dd>
                       </div>
-                    </fieldset>
+                    <?php } ?>
 
-                    <dl class="alert-meta">
-                      <?php if ($search_result_count > 0) { ?>
-                        <div class="alert-meta__item">
-                          <dt><?= gettext('This week') ?></dt>
-                          <dd><?= sprintf(gettext('%d mentions'), $search_result_count) ?></dd>
-                        </div>
-                      <?php } ?>
+                    <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert 	&rarr;') ?></a>
+                  </dl>
 
-                      <?php if (isset($lastmention)) { ?>
-                        <div class="alert-meta__item">
-                        <dt><?= gettext('Date of last mention') ?></dt>
-                          <dd>30 May 2024</dd>
-                        </div>
+                  <button type="submit" name="step" value="define" class="prev" aria-label="Go back to Step 2">Previous</button>
+                  <button type="submit" name="step" value="review" class="next" aria-label="Go to Step 3">Next</button>
+                  <button type="submit" class="button button--red" name="action" value="Abandon">
+                    <i aria-hidden="true" class="fi-trash"></i>
+                    <span><?= gettext('Abandon changes') ?></span>
+                  </button>
+                </div>
+              <?php } elseif ($step == "review") { ?>
+
+                <?php foreach ($keywords as $word) {
+                    if (!in_array($word, $skip_keyword_terms)) { ?>
+                  <input type="hidden" name="words[]" value="<?= _htmlspecialchars($word) ?>">
+                <?php }
+                    } ?>
+                <?php foreach ($selected_related_terms as $word) { ?>
+                  <input type="hidden" name="selected_related_terms[]" value="<?= _htmlspecialchars($word) ?>">
+                <?php } ?>
+                <input type="hidden" name="add_all_related" value="<?= $add_all_related ?>">
+                <input type="hidden" name="this_step" value="review">
+                <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
+                <input type="hidden" name="exclusions" value="<?= _htmlspecialchars($exclusions) ?>">
+                <input type="hidden" name="representative" value="<?= _htmlspecialchars($representative) ?>">
+                <input type="hidden" name="search_section" value="<?= _htmlspecialchars($search_section) ?>">
+                <input type="hidden" name="email" id="email" value="<?= _htmlentities($email) ?>">
+                <input type="hidden" name="match_all" value="<?= $match_all ? 'on' : ''?>">
+                <!-- Step 4 (Review) -->
+                <div class="alert-step" id="step3" role="region" aria-labelledby="step3-header">
+                  <h2 id="step3-header"><?= gettext('Review Your Alert') ?></h2>
+
+                  <div class="keyword-list alert-form__section">
+                    <?php if ($match_all) { ?>
+                      <h3><?= gettext('You will get an alert if all of these words are in a speech') ?>:</h3>
+                    <?php } else { ?>
+                      <h3><?= gettext('You will get an alert if any of these words are in a speech') ?>:</h3>
+                    <?php } ?>
+                    <ul>
+                      <?php foreach ($keywords as $word) { ?>
+                      <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
                       <?php } ?>
-
-                      <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert 	&rarr;') ?></a>
-                    </dl>
-
-                    <button type="submit" name="step" value="define" class="prev" aria-label="Go back to Step 2">Previous</button>
-                    <button type="submit" name="step" value="review" class="next" aria-label="Go to Step 3">Next</button>
-                    <button type="submit" class="button button--red" name="action" value="Abandon">
-                      <i aria-hidden="true" class="fi-trash"></i>
-                      <span><?= gettext('Abandon changes') ?></span>
-                    </button>
+                    </ul>
                   </div>
-                <?php } elseif ($step == "review") { ?>
 
-                  <?php foreach ($keywords as $word) {
-                      if (!in_array($word, $skip_keyword_terms)) { ?>
-                    <input type="hidden" name="words[]" value="<?= _htmlspecialchars($word) ?>">
-                  <?php }
-                      } ?>
-                  <?php foreach ($selected_related_terms as $word) { ?>
-                    <input type="hidden" name="selected_related_terms[]" value="<?= _htmlspecialchars($word) ?>">
+                  <?php if ($exclusions) { ?>
+                  <div class="keyword-list excluded-keywords alert-form__section">
+                  <h3><?= gettext('Unless the speech also includes these words') ?>:</h3>
+                    <ul>
+                      <?php foreach (explode(" ", $exclusions) as $word) { ?>
+                      <li class="keyword-list__tag keyword-list__tag--excluded"><?= _htmlspecialchars($word) ?>
+                      <?php } ?>
+                    </ul>
+                  </div>
                   <?php } ?>
-                  <input type="hidden" name="add_all_related" value="<?= $add_all_related ?>">
-                  <input type="hidden" name="this_step" value="review">
-                  <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
-                  <input type="hidden" name="exclusions" value="<?= _htmlspecialchars($exclusions) ?>">
-                  <input type="hidden" name="representative" value="<?= _htmlspecialchars($representative) ?>">
-                  <input type="hidden" name="search_section" value="<?= _htmlspecialchars($search_section) ?>">
-                  <input type="hidden" name="email" id="email" value="<?= _htmlentities($email) ?>">
-                  <input type="hidden" name="match_all" value="<?= $match_all ? 'on' : ''?>">
-                  <!-- Step 4 (Review) -->
-                  <div class="alert-step" id="step3" role="region" aria-labelledby="step3-header">
-                    <h2 id="step3-header"><?= gettext('Review Your Alert') ?></h2>
 
-                    <div class="keyword-list alert-page-subsection">
-                      <?php if ($match_all) { ?>
-                        <h3><?= gettext('You will get an alert if all of these words are in a speech') ?>:</h3>
-                      <?php } else { ?>
-                        <h3><?= gettext('You will get an alert if any of these words are in a speech') ?>:</h3>
-                      <?php } ?>
+                  <div class="keyword-list alert-form__section">
+                  <?php if (count($sections) > 0) { ?>
+                    <h3><?= gettext('And only if the speech is in') ?>:</h3>
                       <ul>
-                        <?php foreach ($keywords as $word) { ?>
+                      <?php foreach ($sections as $word) { ?>
                         <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
-                        <?php } ?>
-                      </ul>
-                    </div>
-
-                    <?php if ($exclusions) { ?>
-                    <div class="keyword-list excluded-keywords alert-page-subsection">
-                    <h3><?= gettext('Unless the speech also includes these words') ?>:</h3>
-                      <ul>
-                        <?php foreach (explode(" ", $exclusions) as $word) { ?>
-                        <li class="keyword-list__tag keyword-list__tag--excluded"><?= _htmlspecialchars($word) ?>
-                        <?php } ?>
+                      <?php } ?>
                       </ul>
-                    </div>
-                    <?php } ?>
+                  <?php } else { ?>
+                    <h3><?= gettext('in the UK, Scottish or Welsh Parliaments or Northern Ireland Assembly') ?></h3>
+                  <?php } ?>
+                  </div>
 
-                    <div class="keyword-list alert-page-subsection">
-                    <?php if (count($sections) > 0) { ?>
-                      <h3><?= gettext('And only if the speech is in') ?>:</h3>
-                        <ul>
-                        <?php foreach ($sections as $word) { ?>
-                          <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?>
-                        <?php } ?>
-                        </ul>
-                    <?php } else { ?>
-                      <h3><?= gettext('in the UK, Scottish or Welsh Parliaments or Northern Ireland Assembly') ?></h3>
-                    <?php } ?>
-                    </div>
+                  <?php if (count($members) > 0) { ?>
+                  <div class="keyword-list alert-form__section">
+                  <h3><?= gettext('And only when spoken by') ?></h3>
+                    <ul>
+                      <?php foreach ($members as $member) { ?>
+                      <li class="keyword-list__tag keyword-list__tag--included"><?= $member['given_name'] ?> <?= $member['family_name'] ?>
+                      <?php } ?>
+                    </ul>
+                  </div>
+                  <?php } ?>
 
-                    <?php if (count($members) > 0) { ?>
-                    <div class="keyword-list alert-page-subsection">
-                    <h3><?= gettext('And only when spoken by') ?></h3>
-                      <ul>
-                        <?php foreach ($members as $member) { ?>
-                        <li class="keyword-list__tag keyword-list__tag--included"><?= $member['given_name'] ?> <?= $member['family_name'] ?>
+                  <?php if ($search_result_count > 0 || isset($lastmention)) { ?>
+                    <hr>
+                    <dl class="alert-meta">
+                      <h3>See mentions for this alert</h3>
+
+                      <div class="alert-meta__results">
+                        <?php if ($search_result_count > 0) { ?>
+                          <div class="alert-meta__item">
+                            <dt><?= gettext('This week') ?></dt>
+                            <dd><?= sprintf(gettext('%d mentions'), $search_result_count) ?></dd>
+                          </div>
                         <?php } ?>
-                      </ul>
-                    </div>
-                    <?php } ?>
 
-                    <?php if ($search_result_count > 0 || isset($lastmention)) { ?>
-                      <hr>
-                      <dl class="alert-meta">
-                        <h3>See mentions for this alert</h3>
-
-                        <div class="alert-meta__results">
-                          <?php if ($search_result_count > 0) { ?>
-                            <div class="alert-meta__item">
-                              <dt><?= gettext('This week') ?></dt>
-                              <dd><?= sprintf(gettext('%d mentions'), $search_result_count) ?></dd>
-                            </div>
-                          <?php } ?>
-
-                          <?php // if (isset($lastmention)) { ?>
-                            <div class="alert-meta__item">
-                              <dt><?= gettext('Date of last mention') ?></dt>
-                              <dd>30 May 2024</dd>
-                            </div>
-                          <?php // } ?>
-                        </div>
-
-                        <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert 	&rarr;') ?></a>
-                      </dl>
-                    <?php } ?>
+                        <?php // if (isset($lastmention)) { ?>
+                          <div class="alert-meta__item">
+                            <dt><?= gettext('Date of last mention') ?></dt>
+                            <dd>30 May 2024</dd>
+                          </div>
+                        <?php // } ?>
+                      </div>
 
-                    <hr>
-                    <button type="submit" name="step" value="define" class="prev" aria-label="Go back to Step 2">Go Back</button>
-                    <button class="button" type="submit" name="step" value="confirm">
-                      <i aria-hidden="true" class="fi-save"></i>
-                      <span><?= gettext('Save alert') ?></span>
-                    </button>
-                    <button type="submit" class="button button--red" name="action" value="Abandon">
-                      <i aria-hidden="true" class="fi-trash"></i>
-                      <span><?= gettext('Abandon changes') ?></span>
-                    </button>
-                    <?php if ($token) { ?>
-                    <button type="submit" class="button button--red" name="action" value="Delete">
-                      <i aria-hidden="true" class="fi-trash"></i>
-                      <span><?= gettext('Delete alert') ?></span>
-                    </button>
-                    <?php } ?>
-                  </div>
+                      <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert 	&rarr;') ?></a>
+                    </dl>
                   <?php } ?>
-                </form>
 
-              </div>
+                  <hr>
+                  <button type="submit" name="step" value="define" class="prev" aria-label="Go back to Step 2">Go Back</button>
+                  <button class="button" type="submit" name="step" value="confirm">
+                    <i aria-hidden="true" class="fi-save"></i>
+                    <span><?= gettext('Save alert') ?></span>
+                  </button>
+                  <button type="submit" class="button button--red" name="action" value="Abandon">
+                    <i aria-hidden="true" class="fi-trash"></i>
+                    <span><?= gettext('Abandon changes') ?></span>
+                  </button>
+                  <?php if ($token) { ?>
+                  <button type="submit" class="button button--red" name="action" value="Delete">
+                    <i aria-hidden="true" class="fi-trash"></i>
+                    <span><?= gettext('Delete alert') ?></span>
+                  </button>
+                  <?php } ?>
+                </div>
+                <?php } ?>
+              </form>
             </div>
 
             <div class="alert-section__secondary">
diff --git a/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php b/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
index 7fb75f3046..eba980bd0a 100644
--- a/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
+++ b/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
@@ -12,7 +12,7 @@
                       </button>
                       <div id="accordion-content-<?= $index ?>" class="keyword-alert-accordion__content js-accordion-content" aria-hidden="true" role="img">
                         <div class="keyword-alert-accordion__content-header">
-                          <div class="alert-page-subsection__controls">
+                          <div class="alert__controls">
                             <form action="<?= $actionurl ?>" method="POST">
                               <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
                               <?php if ($alert['status'] == 'unconfirmed') { ?>
@@ -119,7 +119,7 @@
 
                 <hr>
 
-                <div class="alert-section__page-header">
+                <div class="alert-section__header">
                   <div>
                     <h2>Representative alerts</h2>
                   </div>
@@ -135,7 +135,7 @@
                 <?php if ($current_mp) { ?>
                   <h3><?= gettext('Your MP') ?></h3>
                   <ul class="alerts-manage__list">
-                    <li class="alert-section--message">
+                    <li class="alert-section__message">
                       <?= sprintf(gettext('You are not subscribed to an alert for your current MP, %s'), '<strong>' . htmlspecialchars($current_mp->full_name()) . '</strong>') ?>, speaks.
                       <form action="<?= $actionurl ?>" method="post">
                         <input type="hidden" name="pid" value="<?= $current_mp->person_id() ?>">
@@ -151,7 +151,7 @@
                     <?php include '_own_mp_alerts.php' ?>
                   <?php } else { ?>
                     <?php if (!in_array($own_mp_criteria, $all_keywords)) { ?>
-                      <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars($own_mp_criteria) ?> is <strong>mentioned</strong></p>
+                      <p class="alert-form__subtitle">Alert when <?= _htmlspecialchars($own_mp_criteria) ?> is <strong>mentioned</strong></p>
                       <form action="<?= $actionurl ?>" method="post">
                         <input type="hidden" name="keyword" value="<?= _htmlentities($own_mp_criteria) ?>">
                         <button type="submit" class="button small" name="action" value="Subscribe">
@@ -162,19 +162,19 @@
                     <?php } ?>
                   <?php } ?>
                 <?php } elseif (count($own_member_alerts) > 0) { ?>
-                  <div class="alert-page-subsection">
-                    <h3 class="alert-page-subsection--heading"><?= gettext('Your MP') ?> ﹒ <?= $own_member_alerts[0]['spokenby'][0] ?></h3>
+                  <div class="alert-form__section">
+                    <h3><?= gettext('Your MP') ?> ﹒ <?= $own_member_alerts[0]['spokenby'][0] ?></h3>
                     <?php include '_own_mp_alerts.php' ?>
                   </div>
                 <?php } ?>
 
                 <?php foreach ($spoken_alerts as $person_alerts) { ?>
                   <hr>
-                  <div class="alert-page-subsection">
-                    <h3 class="alert-page-subsection--heading"><?= _htmlspecialchars(implode(', ', $person_alerts[0]['spokenby'])) ?></h3>
+                  <div class="alert-form__section">
+                    <h3><?= _htmlspecialchars(implode(', ', $person_alerts[0]['spokenby'])) ?></h3>
                     <?php foreach ($person_alerts as $alert) { ?>
-                      <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
-                      <div class="alert-page-subsection__controls">
+                      <p class="alert-form__subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
+                      <div class="alert__controls">
                         <form action="<?= $actionurl ?>" method="POST">
                           <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
                           <?php if ($alert['status'] == 'unconfirmed') { ?>
@@ -227,7 +227,7 @@
                       </div>
                     <?php } ?>
                     <?php if (!in_array(implode('', $person_alerts[0]['spokenby']), $all_keywords)) { ?>
-                      <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $person_alerts[0]['spokenby'])) ?> is <strong>mentioned</strong></p>
+                      <p class="alert-form__subtitle">Alert when <?= _htmlspecialchars(implode(', ', $person_alerts[0]['spokenby'])) ?> is <strong>mentioned</strong></p>
                       <form action="<?= $actionurl ?>" method="post">
                         <input type="hidden" name="words[]" value="<?= _htmlentities(implode('', $person_alerts[0]['spokenby'])) ?>">
                         <button type="submit" class="button small" name="action" value="Subscribe">
diff --git a/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
index 650f51868e..7df00df7bc 100644
--- a/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
@@ -16,7 +16,7 @@
     <?php } ?>
   </ul>
 <?php } else { ?>
-  <form action="<?= $actionurl ?>" method="post" class="" id="create-alert-form">
+  <form action="<?= $actionurl ?>" method="post" class="alerts-form">
     <?php if (!$email_verified) { ?>
       <p>
         <?php if (isset($errors["email"]) && $submitted) { ?>
@@ -42,7 +42,7 @@
         <?php } ?>
       </p>
 
-      <div class="alert-page-subsection">
+      <div class="alert-form__section">
         <div class="checkbox-wrapper">
           <input type="checkbox" id="ignore_speaker_votes" name="ignore_speaker_votes"<?= $ignore_speaker_votes ? ' checked' : ''?>>
           <label for="ignore_speaker_votes"><?= gettext('Do not include votes') ?></label>
diff --git a/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php b/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php
index da8069171d..f208b7ac5d 100644
--- a/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php
+++ b/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php
@@ -1,7 +1,7 @@
 
 <?php foreach ($own_member_alerts as $alert) { ?>
-<p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
-<div class="alert-page-subsection__controls">
+<p class="alert-form__subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
+<div class="alert__controls">
   <form action="<?= $actionurl ?>" method="POST">
     <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
     <input type="hidden" name="pid" value="<?= _htmlspecialchars($alert['pid']) ?>">
@@ -57,7 +57,7 @@
 <?php } ?>
 
 <?php if (!in_array($own_mp_criteria, $all_keywords)) { ?>
-<p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars($own_mp_criteria) ?> is <strong>mentioned</strong></p>
+<p class="alert-form__subtitle">Alert when <?= _htmlspecialchars($own_mp_criteria) ?> is <strong>mentioned</strong></p>
 <form action="<?= $actionurl ?>" method="post">
   <input type="hidden" name="step" value="confirm">
   <input type="hidden" name="words[]" value="<?= _htmlentities($own_mp_criteria) ?>">
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 5d9f50e0c7..67a428416c 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -278,7 +278,7 @@
                 <p>
                     <?= gettext('Plus, you won’t need to confirm your email address for every alert you set.') ?>
                 </p>
-              <div class="alert-section__page-header">
+              <div class="alert-section__header">
                 <h3>Create an alert for a phrase or keyword</h3>
                 <form action="<?= $actionurl ?>" method="post">
                     <input type="hidden" name="step" value="define">
@@ -292,7 +292,7 @@
 
               <h3>or</h3>
 
-              <div class="alert-section__page-header">
+              <div class="alert-section__header">
                 <h3>Create an alert when an MP speaks</h3>
                 <form action="<?= $actionurl ?>" method="post">
                   <input type="hidden" name="mp_step" value="mp_alert">
@@ -312,7 +312,7 @@
                 </div>
               <?php } ?>
 
-              <div class="alert-section__page-header">
+              <div class="alert-section__header">
                 <div>
                   <h2><?= gettext('Keywords alerts') ?></h2>
                   <!-- Go to Create alert page -->