diff --git a/app/templates/views/alert.cy.html b/app/templates/views/alert.cy.html
index cc47f7c3..fa390670 100644
--- a/app/templates/views/alert.cy.html
+++ b/app/templates/views/alert.cy.html
@@ -30,19 +30,32 @@
 {% endif %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "Am Rybuddion Argyfwng",
-        "href": "/alerts/about.cy"
-      },
-      parentBreadcrumb,
-    ]
-  }) }}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
+    {{ govukBreadcrumbs({
+      "items": [
+        {
+          "text": "Home",
+          "href": "https://www.gov.uk/"
+        },
+        {
+          "text": "Am Rybuddion Argyfwng",
+          "href": "/alerts/about.cy"
+        },
+        parentBreadcrumb,
+      ]
+    }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'cy',
+        'en': {
+          'href': '/alerts/' ~ (alert_data | get_url_for_alert)
+        }
+      }) }}
+    </div>
+  </div>
 {% endblock %}
 
 {% block mainContent %}
@@ -53,14 +66,6 @@ <h1 class="govuk-heading-xl alerts-icon__container alerts-icon__container--48">
         Emergency Alert
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/' ~ (alert_data | get_url_for_alert)
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds alert-icon__container">
diff --git a/app/templates/views/alert.html b/app/templates/views/alert.html
index dae7a7ce..476745cd 100644
--- a/app/templates/views/alert.html
+++ b/app/templates/views/alert.html
@@ -30,6 +30,8 @@
 {% endif %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -43,6 +45,17 @@
       parentBreadcrumb,
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'en',
+    'cy': {
+      'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -53,14 +66,6 @@ <h1 class="govuk-heading-xl alerts-icon__container alerts-icon__container--48">
         Emergency Alert
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/' ~ (alert_data | get_url_for_alert) ~ '.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds alert-icon__container">
diff --git a/app/templates/views/announcements.cy.html b/app/templates/views/announcements.cy.html
index 755f4ab0..b9dfabdb 100644
--- a/app/templates/views/announcements.cy.html
+++ b/app/templates/views/announcements.cy.html
@@ -20,6 +20,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -32,6 +34,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts/announcements'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/announcements'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/announcements.html b/app/templates/views/announcements.html
index 0f073739..45b3b11f 100644
--- a/app/templates/views/announcements.html
+++ b/app/templates/views/announcements.html
@@ -20,18 +20,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/announcements.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/announcements.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/current-alerts.cy.html b/app/templates/views/current-alerts.cy.html
index cd4edd2a..b95c5287 100644
--- a/app/templates/views/current-alerts.cy.html
+++ b/app/templates/views/current-alerts.cy.html
@@ -25,6 +25,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -37,6 +39,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts/current-alerts'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/current-alerts'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/current-alerts.html b/app/templates/views/current-alerts.html
index 04ad1cc2..ae5ec8a6 100644
--- a/app/templates/views/current-alerts.html
+++ b/app/templates/views/current-alerts.html
@@ -25,18 +25,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/current-alerts.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block mainContent %}
@@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/current-alerts.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/how-alerts-work.cy.html b/app/templates/views/how-alerts-work.cy.html
index c3b7c984..20678bbc 100644
--- a/app/templates/views/how-alerts-work.cy.html
+++ b/app/templates/views/how-alerts-work.cy.html
@@ -20,6 +20,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -32,6 +34,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts/how-alerts-work'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/how-alerts-work'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -129,12 +134,10 @@ <h2 class="govuk-heading-l">
       <p class="govuk-body" id="opt-out">
         I optio allan:
       </p>
-      <ul class="govuk-list">
-        <ol type="1">
-          <li>Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.</li>
-          <li>Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.</li>
-        </ol>
-      </ul>
+      <ol class="govuk-list govuk-list--bullet">
+        <li>Chwiliwch am ‘rybuddion argyfwng’ yn eich gosodiadau.</li>
+        <li>Diffoddwch ‘rybuddion difrifol’ a ‘rhybuddion eithafol’.</li>
+      </ol>
       <p class="govuk-body">
         Os byddwch chi'n dal i dderbyn rhybuddion, cysylltwch â gwneuthurwr eich dyfais i gael cymorth.
       </p>
diff --git a/app/templates/views/how-alerts-work.html b/app/templates/views/how-alerts-work.html
index cfec0e75..a4e1ae5e 100644
--- a/app/templates/views/how-alerts-work.html
+++ b/app/templates/views/how-alerts-work.html
@@ -20,18 +20,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/how-alerts-work.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/how-alerts-work.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -129,12 +134,10 @@ <h2 class="govuk-heading-l">
       <p class="govuk-body" id="opt-out">
         To opt out:
       </p>
-      <ul class="govuk-list">
-        <ol type="1">
-          <li>Search your settings for ‘emergency alerts’.</li>
-          <li>Turn off ‘severe alerts’ and ‘extreme alerts’.</li>
-        </ol>
-      </ul>
+      <ol class="govuk-list govuk-list--bullet">
+        <li>Search your settings for ‘emergency alerts’.</li>
+        <li>Turn off ‘severe alerts’ and ‘extreme alerts’.</li>
+      </ol>
       <p class="govuk-body">
         If you still get alerts, contact your device manufacturer for help.
       </p>
diff --git a/app/templates/views/index.cy.html b/app/templates/views/index.cy.html
index 645a3a26..f76790de 100644
--- a/app/templates/views/index.cy.html
+++ b/app/templates/views/index.cy.html
@@ -28,6 +28,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -36,6 +38,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -45,14 +58,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts'
-        }
-      }) }}
-    </div>
   </div>
   {% if alerts.current_and_public or alerts.status_box_announcements %}
     {% if alerts.current_and_public %}
