diff --git a/classes/AlertView/Standard.php b/classes/AlertView/Standard.php
index 3a14cbccd9..098fb84dd0 100644
--- a/classes/AlertView/Standard.php
+++ b/classes/AlertView/Standard.php
@@ -25,7 +25,9 @@ public function display() {
         $this->checkInput();
         $this->searchForConstituenciesAndMembers();
 
-        if (!sizeof($this->data['errors']) && ($this->data['keyword'] || $this->data['pid'])) {
+        if ($this->data['step'] || $this->data['addword']) {
+            $this->processStep();
+        } elseif (!$this->data['results'] == 'changes-abandoned' && !sizeof($this->data['errors']) && ($this->data['keyword'] || $this->data['pid'])) {
             $this->addAlert();
         }
 
@@ -48,7 +50,8 @@ private function processAction() {
                 $success = $this->confirmAlert($token);
                 if ($success) {
                     $this->data['results'] = 'alert-confirmed';
-                    $this->data['criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
+                    $this->data['criteria'] = $this->alert->criteria;
+                    $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
                 }
             } elseif ($action == 'Suspend') {
                 $success = $this->suspendAlert($token);
@@ -70,6 +73,8 @@ private function processAction() {
                 if ($success) {
                     $this->data['results'] = 'all-alerts-deleted';
                 }
+            } elseif ($action == 'Abandon') {
+                $this->data['results'] = 'changes-abandoned';
             }
             if (!$success) {
                 $this->data['results'] = 'alert-fail';
@@ -79,6 +84,25 @@ private function processAction() {
         $this->data['alert'] = $alert;
     }
 
+    private function processStep() {
+        if ($this->data['step'] == 'confirm') {
+            $success = true;
+            if ($this->data['alert']) {
+                $success = $this->updateAlert($this->data['alert']['id'], $this->data);
+                if ($success) {
+                    $this->data['results'] = 'alert-confirmed';
+                    $this->data['step'] = '';
+                } else {
+                    $this->data['results'] = 'alert-fail';
+                    $this->data['step'] = 'review';
+                }
+            } else {
+                $success = $this->addAlert();
+                $this->data['step'] = '';
+            }
+        }
+    }
+
 
     private function getBasicData() {
         global $this_page;
@@ -93,12 +117,66 @@ private function getBasicData() {
             $this->data["email"] = trim(get_http_var("email"));
             $this->data['email_verified'] = false;
         }
-        $this->data['keyword'] = trim(get_http_var("keyword"));
+
+        $this->data['token'] = get_http_var('t');
+        $this->data['step'] = trim(get_http_var("step"));
+        $this->data['addword'] = trim(get_http_var("addword"));
+        $this->data['this_step'] = trim(get_http_var("this_step"));
+
+        if ($this->data['addword'] || $this->data['step']) {
+            $alert = $this->alert->check_token($this->data['token']);
+
+            $criteria = '';
+            if ($alert) {
+                $criteria = $alert['criteria'];
+            }
+
+            $this->data['alert'] = $alert;
+
+            $this->data['alert_parts'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria, true);
+
+            $existing_rep = '';
+            if (isset($this->data['alert_parts']['spokenby'])) {
+                $existing_rep = $this->data['alert_parts']['spokenby'][0];
+            }
+
+            $existing_section = '';
+            if (count($this->data['alert_parts']['sections'])) {
+                $existing_section = $this->data['alert_parts']['sections'][0];
+            }
+
+            $words = get_http_var('words', $this->data['alert_parts']['words'], true);
+
+            $this->data['words'] = [];
+            $this->data['keywords'] = [];
+            foreach ($words as $word) {
+                if (trim($word) != '') {
+                    $this->data['keywords'][] = $word;
+                    $this->data['words'][] = $this->wrap_phrase_in_quotes($word);
+                }
+            }
+            $this->data['exclusions'] = trim(get_http_var("exclusions", implode('', $this->data['alert_parts']['exclusions'])));
+            $this->data['representative'] = trim(get_http_var("representative", $existing_rep));
+
+            $this->data['search_section'] = trim(get_http_var("search_section", $existing_section));
+
+            $this->data['keyword'] = implode(' ', $this->data['words']);
+            if ($this->data['exclusions']) {
+                $this->data['keyword'] .= " -" . $this->data["exclusions"];
+            }
+
+            $this->data['results'] = '';
+
+            $this->getSearchSections();
+        } else {
+            $this->data['keyword'] = trim(get_http_var("keyword"));
+            $this->data['search_section'] = '';
+        }
+
         $this->data['pid'] = trim(get_http_var("pid"));
         $this->data['alertsearch'] = trim(get_http_var("alertsearch"));
         $this->data['pc'] = get_http_var('pc');
-        $this->data['submitted'] = get_http_var('submitted') || $this->data['pid'] || $this->data['keyword'];
-        $this->data['token'] = get_http_var('t');
+        $this->data['submitted'] = get_http_var('submitted') || $this->data['pid'] || $this->data['keyword'] || $this->data['step'];
         $this->data['sign'] = get_http_var('sign');
         $this->data['site'] = get_http_var('site');
         $this->data['message'] = '';
@@ -108,11 +186,45 @@ private function getBasicData() {
         $this->data['actionurl'] = $ACTIONURL->generate();
     }
 
-    private function checkInput() {
+    private function wrap_phrase_in_quotes($phrase) {
+        if (strpos($phrase, ' ') > 0) {
+            $phrase = '"' . trim($phrase, '"') . '"';
+        }
+
+        return $phrase;
+    }
+
+    private function getRecentResults($text) {
+        global $SEARCHENGINE;
+        $se = new \SEARCHENGINE($text);
+        $this->data['search_result_count'] = $se->run_count(0, 10);
+        $se->run_search(0, 1, 'date');
+    }
+
+    private function getSearchSections() {
+        $this->data['sections'] = [];
+        if ($this->data['search_section']) {
+            foreach (explode(' ', $this->data['search_section']) as $section) {
+                $this->data['sections'][] = \MySociety\TheyWorkForYou\Utility\Alert::sectionToTitle($section);
+            }
+        }
+    }
+
+    protected function updateAlert($token) {
+        $success = $this->alert->update($token, $this->data);
+        return $success;
+    }
+
+    protected function checkInput() {
         global $SEARCHENGINE;
 
         $errors = [];
 
+        if ($this->data['step'] == 'define' || $this->data['step'] == 'mp_alert') {
+            $this->data['errors'] = $errors;
+            return;
+        }
+
         // Check each of the things the user has input.
         // If there is a problem with any of them, set an entry in the $errors array.
         // This will then be used to (a) indicate there were errors and (b) display
@@ -155,11 +267,32 @@ private function checkInput() {
         $this->data['errors'] = $errors;
     }
 
-    private function searchForConstituenciesAndMembers() {
-        // Do the search
-        if ($this->data['alertsearch']) {
+    protected function searchForConstituenciesAndMembers() {
+        if ($this->data['results'] == 'changes-abandoned') {
+            return;
+        }
+        $errors = [];
+        if ($this->data['alertsearch'] != '') {
             $this->data['members'] = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookupWithNames($this->data['alertsearch'], true);
             [$this->data['constituencies'], $this->data['valid_postcode']] = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($this->data['alertsearch']);
+        } elseif ($this->data['pid']) {
+            $MEMBER = new \MEMBER(['person_id' => $this->data['pid']]);
+            $this->data['members'] = [[
+                "person_id" => $MEMBER->person_id,
+                "given_name" => $MEMBER->given_name,
+                "family_name" => $MEMBER->family_name,
+            ]];
+        } elseif (isset($this->data['representative']) && $this->data['representative'] != '') {
+            $this->data['members'] = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookupWithNames($this->data['representative'], true);
+
+            $member_count = count($this->data['members']);
+            if ($member_count == 0) {
+                $errors["representative"] = gettext("No matching representative found");
+            } elseif ($member_count > 1) {
+                $errors["representative"] = gettext("Multiple matching representatives found, please select one.");
+            } else {
+                $this->data['pid'] = $this->data['members'][0]['person_id'];
+            }
         } else {
             $this->data['members'] = [];
         }
@@ -186,9 +319,15 @@ private function searchForConstituenciesAndMembers() {
             }
             $this->data['constituencies'] = $cons;
         }
+
+        if (count($this->data["errors"]) > 0) {
+            $this->data["errors"] = array_merge($this->data["errors"], $errors);
+        } else {
+            $this->data["errors"] = $errors;
+        }
     }
 
-    private function addAlert() {
+    protected function addAlert() {
         $external_auth = auth_verify_with_shared_secret($this->data['email'], OPTION_AUTH_SHARED_SECRET, get_http_var('sign'));
         if ($external_auth) {
             $confirm = false;
@@ -230,11 +369,12 @@ private function addAlert() {
         $this->data['pc'] = '';
 
         $this->data['results'] = $result;
-        $this->data['criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
+        $this->data['criteria'] = $this->alert->criteria;
+        $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
     }
 
 
-    private function formatSearchTerms() {
+    protected function formatSearchTerms() {
         if ($this->data['alertsearch']) {
             $this->data['alertsearch_pretty'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['alertsearch']);
             $this->data['search_text'] = $this->data['alertsearch'];
@@ -243,7 +383,7 @@ private function formatSearchTerms() {
         }
     }
 
-    private function checkForCommonMistakes() {
+    protected function checkForCommonMistakes() {
         $mistakes = [];
         if (strstr($this->data['alertsearch'], ',') > -1) {
             $mistakes['multiple'] = 1;
@@ -261,7 +401,7 @@ private function checkForCommonMistakes() {
         $this->data['mistakes'] = $mistakes;
     }
 
-    private function formatSearchMemberData() {
+    protected function formatSearchMemberData() {
         if (isset($this->data['postcode'])) {
             try {
                 $postcode = $this->data['postcode'];
@@ -302,13 +442,38 @@ private function formatSearchMemberData() {
         }
     }
 
-    private function setUserData() {
+    protected function setUserData() {
+        if (!isset($this->data['criteria'])) {
+            $criteria = $this->data['keyword'];
+            if ($this->data['search_section']) {
+                $criteria .= " section:" . $this->data['search_section'];
+            }
+            if ($this->data['pid']) {
+                $criteria .= " speaker:" . $this->data['pid'];
+            }
+            $this->getRecentResults($criteria);
+
+            $this->data['criteria'] = $criteria;
+            $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria);
+        }
+        if ($this->data['alertsearch'] && !(isset($this->data['members']) || $this->data['pid'])) {
+            $this->data['step'] = 'define';
+            $this->data['words'] = [$this->data['alertsearch']];
+            $this->data['keywords'] = [$this->data['alertsearch']];
+            $this->data['exclusions'] = '';
+            $this->data['representative'] = '';
+        }
         $this->data['current_mp'] = false;
         $this->data['alerts'] = [];
         $this->data['keyword_alerts'] = [];
         $this->data['speaker_alerts'] = [];
+        $this->data['spoken_alerts'] = [];
         $this->data['own_member_alerts'] = [];
         $this->data['all_keywords'] = [];
+        if ($this->data['results'] == 'changes-abandoned') {
+            $this->data['members'] = false;
+            $this->data['alertsearch'] = '';
+        }
         $own_mp_criteria = '';
         if ($this->data['email_verified']) {
             if ($this->user->postcode()) {
@@ -330,5 +495,10 @@ private function setUserData() {
                 }
             }
         }
+        if ($this->data['addword'] != '' || ($this->data['step'] && count($this->data['errors']) > 0)) {
+            $this->data["step"] = get_http_var('this_step');
+        } else {
+            $this->data['this_step'] = '';
+        }
     }
 }
diff --git a/classes/Utility/Alert.php b/classes/Utility/Alert.php
index 79f6d42f7d..d2c636b373 100644
--- a/classes/Utility/Alert.php
+++ b/classes/Utility/Alert.php
@@ -10,12 +10,23 @@
 
 class Alert {
     #XXX don't calculate this every time
-    private static function sectionToTitle($section) {
-        global $hansardmajors;
-        $section_map = [];
-        foreach ($hansardmajors as $major => $details) {
-            $section_map[$details["page_all"]] = $details["title"];
-        }
+    public static function sectionToTitle($section) {
+        $section_map = [
+            "uk" => gettext('All UK'),
+            "debates" => gettext('House of Commons debates'),
+            "whalls" => gettext('Westminster Hall debates'),
+            "lords" => gettext('House of Lords debates'),
+            "wrans" => gettext('Written answers'),
+            "wms" => gettext('Written ministerial statements'),
+            "standing" => gettext('Bill Committees'),
+            "future" => gettext('Future Business'),
+            "ni" => gettext('Northern Ireland Assembly Debates'),
+            "scotland" => gettext('All Scotland'),
+            "sp" => gettext('Scottish Parliament Debates'),
+            "spwrans" => gettext('Scottish Parliament Written answers'),
+            "wales" => gettext('Welsh parliament record'),
+            "lmqs" => gettext('Questions to the Mayor of London'),
+        ];
 
         return $section_map[$section];
     }
@@ -30,6 +41,10 @@ public static function detailsToCriteria($details) {
             $criteria[] = 'speaker:' . $details['pid'];
         }
 
+        if (!empty($details['search_section'])) {
+            $criteria[] = 'section:' . $details['search_section'];
+        }
+
         $criteria = join(' ', $criteria);
         return $criteria;
     }
@@ -74,10 +89,23 @@ public static function forUser($email) {
 
     public static function prettifyCriteria($alert_criteria, $as_parts = false) {
         $text = '';
+        $parts = ['words' => [], 'sections' => [], 'exclusions' => []];
         if ($alert_criteria) {
-            $criteria = explode(' ', $alert_criteria);
-            $parts = [];
+            # check for phrases
+            if (strpos($alert_criteria, '"') !== false) {
+                # match phrases
+                preg_match_all('/"([^"]*)"/', $alert_criteria, $phrases);
+                # and then remove them from the criteria
+                $alert_criteria = trim(preg_replace('/ +/', ' ', str_replace($phrases[0], "", $alert_criteria)));
+
+                # and then create an array with the words and phrases
+                $criteria = explode(' ', $alert_criteria);
+                $criteria = array_merge($criteria, $phrases[1]);
+            } else {
+                $criteria = explode(' ', $alert_criteria);
+            }
             $words = [];
+            $exclusions = [];
             $sections = [];
             $sections_verbose = [];
             $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
@@ -86,6 +114,8 @@ public static function prettifyCriteria($alert_criteria, $as_parts = false) {
                 if (preg_match('#^section:(\w+)#', $c, $m)) {
                     $sections[] = $m[1];
                     $sections_verbose[] = self::sectionToTitle($m[1]);
+                } elseif (strpos($c, '-') === 0) {
+                    $exclusions[] = str_replace('-', '', $c);
                 } elseif (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $words[] = $c;
                 }
@@ -107,6 +137,8 @@ public static function prettifyCriteria($alert_criteria, $as_parts = false) {
                 $parts['sections'] = $sections;
                 $parts['sections_verbose'] = $sections_verbose;
             }
+
+            $parts['exclusions'] = $exclusions;
         }
         if ($as_parts) {
             return $parts;
diff --git a/www/docs/js/main.js b/www/docs/js/main.js
index 467482ce81..cd3d79f979 100644
--- a/www/docs/js/main.js
+++ b/www/docs/js/main.js
@@ -464,35 +464,6 @@ document.addEventListener('DOMContentLoaded', function() {
   createAccordion('.accordion-button', '.accordion-content');
 });
 
-// Create alert form
-$(document).ready(function() {
-  let currentStep = 0;
-  let steps = $(".alert-step");
-
-  // Show the first step
-  $(steps[currentStep]).show();
-
-  // Focus management: Set focus to the first input on each step change
-  function focusFirstInput(stepIndex) {
-    $(steps[stepIndex]).find('input, button').first().focus();
-  }
-
-  // Next button click
-  $(".next").click(function() {
-    $(steps[currentStep]).hide();
-    currentStep++;
-    $(steps[currentStep]).show();
-    focusFirstInput(currentStep); // Set focus to the first input of the new step
-  });
-
-  // Previous button click
-  $(".prev").click(function() {
-    $(steps[currentStep]).hide();
-    currentStep--;
-    $(steps[currentStep]).show();
-    focusFirstInput(currentStep); // Set focus to the first input of the new step
-  });
-});
 
 $(function() {
 
diff --git a/www/docs/style/sass/parts/_accordion.scss b/www/docs/style/sass/parts/_accordion.scss
index 8499959cc9..b8408fd3fa 100644
--- a/www/docs/style/sass/parts/_accordion.scss
+++ b/www/docs/style/sass/parts/_accordion.scss
@@ -76,6 +76,10 @@
 
     .alert-controller-wrapper {
         margin-bottom: 2rem;
+        form {
+            display: inline;
+        }
+
         button {
             margin-bottom: 0;
             span {
@@ -114,6 +118,12 @@
     }
 }
 
+.alert-page-alert-controls {
+    form {
+        display: inline;
+    }
+}
+
 .keyword-list {
     ul {
         list-style: none;
@@ -174,6 +184,11 @@ button {
 
 }
 
+.alert-page-option-label {
+    display: inline;
+    margin-left: 0.5em;
+}
+
 .button.red {
     background-color: $color-red;
     color: #fff;
@@ -183,15 +198,6 @@ button {
     }
 }
 
-// FORM
-.alert-step {
-    display: none;
-}
-
-.alert-step.active {
-    display: block;
-}
-
 #create-alert-form {
     label {
         color: $body-font-color;
diff --git a/www/includes/easyparliament/alert.php b/www/includes/easyparliament/alert.php
index 66493d36e8..3746aa7f33 100644
--- a/www/includes/easyparliament/alert.php
+++ b/www/includes/easyparliament/alert.php
@@ -104,6 +104,27 @@ public function fetch($confirmed, $deleted) {
         return $data;
     }
 
+    public function update($id, $details) {
+        $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
+
+        $q = $this->db->query("SELECT * FROM alerts
+            WHERE alert_id = :id", [
+            ':id' => $id,
+        ])->first();
+        if ($q) {
+            $q = $this->db->query("UPDATE alerts SET deleted = 0, criteria = :criteria, confirmed = 1
+                WHERE alert_id = :id", [
+                ":criteria" => $criteria,
+                ":id" => $id,
+            ]);
+
+            if ($q->success()) {
+                return 1;
+            }
+        }
+        return -1;
+    }
+
     public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
diff --git a/www/includes/easyparliament/templates/html/alert/_alert_form.php b/www/includes/easyparliament/templates/html/alert/_alert_form.php
new file mode 100644
index 0000000000..2ba812e7e7
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/alert/_alert_form.php
@@ -0,0 +1,256 @@
+          <div class="alert-section">
+            <div class="alert-section__primary">
+              <div class="alert-page-section">
+                <div class="alert-creation-steps">
+                  <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") { ?>
+
+                    <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 } ?>
+
+                      <div class="alert-page-subsection">
+                      <label for="words[]"><?= gettext('What word or phrase would you like to recieve 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">
+                        <span><?= gettext('Add word') ?></span>
+                          <i aria-hidden="true" class="fi-save"></i>
+                        </button>
+                      </div>
+
+                      <div class="alert-page-subsection">
+                        <label for="exclusions"><?= gettext('Is there anything you would not like to recieve 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-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 } ?>
+                          <?php } ?>
+                          <p><?= gettext("Or edit the name") ?></p>
+                        <?php } ?>
+                          <input type="text" id="representative" name="representative" value="<?= _htmlspecialchars($representative) ?>" aria-required="true">
+                      </div>
+
+
+                      <button type="submit" name="step" value="review" class="next" aria-label="Go to Step 2">Next</button>
+                    </div>
+                  <?php } elseif ($step == "add_vector_related") { ?>
+
+                    <?php foreach ($keywords as $word) { ?>
+                    <input type="hidden" name="words[]" value="<?= $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) ?>">
+                    <div class="alert-step" id="step2" role="region" aria-labelledby="step2-header">
+                      <h2 id="step2-header">Adding some extras</h2>
+                      <div class="keyword-list alert-page-subsection">
+                        <h3 class="heading-with-bold-word">Current keywords in this alert:</h3>
+                        <ul>
+                          <?php foreach ($keywords as $word) { ?>
+                          <li class="label label--primary-light"><?= _htmlspecialchars($word) ?>
+                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                          <?php } ?>
+                        </ul>
+                        <div class="add-remove-tool">
+                          <input type="text" placeholder="e.g.'freedom of information'">
+                          <button type="submit" class="prefix"><?= gettext('Add') ?></button>
+                        </div>
+                      </div>
+
+                      <dl class="alert-meta-info">
+                        <?php if ($search_result_count > 0) { ?>
+                          <div class="content-header-item">
+                            <dt>This week</dt>
+                            <dd><?= $search_result_count ?> mentions</dd>
+                          </div>
+                        <?php } ?>
+
+                        <div class="content-header-item">
+                          <dt>Date of last mention</dt>
+                          <dd>30 May 2024</dd>
+                        </div>
+
+                        <!-- Takes you to the result page of this query -->
+                        <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" class="button small"><?= gettext('See results for this alert') ?></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>
+                    </div>
+                  <?php } elseif ($step == "review") { ?>
+
+                    <?php foreach ($keywords as $word) { ?>
+                      <input type="hidden" name="words[]" value="<?= _htmlspecialchars($word) ?>">
+                    <?php } ?>
+                    <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) ?>">
+                    <!-- 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">
+                        <h3 class="heading-with-bold-word"><?= gettext('You will get an alert if any of these words are in a speech') ?>:</h3>
+                        <ul>
+                          <?php foreach ($keywords as $word) { ?>
+                          <li class="label label--primary-light"><?= _htmlspecialchars($word) ?>
+                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                          <?php } ?>
+                        </ul>
+                      </div>
+
+                      <?php if ($exclusions) { ?>
+                      <div class="keyword-list excluded-keywords alert-page-subsection">
+                      <h3 class="heading-with-bold-word"><?= gettext('Unless the speech also includes these words') ?>:</h3>
+                        <ul>
+                          <?php foreach (explode(" ", $exclusions) as $word) { ?>
+                          <li class="label label--red"><?= _htmlspecialchars($word) ?>
+                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                          <?php } ?>
+                        </ul>
+                      </div>
+                      <?php } ?>
+
+                      <div class="keyword-list alert-page-subsection">
+                      <?php if (count($sections) > 0) { ?>
+                        <h3 class="heading-with-bold-word"><?= gettext('And only if the speech is in') ?>:</h3>
+                          <ul>
+                          <?php foreach ($sections as $word) { ?>
+                            <li class="label label--red"><?= _htmlspecialchars($word) ?>
+                              <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                          <?php } ?>
+                          </ul>
+                      <?php } else { ?>
+                        <h3 class="heading-with-bold-word"><?= 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-page-subsection">
+                      <h3 class="heading-with-bold-word"><?= gettext('And only when spoken by') ?></h3>
+                        <ul>
+                          <?php foreach ($members as $member) { ?>
+                          <li class="label label--primary-light"><?= $member['given_name'] ?> <?= $member['family_name'] ?>
+                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                          <?php } ?>
+                        </ul>
+                      </div>
+                      <?php } ?>
+
+                      <dl class="alert-meta-info">
+                        <?php if ($search_result_count > 0) { ?>
+                          <div class="content-header-item">
+                            <dt><?= gettext('This week') ?></dt>
+                            <dd><?= sprintf(gettext('%d mentions'), $search_result_count) ?></dd>
+                          </div>
+                        <?php } ?>
+
+                        <?php if (isset($lastmention)) { ?>
+                          <div class="content-header-item">
+                          <dt><?= gettext('Date of last mention') ?></dt>
+                            <dd>30 May 2024</dd>
+                          </div>
+                        <?php } ?>
+
+                        <a href="/search/?q=<?= _htmlspecialchars($criteria) ?>" target="_blank" class="button small"><?= gettext('See results for this alert') ?></a>
+                      </dl>
+
+                      <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">
+                      <span><?= gettext('Save alert') ?></span>
+                        <i aria-hidden="true" class="fi-save"></i>
+                      </button>
+                      <button type="submit" class="button red" name="action" value="Abandon">
+                        <span><?= gettext('Abandon changes') ?></span>
+                        <i aria-hidden="true" class="fi-trash"></i>
+                      </button>
+                      <?php if ($token) { ?>
+                      <button type="submit" class="button red" name="action" value="Delete">
+                        <span><?= gettext('Delete alert') ?></span>
+                        <i aria-hidden="true" class="fi-trash"></i>
+                      </button>
+                      <?php } ?>
+                    </div>
+                    <?php } ?>
+                  </form>
+
+                </div>
+              </div>
+            </div>
+          </div>
diff --git a/www/includes/easyparliament/templates/html/alert/_list_accordian.php b/www/includes/easyparliament/templates/html/alert/_list_accordian.php
new file mode 100644
index 0000000000..0c05ee1666
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/alert/_list_accordian.php
@@ -0,0 +1,276 @@
+              <div class="accordion">
+                <?php foreach ($keyword_alerts as $index => $alert) { ?>
+                <div class="accordion-item">
+                <button class="accordion-button" href="#accordion-content-<?= $index ?>" aria-expanded="false">
+                    <div class="accordion-button--content">
+                      <span class="content-title"><?= _htmlspecialchars($alert['criteria']) ?></span>
+                      <?php if (array_key_exists("mentions", $alert)) { ?>
+                      <span class="content-subtitle"><?= sprintf(gettext('%d mentions this week'), $alert['mentions']) ?></span>
+                      <?php } ?>
+                    </div>
+                    <i aria-hidden="true" role="img" class="fi-plus"></i>
+                  </button>
+                  <div id="accordion-content-<?= $index ?>" class="accordion-content" aria-hidden="true" role="img">
+                    <div class="accordion-content-header">
+                      <div class="alert-controller-wrapper">
+                        <form action="<?= $actionurl ?>" method="POST">
+                          <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                          <button class="button small display-none">Discard changes</button>
+                          <?php if ($alert['status'] == 'unconfirmed') { ?>
+                            <button type="submit" class="button small" name="action" value="Confirm">
+                              <span><?= gettext('Confirm alert') ?></span>
+                              <i aria-hidden="true" class="fi-save"></i>
+                            </button>
+                          <?php } elseif ($alert['status'] == 'suspended') { ?>
+                            <button type="submit" class="button small" name="action" value="Resume">
+                            <span><?= gettext('Resume alert') ?></span>
+                              <i aria-hidden="true" class="fi-play"></i>
+                            </button>
+                          <?php } else { ?>
+                            <button type="submit" class="button small" name="action" value="Suspend">
+                              <span><?= gettext('Suspend alert') ?></span>
+                              <i aria-hidden="true" class="fi-pause"></i>
+                            </button>
+                            <button type="submit" class="button small red" name="action" value="Delete">
+                              <span><?= gettext('Delete alert') ?></span>
+                              <i aria-hidden="true" class="fi-trash"></i>
+                            </button>
+                          </form>
+                          <form action="<?= $actionurl ?>" method="POST">
+                            <input type="hidden" name="step" value="define">
+                            <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                            <button type="submit" class="button small" value="Edit">
+                              <span><?= gettext('Edit alert') ?></span>
+                              <i aria-hidden="true" class="fi-page-edit"></i>
+                            </button>
+                          <?php } ?>
+                          </form>
+                      </div>
+                      <dl class="alert-meta-info">
+                          <?php if (array_key_exists("mentions", $alert)) { ?>
+                           <div class="content-header-item">
+                             <dt><?= gettext('This week') ?></dt>
+                             <dd><?= sprintf(gettext('%d mentions'), $alert['mentions']) ?></dd>
+                           </div>
+                          <?php } ?>
+
+                          <?php if (array_key_exists("last_mention", $alert)) { ?>
+                          <div class="content-header-item">
+                          <dt><?= gettext('Date of last mention') ?></dt>
+                          <dd><?= $alert['last_mention'] ?></dd>
+                          </div>
+                          <?php } ?>
+
+                          <a href="/search/?q=<?= $alert['raw'] ?>" class="button small"><?= gettext('See results for this alert') ?></a>
+                        </dl>
+                    </div>
+
+                    <?php if ($alert["keywords"] or $alert["exclusions"] or $alert["sections"] or array_key_exists('spokenby', $alert)) { ?>
+                    <hr>
+                    <?php } ?>
+
+                    <?php if ($alert["keywords"]) { ?>
+                    <div class="keyword-list alert-page-subsection">
+                      <h3 class="heading-with-bold-word">Keywords <span class="bold">included</span> in this alert:</h3>
+                      <ul>
+                        <?php foreach ($alert["keywords"] as $keyword) { ?>
+                        <li class="label label--primary-light"><?= _htmlspecialchars($keyword) ?>
+                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                        <?php } ?>
+                      </ul>
+                      <div class="add-remove-tool display-none">
+                        <input type="text" placeholder="e.g.'freedom of information'">
+                        <button type="submit" class="prefix">add</button>
+                      </div>
+                    </div>
+                    <?php } ?>
+
+                    <?php if ($alert["exclusions"]) { ?>
+                    <div class="keyword-list excluded-keywords alert-page-subsection">
+                      <h3 class="heading-with-bold-word">Keywords <span class="bold">excluded</span> in this alert:</h3>
+                      <ul>
+                        <?php foreach ($alert["exclusions"] as $exclusion) { ?>
+                        <li class="label label--red"><?= _htmlspecialchars($exclusion) ?>
+                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                        <?php } ?>
+                      </ul>
+                      <div class="add-remove-tool display-none">
+                        <input type="text" placeholder="e.g.'freedom of information'">
+                        <button type="submit" class="prefix">add</button>
+                      </div>
+                    </div>
+                    <?php } ?>
+
+                    <?php if ($alert['sections']) { ?>
+                    <div class="keyword-list alert-page-subsection">
+                      <h3 class="display-none"><label for="sections">Which section should this alert apply to?</label></h3>
+                      <select name="sections" id="sections" class="display-none">
+                        <option value="uk-parliament">All sections</option>
+                        <option value="uk-parliament">UK Parliament</option>
+                        <option value="scottish-parliament">Scottish Parliament</option>
+                      </select>
+                      <h3 class="heading-with-bold-word">Which <span class="bold">section</span> should this alert apply to:</h3>
+                      <ul>
+                        <?php foreach ($alert["sections_verbose"] as $section) { ?>
+                        <li class="label label--red"><?= _htmlspecialchars($section) ?>
+                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                        <?php } ?>
+                      </ul>
+                    </div>
+                    <?php } ?>
+
+                    <!-- Only to be displayed if there is a person in this query -->
+
+                    <?php if (array_key_exists('spokenby', $alert)) { ?>
+                      <div class="keyword-list alert-page-subsection">
+                        <h3 class="heading-with-bold-word"><?= gettext('This alert applies to the following <span class="bold">representative</span>') ?></h3>
+                        <ul>
+                        <?php foreach ($alert['spokenby'] as $speaker) { ?>
+                        <li class="label label--primary-light"><?= $speaker ?>
+                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
+                        <?php } ?>
+                        </ul>
+                        <div class="add-remove-tool display-none">
+                          <input type="text" placeholder="e.g.'freedom of information'">
+                          <button type="submit" class="prefix">add</button>
+                        </div>
+                      </div>
+                    <?php } ?>
+
+                    <button class="display-none" style="margin: -1rem 0rem 3rem;">Save changes</button>
+                    <button class="display-none" style="margin: -1rem 0rem 3rem;">Discard changes</button>
+
+                  </div>
+                </div>
+                <?php } ?>
+
+                <hr>
+
+                    <div class="alert-page-header">
+                      <div>
+                        <h2>Representative alerts</h2>
+                      </div>
+                      <form action="<?= $actionurl ?>" method="post">
+                        <input type="hidden" name="step" value="mp_alert">
+                        <button type="submit" class="button small">
+                          <?= gettext('Create new MP alert') ?>
+                          <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                        </button>
+                      </form>
+                      </div>
+                    <?php if ($current_mp) { ?>
+                      <ul class="alerts-manage__list">
+                          <li>
+                              <?= sprintf(gettext('You are not subscribed to an alert for your current MP, %s'), $current_mp->full_name()) ?>.
+                              <form action="<?= $actionurl ?>" method="post">
+                                  <input type="hidden" name="pid" value="<?= $current_mp->person_id() ?>">
+                                  <input type="submit" class="button" value="<?= gettext('Subscribe') ?>">
+                              </form>
+                          </li>
+                      </ul>
+                    <?php } else { ?>
+                      <?php foreach ($own_member_alerts as $alert) { ?>
+                        <div class="alert-page-subsection">
+                          <h3 class="alert-page-subsection--heading"><?= gettext('Your MP') ?> ﹒ XXX</h3>
+
+                          <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
+                          <div class="alert-page-alert-controls">
+                            <form action="<?= $actionurl ?>" method="POST">
+                              <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                              <?php if ($alert['status'] == 'unconfirmed') { ?>
+                                <button type="submit" class="button small" name="action" value="Confirm">
+                                  <span><?= gettext('Confirm alert') ?></span>
+                                  <i aria-hidden="true" class="fi-save"></i>
+                                </button>
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
+                              <button type="submit" class="button small" name="action" value="Resume">
+                                <span><?= gettext('Resume alert') ?></span>
+                                <i aria-hidden="true" class="fi-play"></i>
+                              </button>
+                              <?php } else { ?>
+                              <button typ="submit" class="button small" value="Suspend">
+                                <span><?= gettext('Suspend alert') ?></span>
+                                <i aria-hidden="true" class="fi-pause"></i>
+                              </button>
+                              <button typ="submit" class="button small" value="Delete">
+                                <span><?= gettext('Delete alert') ?></span>
+                                <i aria-hidden="true" class="fi-trash"></i>
+                              </button>
+                            </form>
+                            <form action="<?= $actionurl ?>" method="POST">
+                              <input type="hidden" name="step" value="define">
+                              <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                              <button type="submit" class="button small" value="Edit">
+                                <span><?= gettext('Edit alert') ?></span>
+                                <i aria-hidden="true" class="fi-page-edit"></i>
+                              </button>
+                            </form>
+                              <?php } ?>
+
+                          <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
+                          <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
+                          <form action="<?= $actionurl ?>" method="post">
+                            <input type="hidden" name="keyword" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
+                            <button type="submit" class="button small" name="action" value="Subscribe">
+                              <?= gettext('Create new alert') ?>
+                              <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                            </button>
+                          </form>
+                          <?php } ?>
+                        </div>
+                      </div>
+                      <?php } ?>
+                    <?php } ?>
+
+                    <?php foreach ($spoken_alerts as $alert) { ?>
+                      <div class="alert-page-subsection">
+                        <h3 class="alert-page-subsection--heading"><?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?></h3>
+
+                          <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?>
+                          <div class="alert-page-alert-controls">
+                            <form action="<?= $actionurl ?>" method="POST">
+                              <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                              <?php if ($alert['status'] == 'unconfirmed') { ?>
+                                <button type="submit" class="button small" name="action" value="Confirm">
+                                  <span><?= gettext('Confirm alert') ?></span>
+                                  <i aria-hidden="true" class="fi-save"></i>
+                                </button>
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
+                              <button type="submit" class="button small" name="action" value="Resume">
+                                <span><?= gettext('Resume alert') ?></span>
+                                <i aria-hidden="true" class="fi-play"></i>
+                              </button>
+                              <?php } else { ?>
+                              <button type="submit" class="button small" name="action" value="Suspend">
+                                <span><?= gettext('Suspend alert') ?></span>
+                                <i aria-hidden="true" class="fi-pause"></i>
+                              </button>
+                              <button type="submit" class="button small" name="action" value="Delete">
+                                <span><?= gettext('Delete alert') ?></span>
+                                <i aria-hidden="true" class="fi-trash"></i>
+                              </button>
+                            </form>
+                            <form action="<?= $actionurl ?>" method="POST">
+                              <input type="hidden" name="step" value="define">
+                              <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                              <button type="submit" class="button small" value="Edit">
+                                <span><?= gettext('Edit alert') ?></span>
+                                <i aria-hidden="true" class="fi-page-edit"></i>
+                              </button>
+                              <?php } ?>
+                            </form>
+
+                          <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
+                          <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
+                          <form action="<?= $actionurl ?>" method="post">
+                            <input type="hidden" name="keyword" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
+                            <button type="submit" class="button small" name="action" value="Subscribe">
+                              <?= gettext('Create new alert') ?>
+                              <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                            </button>
+                          </form>
+                          <?php } ?>
+                        </div>
+                      </div>
+                    <?php } ?>
+                </div>
diff --git a/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
new file mode 100644
index 0000000000..85ee60fb5c
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
@@ -0,0 +1,47 @@
+<form action="<?= $actionurl ?>" method="post" class="">
+  <?php if (!$email_verified) { ?>
+    <p>
+      <?php if (isset($errors["email"]) && $submitted) { ?>
+        <span class="alert-page-error"><?= $errors["email"] ?></span>
+      <?php } ?>
+        <input type="email" class="form-control" placeholder="<?= gettext('Your email address') ?>" name="email" id="email" value="<?= _htmlentities($email) ?>">
+    </p>
+  <?php } ?>
+
+    <p>
+      <?php if ($pid) { ?>
+        <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled"
+            value="<?= $pid_member->full_name() ?><?php if ($pid_member->constituency()) { ?> (<?= _htmlspecialchars($pid_member->constituency()) ?>)<?php } ?>">
+      <?php } elseif ($keyword) { ?>
+        <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled" value="<?= _htmlspecialchars($display_keyword) ?>">
+      <?php } else { ?>
+        <input type="text" class="form-control" placeholder="<?= gettext('Search postcode, or MP name') ?>" name="alertsearch" id="alertsearch" value="<?= _htmlentities($search_text) ?>">
+      <?php } ?>
+    </p>
+
+    <p>
+        <input type="submit" class="button" value="<?= ($pid || $keyword) ? gettext('Subscribe') : gettext('Search') ?>">
+        <button type="submit" class="button red" name="action" value="Abandon">
+          <span><?= gettext('Abandon changes') ?></span>
+          <i aria-hidden="true" class="fi-trash"></i>
+        </button>
+    </p>
+
+    <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
+    <input type="hidden" name="submitted" value="1">
+
+  <?php if ($pid) { ?>
+    <input type="hidden" name="pid" value="<?= _htmlspecialchars($pid) ?>">
+  <?php } ?>
+  <?php if ($keyword) { ?>
+    <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
+  <?php } ?>
+
+  <?php if ($sign) { ?>
+    <input type="hidden" name="sign" value="<?= _htmlspecialchars($sign) ?>">
+  <?php } ?>
+
+  <?php if ($site) { ?>
+    <input type="hidden" name="site" value="<?= _htmlspecialchars($site) ?>">
+  <?php } ?>
+</form>
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 1ee4f9243c..b6f9a178b4 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -20,7 +20,7 @@
                 <p>
                     <?= gettext('You will now receive email alerts for the following criteria:') ?>
                 </p>
-                <ul><?= _htmlspecialchars($criteria) ?></ul>
+                <ul><?= _htmlspecialchars($display_criteria) ?></ul>
                 <p>
                     <?= gettext('This is normally the day after, but could conceivably be later due to issues at our or the parliament’s end.') ?>
                 </p>
@@ -83,7 +83,7 @@
               <?php } elseif ($results == 'alert-added') { ?>
                 <h3><?= gettext('Your alert has been added') ?></h3>
                 <p>
-                    <?= sprintf(gettext('You will now receive email alerts on any day when %s in parliament.'), _htmlspecialchars($criteria)) ?>
+                    <?= sprintf(gettext('You will now receive email alerts on any day when %s in parliament.'), _htmlspecialchars($display_criteria)) ?>
                 </p>
 
               <?php } elseif ($results == 'alert-confirmation') { ?>
@@ -104,6 +104,11 @@
                     <?= gettext('You should receive an email shortly which will contain a link. You will need to follow that link to confirm your email address and receive future alerts. Thanks.') ?>
                 </p>
 
+              <?php } elseif ($results == 'changes-abandoned') { ?>
+                <h3><?= gettext('Changes abandoned') ?></h3>
+                <p>
+                    <?= gettext('Those changes have been abandoned and your alerts are unchanged.') ?>
+                </p>
               <?php } elseif ($results == 'alert-fail') { ?>
                 <h3><?= gettext('Alert could not be created') ?></h3>
                 <p>
@@ -115,7 +120,16 @@
         </div>
       <?php } ?>
 
-      <?php
+      <?php if ($step == 'mp_alert') { ?>
+        <div class="alert-section">
+            <div class="alert-section__primary">
+              <h1><?= gettext("Create an MP Alert") ?></h1>
+              <?php include '_mp_alert_form.php' ?>
+              </div>
+          </div>
+      <?php } elseif ($step !== '') { ?>
+        <?php include '_alert_form.php';
+      } elseif ($this_step == '') {
           if(
               $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
@@ -172,82 +186,28 @@
               <?php } ?>
 
               <?php if ($alertsearch) {
-                  if ($member_options) { ?>
-                <h3><?= gettext('Sign up for alerts for topics') ?></h3>
+                  if (!$member_options) { ?>
+                <h3><?= gettext('That doesn’t match a person, postcode or constituency. Search again to refine your email alert.') ?></h3>
                 <?php } else { ?>
-                <h3><?= gettext('Great! Can you just confirm what you mean?') ?></h3>
-                <?php } ?>
+              <h3><?= gettext('Do you want alerts for a word or phrase?') ?></h3>
                 <ul>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
-                            <input type="hidden" name="keyword" value="<?= _htmlspecialchars($alertsearch) ?>">
+                            <input type="hidden" name="step" value="define">
+                            <input type="hidden" name="words[]" value="<?= _htmlspecialchars($alertsearch) ?>">
                             <?= sprintf(gettext('Receive alerts when %s'), _htmlspecialchars($alertsearch_pretty)) ?>
-                            <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
-                        </form>
-                      <?php if (isset($mistakes['multiple'])) { ?>
-                        <em class="error"><?= gettext('
-                            You have used a comma in your search term –
-                            are you sure this is what you want? You cannot
-                            sign up to multiple search terms using a comma
-                            – either use OR, or create a separate alert
-                            for each individual term.') ?>
-                        </em>
-                      <?php } ?>
-                      <?php if (isset($mistakes['postcode_and'])) { ?>
-                        <em class="error"><?= gettext('
-                            You have used a postcode and something else in your
-                            search term – are you sure this is what you
-                            want? You will only get an alert if all of these
-                            are mentioned in the same debate.') ?>
-                          <?php if (isset($member_alertsearch)) {
-                              printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
-                          } ?>
-                        </em>
-                      <?php } ?>
-                    </li>
-
-                  <?php if (isset($member_alertsearch)) { ?>
-                    <li>
-                        <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
-                            <input type="hidden" name="keyword" value="<?= _htmlspecialchars($member_alertsearch) ?>">
-                            <?= sprintf(gettext('Mentions of [%s] by your MP, %s'), _htmlspecialchars($member_displaysearch), $member->full_name()) ?>
-                            <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
-                        </form>
-                    </li>
-                  <?php } ?>
-
-                  <?php if (isset($scottish_alertsearch)) { ?>
-                    <li>
-                        <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
-                            <input type="hidden" name="keyword" value="<?= _htmlspecialchars($scottish_alertsearch) ?>">
-                            <?= sprintf(gettext('Mentions of [%s] by your MSP, %s'), _htmlspecialchars($member_displaysearch), $scottish_member->full_name()) ?>
-                            <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
-                        </form>
-                    </li>
-                  <?php } ?>
-
-                  <?php if (isset($welsh_alertsearch)) { ?>
-                    <li>
-                        <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
-                            <input type="hidden" name="keyword" value="<?= _htmlspecialchars($welsh_alertsearch) ?>">
-                            <?= sprintf(gettext('Mentions of [%s] by your MS, %s'), _htmlspecialchars($member_displaysearch), $welsh_member->full_name()) ?>
-                            <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
-                        </form>
-                    </li>
-                  <?php } ?>
+                            <input type="submit" class="button small" value="<?= gettext('Create alert') ?>"></form>
+                        </li>
                 </ul>
+              <h3><?= gettext('Not quite right? Search again to refine your email alert.') ?></h3>
+                <?php } ?>
               <?php } ?>
+              <?php include '_mp_alert_form.php' ?>
             </div>
         </div>
-      <?php } ?>
+        <?php } else { ?>
 
         <div class="alert-section">
             <div class="alert-section__primary">
@@ -258,6 +218,30 @@
                 <p>
                     <?= gettext('Plus, you won’t need to confirm your email address for every alert you set.') ?>
                 </p>
+              <div class="alert-page-header">
+                <h3>Create an alert for a phrase or keyword</h3>
+                <form action="<?= $actionurl ?>" method="post">
+                    <input type="hidden" name="step" value="define">
+                    <button type="submit" class="button small" value="<?= gettext('Create new keyword alert') ?>">
+                      <span><?= gettext('Create new keyword alert') ?></span>
+                      <i aria-hidden="true" class="fi-megaphone"></i>
+                    </button>
+                </form>
+
+              </div>
+
+              <h3>or</h3>
+
+              <div class="alert-page-header">
+                <h3>Create an alert when an MP speaks</h3>
+                <form action="<?= $actionurl ?>" method="post">
+                  <input type="hidden" name="step" value="mp_alert">
+                  <button type="submit" class="button small">
+                    <?= gettext('Create new MP alert') ?>
+                    <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                  </button>
+                </form>
+              </div>
               <?php } else { ?>
               <div class="clearfix">
                   <form action="<?= $actionurl ?>" method="POST" class="pull-right">
@@ -274,329 +258,21 @@
                   <p><?= gettext('You haven´t created any keyword alerts.') ?></p>
                 <?php } ?>
                 </div>
-                <a class="button" href="#new_alert">
-                  <?= gettext('Create new alert') ?>
-                  <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                </a>
+                <form action="<?= $actionurl ?>" method="post">
+                    <input type="hidden" name="step" value="define">
+                    <button type="submit" class="button small" value="<?= gettext('Create new keyword alert') ?>">
+                      <span><?= gettext('Create new keyword alert') ?></span>
+                      <i aria-hidden="true" class="fi-megaphone"></i>
+                    </button>
+                </form>
               </div>
 
-              <!-- The groups alerts should be sorted by default from most recent mention to oldest one -->
-              <!-- Future functionality: The groups alerts can be sorted alphabetically-->
+                <!-- The groups alerts should be sorted by default from most recent mention to oldest one -->
+                <!-- Future functionality: The groups alerts can be sorted alphabetically-->
 
-              <div class="accordion">
-                <?php foreach ($keyword_alerts as $index => $alert) { ?>
-                <div class="accordion-item">
-                <button class="accordion-button" href="#accordion-content-<?= $index ?>" aria-expanded="false">
-                    <div class="accordion-button--content">
-                      <span class="content-title"><?= _htmlspecialchars($alert['criteria']) ?></span>
-                      <?php if (array_key_exists("mentions", $alert)) { ?>
-                      <span class="content-subtitle"><?= sprintf(gettext('%d mentions this week'), $alert['mentions']) ?></span>
-                      <?php } ?>
-                    </div>
-                    <i aria-hidden="true" role="img" class="fi-plus"></i>
-                  </button>
-                  <div id="accordion-content-<?= $index ?>" class="accordion-content" aria-hidden="true" role="img">
-                    <div class="accordion-content-header">
-                      <form action="<?= $actionurl ?>" method="POST">
-                        <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                        <div class="alert-controller-wrapper">
-                          <button class="button small display-none">Discard changes</button>
-                          <?php if ($alert['status'] == 'unconfirmed') { ?>
-                            <button type="submit" class="button small" name="action" value="Confirm">
-                              <span><?= gettext('Confirm alert') ?></span>
-                              <i aria-hidden="true" class="fi-save"></i>
-                            </button>
-                          <?php } elseif ($alert['status'] == 'suspended') { ?>
-                            <button type="submit" class="button small" name="action" value="Resume">
-                            <span><?= gettext('Resume alert') ?></span>
-                              <i aria-hidden="true" class="fi-play"></i>
-                            </button>
-                          <?php } else { ?>
-                            <button type="submit" class="button small" name="action" value="Suspend">
-                              <span><?= gettext('Suspend alert') ?></span>
-                              <i aria-hidden="true" class="fi-pause"></i>
-                            </button>
-                            <button type="submit" class="button small red" name="action" value="Delete">
-                              <span><?= gettext('Delete alert') ?></span>
-                              <i aria-hidden="true" class="fi-trash"></i>
-                            </button>
-                          <?php } ?>
-                        </div>
-                      </form>
-                      <dl class="alert-meta-info">
-                          <?php if (array_key_exists("mentions", $alert)) { ?>
-                           <div class="content-header-item">
-                             <dt><?= gettext('This week') ?></dt>
-                             <dd><?= sprintf(gettext('%d mentions'), $alert['mentions']) ?></dd>
-                           </div>
-                          <?php } ?>
-
-                          <?php if (array_key_exists("last_mention", $alert)) { ?>
-                          <div class="content-header-item">
-                          <dt><?= gettext('Date of last mention') ?></dt>
-                          <dd><?= $alert['last_mention'] ?></dd>
-                          </div>
-                          <?php } ?>
-
-                          <a href="/search/?q=<?= $alert['raw'] ?>" class="button small"><?= gettext('See results for this alert') ?></a>
-                        </dl>
-                    </div>
-
-                    <?php if ($alert["keywords"] or $alert["exclusions"] or $alert["sections"] or array_key_exists('spokenby', $alert)) { ?>
-                    <hr>
-                    <?php } ?>
-
-                    <?php if ($alert["keywords"]) { ?>
-                    <div class="keyword-list alert-page-subsection">
-                      <h3 class="heading-with-bold-word">Keywords <span class="bold">included</span> in this alert:</h3>
-                      <ul>
-                        <?php foreach ($alert["keywords"] as $keyword) { ?>
-                        <li class="label label--primary-light"><?= _htmlspecialchars($keyword) ?>
-                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
-                        <?php } ?>
-                      </ul>
-                      <div class="add-remove-tool display-none">
-                        <input type="text" placeholder="e.g.'freedom of information'">
-                        <button type="submit" class="prefix">add</button>
-                      </div>
-                    </div>
-                    <?php } ?>
-
-                    <?php if ($alert["exclusions"]) { ?>
-                    <div class="keyword-list excluded-keywords alert-page-subsection">
-                      <h3 class="heading-with-bold-word">Keywords <span class="bold">excluded</span> in this alert:</h3>
-                      <ul>
-                        <?php foreach ($alert["exclusions"] as $exclusion) { ?>
-                        <li class="label label--red"><?= _htmlspecialchars($exclusion) ?>
-                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
-                        <?php } ?>
-                      </ul>
-                      <div class="add-remove-tool display-none">
-                        <input type="text" placeholder="e.g.'freedom of information'">
-                        <button type="submit" class="prefix">add</button>
-                      </div>
-                    </div>
-                    <?php } ?>
-
-                    <?php if ($alert['sections']) { ?>
-                    <div class="keyword-list alert-page-subsection">
-                      <h3 class="display-none"><label for="sections">Which section should this alert apply to?</label></h3>
-                      <select name="sections" id="sections" class="display-none">
-                        <option value="uk-parliament">All sections</option>
-                        <option value="uk-parliament">UK Parliament</option>
-                        <option value="scottish-parliament">Scottish Parliament</option>
-                      </select>
-                      <h3 class="heading-with-bold-word">Which <span class="bold">section</span> should this alert apply to:</h3>
-                      <ul>
-                        <?php foreach ($alert["sections_verbose"] as $section) { ?>
-                        <li class="label label--red"><?= _htmlspecialchars($section) ?>
-                          <i aria-hidden="true" role="img" class="fi-x"></i></li>
-                        <?php } ?>
-                      </ul>
-                    </div>
-                    <?php } ?>
-
-                    <!-- Only to be displayed if there is a person in this query -->
-
-                    <?php if (array_key_exists('spokenby', $alert)) { ?>
-                      <div class="keyword-list alert-page-subsection">
-                        <h3 class="heading-with-bold-word"><?= gettext('This alert applies to the following <span class="bold">representative</span>') ?></h3>
-                        <ul>
-                        <?php foreach ($alert['spokenby'] as $speaker) { ?>
-                        <li class="label label--primary-light"><?= $speaker ?>
-                            <i aria-hidden="true" role="img" class="fi-x"></i></li>
-                        <?php } ?>
-                        </ul>
-                        <div class="add-remove-tool display-none">
-                          <input type="text" placeholder="e.g.'freedom of information'">
-                          <button type="submit" class="prefix">add</button>
-                        </div>
-                      </div>
-                    <?php } ?>
-
-                    <button class="display-none" style="margin: -1rem 0rem 3rem;">Save changes</button>
-                    <button class="display-none" style="margin: -1rem 0rem 3rem;">Discard changes</button>
-
-                  </div>
-                </div>
-                <?php } ?>
-
-                <hr>
-
-                <div class="alert-page-header alert-page-section">
-                  <div>
-                    <h2>Representative alerts</h2>
-                    <?php if ($current_mp) { ?>
-                      <ul class="alerts-manage__list">
-                          <li>
-                              <?= sprintf(gettext('You are not subscribed to an alert for your current MP, %s'), $current_mp->full_name()) ?>.
-                              <form action="<?= $actionurl ?>" method="post">
-                                  <input type="hidden" name="t" value="<?=_htmlspecialchars($token)?>">
-                                  <input type="hidden" name="pid" value="<?= $current_mp->person_id() ?>">
-                                  <input type="submit" class="button" value="<?= gettext('Subscribe') ?>">
-                              </form>
-                          </li>
-                      </ul>
-                    <?php } else { ?>
-                      <?php foreach ($own_member_alerts as $alert) { ?>
-                        <div class="alert-page-subsection">
-                          <h3 class="alert-page-subsection--heading"><?= gettext('Your MP') ?> ﹒ XXX</h3>
-
-                          <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
-                          <form action="<?= $actionurl ?>" method="POST">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                            <div>
-                              <?php if ($alert['status'] == 'unconfirmed') { ?>
-                                <button type="submit" class="button small" name="action" value="Confirm">
-                                  <span><?= gettext('Confirm alert') ?></span>
-                                  <i aria-hidden="true" class="fi-save"></i>
-                                </button>
-                              <?php } elseif ($alert['status'] == 'suspended') { ?>
-                              <button type="submit" class="button small" name="action" value="Resume">
-                                <span><?= gettext('Resume alert') ?></span>
-                                <i aria-hidden="true" class="fi-play"></i>
-                              </button>
-                              <?php } else { ?>
-                              <button typ="submit" class="button small" value="Suspend">
-                                <span><?= gettext('Suspend alert') ?></span>
-                                <i aria-hidden="true" class="fi-pause"></i>
-                              </button>
-                              <button typ="submit" class="button small" value="Delete">
-                                <span><?= gettext('Delete alert') ?></span>
-                                <i aria-hidden="true" class="fi-trash"></i>
-                              </button>
-                              <?php } ?>
-                            </div>
-                          </form>
-
-                          <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
-                          <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
-                          <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="speaker" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
-                            <button type="submit" class="button small" name="action" value="Subscribe">
-                              <?= gettext('Create new alert') ?>
-                              <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                            </button>
-                          </form>
-                        </div>
-                        <?php } ?>
-                      <?php } ?>
-                    <?php } ?>
-
-                    <?php foreach ($spoken_alerts as $alert) { ?>
-                        <div class="alert-page-subsection">
-                        <h3 class="alert-page-subsection--heading"><?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?></h3>
-
-                          <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?>
-                          <form action="<?= $actionurl ?>" method="POST">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                            <div>
-                              <?php if ($alert['status'] == 'unconfirmed') { ?>
-                                <button type="submit" class="button small" name="action" value="Confirm">
-                                  <span><?= gettext('Confirm alert') ?></span>
-                                  <i aria-hidden="true" class="fi-save"></i>
-                                </button>
-                              <?php } elseif ($alert['status'] == 'suspended') { ?>
-                              <button type="submit" class="button small" name="action" value="Resume">
-                                <span><?= gettext('Resume alert') ?></span>
-                                <i aria-hidden="true" class="fi-play"></i>
-                              </button>
-                              <?php } else { ?>
-                              <button type="submit" class="button small" name="action" value="Suspend">
-                                <span><?= gettext('Suspend alert') ?></span>
-                                <i aria-hidden="true" class="fi-pause"></i>
-                              </button>
-                              <button type="submit" class="button small" name="action" value="Delete">
-                                <span><?= gettext('Delete alert') ?></span>
-                                <i aria-hidden="true" class="fi-trash"></i>
-                              </button>
-                              <?php } ?>
-                            </div>
-                          </form>
-
-                          <?php if (!in_array(implode('', $alert['spokenby']), $all_keywords)) { ?>
-                          <p class="alert-page-subsection--subtitle">Alert when <?= _htmlspecialchars(implode(', ', $alert['spokenby'])) ?> is <strong>mentioned</strong></p>
-                          <form action="<?= $actionurl ?>" method="post">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                            <input type="hidden" name="speaker" value="<?= _htmlentities(implode('', $alert['spokenby'])) ?>">
-                            <button type="submit" class="button small" name="action" value="Subscribe">
-                              <?= gettext('Create new alert') ?>
-                              <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                            </button>
-                          </form>
-                        </div>
-                        <?php } ?>
-                    <?php } ?>
-                  </div>
-                  <a class="button">
-                    <?= gettext('Create new MP alert') ?>
-                    <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                  </a>
-              </div>
-              </div>
-              <?php } ?>
-
-              <?php if ($pid) { ?>
-                <h3>
-                    <?php
-                        $name = $pid_member->full_name();
-                  if ($pid_member->constituency()) {
-                      $name .= ' (' . _htmlspecialchars($pid_member->constituency()) . ')';
-                  } ?>
-                    <?= sprintf(gettext('Sign up for an alert when %s speaks.'), $name) ?>
-                </h3>
-              <?php } elseif ($keyword) { ?>
-                <h3>
-                    <?= sprintf(gettext('Sign up for an alert when %s.'), _htmlspecialchars($display_keyword)) ?>
-                </h3>
-              <?php } elseif ($alertsearch) { ?>
-                <h3><?= gettext('Not quite right? Search again to refine your email alert.') ?></h3>
-              <?php } else { ?>
-                <h3><?= gettext('Request a new TheyWorkForYou email alert') ?></h3>
+                <?php include '_list_accordian.php'; ?>
               <?php } ?>
 
-              <a name="new_alert"></a>
-                <form action="<?= $actionurl ?>" method="post" class="alert-page-main-inputs">
-                  <?php if (!$email_verified) { ?>
-                    <p>
-                      <?php if (isset($errors["email"]) && $submitted) { ?>
-                        <span class="alert-page-error"><?= $errors["email"] ?></span>
-                      <?php } ?>
-                        <input type="email" class="form-control" placeholder="<?= gettext('Your email address') ?>" name="email" id="email" value="<?= _htmlentities($email) ?>">
-                    </p>
-                  <?php } ?>
-
-                    <p>
-                      <?php if ($pid) { ?>
-                        <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled"
-                            value="<?= $pid_member->full_name() ?><?php if ($pid_member->constituency()) { ?> (<?= _htmlspecialchars($pid_member->constituency()) ?>)<?php } ?>">
-                      <?php } elseif ($keyword) { ?>
-                        <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled" value="<?= _htmlspecialchars($display_keyword) ?>">
-                      <?php } else { ?>
-                        <input type="text" class="form-control" placeholder="<?= gettext('Search term, postcode, or MP name') ?>" name="alertsearch" id="alertsearch" value="<?= _htmlentities($search_text) ?>">
-                      <?php } ?>
-                        <input type="submit" class="button" value="<?= ($pid || $keyword) ? gettext('Subscribe') : gettext('Search') ?>">
-                    </p>
-
-                    <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
-                    <input type="hidden" name="submitted" value="1">
-
-                  <?php if ($pid) { ?>
-                    <input type="hidden" name="pid" value="<?= _htmlspecialchars($pid) ?>">
-                  <?php } ?>
-                  <?php if ($keyword) { ?>
-                    <input type="hidden" name="keyword" value="<?= _htmlspecialchars($keyword) ?>">
-                  <?php } ?>
-
-                  <?php if ($sign) { ?>
-                    <input type="hidden" name="sign" value="<?= _htmlspecialchars($sign) ?>">
-                  <?php } ?>
-
-                  <?php if ($site) { ?>
-                    <input type="hidden" name="site" value="<?= _htmlspecialchars($site) ?>">
-                  <?php } ?>
-                </form>
 
               <?php if (!$pid && !$keyword) { ?>
                 <div class="alert-page-search-tips">
@@ -626,9 +302,9 @@
                     <ul>
                 </div>
               <?php } ?>
-            </div>
-
+          </div>
         </div>
-
+        <?php } ?>
+        <?php } ?>
     </div>
 </div>