From 3ef1f8567cbb419598cb830946faddea3a9ad81b Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 30 Oct 2024 14:41:03 +0000
Subject: [PATCH 01/13] add ignore_speaker_votes flag to alerts table

Used to allow people to suppress seeing votes in speaker alerts.
---
 db/0026-add-ignore-votes-alerts.sql | 1 +
 db/schema.sql                       | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 db/0026-add-ignore-votes-alerts.sql

diff --git a/db/0026-add-ignore-votes-alerts.sql b/db/0026-add-ignore-votes-alerts.sql
new file mode 100644
index 0000000000..2425dd136f
--- /dev/null
+++ b/db/0026-add-ignore-votes-alerts.sql
@@ -0,0 +1 @@
+ALTER TABLE `alerts` ADD `ignore_speaker_votes` tinyint(1) NOT NULL default '0';
diff --git a/db/schema.sql b/db/schema.sql
index ef43d99edb..c976243153 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -307,6 +307,7 @@ CREATE TABLE `alerts` (
   `confirmed` tinyint(1) NOT NULL default '0',
   `created` datetime NOT NULL default '0000-00-00 00:00:00',
   `postcode` varchar(10) NOT NULL default '',
+  `ignore_speaker_votes` tinyint(1) NOT NULL default '0',
   `lang` varchar(2) NOT NULL default 'en',
   PRIMARY KEY  (`alert_id`),
   KEY `email` (`email`),

From 075ce8d0d8cb8239680697b1c016b2dc5dc17534 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Wed, 30 Oct 2024 14:43:38 +0000
Subject: [PATCH 02/13] do not include votes in alerts if ignore_speaker_votes
 flag set

Skips over the vote section if the flag is present.
---
 scripts/alertmailer.php               | 3 ++-
 www/includes/easyparliament/alert.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/alertmailer.php b/scripts/alertmailer.php
index 03faba7b63..7766461c92 100644
--- a/scripts/alertmailer.php
+++ b/scripts/alertmailer.php
@@ -195,6 +195,7 @@ function mlog($message) {
         continue;
     }
     $criteria_raw = $alertitem['criteria'];
+    $include_votes = $alertitem['ignore_speaker_votes'] == 0;
     if (preg_match('#\bOR\b#', $criteria_raw)) {
         $criteria_raw = "($criteria_raw)";
     }
@@ -249,7 +250,7 @@ function mlog($message) {
     mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
 
     # Divisions
-    if (preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) {
+    if ($include_votes && preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) {
         $pid = $m[1];
         $q = $db->query('SELECT * FROM persondivisionvotes pdv JOIN divisions USING(division_id)
             WHERE person_id=:person_id AND pdv.lastupdate >= :time', [
diff --git a/www/includes/easyparliament/alert.php b/www/includes/easyparliament/alert.php
index 226b6991e6..54f99adc61 100644
--- a/www/includes/easyparliament/alert.php
+++ b/www/includes/easyparliament/alert.php
@@ -90,6 +90,7 @@ public function fetch($confirmed, $deleted) {
                         criteria,
                         registrationtoken,
                         lang,
+                        ignore_speaker_votes,
                         deleted,
                         confirmed
                         FROM alerts

From 649e4d8e48fb5bfb6935593288d7120f37c98080 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 5 Dec 2024 15:45:27 +0000
Subject: [PATCH 03/13] add front end for creating MP alerts without votes

---
 classes/AlertView/Standard.php                  |  6 +++---
 classes/Utility/Alert.php                       |  9 ++++++---
 www/includes/easyparliament/alert.php           | 17 +++++++++++++----
 .../templates/html/alert/_mp_alert_form.php     |  7 +++++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/classes/AlertView/Standard.php b/classes/AlertView/Standard.php
index 011d91fc1f..6c4feaaec9 100644
--- a/classes/AlertView/Standard.php
+++ b/classes/AlertView/Standard.php
@@ -52,7 +52,7 @@ private function processAction() {
                 if ($success) {
                     $this->data['results'] = 'alert-confirmed';
                     $this->data['criteria'] = $this->alert->criteria;
-                    $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
+                    $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria, $this->alert->ignore_speaker_votes);
                 }
             } elseif ($action == 'Suspend') {
                 $success = $this->suspendAlert($token);
@@ -169,7 +169,7 @@ private function getBasicData() {
 
             $this->data['alert'] = $alert;
 
-            $this->data['alert_parts'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria, true);
+            $this->data['alert_parts'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria, $alert['ignore_speaker_votes'], true);
 
             $existing_rep = '';
             if (isset($this->data['alert_parts']['spokenby'])) {
@@ -470,7 +470,7 @@ protected function addAlert() {
 
         $this->data['results'] = $result;
         $this->data['criteria'] = $this->alert->criteria;
-        $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria);
+        $this->data['display_criteria'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->alert->criteria, $this->alert->ignore_speaker_votes);
     }
 
 
diff --git a/classes/Utility/Alert.php b/classes/Utility/Alert.php
index 6e87183132..33a518912e 100644
--- a/classes/Utility/Alert.php
+++ b/classes/Utility/Alert.php
@@ -58,8 +58,8 @@ public static function forUser($email) {
 
         $alerts = [];
         foreach ($q as $row) {
-            $criteria = self::prettifyCriteria($row['criteria']);
-            $parts = self::prettifyCriteria($row['criteria'], true);
+            $criteria = self::prettifyCriteria($row['criteria'], $row['ignore_speaker_votes']);
+            $parts = self::prettifyCriteria($row['criteria'], $row['ignore_speaker_votes'], true);
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
 
             $status = 'confirmed';
@@ -87,7 +87,7 @@ public static function forUser($email) {
         return $alerts;
     }
 
-    public static function prettifyCriteria($alert_criteria, $as_parts = false) {
+    public static function prettifyCriteria($alert_criteria, $ignore_speaker_votes = false, $as_parts = false) {
         $text = '';
         $parts = ['words' => [], 'sections' => [], 'exclusions' => [], 'match_all' => true];
         if ($alert_criteria) {
@@ -137,6 +137,9 @@ public static function prettifyCriteria($alert_criteria, $as_parts = false) {
                 $parts['words'] = $words;
             } elseif ($spokenby) {
                 $text = implode(' or ', $spokenby) . " speaks";
+                if ($ignore_speaker_votes) {
+                    $text .= " excluding votes";
+                }
                 $parts['spokenby'] = $spokenby;
             }
 
diff --git a/www/includes/easyparliament/alert.php b/www/includes/easyparliament/alert.php
index 54f99adc61..72c29f3777 100644
--- a/www/includes/easyparliament/alert.php
+++ b/www/includes/easyparliament/alert.php
@@ -41,6 +41,7 @@ class ALERT {
     private $alert_id = "";
     public $email = "";
     public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $ignore_speaker_votes = 0;
 
     private $db;
 
@@ -123,15 +124,17 @@ public function get_related_terms($term) {
 
     public function update($id, $details) {
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
+        $ignore_speaker_votes = $details['ignore_speaker_votes'] ? 1 : 0;
 
         $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
+            $q = $this->db->query("UPDATE alerts SET deleted = 0, criteria = :criteria, ignore_speaker_votes = :ignore_speaker_votes, confirmed = 1
                 WHERE alert_id = :id", [
                 ":criteria" => $criteria,
+                ":ignore_speaker_votes" => $ignore_speaker_votes,
                 ":id" => $id,
             ]);
 
@@ -154,6 +157,7 @@ public function add($details, $confirmation_email = false, $instantly_confirm =
         // )
 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
+        $ignore_speaker_votes = $details['ignore_speaker_votes'] ? 1 : 0;
 
         $q = $this->db->query("SELECT * FROM alerts
             WHERE email = :email
@@ -164,12 +168,13 @@ public function add($details, $confirmation_email = false, $instantly_confirm =
         ])->first();
         if ($q) {
             if ($q['deleted']) {
-                $this->db->query("UPDATE alerts SET deleted=0
+                $this->db->query("UPDATE alerts SET deleted=0, ignore_speaker_votes=:ignore_speaker_votes
                     WHERE email = :email
                     AND criteria = :criteria
                     AND confirmed=1", [
                     ':email' => $details['email'],
                     ':criteria' => $criteria,
+                    ':ignore_speaker_votes' => $ignore_speaker_votes,
                 ]);
                 return 1;
             } else {
@@ -178,17 +183,19 @@ public function add($details, $confirmation_email = false, $instantly_confirm =
         }
 
         $q = $this->db->query("INSERT INTO alerts (
-                email, criteria, postcode, lang, deleted, confirmed, created
+                email, criteria, postcode, lang, ignore_speaker_votes, deleted, confirmed, created
             ) VALUES (
                 :email,
                 :criteria,
                 :pc,
                 :lang,
+                :ignore_speaker_votes,
                 '0', '0', NOW()
             )
         ", [
             ':email' => $details['email'],
             ':criteria' => $criteria,
+            ':ignore_speaker_votes' => $ignore_speaker_votes,
             ':pc' => $details['pc'],
             ':lang' => LANGUAGE,
         ]);
@@ -199,6 +206,7 @@ public function add($details, $confirmation_email = false, $instantly_confirm =
 
             $this->alert_id = $q->insert_id();
             $this->criteria = $criteria;
+            $this->ignore_speaker_votes = $ignore_speaker_votes;
 
             // We have to set the alert's registration token.
             // This will be sent to them via email, so we can confirm they exist.
@@ -381,7 +389,7 @@ public function check_token($token) {
             return false;
         }
 
-        $q = $this->db->query("SELECT alert_id, email, criteria
+        $q = $this->db->query("SELECT alert_id, email, criteria, ignore_speaker_votes
                         FROM alerts
                         WHERE alert_id = :alert_id
                         AND registrationtoken = :registration_token
@@ -396,6 +404,7 @@ public function check_token($token) {
                 'id' => $q['alert_id'],
                 'email' => $q['email'],
                 'criteria' => $q['criteria'],
+                'ignore_speaker_votes' => $q['ignore_speaker_votes'],
             ];
         }
 
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 5746c14aed..98123537cc 100644
--- a/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
@@ -37,6 +37,13 @@
         <?php } ?>
       </p>
 
+      <div class="alert-page-subsection">
+        <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>
           <?php if ($pid || $keyword) { ?>
           <button type="submit" class="button" name="mp_step" value="mp_confirm">

From cac401563591f85204b352e548499db84c81c6a3 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 9 Dec 2024 17:41:21 +0000
Subject: [PATCH 04/13] fix spelling in alerts page test

---
 tests/AlertsPageTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/AlertsPageTest.php b/tests/AlertsPageTest.php
index 91a2b15f24..6f70c18d48 100644
--- a/tests/AlertsPageTest.php
+++ b/tests/AlertsPageTest.php
@@ -26,7 +26,7 @@ public function testFetchPage() {
 
     public function testKeywordOnly() {
         $page = $this->fetch_page([ 'alertsearch' => 'elephant']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value="elephant"', $page);
     }
 
@@ -62,7 +62,7 @@ public function testPostcodeAndKeywordWithNoSittingMP() {
 
     public function testBasicKeyWordAlertsCreation() {
         $page = $this->fetch_page([ 'step' => 'define']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
         $page = $this->fetch_page([ 'step' => 'review', 'email' => 'test@example.org', 'words[]' => 'fish']);
@@ -76,7 +76,7 @@ public function testBasicKeyWordAlertsCreation() {
 
     public function testMultipleKeyWordAlertsCreation() {
         $page = $this->fetch_page([ 'step' => 'define']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
         $page = $this->fetch_page([ 'step' => 'review', 'email' => 'test@example.org', 'words[]' => ['fish', 'salmon']]);
@@ -90,7 +90,7 @@ public function testMultipleKeyWordAlertsCreation() {
 
     public function testMultipleKeyWordAlertsCreationLoggedIn() {
         $page = $this->get_page(['step' => 'define']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
         $page = $this->get_page([ 'step' => 'review', 'words[]' => ['fish', 'salmon']]);
@@ -104,7 +104,7 @@ public function testMultipleKeyWordAlertsCreationLoggedIn() {
 
     public function testKeyWordAndSectionAlertsCreationLoggedIn() {
         $page = $this->get_page(['step' => 'define']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
         $page = $this->get_page(['step' => 'review', 'words[]' => 'fish', 'search_section' => 'debates']);
@@ -117,7 +117,7 @@ public function testKeyWordAndSectionAlertsCreationLoggedIn() {
 
     public function testKeyWordAndSpeakerAlertsCreationLoggedIn() {
         $page = $this->get_page(['step' => 'define']);
-        $this->assertStringContainsString('What word or phrase would you like to recieve alerts about', $page);
+        $this->assertStringContainsString('What word or phrase would you like to receive alerts about', $page);
         $this->assertStringContainsString('<input type="text" id="words0" name="words[]" aria-required="true" value=""', $page);
 
         $page = $this->get_page(['step' => 'review', 'words[]' => 'fish', 'representative' => 'Mrs Test Current-MP']);

From bd9f0c24ef3b4d509b8c80edeb5e2ef69d1c9c2e Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Mon, 9 Dec 2024 17:42:24 +0000
Subject: [PATCH 05/13] enable users to exclude votes from existing alerts

This also tidies up editing MP alerts so it's mostly buttons rather than
having to go through a form.
---
 classes/AlertView/Standard.php                | 24 +++++++-
 classes/Utility/Alert.php                     | 11 +++-
 tests/AlertsTest.php                          |  4 ++
 tests/_fixtures/alerts.xml                    |  4 ++
 www/includes/easyparliament/alert.php         |  2 +-
 .../templates/html/alert/_alert_form.php      |  4 ++
 .../templates/html/alert/_list_accordian.php  | 56 ++++++++++++-------
 .../templates/html/alert/_mp_alert_form.php   |  7 ++-
 .../templates/html/alert/_own_mp_alerts.php   | 24 +++++++-
 .../templates/html/alert/index.php            |  1 +
 10 files changed, 111 insertions(+), 26 deletions(-)

diff --git a/classes/AlertView/Standard.php b/classes/AlertView/Standard.php
index 6c4feaaec9..6c6d711498 100644
--- a/classes/AlertView/Standard.php
+++ b/classes/AlertView/Standard.php
@@ -158,18 +158,24 @@ private function getBasicData() {
         $this->data['pid'] = trim(get_http_var("pid"));
         $this->data['pc'] = get_http_var('pc');
         $this->data['submitted'] = get_http_var('submitted') || $this->data['pid'] || $this->data['keyword'] || $this->data['step'];
+        $this->data['ignore_speaker_votes'] = get_http_var('ignore_speaker_votes');
 
         if ($this->data['addword'] || $this->data['step']) {
             $alert = $this->alert->check_token($this->data['token']);
 
             $criteria = '';
+            $alert_ignore_speaker_votes = 0;
             if ($alert) {
                 $criteria = $alert['criteria'];
+                $alert_ignore_speaker_votes = $alert['ignore_speaker_votes'];
             }
 
+            $ignore_speaker_votes = get_http_var('ignore_speaker_votes', $alert_ignore_speaker_votes);
+            $this->data['ignore_speaker_votes'] = ($ignore_speaker_votes == 'on' || $ignore_speaker_votes == 1);
+
             $this->data['alert'] = $alert;
 
-            $this->data['alert_parts'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria, $alert['ignore_speaker_votes'], true);
+            $this->data['alert_parts'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($criteria, $alert_ignore_speaker_votes, true);
 
             $existing_rep = '';
             if (isset($this->data['alert_parts']['spokenby'])) {
@@ -237,6 +243,22 @@ private function getBasicData() {
             $this->data['results'] = '';
 
             $this->getSearchSections();
+        } else if ($this->data['mp_step'] == 'mp_alert') {
+            $alert = $this->alert->check_token($this->data['token']);
+            if ($alert) {
+                $ignore_speaker_votes = get_http_var('ignore_speaker_votes', $alert['ignore_speaker_votes']);
+                $this->data['ignore_speaker_votes'] = ($ignore_speaker_votes == 'on' || $ignore_speaker_votes == 1);
+
+                $existing_rep = '';
+                if (isset($alert['criteria'])) {
+                    $alert_parts = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($alert['criteria'], $alert['ignore_speaker_votes'], true);
+                    $existing_rep = $alert_parts['spokenby'][0];
+                    $this->data['pid'] = $alert_parts['pid'];
+                }
+                $this->data['keyword'] = get_http_var('mp_search', $existing_rep);
+            } else {
+                $this->data['ignore_speaker_votes'] = get_http_var('ignore_speaker_votes');
+            }
         } # XXX probably should do something here if $alertsearch is set
 
         $this->data['sign'] = get_http_var('sign');
diff --git a/classes/Utility/Alert.php b/classes/Utility/Alert.php
index 33a518912e..a4fdcdfc5e 100644
--- a/classes/Utility/Alert.php
+++ b/classes/Utility/Alert.php
@@ -74,6 +74,7 @@ public static function forUser($email) {
                 'status' => $status,
                 'criteria' => $criteria,
                 'raw' => $row['criteria'],
+                'ignore_speaker_votes' => $row['ignore_speaker_votes'],
                 'keywords' => [],
                 'exclusions' => [],
                 'sections' => [],
@@ -89,7 +90,7 @@ public static function forUser($email) {
 
     public static function prettifyCriteria($alert_criteria, $ignore_speaker_votes = false, $as_parts = false) {
         $text = '';
-        $parts = ['words' => [], 'sections' => [], 'exclusions' => [], 'match_all' => true];
+        $parts = ['words' => [], 'sections' => [], 'exclusions' => [], 'match_all' => true, 'pid' => false];
         if ($alert_criteria) {
             # check for phrases
             if (strpos($alert_criteria, ' OR ') !== false) {
@@ -116,7 +117,13 @@ public static function prettifyCriteria($alert_criteria, $ignore_speaker_votes =
             $exclusions = [];
             $sections = [];
             $sections_verbose = [];
-            $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
+            $speaker_parts = \MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria);
+            $pids = array_keys($speaker_parts);
+            $spokenby = array_values($speaker_parts);
+
+            if (count($pids) == 1) {
+                $parts['pid'] = $pids[0];
+            }
 
             foreach ($criteria as $c) {
                 if (preg_match('#^section:(\w+)#', $c, $m)) {
diff --git a/tests/AlertsTest.php b/tests/AlertsTest.php
index ce212441e7..263461350a 100644
--- a/tests/AlertsTest.php
+++ b/tests/AlertsTest.php
@@ -74,6 +74,7 @@ public function testAdd() {
             'email' => 'test@theyworkforyou.com',
             'keyword' => 'test',
             'pc' => 'SW1A 1AA',
+            'ignore_speaker_votes' => 0,
         ];
 
         $response = $ALERT->add($details, false, true);
@@ -96,6 +97,7 @@ public function testAddExisting() {
             'email' => 'test3@theyworkforyou.com',
             'keyword' => 'test3',
             'pc' => 'SW1A 1AA',
+            'ignore_speaker_votes' => 0,
         ];
 
         $response = $ALERT->add($details, false, true);
@@ -117,6 +119,7 @@ public function testAddDeleted() {
             'email' => 'test6@theyworkforyou.com',
             'keyword' => 'test6',
             'pc' => 'SW1A 1AA',
+            'ignore_speaker_votes' => 0,
         ];
 
         $response = $ALERT->add($details, false, true);
@@ -162,6 +165,7 @@ public function testCheckTokenCorrect() {
             'id' => 1,
             'email' => 'test@theyworkforyou.com',
             'criteria' => 'test1',
+            'ignore_speaker_votes' => '0',
         ], $response);
     }
 
diff --git a/tests/_fixtures/alerts.xml b/tests/_fixtures/alerts.xml
index 45924603e9..64547d5503 100644
--- a/tests/_fixtures/alerts.xml
+++ b/tests/_fixtures/alerts.xml
@@ -6,6 +6,7 @@
 			<field name="alert_id">1</field>
 			<field name="deleted">0</field>
 			<field name="confirmed">0</field>
+			<field name="ignore_speaker_votes">0</field>
 			<field name="registrationtoken">token1</field>
 			<field name="email">test@theyworkforyou.com</field>
 			<field name="criteria">test1</field>
@@ -15,6 +16,7 @@
 			<field name="alert_id">3</field>
 			<field name="deleted">0</field>
 			<field name="confirmed">1</field>
+			<field name="ignore_speaker_votes">0</field>
 			<field name="registrationtoken">token3</field>
 			<field name="email">test3@theyworkforyou.com</field>
 			<field name="criteria">test3</field>
@@ -24,6 +26,7 @@
 			<field name="alert_id">5</field>
 			<field name="deleted">0</field>
 			<field name="confirmed">1</field>
+			<field name="ignore_speaker_votes">0</field>
 			<field name="registrationtoken">token5</field>
 			<field name="email">test5@theyworkforyou.com</field>
 			<field name="criteria">speaker:1234</field>
@@ -33,6 +36,7 @@
 			<field name="alert_id">6</field>
 			<field name="deleted">2</field>
 			<field name="confirmed">1</field>
+			<field name="ignore_speaker_votes">0</field>
 			<field name="registrationtoken">token6</field>
 			<field name="email">test6@theyworkforyou.com</field>
 			<field name="criteria">test6</field>
diff --git a/www/includes/easyparliament/alert.php b/www/includes/easyparliament/alert.php
index 72c29f3777..eaf6e3314e 100644
--- a/www/includes/easyparliament/alert.php
+++ b/www/includes/easyparliament/alert.php
@@ -167,7 +167,7 @@ public function add($details, $confirmation_email = false, $instantly_confirm =
             ':criteria' => $criteria,
         ])->first();
         if ($q) {
-            if ($q['deleted']) {
+            if ($q['deleted'] || $q['ignore_speaker_votes'] != $ignore_speaker_votes) {
                 $this->db->query("UPDATE alerts SET deleted=0, ignore_speaker_votes=:ignore_speaker_votes
                     WHERE email = :email
                     AND criteria = :criteria
diff --git a/www/includes/easyparliament/templates/html/alert/_alert_form.php b/www/includes/easyparliament/templates/html/alert/_alert_form.php
index 91a39f82a6..a3789351ec 100644
--- a/www/includes/easyparliament/templates/html/alert/_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_alert_form.php
@@ -105,6 +105,10 @@
                           <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>
 
 
diff --git a/www/includes/easyparliament/templates/html/alert/_list_accordian.php b/www/includes/easyparliament/templates/html/alert/_list_accordian.php
index fb1065f292..f2e16b854e 100644
--- a/www/includes/easyparliament/templates/html/alert/_list_accordian.php
+++ b/www/includes/easyparliament/templates/html/alert/_list_accordian.php
@@ -186,27 +186,45 @@
                                   <span><?= gettext('Confirm alert') ?></span>
                                 </button>
                               <?php } elseif ($alert['status'] == 'suspended') { ?>
-                              <button type="submit" class="button button-outline small" name="action" value="Resume">
-                                <span><?= gettext('Resume alert') ?></span>
-                                <i aria-hidden="true" class="fi-play"></i>
-                              </button>
+                                <button type="submit" class="button button-outline 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 button--outline small" name="action" value="Suspend">
-                                <i aria-hidden="true" class="fi-pause"></i>
-                                <span><?= gettext('Suspend alert') ?></span>
-                              </button>
-                              <button type="submit" class="button small button--outline-red" name="action" value="Delete">
-                                <i aria-hidden="true" class="fi-trash"></i>
-                                <span><?= gettext('Delete alert') ?></span>
-                              </button>
+                                <button type="submit" class="button button--outline small" name="action" value="Suspend">
+                                  <i aria-hidden="true" class="fi-pause"></i>
+                                  <span><?= gettext('Suspend alert') ?></span>
+                                </button>
+                                <button type="submit" class="button small button--outline-red" name="action" value="Delete">
+                                  <i aria-hidden="true" class="fi-trash"></i>
+                                  <span><?= gettext('Delete alert') ?></span>
+                                </button>
+                              <?php } ?>
                             </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 button--outline small" value="Edit">
-                                <i aria-hidden="true" class="fi-page-edit"></i>
-                                <span><?= gettext('Edit alert') ?></span>
-                              </button>
+                              <?php if (count($alert['words'])) { ?>
+                                <input type="hidden" name="step" value="define">
+                                <input type="hidden" name="shown_related" value="1">
+                                <button type="submit" class="button button--outline small" value="Edit">
+                                  <i aria-hidden="true" class="fi-page-edit"></i>
+                                  <span><?= gettext('Edit alert') ?></span>
+                                </button>
+                              <?php } else { ?>
+                                <input type="hidden" name="mp_step" value="mp_confirm">
+                                <input type="hidden" name="pid" value="<?= $alert['pid'] ?>">
+                                <?php if ($alert['ignore_speaker_votes'] == 1) { ?>
+                                  <input type="hidden" name="ignore_speaker_votes" value="0">
+                                  <button type="submit" class="button button--outline small" value="Edit">
+                                    <i aria-hidden="true" class="fi-page-edit"></i>
+                                    <span><?= gettext('Include votes') ?></span>
+                                  </button>
+                                <?php } else { ?>
+                                  <input type="hidden" name="ignore_speaker_votes" value="1">
+                                  <button type="submit" class="button button--outline small" value="Edit">
+                                    <i aria-hidden="true" class="fi-page-edit"></i>
+                                    <span><?= gettext('Ignore votes') ?></span>
+                                  </button>
+                                <?php } ?>
                               <?php } ?>
                             </form>
                           </div>
@@ -214,7 +232,7 @@
                         <?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>
                         <form action="<?= $actionurl ?>" method="post">
-                          <input type="hidden" name="keyword" value="<?= _htmlentities(implode('', $person_alerts[0]['spokenby'])) ?>">
+                          <input type="hidden" name="words[]" value="<?= _htmlentities(implode('', $person_alerts[0]['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>
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 98123537cc..650f51868e 100644
--- a/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_mp_alert_form.php
@@ -8,6 +8,7 @@
               <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
               <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
               <input type="hidden" name="pid" value="<?= $member->person_id() ?>">
+              <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>">
               <?= $member->full_name() ?>
               (<?= _htmlspecialchars($constituency) ?>) in <?= _htmlspecialchars($member->house_text($member->house_disp)) ?>
               <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>"></form>
@@ -25,12 +26,16 @@
       </p>
     <?php } ?>
 
+    <?php if ($token) { ?>
+        <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
+    <?php } ?>
+
       <p>
         <?php if ($pid) { ?>
           <input type="text" class="form-control" name="mp_search" id="mp_search" 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="mp_search" id="mp_search" disabled="disabled" value="<?= _htmlspecialchars($display_keyword) ?>">
+          <input type="text" class="form-control" name="mp_search" id="mp_search" value="<?= _htmlspecialchars($keyword) ?>">
         <?php } else { ?>
           <label for="mp-postcode">Search postcode, or MP name</label>
           <input id="mp-postcode" type="text" class="form-control" placeholder="<?= gettext('e.g. ‘B2 4QA’ or ‘John Doe’') ?>" name="mp_search" id="mp_search" value="<?= _htmlentities($search_text) ?>" style="min-width:300px;">
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 d8d51e2fdb..de22105d70 100644
--- a/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php
+++ b/www/includes/easyparliament/templates/html/alert/_own_mp_alerts.php
@@ -4,6 +4,7 @@
 <div class="alert-page-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']) ?>">
     <?php if ($alert['status'] == 'unconfirmed') { ?>
       <button type="submit" class="button button--outline small" name="action" value="Confirm">
         <i aria-hidden="true" class="fi-save"></i>
@@ -25,13 +26,31 @@
     </button>
   </form>
   <form action="<?= $actionurl ?>" method="POST">
+    <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+    <?php if (count($alert['words'])) { ?>
     <input type="hidden" name="step" value="define">
     <input type="hidden" name="shown_related" value="1">
-    <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
     <button type="submit" class="button button--outline small" value="Edit">
       <i aria-hidden="true" class="fi-page-edit"></i>
       <span><?= gettext('Edit alert') ?></span>
     </button>
+    <?php } else { ?>
+    <input type="hidden" name="mp_step" value="mp_confirm">
+    <input type="hidden" name="pid" value="<?= $alert['pid'] ?>">
+      <?php if ($alert['ignore_speaker_votes'] == 1) { ?>
+        <input type="hidden" name="ignore_speaker_votes" value="0">
+        <button type="submit" class="button button--outline small" value="Edit">
+          <i aria-hidden="true" class="fi-page-edit"></i>
+          <span><?= gettext('Include votes') ?></span>
+        </button>
+      <?php } else { ?>
+        <input type="hidden" name="ignore_speaker_votes" value="1">
+        <button type="submit" class="button button--outline small" value="Edit">
+          <i aria-hidden="true" class="fi-page-edit"></i>
+          <span><?= gettext('Ignore votes') ?></span>
+        </button>
+      <?php } ?>
+    <?php } ?>
   </form>
     <?php } ?>
 </div>
@@ -40,7 +59,8 @@
 <?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>
 <form action="<?= $actionurl ?>" method="post">
-  <input type="hidden" name="keyword" value="<?= _htmlentities($own_mp_criteria) ?>">
+  <input type="hidden" name="step" value="confirm">
+  <input type="hidden" name="words[]" value="<?= _htmlentities($own_mp_criteria) ?>">
   <button type="submit" class="button button--outline small" name="action" value="Subscribe">
     <?= gettext('Create new alert') ?>
     <i aria-hidden="true" role="img" class="fi-megaphone"></i>
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 12af929ee3..2bb2119685 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -155,6 +155,7 @@
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $row['person_id'] ?>">
+                            <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>">
                             <?php
                                   $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
                         if ($row['constituency']) {

From 240cb229935487ab9929fa70fc6e3fb6d2fabb7a Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Wed, 11 Dec 2024 10:22:12 +0000
Subject: [PATCH 06/13] move alerts details from user page

---
 .../templates/html/alert/_list.php            | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/www/includes/easyparliament/templates/html/alert/_list.php b/www/includes/easyparliament/templates/html/alert/_list.php
index 3295bcc997..41d20873d0 100644
--- a/www/includes/easyparliament/templates/html/alert/_list.php
+++ b/www/includes/easyparliament/templates/html/alert/_list.php
@@ -1,27 +1,15 @@
-<h3><?= gettext('Your current email alerts') ?></h3>
+<hr>
+<h3><?= gettext('Email alerts') ?></h3>
+
+<?php $total_alerts = isset($alerts) ? count($alerts) : 0; ?>
+<p><?= sprintf(gettext('You currently have %d email alerts'), $total_alerts) ?></p>
+
+<a href="/alert/" class="button radius">Check here to see your alerts</a>
 
-<ul class="alerts-manage__list">
-  <?php foreach ($alerts as $alert) { ?>
-    <li>
-        <?= sprintf(gettext('When %s'), _htmlspecialchars($alert['criteria'])) ?>.
-        <form action="<?= $actionurl ?>" method="POST">
-            <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-          <?php if ($alert['status'] == 'unconfirmed') { ?>
-            <input type="submit" class="button small" name="action" value="<?= gettext('Confirm') ?>">
-          <?php } elseif ($alert['status'] == 'suspended') { ?>
-            <input type="submit" class="button small" name="action" value="<?= gettext('Resume') ?>">
-          <?php } else { ?>
-            <input type="submit" class="button button--secondary small" name="action" value="<?= gettext('Suspend') ?>">
-            <input type="submit" class="button button--negative small" name="action" value="<?= gettext('Delete') ?>">
-          <?php } ?>
-        </form>
-    </li>
-  <?php } ?>
-</ul>
 
 <div class="clearfix">
     <form action="<?= $actionurl ?>" method="POST" class="pull-right">
-        <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+        <!-- No need to reference $alert['token'] here, as you're deleting all alerts -->
         <input type="submit" class="button button--negative small" name="action" value="<?= gettext('Delete All') ?>">
     </form>
 </div>

From 801539ddca94cc27f82a43c3150c36622052b2ea Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Thu, 12 Dec 2024 07:18:26 +0000
Subject: [PATCH 07/13] Moved .label inside accordion

---
 www/docs/style/sass/parts/_accordion.scss | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/docs/style/sass/parts/_accordion.scss b/www/docs/style/sass/parts/_accordion.scss
index 4c44111154..3bf318406f 100644
--- a/www/docs/style/sass/parts/_accordion.scss
+++ b/www/docs/style/sass/parts/_accordion.scss
@@ -1,21 +1,3 @@
-.label {
-    background-color: #fff;
-    color: $primary-color;
-    padding: 0.25rem 0.5rem;
-    border-radius: 1rem;
-    font-size: 0.75rem;
-
-    &--primary-light {
-        background-color: $primary-color-200;
-        color: $body-font-color;
-    }
-
-    &--red {
-        background-color: lighten($color-red, 40%);
-        color: $body-font-color;
-    }
-}
-
 .alert-page-header {
     display: flex;
     flex-direction: row;
@@ -41,6 +23,24 @@
 
 .accordion {
     margin-top: 2rem;
+
+    .label {
+        background-color: #fff;
+        color: $primary-color;
+        padding: 0.25rem 0.5rem;
+        border-radius: 1rem;
+        font-size: 0.75rem;
+    
+        &--primary-light {
+            background-color: $primary-color-200;
+            color: $body-font-color;
+        }
+    
+        &--red {
+            background-color: lighten($color-red, 40%);
+            color: $body-font-color;
+        }
+    }
 }
 
 .accordion-button {

From f7cfffab9770ecc02b4970e6d9c9a5535e57ede6 Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Thu, 12 Dec 2024 08:11:14 +0000
Subject: [PATCH 08/13] Added confirmation when deleting alerts

---
 www/docs/js/main.js                                | 14 ++++++++++++++
 .../easyparliament/templates/html/alert/_list.php  |  2 +-
 .../easyparliament/templates/html/alert/index.php  |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/www/docs/js/main.js b/www/docs/js/main.js
index 9f319d38f9..729bbbc150 100644
--- a/www/docs/js/main.js
+++ b/www/docs/js/main.js
@@ -486,6 +486,20 @@ document.addEventListener('DOMContentLoaded', function() {
   createAccordion('.accordion-button', '.accordion-content');
 });
 
+// Comfirm deletion of alerts
+function confirmDelete() {
+  var triggers = document.querySelectorAll('.js-confirm-delete');
+
+  triggers.forEach(function(trigger) {
+    trigger.addEventListener('click', function(event) {
+      var message = "Are you sure you want to delete all alerts?";
+      if (!confirm(message)) {
+        event.preventDefault();
+      }
+    });
+  });
+}
+confirmDelete();
 
 $(function() {
 
diff --git a/www/includes/easyparliament/templates/html/alert/_list.php b/www/includes/easyparliament/templates/html/alert/_list.php
index 41d20873d0..4c685f6adf 100644
--- a/www/includes/easyparliament/templates/html/alert/_list.php
+++ b/www/includes/easyparliament/templates/html/alert/_list.php
@@ -10,6 +10,6 @@
 <div class="clearfix">
     <form action="<?= $actionurl ?>" method="POST" class="pull-right">
         <!-- No need to reference $alert['token'] here, as you're deleting all alerts -->
-        <input type="submit" class="button button--negative small" name="action" value="<?= gettext('Delete All') ?>">
+        <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete All') ?>">
     </form>
 </div>
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 2bb2119685..addb7dcfb3 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -316,7 +316,7 @@
                 <?php if ($keyword_alerts || $spoken_alerts || $own_member_alerts) { ?>
                   <form action="<?= $actionurl ?>" method="POST" class="pull-right">
                       <input type="hidden" name="t" value="<?= _htmlspecialchars($delete_token) ?>">
-                      <input type="submit" class="button button--negative small" name="action" value="<?= gettext('Delete All') ?>">
+                      <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete All') ?>">
                   </form>
                 <?php } ?>
                   <form action="<?= $actionurl ?>" method="post">

From 9039f272ef09c1455d8c06db59dcc94347538362 Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Mon, 16 Dec 2024 11:17:28 +0000
Subject: [PATCH 09/13] Improved copy for "delete all" button for alerts

Without context it was a bit unclear what the "Delete all" button does. The new copy clarifies the button will delete all alerts. The new aria-label will also make sure assistive devices know this includes keywords and representative alerts.
---
 www/includes/easyparliament/templates/html/alert/_list.php | 2 +-
 www/includes/easyparliament/templates/html/alert/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/includes/easyparliament/templates/html/alert/_list.php b/www/includes/easyparliament/templates/html/alert/_list.php
index 4c685f6adf..a448dafb3b 100644
--- a/www/includes/easyparliament/templates/html/alert/_list.php
+++ b/www/includes/easyparliament/templates/html/alert/_list.php
@@ -10,6 +10,6 @@
 <div class="clearfix">
     <form action="<?= $actionurl ?>" method="POST" class="pull-right">
         <!-- No need to reference $alert['token'] here, as you're deleting all alerts -->
-        <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete All') ?>">
+        <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
     </form>
 </div>
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index addb7dcfb3..931ec1a2bc 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -316,7 +316,7 @@
                 <?php if ($keyword_alerts || $spoken_alerts || $own_member_alerts) { ?>
                   <form action="<?= $actionurl ?>" method="POST" class="pull-right">
                       <input type="hidden" name="t" value="<?= _htmlspecialchars($delete_token) ?>">
-                      <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete All') ?>">
+                      <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
                   </form>
                 <?php } ?>
                   <form action="<?= $actionurl ?>" method="post">

From 09d2381f10de36c2f0d3804336f46e5eb369c08b Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Mon, 16 Dec 2024 11:28:10 +0000
Subject: [PATCH 10/13] Move delete all button to top of the page

This way it should be clearer the button will delete both keywords and representative alerts
---
 .../easyparliament/templates/html/alert/index.php  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 931ec1a2bc..8782a49b71 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -303,6 +303,14 @@
                 </form>
               </div>
               <?php } else { ?>
+              <?php if ($keyword_alerts || $spoken_alerts || $own_member_alerts) { ?>
+                <div class="clearfix">
+                  <form action="<?= $actionurl ?>" method="POST" class="pull-right">
+                      <input type="hidden" name="t" value="<?= _htmlspecialchars($delete_token) ?>">
+                      <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
+                  </form>
+                </div>
+              <?php } ?>
 
               <div class="alert-page-header">
                 <div>
@@ -313,12 +321,6 @@
                   <?php } ?>
                 </div>
                 <div class="alert-page-header__button-group">
-                <?php if ($keyword_alerts || $spoken_alerts || $own_member_alerts) { ?>
-                  <form action="<?= $actionurl ?>" method="POST" class="pull-right">
-                      <input type="hidden" name="t" value="<?= _htmlspecialchars($delete_token) ?>">
-                      <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
-                  </form>
-                <?php } ?>
                   <form action="<?= $actionurl ?>" method="post">
                       <input type="hidden" name="step" value="define">
                       <button type="submit" class="button small" value="<?= gettext('Create new keyword alert') ?>">

From f876fcce85894875b3a36a5cb7db606fd6ed3e35 Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Mon, 16 Dec 2024 11:37:11 +0000
Subject: [PATCH 11/13] Removed float right from "delete all" button in user's
 page

Move to the left so it's easier to spot for the user. On the right semmed a bit out of place.
---
 .../easyparliament/templates/html/alert/_list.php     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/www/includes/easyparliament/templates/html/alert/_list.php b/www/includes/easyparliament/templates/html/alert/_list.php
index a448dafb3b..9e2549de96 100644
--- a/www/includes/easyparliament/templates/html/alert/_list.php
+++ b/www/includes/easyparliament/templates/html/alert/_list.php
@@ -6,10 +6,7 @@
 
 <a href="/alert/" class="button radius">Check here to see your alerts</a>
 
-
-<div class="clearfix">
-    <form action="<?= $actionurl ?>" method="POST" class="pull-right">
-        <!-- No need to reference $alert['token'] here, as you're deleting all alerts -->
-        <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
-    </form>
-</div>
+<form action="<?= $actionurl ?>" method="POST">
+    <!-- No need to reference $alert['token'] here, as you're deleting all alerts -->
+    <input type="submit" class="button button--negative small js-confirm-delete" name="action" value="<?= gettext('Delete all alerts') ?>" aria-label="Delete all keywords and representatives alerts">
+</form>

From 14303dd5e9ec4fa10f0fbf05bfe0f3da1adc1686 Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Mon, 16 Dec 2024 12:36:11 +0000
Subject: [PATCH 12/13] CSS Class rename to fit TWFY

- Improved naming for keyword alert list(New name is more self explanatory)
- New classes use BEM convention
---
 www/docs/js/main.js                           |   2 +-
 www/docs/style/sass/app.scss                  |   1 +
 www/docs/style/sass/pages/_alert.scss         |  93 +++
 www/docs/style/sass/parts/_accordion.scss     | 165 +-----
 www/docs/style/sass/parts/_labels.scss        |  17 +
 .../templates/html/alert/_alert_form.php      | 542 +++++++++---------
 .../html/alert/_keyword_alert_list.php        | 240 ++++++++
 .../templates/html/alert/_list_accordian.php  | 244 --------
 .../templates/html/alert/_own_mp_alerts.php   |   2 +-
 .../templates/html/alert/index.php            |  24 +-
 10 files changed, 643 insertions(+), 687 deletions(-)
 create mode 100644 www/docs/style/sass/parts/_labels.scss
 create mode 100644 www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
 delete mode 100644 www/includes/easyparliament/templates/html/alert/_list_accordian.php

diff --git a/www/docs/js/main.js b/www/docs/js/main.js
index 729bbbc150..64997ca4d0 100644
--- a/www/docs/js/main.js
+++ b/www/docs/js/main.js
@@ -483,7 +483,7 @@ function createAccordion(triggerSelector, contentSelector) {
 
 // Initialize accordion when DOM is loaded
 document.addEventListener('DOMContentLoaded', function() {
-  createAccordion('.accordion-button', '.accordion-content');
+  createAccordion('.js-accordion-button', '.js-accordion-content');
 });
 
 // Comfirm deletion of alerts
diff --git a/www/docs/style/sass/app.scss b/www/docs/style/sass/app.scss
index 511351cd8c..404903777b 100644
--- a/www/docs/style/sass/app.scss
+++ b/www/docs/style/sass/app.scss
@@ -246,6 +246,7 @@ form {
 @import "parts/panels";
 @import "parts/promo-banner";
 @import "parts/accordion";
+@import "parts/labels";
 
 @import "pages/mp";
 @import "pages/topics";
diff --git a/www/docs/style/sass/pages/_alert.scss b/www/docs/style/sass/pages/_alert.scss
index ff0e5b90ea..9572327fcd 100644
--- a/www/docs/style/sass/pages/_alert.scss
+++ b/www/docs/style/sass/pages/_alert.scss
@@ -406,3 +406,96 @@
         margin-left: 0.5em;
     }
 }
+
+.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;
+      flex-direction: row;
+      flex-wrap: wrap;
+      column-gap: 1rem;
+      row-gap: 1rem;
+      align-items: center;
+      margin-bottom: 1rem;
+
+      .alert-meta__item {
+          border-radius: 0.5rem;
+          background-color: $primary-color-200;
+          padding: 1rem;
+
+          dt { 
+              font-size: 0.7rem;
+              text-transform: uppercase;
+              margin-bottom: 0;
+          }
+      
+          dd {
+              margin-bottom: 0;
+              font-size: 1.1rem;
+          }
+      }
+  }
+}
+
+// Accordion Keyword
+.keyword-alert-accordion {
+  margin-top: 2rem;
+}
+
+.keyword-alert-accordion__button {
+  @extend .accordion__button;
+}
+
+.keyword-alert-accordion__content {
+  @extend .accordion__content;
+}
+
+.keyword-alert-accordion__button-content {
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  align-items: start;
+  gap: 0.25rem;
+  
+  .keyword-alert-accordion__subtitle {
+      font-size: 0.75rem;
+      font-weight: bold;
+  }
+}
+
+.keyword-alert-accordion__keyword-list,
+.alert-creation-steps {
+  margin-bottom: 2.5rem;
+  ul {
+      list-style: none;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+      margin-left: 0;
+
+      li {
+          font-weight: bold;
+          i {
+              margin-left: 0.25rem;
+          }
+      }
+  }
+
+  h3 {
+    font-weight: 400;
+  }
+}
diff --git a/www/docs/style/sass/parts/_accordion.scss b/www/docs/style/sass/parts/_accordion.scss
index 3bf318406f..2d65e403e0 100644
--- a/www/docs/style/sass/parts/_accordion.scss
+++ b/www/docs/style/sass/parts/_accordion.scss
@@ -1,49 +1,4 @@
-.alert-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-page-header__button-group {
-        display: flex;
-        flex-direction: row;
-        gap: 0.5rem;
-        input {
-            margin-bottom: 0;
-        }
-    }
-}
-
-.accordion {
-    margin-top: 2rem;
-
-    .label {
-        background-color: #fff;
-        color: $primary-color;
-        padding: 0.25rem 0.5rem;
-        border-radius: 1rem;
-        font-size: 0.75rem;
-    
-        &--primary-light {
-            background-color: $primary-color-200;
-            color: $body-font-color;
-        }
-    
-        &--red {
-            background-color: lighten($color-red, 40%);
-            color: $body-font-color;
-        }
-    }
-}
-
-.accordion-button {
+.accordion__button {
     width: 100%;
     display: flex;
     justify-content: space-between;
@@ -69,133 +24,31 @@
             transform: rotate(45deg);
         }
     }
-
-}
-
-.accordion-button--content {
-    display: flex;
-    flex-direction: row;
-    align-content: center;
-    align-items: center;
-    gap: 0.75rem;
-
-    .content-subtitle {
-        @extend .label;
-    }
 }
 
-.accordion-content {
+.accordion__content {
     max-height: 0;
     overflow: hidden;
     transition: max-height 0.3s ease;
     padding-left: 1rem;
 
-    .alert-controller-wrapper {
-        margin-bottom: 2rem;
-        form {
-            display: inline;
-        }
-
-        button {
-            margin-bottom: 0;
-            span {
-                margin-right: 0.2rem;
-            }
-        }
-
-        button.alert {
-            background-color: $color-red;
-            color: #fff;
-        }
-    }
-
-    .add-remove-tool {
-        display: flex;
-        flex-direction: row;
-
-        input {
-            margin: 0;
-            height: 40px;
-        }
+}
 
-        button {
-            max-width: 100px;
-            height: 40px;
-        }
-    }
 
-    label {
-        font-size: inherit;
-        color: inherit;
-    }
 
-    select {
-        max-width: 350px;
-    }
-}
 
-.alert-page-alert-controls {
+.alert-page-subsection__controls  {
+    margin-bottom: 2rem;
     form {
         display: inline;
     }
-}
-
-.keyword-list {
-    ul {
-        list-style: none;
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        gap: 0.5rem;
-        margin-left: 0;
-
-        li {
-            font-weight: bold;
-            i {
-                margin-left: 0.25rem;
-            }
-        }
-
-    }
-}
-
-.heading-with-bold-word {
-    font-weight: 400;
-
-    span {
-        font-weight: bold;
-    }
-}
 
-.alert-meta-info {
-
-    .alert-meta-info-results {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        column-gap: 1rem;
-        row-gap: 1rem;
-        align-items: center;
-        margin-bottom: 1rem;
-
-        .content-header-item {
-            border-radius: 0.5rem;
-            background-color: $primary-color-200;
-            padding: 1rem;
-
-            dt { 
-                font-size: 0.7rem;
-                text-transform: uppercase;
-                margin-bottom: 0;
-            }
-        
-            dd {
-                margin-bottom: 0;
-                font-size: 1.1rem;
-            }
+    button {
+        margin-bottom: 0;
+        span {
+            margin-right: 0.2rem;
         }
     }
-
 }
 
 button {
diff --git a/www/docs/style/sass/parts/_labels.scss b/www/docs/style/sass/parts/_labels.scss
new file mode 100644
index 0000000000..a8454744f2
--- /dev/null
+++ b/www/docs/style/sass/parts/_labels.scss
@@ -0,0 +1,17 @@
+.label {
+    background-color: #fff;
+    color: $primary-color;
+    padding: 0.25rem 0.5rem;
+    border-radius: 1rem;
+    font-size: 0.75rem;
+
+    &--primary-light {
+        background-color: $primary-color-200;
+        color: $body-font-color;
+    }
+
+    &--red {
+        background-color: lighten($color-red, 40%);
+        color: $body-font-color;
+    }
+}
diff --git a/www/includes/easyparliament/templates/html/alert/_alert_form.php b/www/includes/easyparliament/templates/html/alert/_alert_form.php
index a3789351ec..2a05c6482d 100644
--- a/www/includes/easyparliament/templates/html/alert/_alert_form.php
+++ b/www/includes/easyparliament/templates/html/alert/_alert_form.php
@@ -1,312 +1,310 @@
           <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>
+              <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") { ?>
+                <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>
+                  <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-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 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 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-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>
+
+                    <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-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 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>
+                          <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>
+                    </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-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>
+                    <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") { ?>
 
-                        <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>
+                  <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="label label--primary-light"><?= _htmlspecialchars($word) ?>
+                        <?php }
+                            } ?>
+                      </ul>
+                    </div>
+
+                    <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 } ?>
-                          <?php } ?>
-                          <p><?= gettext("Or edit the name") ?></p>
+                            <?= _htmlspecialchars($suggestion) ?>
+                          </label>
                         <?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>
+                    </fieldset>
 
+                    <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 } ?>
 
-                      <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-page-subsection">
-                      <h3 class="heading-with-bold-word"><?= gettext('Current keywords in this alert:') ?></h3>
-                        <ul>
-                          <?php foreach ($keywords as $word) {
-                              if (!in_array($word, $skip_keyword_terms)) { ?>
-                              <li class="label label--primary-light"><?= _htmlspecialchars($word) ?>
-                          <?php }
-                              } ?>
-                        </ul>
-                      </div>
-
-                      <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 } ?>
+                      <?php if (isset($lastmention)) { ?>
+                        <div class="alert-meta__item">
+                        <dt><?= gettext('Date of last mention') ?></dt>
+                          <dd>30 May 2024</dd>
                         </div>
-                      </fieldset>
-
-                      <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 } ?>
 
-                        <?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" aria-label="See results for this alert - Opens in a new tab"><?= gettext('See results for this alert 	&rarr;') ?></a>
+                    </dl>
 
-                        <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>
+                  </div>
+                <?php } elseif ($step == "review") { ?>
 
-                      <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>
+                  <?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-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 } ?>
+                      <ul>
+                        <?php foreach ($keywords as $word) { ?>
+                        <li class="label label--primary-light"><?= _htmlspecialchars($word) ?>
+                        <?php } ?>
+                      </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 } ?>
-                    <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 class="heading-with-bold-word"><?= gettext('You will get an alert if all of these words are in a speech') ?>:</h3>
-                        <?php } else { ?>
-                          <h3 class="heading-with-bold-word"><?= gettext('You will get an alert if any of these words are in a speech') ?>:</h3>
+
+                    <?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="label label--red"><?= _htmlspecialchars($word) ?>
                         <?php } ?>
+                      </ul>
+                    </div>
+                    <?php } ?>
+
+                    <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 ($keywords as $word) { ?>
+                        <?php foreach ($sections as $word) { ?>
                           <li class="label label--primary-light"><?= _htmlspecialchars($word) ?>
-                          <?php } ?>
+                        <?php } ?>
                         </ul>
-                      </div>
+                    <?php } else { ?>
+                      <h3><?= gettext('in the UK, Scottish or Welsh Parliaments or Northern Ireland Assembly') ?></h3>
+                    <?php } ?>
+                    </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) ?>
-                          <?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="label label--primary-light"><?= $member['given_name'] ?> <?= $member['family_name'] ?>
+                        <?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--primary-light"><?= _htmlspecialchars($word) ?>
-                          <?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 ($search_result_count > 0 || isset($lastmention)) { ?>
+                      <hr>
+                      <dl class="alert-meta">
+                        <h3>See mentions for this alert</h3>
 
-                      <?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'] ?>
+                        <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-info">
-                          <h3>See mentions for this alert</h3>
-
-                          <div class="alert-meta-info-results">
-                            <?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 // } ?>
-                          </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>
 
diff --git a/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php b/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
new file mode 100644
index 0000000000..5ac6238f92
--- /dev/null
+++ b/www/includes/easyparliament/templates/html/alert/_keyword_alert_list.php
@@ -0,0 +1,240 @@
+                <div class="keyword-alert-accordion">
+                  <?php foreach ($keyword_alerts as $index => $alert) { ?>
+                    <div class="keyword-alert-accordion__item">
+                      <button class="keyword-alert-accordion__button js-accordion-button" href="#accordion-content-<?= $index ?>" aria-expanded="false">
+                        <div class="keyword-alert-accordion__button-content">
+                          <span class="keyword-alert-accordion__title"><?= _htmlspecialchars($alert['criteria']) ?></span>
+                          <?php if (array_key_exists("mentions", $alert)) { ?>
+                            <span class="keyword-alert-accordion__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="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">
+                            <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">
+                                  <i aria-hidden="true" class="fi-save"></i>
+                                  <span><?= gettext('Confirm alert') ?></span>
+                                </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 button--outline small" name="action" value="Suspend">
+                                  <i aria-hidden="true" class="fi-pause"></i>
+                                  <span><?= gettext('Suspend alert') ?></span>
+                                </button>
+                                <button type="submit" class="button small button--outline-red" name="action" value="Delete">
+                                  <i aria-hidden="true" class="fi-trash"></i>
+                                  <span><?= gettext('Delete alert') ?></span>
+                                </button>
+                              </form>
+                              <form action="<?= $actionurl ?>" method="POST">
+                                <input type="hidden" name="step" value="define">
+                                <input type="hidden" name="shown_related" value="1">
+                                <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
+                                <button type="submit" class="button button--outline small" value="Edit">
+                                  <i aria-hidden="true" class="fi-page-edit"></i>
+                                  <span><?= gettext('Edit alert') ?></span>
+                                </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'] ?>"><?= gettext('See results for this alert &rarr;') ?></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-alert-accordion__keyword-list">
+                            <h3 class="heading-with-bold-word">Keywords <strong>included</strong> in this alert:</h3>
+                            <ul>
+                              <?php foreach ($alert["keywords"] as $keyword) { ?>
+                                <li class="label label--primary-light"><?= _htmlspecialchars($keyword) ?>
+                              <?php } ?>
+                            </ul>
+                          </div>
+                        <?php } ?>
+
+                        <?php if ($alert["exclusions"]) { ?>
+                          <div class="keyword-alert-accordion__keyword-list excluded-keywords">
+                            <h3 class="heading-with-bold-word">Keywords <strong>excluded</strong> in this alert:</h3>
+                            <ul>
+                              <?php foreach ($alert["exclusions"] as $exclusion) { ?>
+                                <li class="label label--red"><?= _htmlspecialchars($exclusion) ?>
+                              <?php } ?>
+                            </ul>
+                          </div>
+                        <?php } ?>
+
+                        <?php if ($alert['sections']) { ?>
+                          <div class="keyword-alert-accordion__keyword-list">
+                            <h3 class="heading-with-bold-word">Which <strong class="bold">section</strong> should this alert apply to:</h3>
+                            <ul>
+                              <?php foreach ($alert["sections_verbose"] as $section) { ?>
+                                <li class="label label--primary-light"><?= _htmlspecialchars($section) ?>
+                              <?php } ?>
+                            </ul>
+                          </div>
+                        <?php } ?>
+
+                        <?php if (array_key_exists('spokenby', $alert)) { ?>
+                          <div class="keyword-alert-accordion__keyword-list">
+                            <h3 class="heading-with-bold-word"><?= gettext('This alert applies to the following <strong class="bold">representative</span>') ?></h3>
+                            <ul>
+                              <?php foreach ($alert['spokenby'] as $speaker) { ?>
+                                <li class="label label--primary-light"><?= $speaker ?>
+                              <?php } ?>
+                            </ul>
+                          </div>
+                        <?php } ?>
+                      </div>
+                    </div>
+                  <?php } ?>
+                </div>
+
+                <hr>
+
+                <div class="alert-section__page-header">
+                  <div>
+                    <h2>Representative alerts</h2>
+                  </div>
+                  <form action="<?= $actionurl ?>" method="post">
+                    <input type="hidden" name="mp_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) { ?>
+                  <h3><?= gettext('Your MP') ?></h3>
+                  <ul class="alerts-manage__list">
+                    <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() ?>">
+                        <input type="submit" class="button" value="<?= gettext('Subscribe') ?>">
+                      </form>
+                    </li>
+                  </ul>
+                  <?php if (count($own_member_alerts) > 0) { ?>
+                    <hr>
+                    <p>
+                      <?= gettext('You are subscribed to the following alerts about your MP.') ?>
+                    </p>
+                    <?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>
+                      <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">
+                          <?= gettext('Create new alert') ?>
+                          <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                        </button>
+                      </form>
+                    <?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>
+                    <?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>
+                    <?php foreach ($person_alerts as $alert) { ?>
+                      <p class="alert-page-subsection--subtitle"><?= _htmlspecialchars($alert['criteria']) ?></p>
+                      <div class="alert-page-subsection__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">
+                              <i aria-hidden="true" class="fi-save"></i>
+                              <span><?= gettext('Confirm alert') ?></span>
+                            </button>
+                          <?php } elseif ($alert['status'] == 'suspended') { ?>
+                            <button type="submit" class="button button-outline 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 button--outline small" name="action" value="Suspend">
+                              <i aria-hidden="true" class="fi-pause"></i>
+                              <span><?= gettext('Suspend alert') ?></span>
+                            </button>
+                            <button type="submit" class="button small button--outline-red" name="action" value="Delete">
+                              <i aria-hidden="true" class="fi-trash"></i>
+                              <span><?= gettext('Delete alert') ?></span>
+                            </button>
+                          <?php } ?>
+                        </form>
+                        <form action="<?= $actionurl ?>" method="POST">
+                          <?php if (count($alert['words'])) { ?>
+                            <input type="hidden" name="step" value="define">
+                            <input type="hidden" name="shown_related" value="1">
+                            <button type="submit" class="button button--outline small" value="Edit">
+                              <i aria-hidden="true" class="fi-page-edit"></i>
+                              <span><?= gettext('Edit alert') ?></span>
+                            </button>
+                          <?php } else { ?>
+                            <input type="hidden" name="mp_step" value="mp_confirm">
+                            <input type="hidden" name="pid" value="<?= $alert['pid'] ?>">
+                            <?php if ($alert['ignore_speaker_votes'] == 1) { ?>
+                              <input type="hidden" name="ignore_speaker_votes" value="0">
+                              <button type="submit" class="button button--outline small" value="Edit">
+                                <i aria-hidden="true" class="fi-page-edit"></i>
+                                <span><?= gettext('Include votes') ?></span>
+                              </button>
+                            <?php } else { ?>
+                              <input type="hidden" name="ignore_speaker_votes" value="1">
+                              <button type="submit" class="button button--outline small" value="Edit">
+                                <i aria-hidden="true" class="fi-page-edit"></i>
+                                <span><?= gettext('Ignore votes') ?></span>
+                              </button>
+                            <?php } ?>
+                          <?php } ?>
+                        </form>
+                      </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>
+                      <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">
+                          <?= gettext('Create new alert') ?>
+                          <i aria-hidden="true" role="img" class="fi-megaphone"></i>
+                        </button>
+                      </form>
+                    <?php } ?>
+                  </div>
+                <?php } ?>
\ No newline at end of file
diff --git a/www/includes/easyparliament/templates/html/alert/_list_accordian.php b/www/includes/easyparliament/templates/html/alert/_list_accordian.php
deleted file mode 100644
index f2e16b854e..0000000000
--- a/www/includes/easyparliament/templates/html/alert/_list_accordian.php
+++ /dev/null
@@ -1,244 +0,0 @@
-              <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']) ?>">
-                          <?php if ($alert['status'] == 'unconfirmed') { ?>
-                            <button type="submit" class="button small" name="action" value="Confirm">
-                              <i aria-hidden="true" class="fi-save"></i>
-                              <span><?= gettext('Confirm alert') ?></span>
-                            </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 button--outline small" name="action" value="Suspend">
-                              <i aria-hidden="true" class="fi-pause"></i>
-                              <span><?= gettext('Suspend alert') ?></span>
-                            </button>
-                            <button type="submit" class="button small button--outline-red" name="action" value="Delete">
-                              <i aria-hidden="true" class="fi-trash"></i>
-                              <span><?= gettext('Delete alert') ?></span>
-                            </button>
-                          </form>
-                          <form action="<?= $actionurl ?>" method="POST">
-                            <input type="hidden" name="step" value="define">
-                            <input type="hidden" name="shown_related" value="1">
-                            <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                            <button type="submit" class="button button--outline small" value="Edit">
-                              <i aria-hidden="true" class="fi-page-edit"></i>
-                              <span><?= gettext('Edit alert') ?></span>
-                            </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'] ?>"><?= gettext('See results for this alert &rarr;') ?></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) ?>
-                        <?php } ?>
-                      </ul>
-                    </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) ?>
-                        <?php } ?>
-                      </ul>
-                    </div>
-                    <?php } ?>
-
-                    <?php if ($alert['sections']) { ?>
-                    <div class="keyword-list alert-page-subsection">
-                      <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--primary-light"><?= _htmlspecialchars($section) ?>
-                        <?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 ?>
-
-                        <?php } ?>
-                        </ul>
-                      </div>
-                    <?php } ?>
-                  </div>
-                </div>
-                <?php } ?>
-
-                <hr>
-
-                    <div class="alert-page-header">
-                      <div>
-                        <h2>Representative alerts</h2>
-                      </div>
-                      <form action="<?= $actionurl ?>" method="post">
-                        <input type="hidden" name="mp_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) { ?>
-                      <h3 class="alert-page-subsection--heading"><?= gettext('Your MP') ?></h3>
-                      <ul class="alerts-manage__list">
-                          <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() ?>">
-                                  <input type="submit" class="button" value="<?= gettext('Subscribe') ?>">
-                              </form>
-                          </li>
-                      </ul>
-                      <?php if (count($own_member_alerts) > 0) { ?>
-                        <hr>
-                          <p>
-                            <?= gettext('You are subscribed to the following alerts about your MP.') ?>
-                          </p>
-                          <?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>
-                        <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">
-                            <?= gettext('Create new alert') ?>
-                            <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                          </button>
-                        </form>
-                        <?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>
-
-                          <?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>
-
-                          <?php foreach ($person_alerts as $alert) { ?>
-                          <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">
-                                  <i aria-hidden="true" class="fi-save"></i>
-                                  <span><?= gettext('Confirm alert') ?></span>
-                                </button>
-                              <?php } elseif ($alert['status'] == 'suspended') { ?>
-                                <button type="submit" class="button button-outline 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 button--outline small" name="action" value="Suspend">
-                                  <i aria-hidden="true" class="fi-pause"></i>
-                                  <span><?= gettext('Suspend alert') ?></span>
-                                </button>
-                                <button type="submit" class="button small button--outline-red" name="action" value="Delete">
-                                  <i aria-hidden="true" class="fi-trash"></i>
-                                  <span><?= gettext('Delete alert') ?></span>
-                                </button>
-                              <?php } ?>
-                            </form>
-                            <form action="<?= $actionurl ?>" method="POST">
-                              <?php if (count($alert['words'])) { ?>
-                                <input type="hidden" name="step" value="define">
-                                <input type="hidden" name="shown_related" value="1">
-                                <button type="submit" class="button button--outline small" value="Edit">
-                                  <i aria-hidden="true" class="fi-page-edit"></i>
-                                  <span><?= gettext('Edit alert') ?></span>
-                                </button>
-                              <?php } else { ?>
-                                <input type="hidden" name="mp_step" value="mp_confirm">
-                                <input type="hidden" name="pid" value="<?= $alert['pid'] ?>">
-                                <?php if ($alert['ignore_speaker_votes'] == 1) { ?>
-                                  <input type="hidden" name="ignore_speaker_votes" value="0">
-                                  <button type="submit" class="button button--outline small" value="Edit">
-                                    <i aria-hidden="true" class="fi-page-edit"></i>
-                                    <span><?= gettext('Include votes') ?></span>
-                                  </button>
-                                <?php } else { ?>
-                                  <input type="hidden" name="ignore_speaker_votes" value="1">
-                                  <button type="submit" class="button button--outline small" value="Edit">
-                                    <i aria-hidden="true" class="fi-page-edit"></i>
-                                    <span><?= gettext('Ignore votes') ?></span>
-                                  </button>
-                                <?php } ?>
-                              <?php } ?>
-                            </form>
-                          </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>
-                        <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">
-                            <?= gettext('Create new alert') ?>
-                            <i aria-hidden="true" role="img" class="fi-megaphone"></i>
-                          </button>
-                        </form>
-                        <?php } ?>
-                      </div>
-                    <?php } ?>
-                </div>
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 de22105d70..da8069171d 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-alert-controls">
+<div class="alert-page-subsection__controls">
   <form action="<?= $actionurl ?>" method="POST">
     <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
     <input type="hidden" name="pid" value="<?= _htmlspecialchars($alert['pid']) ?>">
diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 8782a49b71..0f97512f4c 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-page-header">
+              <div class="alert-section__page-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-page-header">
+              <div class="alert-section__page-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-page-header">
+              <div class="alert-section__page-header">
                 <div>
                   <h2><?= gettext('Keywords alerts') ?></h2>
                   <!-- Go to Create alert page -->
@@ -320,21 +320,19 @@
                     <p><?= gettext('You haven´t created any keyword alerts.') ?></p>
                   <?php } ?>
                 </div>
-                <div class="alert-page-header__button-group">
-                  <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>
+                <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-->
 
-                <?php include '_list_accordian.php'; ?>
+                <?php include '_keyword_alert_list.php'; ?>
               <?php } ?>
 
           </div>

From acf886092fc5c2e3a884cc07c86b00634acf434f Mon Sep 17 00:00:00 2001
From: Lucas Cumsille M <hello@lucascm.dev>
Date: Tue, 17 Dec 2024 10:10:17 +0000
Subject: [PATCH 13/13] Fixed type alert page

---
 www/includes/easyparliament/templates/html/alert/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/includes/easyparliament/templates/html/alert/index.php b/www/includes/easyparliament/templates/html/alert/index.php
index 0f97512f4c..5d9f50e0c7 100644
--- a/www/includes/easyparliament/templates/html/alert/index.php
+++ b/www/includes/easyparliament/templates/html/alert/index.php
@@ -317,7 +317,7 @@
                   <h2><?= gettext('Keywords alerts') ?></h2>
                   <!-- Go to Create alert page -->
                   <?php if (!$alerts) { ?>
-                    <p><?= gettext('You haven´t created any keyword alerts.') ?></p>
+                    <p><?= gettext("You haven't created any keyword alerts.") ?></p>
                   <?php } ?>
                 </div>
                 <form action="<?= $actionurl ?>" method="post">