diff --git a/src/client/assets/stylesheets/application.scss b/src/client/assets/stylesheets/application.scss
index 06639a55..4a2682a2 100644
--- a/src/client/assets/stylesheets/application.scss
+++ b/src/client/assets/stylesheets/application.scss
@@ -1,10 +1,11 @@
-$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
-$govuk-global-styles: true;
-
-@import "~govuk-frontend/dist/govuk/all";
-
-@import "variables/all";
-@import "helpers/all";
-@import "core/all";
-@import "components/all";
-@import "partials/all";
+$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
+$govuk-global-styles: true;
+
+@import "~govuk-frontend/dist/govuk/all";
+
+@import "variables/all";
+@import "helpers/all";
+@import "core/all";
+@import "components/all";
+@import "partials/all";
+@import "daqi/all";
diff --git a/src/client/assets/stylesheets/components/_all.scss b/src/client/assets/stylesheets/components/_all.scss
index e182d231..b12a95ca 100644
--- a/src/client/assets/stylesheets/components/_all.scss
+++ b/src/client/assets/stylesheets/components/_all.scss
@@ -1,2 +1,2 @@
-@import "breadcrumbs/breadcrumbs";
-@import "heading/heading";
+@import "breadcrumbs/breadcrumbs";
+@import "heading/heading";
diff --git a/src/client/assets/stylesheets/daqi/_all.scss b/src/client/assets/stylesheets/daqi/_all.scss
new file mode 100644
index 00000000..533a8198
--- /dev/null
+++ b/src/client/assets/stylesheets/daqi/_all.scss
@@ -0,0 +1,540 @@
+//
+// For guidance on how to add CSS and SCSS see:
+// https://prototype-kit.service.gov.uk/docs/adding-css-javascript-and-images
+// 
+
+// Add extra styles here
+
+
+// Table
+.app-table--daqi {
+  border-collapse: separate;
+  border: 0;
+}
+
+.daqi-table__header {
+  @include govuk-font($size: 16, $weight: regular);
+  border: 0;
+  padding: govuk-spacing(2);
+  vertical-align: bottom;
+  text-align: center;
+  width: 10%;
+  border-right: 3px solid #ffffff; /* Add a 3px white vertical border to header cells */
+}
+
+.daqi-table__header:last-child {
+  padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(2) 9px;
+}
+
+.daqi-table__cell {
+  @include govuk-font($size: 16, $weight: regular);
+  padding: govuk-spacing(2);
+  border: 0;
+  width: 10%;
+  background-color: govuk-colour("light-grey");
+  border-right: 2px solid #ffffff; /* Add a 3px white vertical border to data cells */
+}
+
+.daqi-table__cell:last-child {
+  padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(2) 9px;
+}
+
+.daqi-table__caption {
+  font-weight: 700;
+  text-align: left;
+  
+}
+
+.daqi-band {
+  @include govuk-font($size: 14, $weight: regular);
+  border: 0;
+  vertical-align: top;
+  text-align: left;
+  width: 10%;
+  border-right: 3px solid #ffffff; /* Add a 3px white vertical border to cells in .daqi-band */
+}
+
+.daqi-band:last-child {
+  text-align: right;
+}
+
+
+// DAQI colours
+
+$daqi-colour-0: govuk-colour("light-grey");
+$daqi-colour-1: govuk-colour("green");
+$daqi-colour-2: govuk-colour("green");
+$daqi-colour-3: govuk-colour("green");
+$daqi-colour-4: govuk-colour("yellow");
+$daqi-colour-5: govuk-colour("yellow");
+$daqi-colour-6: govuk-colour("yellow");
+$daqi-colour-7: govuk-colour("red");
+$daqi-colour-8: govuk-colour("red");
+$daqi-colour-9: govuk-colour("red");
+$daqi-colour-10: govuk-colour("purple");
+  
+  
+  // DAQI table
+
+  .daqi-selected {
+    font-weight: bold; 
+  }
+
+  .daqi-0 {
+    background-color: $daqi-colour-0;
+    color: govuk-colour("black");
+  }
+
+  .daqi-1 {
+    background-color: $daqi-colour-1;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-2 {
+    background-color: $daqi-colour-2;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-3 {
+    background-color: $daqi-colour-3;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-4 {
+    background-color: $daqi-colour-4;
+    color: govuk-colour("black");
+    font-weight: bold; 
+  }
+  
+  .daqi-5 {
+    background-color: $daqi-colour-5;
+    color: govuk-colour("black");
+    font-weight: bold; 
+  }
+  
+  .daqi-6 {
+    background-color: $daqi-colour-6;
+    color: govuk-colour("black");
+    font-weight: bold; 
+  }
+  
+  .daqi-7 {
+    background-color: $daqi-colour-7;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-8 {
+    background-color: $daqi-colour-8;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-9 {
+    background-color: $daqi-colour-9;
+    color: govuk-colour("white");
+    font-weight: bold; 
+  }
+  
+  .daqi-10 {
+    background-color: $daqi-colour-10;
+    color: govuk-colour("white");
+    font-weight: bold; 
+}
+
+
+@for $i from 0 through 10 {
+  .daqi-#{$i} {
+    text-align: center;
+  }
+}
+
+
+
+
+// DAQI Tag
+
+.daqi-tag {
+
+  display: inline-block;
+
+  // When a user customises their colours often the background is removed,
+  // by adding a outline we ensure that the tag component still keeps it's meaning.
+  // https://accessibility.blog.gov.uk/2017/03/27/how-users-change-colours-on-websites/
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+
+  color: govuk-colour("white");
+  background-color: govuk-colour("blue");
+  letter-spacing: 1px;
+
+  text-decoration: none;
+}
+
+.daqi-tag--round {
+  border-radius: 50%; 
+}
+
+mark {
+  background-color: transparent;
+  font-weight: bold;
+  color: inherit;
+}
+
+.daqi-tag--1 {
+  color: govuk-colour("white");
+  background: $daqi-colour-1;
+}
+
+.daqi-tag--2 {
+  color: govuk-colour("white");
+  background: $daqi-colour-2;
+}
+
+.daqi-tag--3 {
+  color: govuk-colour("white");
+  background: $daqi-colour-3;
+}
+
+.daqi-tag--4 {
+  color: govuk-colour("black");
+  background: $daqi-colour-4;
+}
+
+.daqi-tag--5 {
+  color: govuk-colour("black");
+  background: $daqi-colour-5;
+}
+
+.daqi-tag--6 {
+  color: govuk-colour("black");
+  background: $daqi-colour-6;
+}
+
+.daqi-tag--7 {
+  color: govuk-colour("white");
+  background: $daqi-colour-7;
+}
+
+.daqi-tag--8 {
+  color: govuk-colour("white");
+  background: $daqi-colour-8;
+}
+
+.daqi-tag--9 {
+  color: govuk-colour("white");
+  background: $daqi-colour-9;
+}
+
+.daqi-tag--10 {
+  color: govuk-colour("white");
+  background: $daqi-colour-10;
+}
+
+
+// Pollutants
+
+.pollutant-value {
+    margin-bottom: govuk-spacing(0);
+  }
+
+// Section
+
+.app-section__heading {
+    border-top: 2px solid govuk-colour("black");
+    margin: 0 0 govuk-spacing(6);
+    padding: govuk-spacing(6) 0 0;
+}
+
+
+// Forecast Panel
+
+@for $i from 1 through 3 {
+  .daqi-panel--#{$i} {
+    border-left: 10px solid $daqi-colour-1;
+    background-color: #fdedee;
+  }
+}
+
+@for $i from 4 through 6 {
+  .daqi-panel--#{$i} {
+    border-left: 10px solid $daqi-colour-4;
+    background-color: #fdedee;
+  }
+}
+
+@for $i from 7 through 9 {
+  .daqi-panel--#{$i} {
+    border-left: 10px solid $daqi-colour-7;
+  }
+}
+
+.daqi-panel {
+  border-left: 10px solid $daqi-colour-10;
+  background-color: #fdedee;
+}
+
+// Pollutant Card
+
+.air-quality-statistics {
+  &__list {
+      margin:0;
+  }
+
+  &__list::after {
+      content:'';
+      display:block;
+      clear:both;
+  }
+
+  &__item {
+    float: left;
+    box-sizing: border-box;
+    padding-right: 10px;
+    min-width: 6em;
+    
+    @include mq($from: desktop) {
+        width: 33.33%; /* All items take 33.33% width on desktop */
+    }
+  }
+
+  &__item:first-child {
+      width: 33.33%; /* First item takes 50% width */
+  }
+
+  &__item:nth-child(2), &__item:nth-child(3) {
+      width: 33.33%; /* Second and third items take 25% width */
+  }
+
+  &__key {
+      @include govuk-font($size: 19);
+      color: $govuk-secondary-text-colour;
+  }
+
+  &__value {
+      @include govuk-font($size: 27);
+      margin:0;
+      display: block;
+      box-sizing: border-box;
+  }
+
+  &__value::first-letter {
+      margin-left: -0.075em;
+  }  
+
+  &__data-tip:focus {
+      border-bottom: 0;
+      margin-bottom: 0;
+  }
+
+  &--border {
+      border-top: 1px solid $govuk-border-colour;
+      border-bottom: 1px solid $govuk-border-colour;
+      padding-bottom: 15px; 
+      @include mq ($from: tablet) {
+          padding-bottom: 20px;
+      }
+  }
+
+  &--border &__key {
+      padding-top: 15px;
+  }
+}
+
+
+@mixin defra-visually-hidden {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(50%);
+  clip-path: inset(50%);
+  border: 0;
+  white-space: nowrap;
+}
+
+.defra-toggletip {
+	// height: 1rem;
+	&:first-child {
+		display: inline-block;
+	}
+
+  display: inline-block;
+  position: relative;
+
+	&:not(.defra-toggletip-target) {
+		padding-right: 26px;
+	}
+
+	&--open {
+		z-index: 99;
+	}
+
+	&__container {
+		position: absolute;
+		top: -3px;
+		@include mq ($from: tablet) {
+			top: -1px;
+		}
+		right: 0;
+		width: 26px;
+		height: 26px;
+	}
+
+	&__button {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 26px;
+		height: 26px;
+		background-color: #ffffff;
+		border: 0;
+		padding: 0;
+		text-align: center;
+		color: $govuk-text-colour;
+		cursor: help;
+		
+    &-icon {
+			pointer-events: none;
+			position: absolute;
+			overflow: visible;
+			top: 5px;
+			left: 5px;
+			width: 16px;
+			height: 16px;
+			border-radius: 100%;
+		}
+
+		&-text {
+			@include defra-visually-hidden;
+		}
+
+		svg {
+			position: relative;
+			margin: -1px 0 0 -1px;
+		}
+
+		&:hover, &:focus {
+			color: govuk-colour('black');
+		}
+
+		&:hover span {
+			box-shadow: 0 0 0 5px govuk-colour('light-grey');
+		}
+
+		&:focus {
+			outline: 3px solid transparent;
+
+			span {
+				box-shadow: 0 0 0 1px govuk-colour('black'), 0 0 0 5px $govuk-focus-colour;
+			}
+		}
+	}
+
+	&__info {
+		@include govuk-font($size: 16);
+		cursor: auto;
+		position:absolute;
+		width:0;
+		overflow: hidden;
+		box-sizing: border-box;
+		visibility: hidden;
+		top: auto;
+		bottom: 100%;
+		left: 0;
+		padding-bottom: 10px;
+		text-align: left;
+	}
+
+	&__text {
+		position: relative;
+		display:block;
+		box-sizing: border-box;
+		padding: 7.5px 10px;
+		color: #ffffff;
+		background: #000000;
+		border: 0 solid currentcolor;
+		z-index: 2;
+
+		span {
+			color: #ffffff;
+		}
+	}
+
+	&__arrow {
+		position: absolute;
+		box-sizing: border-box;
+		z-index: 1;
+		width: 10px;
+		height: 10px;
+		left: 50%;
+		bottom: auto;
+		top: 100%;
+		margin: -15px 0 0 -5px;
+		color: govuk-colour('black');
+		border: 5px solid currentcolor;
+		-webkit-transform: rotate(135deg);
+		-moz-transform: rotate(135deg);
+		-o-transform: rotate(135deg);
+		transform: rotate(135deg);
+	}
+
+	&--bottom &__info {
+		bottom: auto;
+		top: 100%;
+		padding-top: 10px;
+		padding-bottom: 0;
+	}
+
+	&--bottom &__arrow {
+		bottom: 100%;
+		top: auto;
+		margin: 0 0 -15px -5px;
+	}
+
+	&--open &__info {
+		visibility: visible;
+		width:200px;
+		overflow: visible;
+	}
+
+	&.defra-toggletip-target {
+		cursor: help;
+		border-bottom: 1px dashed govuk-colour('black');
+		padding-bottom: 1px;
+		outline: 3px solid transparent;
+
+		&:focus, &:hover:focus-visible {
+			border-bottom: 1px solid govuk-colour('black');
+			box-shadow: 0 2px 0 govuk-colour('black'), 0 6px 0 govuk-colour('yellow');
+		}
+
+		&:focus:not(:focus-visible):not(:hover) {
+			border-bottom: 1px dashed govuk-colour('black');
+			box-shadow: none;
+		}
+    
+		&:hover {
+			border-bottom: 1px solid govuk-colour('black');
+			box-shadow: 0 2px 0 govuk-colour('black');
+		}
+	}
+}
+
+// Utility classes
+
+.align-middle {
+  vertical-align: middle;
+}
+
+.govuk-caption-s {
+  @extend %govuk-caption-m !optional;
+  @include govuk-font($size: 16);
+}
+
diff --git a/src/server/common/components/aq-levels-table/macro.njk b/src/server/common/components/aq-levels-table/macro.njk
new file mode 100644
index 00000000..c8ed1c66
--- /dev/null
+++ b/src/server/common/components/aq-levels-table/macro.njk
@@ -0,0 +1,3 @@
+{% macro aqLevelsTable (params) %}
+  {%- include "./template.njk" -%}
+{% endmacro %}
\ No newline at end of file
diff --git a/src/server/common/components/aq-levels-table/template.njk b/src/server/common/components/aq-levels-table/template.njk
new file mode 100644
index 00000000..0031b742
--- /dev/null
+++ b/src/server/common/components/aq-levels-table/template.njk
@@ -0,0 +1,41 @@
+<table class="defra-aq-levels-table
+  {%- if params.classes %} {{ params.classes }}{% endif %}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+  {% if params.caption %}
+  <caption class="defra-aq-levels__caption
+  {%- if params.captionClasses %} {{ params.captionClasses }}{% endif %}">{{ params.caption }}</caption>
+  {% endif %}
+  {% if params.head %}
+  <thead class="defra-aq-levels-table__head">
+    <tr class="defra-aq-levels-table__row">
+    {% for item in params.head %}
+      <th scope="col" class="defra-aq-levels-table__cell 
+      {%- if item.format %} defra-aq-levels-table__cell{{ item.format }}{% endif %}
+      {%- if item.classes %} {{ item.classes }}{% endif %}"
+      {%- if item.colspan %} colspan="{{ item.colspan }}"{% endif %}
+      {%- if item.rowspan %} rowspan="{{ item.rowspan }}"{% endif %}{% for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>{{ item.html |safe if item.html else item.text }}</th>
+    {% endfor %}
+    </tr>
+  </thead>
+  {% endif %}
+  <tbody class="defra-aq-levels-table__body">
+    {% for row in params.rows %}
+      {% if row %}
+        <tr class="defra-aq-levels-table__row">
+        {% for cell in row %}
+          {% set commonAttributes %}
+            {%- if cell.colspan %} colspan="{{ cell.colspan }}"{% endif %}
+            {%- if cell.rowspan %} rowspan="{{ cell.rowspan }}"{% endif %}{% for attribute, value in cell.attributes %} {{ attribute }}="{{ value }}"{% endfor %}
+          {% endset %}
+          {% if loop.first and params.firstCellIsHeader %}
+          <th scope="row" class="defra-aq-levels__header{%- if cell.classes %} {{ cell.classes }}{% endif %}"
+            {{- commonAttributes | safe -}}
+          >{{ cell.html | safe if cell.html else cell.text }}</th>
+          {% else %}
+          <td class="defra-aq-levels-table__cell {%- if cell.classes %} {{ cell.classes }}{% endif %}">{{ cell.html | safe if cell.html else cell.text }}</td>
+          {% endif %}
+        {% endfor %}
+        </tr>
+      {% endif %}
+    {% endfor %}
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/src/server/common/components/pollutant/macro.njk b/src/server/common/components/pollutant/macro.njk
new file mode 100644
index 00000000..94e18cb8
--- /dev/null
+++ b/src/server/common/components/pollutant/macro.njk
@@ -0,0 +1,4 @@
+{% macro appPollutant(params) %}
+  {%- include "./template.njk" -%}
+  {{ params.html | safe }} {# Render the HTML string safely #}
+{% endmacro %}
\ No newline at end of file
diff --git a/src/server/common/components/pollutant/template.njk b/src/server/common/components/pollutant/template.njk
new file mode 100644
index 00000000..2dad2f41
--- /dev/null
+++ b/src/server/common/components/pollutant/template.njk
@@ -0,0 +1,18 @@
+{% from "components/daqitag/macro.njk" import appDaqitag %}
+
+<div class="govuk-grid-column-one-third govuk-!-margin-bottom-6">
+  <h3 class="govuk-heading-s govuk-!-margin-bottom-2">
+    <a class="govuk-link" href="{{ params.href }}">{{ params.type | safe }}</a>
+  </h3>
+  <div class="govuk-body govuk-!-margin-bottom-0 govuk-!-font-weight-bold govuk-!-font-size-80">
+    {{ params.value }}
+  </div>
+    <p class="govuk-body govuk-!-font-weight-bold govuk-!-margin-bottom-3">
+      {{ params.unit | safe }}
+    </p>
+  {{ appDaqitag({
+    classes: params.tagClass,
+    text: params.tagText | capitalize
+  }) }}
+    {# <span class="govuk-body-s">{{ params.limit | safe }}</span> #}
+</div>
\ No newline at end of file
diff --git a/src/server/common/components/toggletip/macro.njk b/src/server/common/components/toggletip/macro.njk
new file mode 100644
index 00000000..1f0835ed
--- /dev/null
+++ b/src/server/common/components/toggletip/macro.njk
@@ -0,0 +1,3 @@
+{% macro toggletip(class, label, tooltiptext, text) %}
+    {%- include "./template.njk" -%}
+{% endmacro %}
diff --git a/src/server/common/components/toggletip/template.njk b/src/server/common/components/toggletip/template.njk
new file mode 100644
index 00000000..9cc7ddee
--- /dev/null
+++ b/src/server/common/components/toggletip/template.njk
@@ -0,0 +1,15 @@
+<div class="defra-toggletip defra-toggletip--open defra-toggletip--up" data-toggletip="" data-toggletip-label={{label}} data-toggletip-content={{content}}>
+      {{text}}
+      <span class="defra-toggletip__container" data-toggletip-container="">
+      <button class="tooltip defra-toggletip__button defra-toggletip-target" aria-label={{label}} tabindex="-1">
+      <span class="defra-toggletip__button-icon">
+      <svg focusable="false" aria-hidden="true" width="18" height="18" viewBox="0 0 18 18"><circle cx="9" cy="9" r="7.5" fill="none" stroke="currentColor"></circle><path d="M9.841 11.409h1.47c.314 0 .538.057.67.171s.198.303.198.567c0 .269-.067.463-.201.581s-.357.178-.667.178H6.69c-.31 0-.532-.059-.667-.178s-.201-.312-.201-.581c0-.264.065-.453.195-.567s.354-.171.673-.171h1.47V8.087h-.773c-.305 0-.524-.058-.656-.175s-.198-.308-.198-.577.064-.461.191-.575.349-.17.663-.17h2.058c.127 0 .225.026.294.078s.102.124.102.216v4.525zM8.857 3.5c.333 0 .554.064.663.191s.164.433.164.916c0 .465-.049.753-.147.865s-.329.167-.694.167c-.355 0-.584-.052-.687-.157s-.154-.314-.154-.629c0-.583.053-.954.158-1.114s.337-.239.697-.239z" fill-rule="nonzero" fill="currentColor"></path></svg>
+      <span class="defra-toggletip__button-text">i</span>
+      </span>
+      </button>
+      <span class="defra-toggletip__info" role="status" style="">
+        <span class="defra-toggletip__text">{{tooltiptext}}</span>
+        <span class="defra-toggletip__arrow" style=""></span>
+      </span>
+      </span>
+</div>
diff --git a/src/server/common/templates/layouts/page.njk b/src/server/common/templates/layouts/page.njk
index 21eb1be1..7563e178 100644
--- a/src/server/common/templates/layouts/page.njk
+++ b/src/server/common/templates/layouts/page.njk
@@ -8,6 +8,12 @@
 {% from "search/macro.njk" import appSearch -%}
 {% from "error-summary/macro.njk" import govukErrorSummary %}
 {% from "button/macro.njk" import govukButton -%}
+{% from "table/macro.njk" import govukTable -%}
+{% from "inset-text/macro.njk" import govukInsetText -%}
+{% from "details/macro.njk" import govukDetails -%}
+{% from "pollutant/macro.njk" import appPollutant %}
+{% from "toggletip/macro.njk" import toggletip %}
+{% from "aq-levels-table/macro.njk" import aqLevelsTable %}
 
 {% set mainClasses = "app-main-wrapper" %}
 
diff --git a/src/server/common/components/includes/daqi-index.njk b/src/server/common/templates/partials/daqi-index.njk
similarity index 100%
rename from src/server/common/components/includes/daqi-index.njk
rename to src/server/common/templates/partials/daqi-index.njk
diff --git a/src/server/common/components/includes/daqi.njk b/src/server/common/templates/partials/daqi.njk
similarity index 100%
rename from src/server/common/components/includes/daqi.njk
rename to src/server/common/templates/partials/daqi.njk
diff --git a/src/server/common/components/includes/monitoring-sites.njk b/src/server/common/templates/partials/monitoring-sites.njk
similarity index 100%
rename from src/server/common/components/includes/monitoring-sites.njk
rename to src/server/common/templates/partials/monitoring-sites.njk
diff --git a/src/server/common/components/includes/pollutants.njk b/src/server/common/templates/partials/pollutants.njk
similarity index 100%
rename from src/server/common/components/includes/pollutants.njk
rename to src/server/common/templates/partials/pollutants.njk
diff --git a/src/server/locations/location.njk b/src/server/locations/location.njk
index 1eaac9d4..34896ef4 100644
--- a/src/server/locations/location.njk
+++ b/src/server/locations/location.njk
@@ -19,7 +19,7 @@
   </div>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop govuk-grid-column-full govuk-!-margin-bottom-9">
-      {# {% include "includes/daqi.njk" %}
+      {% include "partials/daqi.njk" %}
       {% if airQuality.value >= 1 and airQuality.value <= 3 %}
           <h2 class="govuk-heading-m">Advice for {{ airQuality.readableBand }} levels of air pollution</h2>
           <p>{{ airQuality.advice }}</p>
@@ -42,7 +42,7 @@
           }) }}
           <p>{{ airQuality.advice }}</p>
       {% endif %}    
-      {% include "includes/daqi-index.njk" %}
+      {% include "partials/daqi-index.njk" %}
       <h2 class="govuk-heading-m">UK air pollution summary</h2>
       <p class="govuk-!-margin-bottom-6">
         {{ airQuality.outlook }}
@@ -50,10 +50,10 @@
       <p class="govuk-caption-s govuk-!-margin-bottom-4">Latest at 05:00am {{ "today" | govukDate }}</p>
       <hr class="govuk-section-break govuk-section-break--visible govuk-!-margin-bottom-6">
       <h2 class="govuk-heading-m">How air pollutants can affect your health</h2>
-      {% include "includes/pollutants.njk" %}
+      {% include "partials/pollutants.njk" %}
       <hr class="govuk-section-break govuk-section-break--visible govuk-!-margin-bottom-6 govuk-!-margin-top-6">
-      <h2 class="govuk-heading-m">Air pollutants monitored near by</h2> #}
-      {% include "includes/pollutants.njk" %}
+      <h2 class="govuk-heading-m">Air pollutants monitored near by</h2>
+      {% include "partials/monitoring-sites.njk" %}
     </div>
   </div>
 {% endblock %}