diff --git a/app/templates/views/index.html b/app/templates/views/index.html
index 5d076a45..9ff10333 100644
--- a/app/templates/views/index.html
+++ b/app/templates/views/index.html
@@ -27,16 +27,30 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/about.cy'
+        }
+      }) }}
+    </div>
+  </div>
 {% endblock %}
 
+
 {% block mainContent %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -44,14 +58,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/about.cy'
-        }
-      }) }}
-    </div>
   </div>
   {% if alerts.current_and_public or alerts.status_box_announcements %}
     {% if alerts.current_and_public %}
diff --git a/app/templates/views/past-alerts.cy.html b/app/templates/views/past-alerts.cy.html
index f87b921c..f0214de0 100644
--- a/app/templates/views/past-alerts.cy.html
+++ b/app/templates/views/past-alerts.cy.html
@@ -25,18 +25,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "Am Rybuddion Argyfwng",
-        "href": "/alerts/about.cy"
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
+    {{ govukBreadcrumbs({
+      "items": [
+        {
+          "text": "Home",
+          "href": "https://www.gov.uk/"
+        },
+        {
+          "text": "Am Rybuddion Argyfwng",
+          "href": "/alerts/about.cy"
+        }
+      ]
+    }) }}
+  </div>
+  <div style="flex-grow: 1;"></div>
+  <div style="margin-left: 10px;">
+    {{ hmrcLanguageSelect({
+      'language': 'cy',
+      'en': {
+        'href': '/alerts/past-alerts'
       }
-    ]
-  }) }}
+    }) }}
+  </div>
+</div>
 {% endblock %}
 
 {% block content %}
@@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/past-alerts'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/past-alerts.html b/app/templates/views/past-alerts.html
index 8caaf74b..d80a5198 100644
--- a/app/templates/views/past-alerts.html
+++ b/app/templates/views/past-alerts.html
@@ -25,18 +25,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/past-alerts.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block content %}
@@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/past-alerts.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/views/service-tests.cy.html b/app/templates/views/service-tests.cy.html
index b50e284f..14916dc1 100644
--- a/app/templates/views/service-tests.cy.html
+++ b/app/templates/views/service-tests.cy.html
@@ -20,6 +20,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -32,6 +34,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts/service-tests'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'cy',
-        'en': {
-          'href': '/alerts/service-tests'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -112,4 +117,4 @@ <h2 class="govuk-heading-m govuk-!-margin-top-6">
         {{ alert_or_planned_test.content | paragraphize(classes="govuk-body") }}
     </div>
   {% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/app/templates/views/service-tests.html b/app/templates/views/service-tests.html
index 1c0aee67..206bb183 100644
--- a/app/templates/views/service-tests.html
+++ b/app/templates/views/service-tests.html
@@ -20,18 +20,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/service-tests.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block mainContent %}
@@ -41,14 +54,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/service-tests.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
@@ -114,4 +119,4 @@ <h2 class="govuk-heading-m govuk-!-margin-top-6">
       {{ alert_or_planned_test.content | paragraphize(classes="govuk-body") }}
     </div>
   {% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/app/templates/views/system-testing.cy.html b/app/templates/views/system-testing.cy.html
index 496e0ec0..b0825c43 100644
--- a/app/templates/views/system-testing.cy.html
+++ b/app/templates/views/system-testing.cy.html
@@ -25,6 +25,8 @@
 {%- endblock %}
 
 {% block beforeContent %}
+<div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+  <div style="margin-right: 10px;">
   {{ govukBreadcrumbs({
     "items": [
       {
@@ -37,6 +39,17 @@
       }
     ]
   }) }}
+</div>
+<div style="flex-grow: 1;"></div>
+<div style="margin-left: 10px;">
+  {{ hmrcLanguageSelect({
+    'language': 'cy',
+    'en': {
+      'href': '/alerts/system-testing'
+    }
+  }) }}
+</div>
+</div>
 {% endblock %}
 
 {% block content %}
diff --git a/app/templates/views/system-testing.html b/app/templates/views/system-testing.html
index a86d6fda..bdc827aa 100644
--- a/app/templates/views/system-testing.html
+++ b/app/templates/views/system-testing.html
@@ -25,18 +25,31 @@
 {%- endblock %}
 
 {% block beforeContent %}
-  {{ govukBreadcrumbs({
-    "items": [
-      {
-        "text": "Home",
-        "href": "https://www.gov.uk/"
-      },
-      {
-        "text": "About Emergency Alerts",
-        "href": "/alerts"
-      }
-    ]
-  }) }}
+  <div class="govuk-grid-row" style="display: flex; align-items: center; padding: 0 15px;">
+    <div style="margin-right: 10px;">
+      {{ govukBreadcrumbs({
+        "items": [
+          {
+            "text": "Home",
+            "href": "https://www.gov.uk/"
+          },
+          {
+            "text": "About Emergency Alerts",
+            "href": "/alerts"
+          }
+        ]
+      }) }}
+    </div>
+    <div style="flex-grow: 1;"></div>
+    <div style="margin-left: 10px;">
+      {{ hmrcLanguageSelect({
+        'language': 'en',
+        'cy': {
+          'href': '/alerts/system-testing.cy'
+        }
+      }) }}
+    </div>
+    </div>
 {% endblock %}
 
 {% block content %}
@@ -46,14 +59,6 @@ <h1 class="govuk-heading-xl">
         {{ pageTitle }}
       </h1>
     </div>
-    <div class="govuk-grid-column-one-third">
-      {{ hmrcLanguageSelect({
-        'language': 'en',
-        'cy': {
-          'href': '/alerts/system-testing.cy'
-        }
-      }) }}
-    </div>
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">