diff --git a/server/models/views/lib/find-min-threshold.js b/server/models/views/lib/find-min-threshold.js
index cf0909c36..360990474 100644
--- a/server/models/views/lib/find-min-threshold.js
+++ b/server/models/views/lib/find-min-threshold.js
@@ -31,7 +31,7 @@ function filterImtdThresholds (imtdThresholds) {
 
   return {
     alert: minObjectA ? minObjectA.value : null,
-    warning: minObjectW ? minObjectW.value : null
+    warning: minObjectW || null
   }
 }
 
diff --git a/server/models/views/lib/process-imtd-thresholds.js b/server/models/views/lib/process-imtd-thresholds.js
index 0d84f7e8f..549b6c17f 100644
--- a/server/models/views/lib/process-imtd-thresholds.js
+++ b/server/models/views/lib/process-imtd-thresholds.js
@@ -17,17 +17,26 @@ function processThreshold (threshold, stationStageDatum, stationSubtract, postPr
 function processImtdThresholds (imtdThresholds, stationStageDatum, stationSubtract, postProcess) {
   const thresholds = []
 
-  const imtdThresholdWarning = processThreshold(imtdThresholds?.warning, stationStageDatum, stationSubtract, postProcess)
+  const imtdThresholdWarning = processThreshold(imtdThresholds?.warning?.value, stationStageDatum, stationSubtract, postProcess)
+  // Correct threshold value if value > zero (Above Ordnance Datum) [FSR-595]
   if (imtdThresholdWarning) {
-    // Correct threshold value if value > zero (Above Ordnance Datum) [FSR-595]
-    thresholds.push({
-      id: 'warningThreshold',
-      description: 'Property flooding is possible above this level. One or more flood warnings may be issued',
-      shortname: 'Possible flood warnings',
-      value: imtdThresholdWarning
-    })
+    if (imtdThresholds.warning.severity_value) {
+      const warningType = imtdThresholds.warning.severity_value === 3 ? 'Severe Flood Warning' : 'Flood Warning'
+      thresholds.push({
+        id: 'warningThreshold',
+        description: `${warningType} issued: <a href="/target-area/${imtdThresholds.warning.fwis_code}">${imtdThresholds.warning.ta_name}</a>`,
+        shortname: 'Possible flood warnings',
+        value: imtdThresholdWarning
+      })
+    } else {
+      thresholds.push({
+        id: 'warningThreshold',
+        description: 'Property flooding is possible above this level. One or more flood warnings may be issued',
+        shortname: 'Possible flood warnings',
+        value: imtdThresholdWarning
+      })
+    }
   }
-
   const imtdThresholdAlert = processThreshold(imtdThresholds?.alert, stationStageDatum, stationSubtract, postProcess)
   if (imtdThresholdAlert) {
     thresholds.push({
diff --git a/server/models/views/station.js b/server/models/views/station.js
index 904cd05da..0c1886542 100644
--- a/server/models/views/station.js
+++ b/server/models/views/station.js
@@ -170,7 +170,7 @@ class ViewModel {
 
       oneHourAgo.setHours(oneHourAgo.getHours() - 1)
 
-      // check if recent value is over one hour old0
+      // check if recent value is over one hour old
       this.dataOverHourOld = new Date(this.recentValue.ts) < oneHourAgo
 
       this.recentValue.dateWhen = 'on ' + moment.tz(this.recentValue.ts, tz).format('D/MM/YY')
@@ -248,7 +248,7 @@ class ViewModel {
         id: 'highest',
         value: this.station.porMaxValue,
         description: this.station.thresholdPorMaxDate
-          ? 'Water reaches the highest level recorded at this measuring station (recorded on ' + this.station.thresholdPorMaxDate + ')'
+          ? `Water reaches the highest level recorded at this measuring station (${this.station.thresholdPorMaxDate})`
           : 'Water reaches the highest level recorded at this measuring station',
         shortname: 'Highest level on record'
       })
@@ -268,7 +268,7 @@ class ViewModel {
     thresholds.push(...processedImtdThresholds)
 
     if (this.station.percentile5) {
-      // Only push typical range if it has a percentil5
+      // Only push typical range if it has a percentile5
       thresholds.push({
         id: 'pc5',
         value: this.station.percentile5,
diff --git a/server/routes/station.js b/server/routes/station.js
index 907d37d64..23664da2e 100644
--- a/server/routes/station.js
+++ b/server/routes/station.js
@@ -10,6 +10,7 @@ module.exports = {
   handler: async (request, h) => {
     const { id } = request.params
     let { direction } = request.params
+    // const thresholdId = request.query.tid?
 
     // Convert human readable url to service parameter
     direction = direction === 'downstream' ? 'd' : 'u'
diff --git a/server/src/js/components/chart.js b/server/src/js/components/chart.js
index 227a6ee4e..914f90f42 100644
--- a/server/src/js/components/chart.js
+++ b/server/src/js/components/chart.js
@@ -2,13 +2,13 @@
 // Chart component
 
 import '../utils'
+import { area as d3Area, line as d3Line, curveMonotoneX } from 'd3-shape'
 import { axisBottom, axisLeft } from 'd3-axis'
 import { scaleLinear, scaleBand, scaleTime } from 'd3-scale'
 import { timeFormat } from 'd3-time-format'
+import { timeHour, timeMinute } from 'd3-time'
 import { select, selectAll, pointer } from 'd3-selection'
 import { max, bisector, extent } from 'd3-array'
-import { timeHour, timeMinute } from 'd3-time'
-import { area as d3Area, line as d3Line, curveMonotoneX } from 'd3-shape'
 
 const { forEach, simplify } = window.flood.utils
 
@@ -776,6 +776,9 @@ function LineChart (containerId, stationId, data, options = {}) {
         .attr('class', 'threshold__line')
         .attr('aria-hidden', true)
         .attr('x2', xScale(xExtent[1])).attr('y2', 0)
+
+      // Label
+      const copy = `${threshold.level}m ${threshold.name}`.match(/[\s\S]{1,35}(?!\S)/g, '$&\n')
       const label = thresholdContainer.append('g')
         .attr('class', 'threshold-label')
       const path = label.append('path')
@@ -784,10 +787,13 @@ function LineChart (containerId, stationId, data, options = {}) {
       const text = label.append('text')
         .attr('class', 'threshold-label__text')
       text.append('tspan').attr('font-size', 0).text('Threshold: ')
-      text.append('tspan').attr('x', 10).attr('y', 22).text(`${threshold.level}m ${threshold.name}`)
+      copy.map((l, i) => text.append('tspan').attr('x', 10).attr('y', (i + 1) * 22).text(l.trim()))
       const textWidth = Math.round(text.node().getBBox().width)
+      const textHeight = Math.round(text.node().getBBox().height)
       path.attr('d', `m-0.5,-0.5 l${textWidth + 20},0 l0,36 l-${((textWidth + 20) / 2) - 7.5},0 l-7.5,7.5 l-7.5,-7.5 l-${((textWidth + 20) / 2) - 7.5},0 l0,-36 l0,0`)
-      label.attr('transform', `translate(${Math.round(width / 2 - ((textWidth + 20) / 2))}, -46)`)
+      label.attr('transform', `translate(${Math.round(width / 2 - ((textWidth + 20) / 2))}, -${29 + textHeight})`)
+
+      // Remove button
       const remove = thresholdContainer.append('a')
         .attr('role', 'button')
         .attr('class', 'threshold__remove')
@@ -800,6 +806,7 @@ function LineChart (containerId, stationId, data, options = {}) {
       remove.append('circle').attr('class', 'threshold__remove-button').attr('r', 11)
       remove.append('line').attr('x1', -3).attr('y1', -3).attr('x2', 3).attr('y2', 3)
       remove.append('line').attr('y1', -3).attr('x2', -3).attr('x1', 3).attr('y2', 3)
+
       // Set individual elements size and position
       thresholdContainer.attr('transform', 'translate(0,' + Math.round(yScale(threshold.level)) + ')')
     })
@@ -931,7 +938,7 @@ function LineChart (containerId, stationId, data, options = {}) {
   const showTooltip = (tooltipY = 10) => {
     if (!dataPoint) return
     // Hide threshold label
-    thresholdsContainer.select('.threshold--selected .threshold-label').style('visibility', 'hidden')
+    // thresholdsContainer.select('.threshold--selected .threshold-label').style('visibility', 'hidden')
     // Set tooltip text
     const value = dataCache.type === 'river' && (Math.round(dataPoint.value * 100) / 100) <= 0 ? '0' : dataPoint.value.toFixed(2) // *DBL below zero addition
     tooltipValue.text(`${value}m`) // *DBL below zero addition
@@ -1109,7 +1116,8 @@ function LineChart (containerId, stationId, data, options = {}) {
   //
 
   const defaults = {
-    btnAddThresholdClass: 'defra-button-text-s'
+    btnAddThresholdClass: 'defra-button-text-s',
+    btnAddThresholdText: 'Show on chart <span class="govuk-visually-hidden">(Visual only)</span>'
   }
   options = Object.assign({}, defaults, options)
 
@@ -1170,16 +1178,30 @@ function LineChart (containerId, stationId, data, options = {}) {
   const tooltipDescription = tooltipText.append('tspan').attr('class', 'tooltip-text').attr('x', 12).attr('dy', '1.4em')
 
   // Add optional 'Add threshold' buttons
-  document.querySelectorAll('[data-threshold-add]').forEach(container => {
-    const button = document.createElement('button')
-    button.className = options.btnAddThresholdClass
-    button.innerHTML = `Show<span class="govuk-visually-hidden"> ${container.getAttribute('data-level')}m threshold</span> on chart <span class="govuk-visually-hidden">(Visual only)</span>`
-    button.setAttribute('aria-controls', `${containerId}-visualisation`)
-    button.setAttribute('data-id', container.getAttribute('data-id'))
-    button.setAttribute('data-threshold-add', '')
-    button.setAttribute('data-level', container.getAttribute('data-level'))
-    button.setAttribute('data-name', container.getAttribute('data-name'))
-    container.parentElement.replaceChild(button, container)
+  document.querySelectorAll('[data-threshold-add]').forEach((container, i) => {
+    const tooltip = document.createElement('div')
+    tooltip.className = 'defra-tooltip defra-tooltip--left'
+    tooltip.setAttribute('data-tooltip', '')
+    tooltip.innerHTML = `
+      <button class="${options.btnAddThresholdClass}"
+        aria-labelledby="tooltip-${i}"
+        aria-controls="${containerId}-visualisation"
+        data-id="${container.getAttribute('data-id')}"
+        data-level="${container.getAttribute('data-level')}"
+        data-name="${container.getAttribute('data-name')}"
+        data-threshold-add >
+        <svg width="20" height="20" viewBox="0 0 20 20" fill-rule="evenodd" fill="currentColor">
+          <path d="M2.75 14.443v2.791H18v1.5H1.25V1.984h1.5v7.967L6.789 4.91l5.016 4.013 5.056-5.899 2.278 1.952-6.944 8.101L7.211 9.09 2.75 14.443z"/>
+        </svg>
+      </button>
+      <div id="tooltip-${i}" class="defra-tooltip__label" role="tooltip">
+        <div class="defra-tooltip__label-inner govuk-body-s">
+          ${options.btnAddThresholdText}
+          <span class="govuk-visually-hidden>(visual only)</span>
+        </div>
+      </div>
+    `
+    container.parentElement.replaceChild(tooltip, container)
   })
 
   // Define globals
@@ -1241,8 +1263,8 @@ function LineChart (containerId, stationId, data, options = {}) {
     significantContainer.node().parentNode.classList.remove('significant--visible')
     // svg.select('.focussed-cell').remove()
     // Add threshold button
-    if (!e.target.hasAttribute('data-threshold-add')) return
-    const button = e.target
+    const button = e.target.closest('button')
+    if (!(button && button.hasAttribute('data-threshold-add'))) return
     addThreshold({
       id: button.getAttribute('data-id'),
       level: Number(button.getAttribute('data-level')),
@@ -1411,8 +1433,8 @@ if (document.getElementById('bar-chart')) {
 // Line chart
 if (document.getElementById('line-chart')) {
   const lineChart = window.flood.charts.createLineChart('line-chart', window.flood.model.id, window.flood.model.telemetry)
-  const thresholdId = 'threshold-pc5'
-  const threshold = document.querySelector(`[data-id="${thresholdId}"]`)
+  const thresholdId = `threshold-${window.flood.model.rloiId}-high`
+  const threshold = document.querySelector(`[data-id="${window.flood.utils.getParameterByName('tid') || thresholdId}"]`)
   if (threshold) {
     lineChart.addThreshold({
       id: thresholdId,
diff --git a/server/src/js/components/map/tooltip.js b/server/src/js/components/map/tooltip.js
deleted file mode 100644
index 2a1e47db0..000000000
--- a/server/src/js/components/map/tooltip.js
+++ /dev/null
@@ -1,158 +0,0 @@
-'use strict'
-
-// Tooltip component
-
-const { xhr } = window.flood.utils
-
-// ie11 closest() polyfill
-const Element = window.Element
-if (!Element.prototype.matches) {
-  Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector
-}
-if (!Element.prototype.closest) {
-  Element.prototype.closest = (s) => {
-    let el = this
-    do {
-      if (Element.prototype.matches.call(el, s)) return el
-      el = el.parentElement || el.parentNode
-    } while (el !== null && el.nodeType === 1)
-    return null
-  }
-}
-
-const Tooltips = (options) => {
-  // Setup defaults
-  const defaults = {
-    margin: 15
-  }
-  options = Object.assign({}, defaults, options)
-
-  // Add tooltip
-  const addTooltip = (tool) => {
-    // Outer margin
-    const viewportMargin = options.margin
-    // Open tooltip first so we can get dimensions
-    tool.parentNode.classList.add('defra-tooltip--open')
-    // Typically more text so width is fixed
-    if (tool.tagName === 'A') {
-      tool.parentNode.classList.add('defra-tooltip--fixed-width')
-    }
-    // Determin position of overlay
-    const tooltip = tool.parentNode
-    const tooltipLeft = tooltip.getBoundingClientRect().left
-    const tooltipWidth = tooltip.getBoundingClientRect().width
-    const tip = tool.nextElementSibling
-    const tipWidth = tip.getBoundingClientRect().width
-    // Centre tip
-    let tipOffsetX = ((tipWidth - tooltipWidth) / 2) - (((tipWidth - tooltipWidth) / 2) * 2)
-    // Correct offset if near sides of govuk-width-container
-    const newTipLeft = tooltipLeft + tipOffsetX
-    const viewportWidth = window.innerWidth
-    if (newTipLeft < viewportMargin) {
-      // Left side
-      tipOffsetX = ((tooltipLeft - viewportMargin) / 2) - (((tooltipLeft - viewportMargin) / 2) * 2)
-    } else if ((newTipLeft + tipWidth) > (viewportWidth - viewportMargin)) {
-      // Right side
-      tipOffsetX = tipOffsetX - (newTipLeft + tipWidth - (viewportWidth - viewportMargin))
-    }
-
-    // Switch position if near top
-    if (tip.getBoundingClientRect().top < viewportMargin) {
-      tool.parentNode.classList.add('defra-tooltip--bottom')
-    }
-    tip.style.marginLeft = `${tipOffsetX}px`
-  }
-
-  // Remove tooltip
-  const removeTooltips = () => {
-    const tooltips = document.querySelectorAll('.defra-tooltip--open')
-    if (tooltips.length) {
-      tooltips.forEach((tooltip) => {
-        tooltip.classList.remove('defra-tooltip--open')
-        tooltip.classList.remove('defra-tooltip--bottom')
-        tooltip.classList.remove('defra-tooltip--keyboard-focus')
-        const tip = tooltip.querySelector('.defra-tooltip__tip')
-        tip.style.removeProperty('margin-left')
-        // xhr tooltips
-        const status = tooltip.querySelector('[role="status"]')
-        if (status) { status.innerHTML = '' }
-      })
-    }
-  }
-
-  // Add on click (xhr tooltip only)
-  document.addEventListener('click', (e) => {
-    const tool = e.target.closest('.defra-tooltip__tool')
-    const isXhrTool = tool && tool.tagName === 'A'
-    // Remove tooltips when clicking outside unless its a basic tooltip
-    if (!tool || isXhrTool) { removeTooltips() }
-    if (tool) { e.preventDefault() }
-    // Only intersted in xhrTools from here on
-    if (!isXhrTool) { return }
-    // Get content
-    const content = tool.nextElementSibling
-    const url = tool.href.split(/\?|#/)[0]
-    // XMLHttpRequest
-    xhr(url, (err, response) => {
-      if (err) {
-        console.log('Error: ' + err)
-      } else {
-        content.innerHTML = ''
-        const fragmentId = tool.href.substring(tool.href.indexOf('#'))
-        const fragment = response.querySelector(`${fragmentId}`)
-        // Remove any hyperlinks
-        fragment.querySelectorAll('a').forEach(link => {
-          link.outerHTML = link.innerHTML
-        })
-        content.appendChild(fragment)
-        addTooltip(tool)
-      }
-    }, 'document')
-  })
-
-  // Remove on escape
-  document.addEventListener('keyup', (e) => {
-    if (e.key === 'Escape' || e.key === 'Esc') {
-      removeTooltips()
-    }
-  })
-
-  // Add on mouse enter (basic tooltip only)
-  document.addEventListener('mouseenter', (e) => {
-    const isTooltip = e.target.classList && e.target.classList.contains('defra-tooltip')
-    if (isTooltip && e.target.firstElementChild.tagName !== 'A') {
-      removeTooltips()
-      addTooltip(e.target.firstElementChild)
-    }
-  }, true)
-
-  // Remove on mouse leave (basic tooltip only)
-  document.addEventListener('mouseleave', (e) => {
-    const isTooltip = e.target.classList && e.target.classList.contains('defra-tooltip')
-    if (isTooltip && e.target.firstElementChild.tagName !== 'A') {
-      removeTooltips()
-    }
-  }, true)
-
-  // Add on focus (basic tooltip only)
-  document.addEventListener('focusin', (e) => {
-    const isTool = e.target.classList.contains('defra-tooltip__tool')
-    if (isTool && e.target.tagName !== 'A') {
-      removeTooltips()
-      addTooltip(e.target)
-    }
-  })
-
-  // Remove on blur (basic and xhr tooltips)
-  document.addEventListener('focusout', (e) => {
-    const isTool = e.target.classList.contains('defra-tooltip__tool')
-    if (isTool) {
-      e.target.parentNode.classList.remove('defra-tooltip--keyboard-focus')
-      removeTooltips()
-    }
-  })
-}
-
-window.flood.createTooltips = (options) => {
-  return Tooltips(options)
-}
diff --git a/server/src/js/components/tooltip.js b/server/src/js/components/tooltip.js
new file mode 100644
index 000000000..460b8c49f
--- /dev/null
+++ b/server/src/js/components/tooltip.js
@@ -0,0 +1,66 @@
+'use strict'
+
+// Tooltip component
+
+// ie11 closest() polyfill
+const Element = window.Element
+if (!Element.prototype.matches) {
+  Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector
+}
+if (!Element.prototype.closest) {
+  Element.prototype.closest = (s) => {
+    let el = this
+    do {
+      if (Element.prototype.matches.call(el, s)) return el
+      el = el.parentElement || el.parentNode
+    } while (el !== null && el.nodeType === 1)
+    return null
+  }
+}
+
+// Tooltip component
+const Tooltips = () => {
+  const tooltips = document.querySelectorAll('[data-tooltip]')
+
+  tooltips.forEach(tooltip => {
+    let timeout
+
+    // Add on mouse enter (basic tooltip only)
+    tooltip.addEventListener('mouseenter', () => {
+      timeout = setTimeout(() => {
+        tooltip.classList.add('defra-tooltip--visible')
+      }, 500)
+    })
+
+    // Remove on mouse leave (basic tooltip only)
+    tooltip.addEventListener('mouseleave', () => {
+      clearTimeout(timeout)
+      tooltip.classList.remove('defra-tooltip--visible')
+    })
+
+    // Remove on escape
+    document.addEventListener('keyup', e => {
+      if (e.key === 'Escape' || e.key === 'Esc') {
+        clearTimeout(timeout)
+        tooltip.classList.remove('defra-tooltip--visible')
+      }
+    })
+
+    // Add on focus (basic tooltip only)
+    tooltip.addEventListener('focusin', (e) => {
+      timeout = setTimeout(() => {
+        tooltip.classList.add('defra-tooltip--visible')
+      }, 500)
+    })
+
+    // Remove on blur (basic and xhr tooltips)
+    tooltip.addEventListener('focusout', (e) => {
+      clearTimeout(timeout)
+      tooltip.classList.remove('defra-tooltip--visible')
+    })
+  })
+}
+
+window.flood.createTooltips = (options) => {
+  return Tooltips(options)
+}
diff --git a/server/src/js/core.js b/server/src/js/core.js
index 477801d4f..9a4a3ec95 100644
--- a/server/src/js/core.js
+++ b/server/src/js/core.js
@@ -13,6 +13,7 @@ import './components/map/outlook'
 import './components/levels-table'
 import './components/toggle-list-display'
 import './components/toggletip'
+import './components/tooltip'
 
 document.addEventListener('readystatechange', () => {
   if (document.readyState === 'interactive') {
@@ -72,6 +73,9 @@ document.addEventListener('readystatechange', () => {
     const elem = document.getElementById('cookie-banner')
     let calledGTag = false
 
+    // Add tooltips
+    window.flood.createTooltips()
+
     // Check not on cookie settings page
     if (elem) {
       const seenCookieMessage = /(^|;)\s*seen_cookie_message=/.test(document.cookie)
diff --git a/server/src/sass/application.scss b/server/src/sass/application.scss
index e35ed622f..bcc2c2a08 100644
--- a/server/src/sass/application.scss
+++ b/server/src/sass/application.scss
@@ -68,6 +68,7 @@ $govuk-breakpoints: (
 @import "components/stations-overview";
 @import "components/chart-controls";
 @import "components/toggletip";
+@import "components/tooltip";
 @import "components/navbar";
 @import "components/flood-levels-table";
 
diff --git a/server/src/sass/components/_chart-controls.scss b/server/src/sass/components/_chart-controls.scss
index 063d6a447..e7f048d16 100644
--- a/server/src/sass/components/_chart-controls.scss
+++ b/server/src/sass/components/_chart-controls.scss
@@ -1,84 +1,74 @@
 .defra-chart-controls {
   position: relative;
-  z-index: 1;
   overflow: auto;
-  margin: -3px -3px 0 -3px;
-  padding: 3px 3px 0 3px;
-
-  &__group {
-    margin: auto;
-    display: inline-block;
-    padding-bottom: 4px;
-  }
-
-  &__group--pagination {
-    float: right;
-    margin-right: 10px;
-  }
-
-  &__button {
-    @extend .defra-button-text-s;
-    touch-action: manipulation;
-    padding: 7.5px;
-    display: inline-block;
-    position: relative;
-    text-align: center;
-    text-decoration: none;
+  z-index: 1;
+  margin: -3px -3px 0px -3px;
+  padding: 3px 3px 0px 3px;
+}
+.defra-chart-controls__period {
+  margin: auto;
+  display: inline-block;
+  padding-bottom: 4px;
+}
+.defra-chart-controls__pagination {
+  display: block;
+  padding-bottom: 4px;
+  float: right;
+}
+.defra-chart-controls-button {
+  touch-action: manipulation;
+  @extend .defra-button-text-s;
+  padding: 7.5px;
+  display: inline-block;
+  position: relative;
+  text-align: center;
+  text-decoration: none;
+  &--selected:not(:focus) {
+    border-bottom: 4px solid govuk-colour('blue');
     margin-bottom: -4px;
-    cursor: pointer;
-    color: govuk-colour('blue');
   }
-
-  &__button:hover {
-    color: $govuk-link-hover-colour;
+  &--selected:hover {
+    border-bottom-color: $govuk-link-hover-colour;
   }
-  &__button--selected {
-    border-bottom: 4px solid govuk-colour('blue');
+  &__icon {
+    display: inline-block;
   }
-  &__button:focus {
-    border-bottom: 4px solid govuk-colour('black');
-    background-color: $govuk-focus-colour;
+  svg {
+    position: relative;
+    top: 1px;
+    margin-left: 5px;
     color: govuk-colour('black');
-    @include high-contrast-mode-only {
-      outline: 3px solid transparent;
-      margin-bottom: 1px;
-      border: none;
-    }
+    forced-color-adjust: auto;
   }
-  &__button[aria-disabled="true"]:focus {
-    @include high-contrast-mode-only {
-      background-color: transparent;
-      box-shadow: none;
+  &--back {
+    padding-left: 0px;
+    padding-right: 0px;
+    margin-right: 15px;
+    svg {
+      margin-right: 5px;
+      margin-left: 0px;
     }
   }
-  &__button[aria-disabled="true"],
-  &__button[aria-disabled="true"]:after,
-  &__button[aria-disabled="true"]:before {
-    color: govuk-colour('mid-grey');
-    cursor: not-allowed;
-    forced-color-adjust: none;
+  &--forward {
+    padding-left: 0px;
+    padding-right: 0px;
+    margin-right: 0px;
   }
-  &__button:after,
-  &__button:before {
-    display: inline-block;
-    border-width: 0 2px 2px 0;
-    width: 8px;
-    height: 8px;
-    border-style: solid;
-    color: $govuk-link-colour;
-    margin-right: 2px;
-    margin-left: 2px;
+  &[aria-disabled="true"] {
+    cursor: not-allowed;
   }
-  &__button[data-direction="forward"]:after {
-    content: '';
-    -webkit-transform: rotate(-45deg);
-    -ms-transform: rotate(-45deg);
-    transform: rotate(-45deg);
+  &[aria-disabled="true"]:not(:focus) {
+    color: govuk-colour('mid-grey');
+    svg {
+      color: govuk-colour('mid-grey');
+    }
   }
-  &__button[data-direction="back"]:before {
-    content: '';
-    -webkit-transform: rotate(135deg);
-    -ms-transform: rotate(135deg);
-    transform: rotate(135deg);
+  @media screen and (-ms-high-contrast: active), screen and (forced-colors: active) {
+    &[aria-disabled="true"] {
+      color: GrayText !important;
+      svg {
+        color: GrayText !important;
+      }
+    }
   }
 }
diff --git a/server/src/sass/components/_flood-impact-list.scss b/server/src/sass/components/_flood-impact-list.scss
index 823b75117..d23d58353 100644
--- a/server/src/sass/components/_flood-impact-list.scss
+++ b/server/src/sass/components/_flood-impact-list.scss
@@ -1,54 +1,56 @@
 .defra-flood-impact-list {
     @include govuk-font($size: 19);
-    & {
-        margin-top: 0px;
-        border-bottom: 1px solid $govuk-border-colour;
-    }
+    margin-top: 0px;
+    border-bottom: 1px solid $govuk-border-colour;
+
     &__row {
         position: relative;
         margin-left: 3.65em;
         overflow: visible;
     }
+
     &__row:before {
         position: absolute;
         content: '';
         width: 3px;
         top: 11px;
-        bottom: -20px;
+        bottom: -22px;
         color: govuk-colour('mid-grey');
         border-left: 3px solid currentcolor;
         margin-left: -1px;
         left: 8%;
+
         @include mq ($from: tablet) {
-          left: 4%;
+            left: 4%;
         }
     }
+
     &__key {
         @include govuk-font($size: false, $tabular: true, $weight: bold);
-        & {
-            position: absolute;
-            left: -3.65em;
-            width: 3.65em;
-            top: 0;
-            text-align: right;
-        }
+        position: absolute;
+        left: -3.65em;
+        width: 3.65em;
+        top: 0;
+        text-align: right;
     }
+
     &__value {
         position: relative;
         margin: 0;
         padding-left: 16%;
-        padding-bottom: 10px;
+
         @include mq ($from: tablet) {
-          padding-left: 8%;
-          padding-bottom: 15px;
+            padding-left: 8%;
         }
     }
+
     &__value--latest {
-      font-weight: bold;
+        font-weight: bold;
     }
+
     &__value:nth-child(2):before {
         position: absolute;
-        content:'';
+        content: '';
         width: 13px;
         height: 3px;
         color: govuk-colour('mid-grey');
@@ -58,99 +60,120 @@
         margin-left: -6px;
         top: 8px;
         left: 8%;
+
         @include mq ($from: tablet) {
             top: 11px;
             left: 4%;
         }
     }
+
     &__row:last-child {
         &:before {
             bottom: 0;
         }
+
         .defra-flood-impact-list__value:last-child {
-            padding-bottom:0;
+            padding-bottom: 0;
         }
+
         .defra-flood-impact-list__value:last-child {
             padding-bottom: 0;
+
             .defra-flood-impact-list__container {
                 border-bottom: 0;
             }
         }
     }
+
     &__container {
-        padding-bottom:10px;
-        border-bottom:1px solid $govuk-border-colour;
+        padding-bottom: 10px;
+        padding-right: 15%;
+
         @include mq ($from: tablet) {
             padding-right: 28%;
             padding-bottom: 15px;
         }
     }
-    &__container button {
-        margin-top: 5px;
-        @include mq ($from: tablet) {
-            position:absolute;
-            right: 0;
-            top: 0;
-            margin-top: 0;
-        }
+
+    &__container .defra-tooltip {
+        margin-top: 10px;
+        position: absolute;
+        right: 0;
+        top: 0;
+        margin-top: 0;
     }
+
+    dd:last-of-type &__container {
+        border-bottom: 1px solid $govuk-border-colour;
+        margin-bottom: 10px;
+    }
+
     .defra-button-text-s {
-        display:block;
+        display: block;
     }
+
     &__row--current .defra-flood-impact-list__action {
         display: none;
     }
+
     &__row--exceeded {
-      &:before {
-          margin-left: -2px;
-          color: govuk-colour('blue');
-          border-left: 5px solid currentcolor;
-      }
-      .defra-flood-impact-list__value:nth-child(2):before {
-          margin-left: -6px;
-          color: govuk-colour('blue');
-          border-top: 5px solid currentcolor;
-      }
+        &:before {
+            margin-left: -2px;
+            color: govuk-colour('blue');
+            border-left: 5px solid currentcolor;
+        }
+
+        .defra-flood-impact-list__value:nth-child(2):before {
+            margin-left: -6px;
+            color: govuk-colour('blue');
+            border-top: 5px solid currentcolor;
+        }
     }
+
     &__row--current {
-      &:before {
-          margin-left: -2px;
-          color: govuk-colour('blue');
-          border-left: 5px solid currentcolor;
-      }
-      .defra-flood-impact-list__value:before {
-          margin-left: -6px;
-          color: govuk-colour('blue');
-          border-top: 5px solid currentcolor;
-      }
+        &:before {
+            margin-left: -2px;
+            color: govuk-colour('blue');
+            border-left: 5px solid currentcolor;
+        }
+
+        .defra-flood-impact-list__value:before {
+            margin-left: -6px;
+            color: govuk-colour('blue');
+            border-top: 5px solid currentcolor;
+        }
     }
+
     &__alert {
-        z-index:1;
+        z-index: 1;
         text-indent: -5000px;
-        position:absolute;
+        position: absolute;
         background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><path d="M16.027,4.191C16.526,4.204 17,4.486 17.249,4.92C21.009,11.756 24.71,18.624 28.359,25.52C28.796,26.38 28.171,27.581 27.114,27.607C19.707,27.666 12.299,27.666 4.891,27.607C3.925,27.583 3.171,26.455 3.646,25.52C7.297,18.625 10.996,11.755 14.757,4.92C15.016,4.467 15.469,4.187 16.027,4.191Z" style="fill:rgb(241,135,0);"/><path d="M16.031,3.691C15.281,3.685 14.672,4.062 14.323,4.671C10.556,11.517 6.856,18.389 3.204,25.286C2.56,26.554 3.577,28.075 4.879,28.107C12.297,28.166 19.708,28.166 27.118,28.107C28.551,28.072 29.393,26.453 28.805,25.294C25.151,18.388 21.449,11.517 17.687,4.679C17.349,4.088 16.711,3.709 16.04,3.691L16.031,3.691ZM16.027,4.191C16.526,4.204 17,4.486 17.249,4.92C21.009,11.756 24.71,18.624 28.359,25.52C28.796,26.38 28.171,27.581 27.114,27.607C19.707,27.666 12.299,27.666 4.891,27.607C3.925,27.583 3.171,26.455 3.646,25.52C7.297,18.625 10.996,11.755 14.757,4.92C15.016,4.467 15.469,4.187 16.027,4.191Z" style="fill:rgb(241,135,0);"/><path d="M15.766,6.149C15.813,6.062 15.904,6.008 16.003,6.008C16.101,6.008 16.192,6.062 16.239,6.149C17.695,8.85 25.417,23.179 26.805,25.753C26.85,25.837 26.848,25.937 26.799,26.019C26.751,26.1 26.663,26.15 26.568,26.15C23.724,26.15 8.281,26.15 5.437,26.15C5.342,26.15 5.254,26.1 5.206,26.019C5.157,25.937 5.155,25.837 5.2,25.753C6.588,23.179 14.31,8.85 15.766,6.149Z" style="fill:white;"/><path d="M14.053,14.993L14.053,15.859L15.584,14.098C15.674,13.995 15.805,13.935 15.941,13.935C16.078,13.936 16.209,13.995 16.298,14.099L20.731,19.223L20.731,19.223C20.902,19.421 20.88,19.719 20.683,19.89C20.485,20.061 20.187,20.039 20.016,19.842L19.611,19.374L19.611,22.069C19.472,22.081 19.404,22.118 19.282,22.193C19.146,22.278 18.967,22.443 18.675,22.578C18.481,22.666 18.239,22.725 17.968,22.724C17.961,22.725 17.955,22.725 17.948,22.725C17.552,22.725 17.228,22.579 17.014,22.436C16.792,22.288 16.66,22.174 16.542,22.123C16.463,22.088 16.389,22.067 16.256,22.066C16.068,22.07 15.998,22.106 15.858,22.193C15.722,22.277 15.543,22.443 15.251,22.578C15.057,22.666 14.815,22.726 14.544,22.724C14.148,22.727 13.822,22.586 13.599,22.443C13.373,22.3 13.223,22.174 13.116,22.124C13.043,22.089 12.997,22.076 12.92,22.075C12.772,22.068 12.517,22.173 12.227,22.332L12.227,19.4L11.821,19.867C11.727,19.974 11.596,20.029 11.463,20.029C11.354,20.029 11.243,19.991 11.154,19.913C10.957,19.742 10.936,19.444 11.107,19.246L12.947,17.131L12.947,14.993L14.053,14.993Z" style="fill:rgb(24,28,27);"/><rect x="17.487" y="19.432" width="1.414" height="1.556" style="fill:white;"/><path d="M25.619,25.301L6.381,25.301L7.421,23.381L7.726,23.381C7.933,23.558 8.188,23.757 8.456,23.929C8.611,24.029 8.77,24.119 8.936,24.19C9.103,24.26 9.275,24.317 9.487,24.32C10.03,24.306 10.427,24.045 10.809,23.851C11.185,23.645 11.528,23.496 11.76,23.503C11.878,23.504 11.957,23.527 12.061,23.577C12.215,23.65 12.405,23.81 12.68,23.985C12.952,24.157 13.335,24.323 13.809,24.32C14.136,24.321 14.421,24.25 14.653,24.146C15.001,23.987 15.221,23.785 15.402,23.671C15.588,23.555 15.707,23.496 15.97,23.492C16.154,23.493 16.268,23.525 16.382,23.575C16.55,23.648 16.723,23.798 16.992,23.976C17.257,24.152 17.645,24.324 18.131,24.32C18.457,24.321 18.743,24.25 18.974,24.146C19.323,23.987 19.543,23.784 19.725,23.671C19.91,23.555 20.029,23.496 20.292,23.492C20.47,23.489 20.681,23.564 20.84,23.653C20.92,23.696 20.986,23.74 21.03,23.772C21.052,23.787 21.068,23.8 21.078,23.807C21.083,23.811 21.086,23.814 21.087,23.815L21.121,23.842C21.39,24.042 21.822,24.32 22.429,24.32L22.453,24.32C23.003,24.309 23.472,24.055 23.877,23.802C24.077,23.673 24.255,23.539 24.402,23.419C24.417,23.406 24.432,23.394 24.446,23.381L24.583,23.381L25.619,25.301Z" style="fill:rgb(0,164,205);"/></svg>');
         background-repeat: no-repeat;
         background-position: top left;
-        background-color:white;
-        border-top:1px solid white;
-        border-bottom:1px solid white;
-        width:32px;
-        height:32px;
+        background-color: white;
+        border-top: 1px solid white;
+        border-bottom: 1px solid white;
+        width: 32px;
+        height: 32px;
         background-size: 32px 32px;
-        margin-left:-16px;
-        top:-6px;
-        left:8%;
+        margin-left: -16px;
+        top: -6px;
+        left: 8%;
+
         @include mq ($from: tablet) {
-            top:-4px;
-            left:4%;
+            top: -4px;
+            left: 4%;
         }
     }
+
     &__warning {
         @extend .defra-flood-impact-list__alert;
         background-image: svg-url('<svg width="32" height="32"><path d="M16.027,4.27C16.526,4.283 17,4.565 17.249,4.999C21.009,11.834 24.71,18.703 28.359,25.599C28.796,26.459 28.171,27.66 27.114,27.686C19.707,27.745 12.299,27.745 4.891,27.686C3.925,27.662 3.171,26.534 3.646,25.599C7.297,18.704 10.996,11.834 14.757,4.999C15.016,4.546 15.469,4.265 16.027,4.27Z" style="fill:rgb(227,0,15);"/><path d="M16.031,3.77C15.281,3.764 14.672,4.141 14.323,4.75C10.556,11.596 6.856,18.468 3.204,25.365C2.56,26.633 3.577,28.154 4.879,28.185C12.297,28.245 19.708,28.245 27.118,28.186C28.551,28.151 29.393,26.532 28.805,25.373C25.151,18.467 21.449,11.596 17.687,4.758C17.349,4.167 16.711,3.788 16.04,3.77L16.031,3.77ZM16.027,4.27C16.526,4.283 17,4.565 17.249,4.999C21.009,11.834 24.71,18.703 28.359,25.599C28.796,26.459 28.171,27.66 27.114,27.686C19.707,27.745 12.299,27.745 4.891,27.686C3.925,27.662 3.171,26.534 3.646,25.599C7.297,18.704 10.996,11.834 14.757,4.999C15.016,4.546 15.469,4.265 16.027,4.27Z" style="fill:rgb(227,0,15);"/><path d="M15.766,6.228C15.813,6.141 15.904,6.087 16.003,6.087C16.101,6.087 16.192,6.141 16.239,6.228C17.695,8.929 25.417,23.258 26.805,25.832C26.85,25.916 26.848,26.016 26.799,26.098C26.751,26.179 26.663,26.229 26.568,26.229C23.724,26.229 8.281,26.229 5.437,26.229C5.342,26.229 5.254,26.179 5.206,26.098C5.157,26.016 5.155,25.916 5.2,25.832C6.588,23.258 14.31,8.929 15.766,6.228Z" style="fill:white;"/><path d="M14.028,13.618L14.028,14.486L15.563,12.721C15.652,12.617 15.784,12.558 15.921,12.558C16.058,12.558 16.189,12.618 16.279,12.722L20.72,17.857L20.721,17.857C20.892,18.055 20.87,18.354 20.672,18.525C20.474,18.696 20.175,18.675 20.004,18.477L19.598,18.007L19.598,20.512C19.459,20.524 19.391,20.561 19.269,20.636C19.133,20.721 18.953,20.887 18.66,21.022C18.465,21.111 18.223,21.17 17.951,21.169C17.945,21.169 17.938,21.169 17.932,21.169C17.535,21.169 17.21,21.023 16.995,20.88C16.773,20.732 16.64,20.617 16.523,20.567C16.443,20.532 16.369,20.51 16.236,20.509C16.047,20.514 15.978,20.55 15.837,20.636C15.701,20.721 15.521,20.887 15.229,21.022C15.034,21.11 14.792,21.17 14.52,21.169C14.123,21.172 13.797,21.03 13.573,20.888C13.347,20.743 13.197,20.617 13.089,20.567C13.017,20.533 12.97,20.519 12.893,20.518C12.745,20.511 12.49,20.616 12.199,20.776L12.199,18.034L11.792,18.502C11.698,18.609 11.566,18.664 11.434,18.664C11.324,18.664 11.213,18.627 11.124,18.548C10.926,18.377 10.905,18.078 11.077,17.88L12.92,15.76L12.92,13.618L14.028,13.618Z" style="fill:rgb(24,28,27);"/><path d="M7.482,23.314C7.517,23.347 7.556,23.382 7.598,23.419C7.819,23.612 8.111,23.848 8.42,24.046C8.575,24.146 8.735,24.236 8.901,24.307C9.068,24.377 9.24,24.435 9.452,24.437C9.997,24.424 10.395,24.162 10.777,23.968C11.154,23.762 11.498,23.612 11.731,23.619C11.848,23.62 11.928,23.644 12.032,23.694C12.186,23.767 12.377,23.927 12.652,24.102C12.925,24.274 13.309,24.44 13.784,24.437C14.111,24.438 14.397,24.368 14.629,24.263C14.978,24.104 15.199,23.901 15.38,23.787C15.567,23.671 15.686,23.612 15.95,23.607C16.134,23.608 16.248,23.641 16.362,23.691C16.531,23.765 16.704,23.914 16.974,24.093C17.239,24.27 17.628,24.442 18.115,24.437C18.442,24.438 18.728,24.368 18.96,24.263C19.309,24.104 19.53,23.901 19.712,23.787C19.898,23.671 20.018,23.612 20.281,23.607C20.459,23.605 20.67,23.68 20.83,23.769C20.91,23.812 20.976,23.856 21.02,23.888C21.042,23.904 21.059,23.916 21.068,23.924C21.073,23.928 21.076,23.93 21.077,23.932L21.077,23.931L21.111,23.958C21.382,24.159 21.814,24.437 22.422,24.437L22.447,24.437C22.998,24.427 23.467,24.172 23.873,23.919C24.073,23.789 24.253,23.655 24.399,23.534C24.449,23.493 24.495,23.453 24.537,23.416L25.619,25.42L6.34,25.42L7.482,23.314Z" style="fill:rgb(0,164,205);"/><path d="M8.649,21.159C8.668,21.193 8.691,21.224 8.717,21.254C8.826,21.377 9.027,21.59 9.292,21.79C9.561,21.985 9.894,22.196 10.357,22.205C10.898,22.19 11.265,21.939 11.613,21.764C11.954,21.575 12.255,21.45 12.428,21.458C12.517,21.459 12.57,21.475 12.653,21.515C12.777,21.572 12.949,21.717 13.209,21.882C13.466,22.046 13.84,22.209 14.296,22.205C14.608,22.207 14.886,22.138 15.109,22.037C15.445,21.882 15.651,21.691 15.807,21.594C15.969,21.494 16.049,21.453 16.265,21.448C16.418,21.449 16.504,21.474 16.594,21.514C16.73,21.572 16.883,21.703 17.137,21.873C17.383,22.039 17.756,22.206 18.212,22.206C18.219,22.206 18.227,22.206 18.234,22.205C18.546,22.207 18.824,22.138 19.048,22.037C19.384,21.882 19.59,21.691 19.747,21.594C19.908,21.494 19.988,21.453 20.204,21.448C20.338,21.445 20.515,21.506 20.651,21.582C20.718,21.619 20.775,21.656 20.812,21.683C20.831,21.696 20.844,21.707 20.852,21.713C20.855,21.716 20.857,21.717 20.858,21.718C20.858,21.718 20.858,21.718 20.859,21.719L20.894,21.747C21.024,21.84 21.188,21.957 21.403,22.05C21.617,22.145 21.88,22.207 22.173,22.205C22.667,22.207 23.062,21.991 23.32,21.774C23.402,21.706 23.475,21.635 23.539,21.569L24.033,22.483C24.011,22.501 23.991,22.52 23.972,22.541L23.972,22.541C23.955,22.562 23.864,22.65 23.748,22.745C23.572,22.891 23.321,23.071 23.072,23.205C22.825,23.341 22.573,23.419 22.447,23.414C22.111,23.407 21.984,23.319 21.72,23.136C21.665,23.091 21.524,22.982 21.318,22.87C21.065,22.735 20.712,22.587 20.281,22.585C19.962,22.583 19.681,22.656 19.455,22.761C19.115,22.922 18.902,23.12 18.719,23.232C18.533,23.346 18.401,23.41 18.115,23.414C17.93,23.413 17.816,23.381 17.703,23.33C17.533,23.257 17.361,23.107 17.091,22.929C16.825,22.752 16.437,22.58 15.95,22.585C15.631,22.583 15.35,22.656 15.124,22.761C14.784,22.922 14.57,23.12 14.388,23.232C14.201,23.346 14.07,23.409 13.784,23.414C13.45,23.409 13.283,23.299 12.994,23.099C12.853,23 12.694,22.88 12.487,22.777C12.281,22.674 12.021,22.595 11.731,22.596C11.148,22.603 10.687,22.862 10.296,23.065C9.911,23.281 9.576,23.428 9.452,23.414C9.452,23.414 9.45,23.414 9.438,23.412C9.391,23.406 9.262,23.357 9.12,23.275C8.905,23.153 8.651,22.967 8.442,22.794C8.236,22.626 8.06,22.456 8.026,22.416C8.014,22.402 8.002,22.39 7.989,22.378L8.649,21.159Z" style="fill:rgb(0,164,205);"/><rect x="17.469" y="18.067" width="1.417" height="1.559" style="fill:white;"/></svg>');
     }
+
     &__severe {
         @extend .defra-flood-impact-list__alert;
         background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><path d="M16.027,4.27C16.526,4.283 17,4.565 17.249,4.999C21.009,11.834 24.71,18.703 28.359,25.599C28.796,26.459 28.171,27.66 27.114,27.686C19.707,27.745 12.299,27.745 4.891,27.686C3.925,27.662 3.171,26.534 3.646,25.599C7.297,18.704 10.996,11.834 14.757,4.999C15.016,4.546 15.469,4.265 16.027,4.27Z" style="fill:rgb(227,0,15);"/><path d="M16.031,3.77C15.281,3.764 14.672,4.141 14.323,4.75C10.556,11.596 6.856,18.468 3.204,25.365C2.56,26.633 3.577,28.154 4.879,28.185C12.297,28.245 19.708,28.245 27.118,28.186C28.551,28.151 29.393,26.532 28.805,25.373C25.151,18.467 21.449,11.596 17.687,4.758C17.349,4.167 16.711,3.788 16.04,3.77L16.031,3.77ZM16.027,4.27C16.526,4.283 17,4.565 17.249,4.999C21.009,11.834 24.71,18.703 28.359,25.599C28.796,26.459 28.171,27.66 27.114,27.686C19.707,27.745 12.299,27.745 4.891,27.686C3.925,27.662 3.171,26.534 3.646,25.599C7.297,18.704 10.996,11.834 14.757,4.999C15.016,4.546 15.469,4.265 16.027,4.27Z" style="fill:rgb(227,0,15);"/><path d="M15.766,6.228C15.813,6.141 15.904,6.087 16.003,6.087C16.101,6.087 16.192,6.141 16.239,6.228C17.695,8.929 25.417,23.258 26.805,25.832C26.85,25.916 26.848,26.016 26.799,26.098C26.751,26.179 26.663,26.229 26.568,26.229C23.724,26.229 8.281,26.229 5.437,26.229C5.342,26.229 5.254,26.179 5.206,26.098C5.157,26.016 5.155,25.916 5.2,25.832C6.588,23.258 14.31,8.929 15.766,6.228Z" style="fill:white;"/><path d="M14.002,13.072L14.002,13.977L15.541,12.137C15.63,12.029 15.762,11.967 15.899,11.967C16.037,11.967 16.167,12.03 16.258,12.138L20.709,17.492L20.71,17.492C20.881,17.699 20.859,18.01 20.661,18.189C20.462,18.367 20.162,18.345 19.991,18.138L19.584,17.649L19.584,18.449C19.445,18.461 19.377,18.5 19.255,18.579C19.157,18.642 19.038,18.748 18.871,18.854L18.871,17.711L17.451,17.711L17.451,19.064C17.261,19.006 17.1,18.919 16.976,18.832C16.754,18.678 16.62,18.558 16.503,18.506C16.423,18.469 16.348,18.447 16.215,18.446C16.026,18.451 15.956,18.488 15.815,18.579C15.679,18.667 15.499,18.84 15.206,18.981C15.011,19.073 14.768,19.135 14.495,19.134C14.098,19.137 13.77,18.99 13.546,18.841C13.32,18.69 13.17,18.559 13.061,18.507C12.988,18.47 12.942,18.457 12.865,18.455C12.716,18.448 12.46,18.558 12.168,18.725L12.168,17.677L11.76,18.165C11.667,18.277 11.535,18.335 11.402,18.335C11.291,18.335 11.181,18.295 11.091,18.213C10.893,18.034 10.872,17.722 11.044,17.517L12.891,15.306L12.891,13.072L14.002,13.072Z" style="fill:rgb(227,0,15);"/><path d="M9.613,19.011C9.617,19.016 9.621,19.02 9.625,19.025C9.72,19.136 9.894,19.329 10.127,19.512C10.361,19.688 10.652,19.881 11.056,19.889C11.528,19.875 11.849,19.646 12.153,19.488C12.451,19.316 12.713,19.203 12.865,19.21C12.942,19.211 12.988,19.225 13.061,19.261C13.169,19.314 13.319,19.445 13.546,19.595C13.771,19.744 14.098,19.892 14.495,19.889C14.768,19.89 15.011,19.828 15.205,19.736C15.499,19.595 15.679,19.422 15.815,19.333C15.956,19.243 16.026,19.205 16.215,19.2C16.348,19.201 16.423,19.224 16.503,19.261C16.62,19.313 16.754,19.433 16.976,19.587C17.191,19.737 17.517,19.889 17.914,19.889C17.921,19.889 17.928,19.889 17.934,19.889C18.207,19.89 18.449,19.828 18.644,19.736C18.938,19.595 19.118,19.422 19.254,19.333C19.395,19.243 19.465,19.205 19.654,19.2C19.771,19.198 19.925,19.253 20.044,19.322C20.103,19.355 20.153,19.39 20.185,19.414C20.201,19.426 20.213,19.436 20.219,19.441C20.222,19.444 20.224,19.445 20.225,19.446C20.225,19.446 20.225,19.446 20.225,19.446L20.257,19.472C20.37,19.557 20.513,19.663 20.701,19.748C20.888,19.833 21.117,19.89 21.373,19.889C21.805,19.89 22.149,19.694 22.375,19.496C22.421,19.457 22.464,19.416 22.503,19.376L22.934,20.205C22.906,20.235 22.835,20.305 22.748,20.379C22.594,20.511 22.376,20.675 22.158,20.796C21.942,20.92 21.723,20.991 21.612,20.986C21.318,20.98 21.208,20.899 20.977,20.733C20.929,20.693 20.806,20.594 20.626,20.492C20.406,20.369 20.097,20.235 19.721,20.233C19.442,20.231 19.197,20.297 19,20.393C18.703,20.539 18.517,20.719 18.357,20.821C18.195,20.924 18.079,20.982 17.83,20.986C17.669,20.985 17.569,20.956 17.47,20.91C17.322,20.844 17.171,20.708 16.935,20.545C16.704,20.385 16.364,20.228 15.939,20.233C15.66,20.231 15.415,20.297 15.218,20.393C14.921,20.539 14.735,20.719 14.576,20.821C14.413,20.924 14.298,20.982 14.049,20.986C13.756,20.982 13.611,20.882 13.358,20.7C13.236,20.611 13.096,20.502 12.915,20.408C12.736,20.314 12.509,20.242 12.256,20.243C11.747,20.249 11.344,20.485 11.003,20.669C10.666,20.865 10.374,20.999 10.266,20.986C10.266,20.986 10.264,20.987 10.254,20.984C10.213,20.978 10.1,20.934 9.976,20.86C9.788,20.749 9.566,20.579 9.384,20.424C9.232,20.294 9.1,20.165 9.044,20.105L9.613,19.011Z" style="fill:rgb(0,164,205);"/><path d="M7.441,23.182C7.477,23.216 7.516,23.252 7.557,23.291C7.779,23.493 8.071,23.738 8.381,23.945C8.537,24.049 8.697,24.143 8.863,24.218C9.031,24.29 9.203,24.35 9.416,24.353C9.962,24.339 10.36,24.066 10.743,23.864C11.122,23.648 11.466,23.493 11.7,23.5C11.818,23.501 11.897,23.525 12.002,23.578C12.156,23.654 12.347,23.821 12.623,24.003C12.897,24.183 13.281,24.356 13.757,24.353C14.085,24.354 14.372,24.281 14.605,24.171C14.954,24.005 15.176,23.794 15.357,23.675C15.544,23.554 15.664,23.493 15.928,23.488C16.113,23.489 16.227,23.522 16.341,23.575C16.511,23.652 16.684,23.808 16.954,23.994C17.22,24.178 17.61,24.358 18.098,24.353C18.426,24.354 18.712,24.281 18.945,24.171C19.295,24.005 19.516,23.794 19.698,23.675C19.885,23.554 20.005,23.493 20.269,23.488C20.447,23.485 20.659,23.564 20.819,23.656C20.899,23.701 20.965,23.747 21.009,23.78C21.032,23.797 21.048,23.81 21.058,23.818C21.063,23.822 21.065,23.825 21.067,23.826L21.067,23.826L21.1,23.854C21.372,24.063 21.805,24.353 22.414,24.353C22.422,24.353 22.431,24.353 22.439,24.353C22.992,24.343 23.462,24.077 23.869,23.813C24.07,23.678 24.249,23.538 24.396,23.412C24.446,23.368 24.492,23.327 24.534,23.289L25.619,25.379L6.298,25.379L7.441,23.182Z" style="fill:rgb(0,164,205);"/><path d="M8.611,20.936C8.63,20.97 8.653,21.004 8.68,21.035C8.789,21.163 8.989,21.385 9.256,21.594C9.525,21.796 9.859,22.017 10.323,22.027C10.865,22.01 11.233,21.748 11.581,21.566C11.924,21.369 12.224,21.239 12.399,21.247C12.488,21.249 12.541,21.264 12.624,21.306C12.748,21.366 12.921,21.517 13.181,21.69C13.438,21.86 13.814,22.03 14.27,22.026C14.583,22.028 14.862,21.956 15.085,21.85C15.422,21.689 15.628,21.49 15.785,21.389C15.947,21.285 16.028,21.242 16.244,21.236C16.397,21.237 16.483,21.264 16.574,21.306C16.71,21.366 16.863,21.503 17.118,21.68C17.364,21.852 17.739,22.027 18.195,22.027C18.203,22.027 18.21,22.027 18.217,22.027C18.53,22.028 18.809,21.957 19.033,21.851C19.37,21.689 19.576,21.491 19.733,21.389C19.895,21.285 19.975,21.242 20.192,21.236C20.327,21.234 20.503,21.297 20.639,21.376C20.707,21.415 20.764,21.454 20.801,21.482C20.82,21.496 20.833,21.507 20.841,21.513C20.844,21.516 20.846,21.517 20.847,21.518C20.847,21.518 20.847,21.519 20.848,21.519L20.848,21.519L20.883,21.548C21.014,21.646 21.178,21.767 21.393,21.865C21.608,21.963 21.872,22.028 22.165,22.027C22.661,22.028 23.056,21.803 23.315,21.576C23.397,21.505 23.471,21.432 23.535,21.363L24.029,22.315C24.007,22.333 23.987,22.354 23.968,22.376L23.968,22.376C23.951,22.397 23.86,22.49 23.744,22.588C23.567,22.741 23.316,22.929 23.066,23.068C22.818,23.21 22.566,23.291 22.439,23.286C22.102,23.278 21.975,23.187 21.711,22.996C21.656,22.949 21.514,22.836 21.307,22.718C21.055,22.577 20.701,22.423 20.269,22.421C19.949,22.42 19.667,22.495 19.441,22.605C19.1,22.773 18.886,22.979 18.703,23.096C18.516,23.215 18.384,23.281 18.098,23.286C17.913,23.285 17.798,23.251 17.685,23.199C17.515,23.122 17.342,22.966 17.071,22.78C16.805,22.596 16.416,22.416 15.928,22.421C15.608,22.42 15.326,22.495 15.1,22.605C14.759,22.773 14.545,22.979 14.362,23.096C14.176,23.215 14.044,23.281 13.757,23.286C13.422,23.281 13.255,23.166 12.965,22.957C12.824,22.855 12.664,22.73 12.457,22.622C12.251,22.514 11.991,22.432 11.7,22.433C11.115,22.44 10.653,22.711 10.262,22.922C9.875,23.147 9.54,23.3 9.416,23.286C9.416,23.286 9.414,23.287 9.402,23.284C9.355,23.277 9.225,23.227 9.083,23.141C8.867,23.014 8.613,22.819 8.404,22.64C8.197,22.464 8.021,22.287 7.986,22.245C7.975,22.231 7.962,22.218 7.95,22.206L8.611,20.936Z" style="fill:rgb(0,164,205);"/></svg>');
     }
-  }
+}
diff --git a/server/src/sass/components/_toggle-list-display.scss b/server/src/sass/components/_toggle-list-display.scss
index f920510e2..3217989a3 100644
--- a/server/src/sass/components/_toggle-list-display.scss
+++ b/server/src/sass/components/_toggle-list-display.scss
@@ -1,3 +1,4 @@
-.js-enabled [data-toggle-list-display-item] {
+.js-enabled [data-toggle-list-display]:not([data-toggle-list-display="warning-default"]) {
     display: none;
-}
+  }
+  
\ No newline at end of file
diff --git a/server/src/sass/components/_toggletip.scss b/server/src/sass/components/_toggletip.scss
index 94521f9ef..abaa3e890 100644
--- a/server/src/sass/components/_toggletip.scss
+++ b/server/src/sass/components/_toggletip.scss
@@ -1,12 +1,10 @@
 .defra-toggletip {
-	height: 1rem;
+	// height: 1rem;
 	&:first-child {
 		display: inline-block;
 	}
-	& {
-		display: inline-block;
-		position: relative;
-	}
+  display: inline-block;
+  position: relative;
 	&:not(.defra-toggletip-target) {
 		padding-right: 26px;
 	}
@@ -19,11 +17,9 @@
 		@include mq ($from: tablet) {
 			top: -1px;
 		}
-		& {
-			right: 0px;
-			width: 26px;
-			height: 26px;
-		}
+		right: 0px;
+		width: 26px;
+		height: 26px;
 	}
 	&__button {
 		position: absolute;
@@ -69,21 +65,17 @@
 	}
 	&__info {
 		@include govuk-font($size: 16);
-		& {
-			cursor: auto;
-		}
-		& {
-			position:absolute;
-			width:0px;
-			overflow: hidden;
-			box-sizing: border-box;
-			visibility: hidden;
-			top: auto;
-			bottom: 100%;
-			left: 0px;
-			padding-bottom: 10px;
-			text-align: left;
-		}
+		cursor: auto;
+		position:absolute;
+		width:0px;
+		overflow: hidden;
+		box-sizing: border-box;
+		visibility: hidden;
+		top: auto;
+		bottom: 100%;
+		left: 0px;
+		padding-bottom: 10px;
+		text-align: left;
 	}
 	&__text {
 		position: relative;
diff --git a/server/src/sass/components/_tooltip.scss b/server/src/sass/components/_tooltip.scss
new file mode 100644
index 000000000..9f4909e7f
--- /dev/null
+++ b/server/src/sass/components/_tooltip.scss
@@ -0,0 +1,121 @@
+.defra-tooltip {
+	position: relative;
+}
+.defra-tooltip__label {
+	display: none;
+	position: absolute;
+}
+.defra-tooltip__label-inner {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle;
+	width: max-content;
+	max-width: 200px;
+	padding: 4px 5px;
+	background: govuk-colour(black);
+	border: 2px solid govuk-colour(black);
+	margin-bottom: 0;
+	&:after {
+			content: '';
+			position: absolute;
+			box-sizing: border-box;
+			z-index: 1;
+			width: 10px;
+			height: 10px;
+			color: govuk-colour(black);
+			border: 5px solid currentcolor;
+			-webkit-transform: rotate(135deg);
+			-moz-transform: rotate(135deg);
+			-o-transform: rotate(135deg);
+			transform: rotate(135deg);
+	}
+}
+.defra-tooltip__label-inner.govuk-body-s {
+	color: white;
+	margin-bottom: 0;
+}
+
+// Above and below
+.defra-tooltip--below .defra-tooltip__label,
+.defra-tooltip--above .defra-tooltip__label {
+	width: 200px;
+	left: 50%;
+	text-align: center;
+	margin-left: -100px;
+}
+
+.defra-tooltip--below .defra-tooltip__label {
+	top: 100%;
+}
+
+.defra-tooltip--above .defra-tooltip__label {
+	bottom: 100%;
+}
+
+.defra-tooltip--below .defra-tooltip__label-inner,
+.defra-tooltip--above .defra-tooltip__label-inner {
+	&:after {
+			left: 50%;
+			margin-left: -4px;
+	}
+}
+.defra-tooltip--below .defra-tooltip__label-inner {
+	margin-top: 10px;
+	&:after {
+			top: -6px;
+	}
+}
+
+.defra-tooltip--above .defra-tooltip__label-inner {
+	margin-bottom: 10px;
+	&:after {
+			bottom: -6px;
+	}
+}
+
+// Left and right
+.defra-tooltip--left .defra-tooltip__label,
+.defra-tooltip--right .defra-tooltip__label {
+	height: 150%;
+	top: -25%;
+	// &:before {
+	// 		content: '';
+	// 		display: inline-block;
+	// 		height: 100%; 
+	// 		vertical-align: middle;
+	// }
+}
+
+.defra-tooltip--left .defra-tooltip__label-inner,
+.defra-tooltip--right .defra-tooltip__label-inner {
+	&:after {
+			top: 50%;
+			margin-top: -4px;
+	}
+}
+
+.defra-tooltip--left .defra-tooltip__label {
+	right: 100%;
+}
+
+.defra-tooltip--left .defra-tooltip__label-inner {
+	margin-right: 10px;
+	&:after {
+			right: -6px;
+	}
+}
+
+.defra-tooltip--right .defra-tooltip__label {
+	left: 100%;
+}
+
+.defra-tooltip--right .defra-tooltip__label-inner {
+	margin-left: 10px;
+	&:after {
+			left: -6px;
+	}
+}
+
+.defra-tooltip--visible .defra-tooltip__label {
+	display: block;
+}
diff --git a/server/views/partials/latest-levels.html b/server/views/partials/latest-levels.html
index 099f7e447..0d9386ef1 100644
--- a/server/views/partials/latest-levels.html
+++ b/server/views/partials/latest-levels.html
@@ -9,7 +9,7 @@ <h2 class="defra-live__title">Latest level{% if model.latestLevels.length > 1 %}
       <p class="defra-flood-meta defra-flood-meta--no-border govuk-!-margin-bottom-0"><strong>{{ warnings.formatted_time }}</strong></p>
       <p>The {{ warnings.river_name }} level at {{ warnings.agency_name }} was {{ warnings.latest_level | toFixed(2) }} metres. Property flooding is possible when it goes above {{ warnings.threshold_value | toFixed(2) }} metres.
         {% if model.latestLevels.length > 1 %}
-        <a href="/station/{{ warnings.rloi_id }}{% if warnings.direction == 'd' %}-downstage{% endif %}">Monitor the {{ warnings.river_name }} level at {{ warnings.agency_name }}</a>
+        <a href="/station/{{ warnings.rloi_id }}{% if warnings.direction == 'd' %}-downstage{% endif %}?tid={{warnings.station_threshold_id}}">Monitor the {{ warnings.river_name }} level at {{ warnings.agency_name }}</a>
         {% endif %}
       </p>
       {% if model.latestLevels.length == 1 %}
@@ -20,4 +20,4 @@ <h2 class="defra-live__title">Latest level{% if model.latestLevels.length > 1 %}
     {% endif %}
   </div>
   {% endfor %}
-</div>
\ No newline at end of file
+</div>
diff --git a/server/views/station.html b/server/views/station.html
index d68dc9008..d10da525e 100644
--- a/server/views/station.html
+++ b/server/views/station.html
@@ -263,10 +263,12 @@ <h2 class="govuk-heading-s govuk-!-margin-top-4 govuk-!-margin-bottom-4">Height
 {% if model.thresholds.length > 0 %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
-    <h2 class="govuk-heading-s govuk-!-margin-bottom-4">How levels here could affect nearby areas</h2>
-    {% if model.station.hasImpacts %}
+    <h2 class="govuk-heading-s govuk-!-margin-bottom-4"data-toggletip data-toggletip-label="More information about historical events" data-toggletip-content="Flooding might not happen again at the same historical levels if, for example, flood defences are now in place.">How levels here could affect nearby areas</h2>
+    <div>
+      {% if model.station.hasImpacts %}
     <span id="toggle-list-display" data-toggle-list-display-type="impact"></span>
     {% endif %}
+    </div>
     <dl class="defra-flood-impact-list govuk-!-margin-bottom-4" id="impact-list">
       {% for band in model.thresholds %}
       <div class="defra-flood-impact-list__row {% if band.isLatest %} defra-flood-impact-list__row--current {% elif band.isExceeded %} defra-flood-impact-list__row--exceeded{% endif %}" {% if band.type === 'historical' %} data-toggle-list-display-item="impact" {% endif %}>
diff --git a/test/models/floods.js b/test/data/floods.js
similarity index 100%
rename from test/models/floods.js
rename to test/data/floods.js
diff --git a/test/data/taThresholdsData.json b/test/data/taThresholdsData.json
index 6297a90d0..e3ebf315b 100644
--- a/test/data/taThresholdsData.json
+++ b/test/data/taThresholdsData.json
@@ -2,6 +2,7 @@
   "singleActiveOffline": [
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -16,6 +17,7 @@
   "singleSuspended": [
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Suspended",
@@ -30,6 +32,7 @@
   "singleClosed": [
     {
       "rloi_id": 7202,
+      "station_threshold_id": 123458,
       "river_name": "River Test",
       "agency_name": "Test Road",
       "status": "Closed",
@@ -44,6 +47,7 @@
   "multipleNormalClosed": [
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -56,6 +60,7 @@
     },
     {
       "rloi_id": 7202,
+      "station_threshold_id": 123458,
       "river_name": "River Test",
       "agency_name": "Test Road",
       "status": "Closed",
@@ -70,6 +75,7 @@
   "multipleNormalActiveOfflineWelshNoValues": [
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -82,6 +88,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -94,6 +101,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Welsh",
       "agency_name": "Welsh Station",
       "status": "Active",
@@ -108,6 +116,7 @@
   "multipleNormalSuspendedClosed": [
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -120,6 +129,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Suspended",
@@ -132,6 +142,7 @@
     },
     {
       "rloi_id": 7202,
+      "station_threshold_id": 123458,
       "river_name": "River Test",
       "agency_name": "Test Road",
       "status": "Closed",
@@ -146,6 +157,7 @@
   "allClosedOrWelshNoValues": [
     {
       "rloi_id": 7202,
+      "station_threshold_id": 123458,
       "river_name": "River Test",
       "agency_name": "Test Road",
       "status": "Closed",
@@ -158,6 +170,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Welsh",
       "agency_name": "Welsh Station",
       "status": "Active",
@@ -172,6 +185,7 @@
   "singleWelshWithValues": [
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Welsh",
       "agency_name": "Welsh Station",
       "status": "Active",
@@ -186,6 +200,7 @@
   "multipleLatestLevels": [
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -198,6 +213,7 @@
     },
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -210,6 +226,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -222,6 +239,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -234,6 +252,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Active",
@@ -246,6 +265,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Active",
@@ -260,6 +280,7 @@
   "overLimitLatestLevels": [
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -272,6 +293,7 @@
     },
     {
       "rloi_id": 7174,
+      "station_threshold_id": 123459,
       "river_name": "River Pinn",
       "agency_name": "Eastcote Road",
       "status": "Active",
@@ -284,6 +306,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -296,6 +319,7 @@
     },
     {
       "rloi_id": 7173,
+      "station_threshold_id": 123465,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -308,6 +332,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Active",
@@ -320,6 +345,7 @@
     },
     {
       "rloi_id": 7201,
+      "station_threshold_id": 123457,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Active",
@@ -332,6 +358,7 @@
     },
     {
       "rloi_id": 1111,
+      "station_threshold_id": 123500,
       "river_name": "River Pinn",
       "agency_name": "Moss Close",
       "status": "Active",
@@ -344,6 +371,7 @@
     },
     {
       "rloi_id": 1111,
+      "station_threshold_id": 123500,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -356,6 +384,7 @@
     },
     {
       "rloi_id": 1112,
+      "station_threshold_id": 123501,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
@@ -368,6 +397,7 @@
     },
     {
       "rloi_id": 1113,
+      "station_threshold_id": 123502,
       "river_name": "River Pinn",
       "agency_name": "Avenue Road",
       "status": "Active",
diff --git a/test/data/warning.json b/test/data/warning.json
new file mode 100644
index 000000000..cd72105e4
--- /dev/null
+++ b/test/data/warning.json
@@ -0,0 +1,19 @@
+{
+  "station_threshold_id":"1749487",
+  "station_id":"7332",
+  "fwis_code":"062FWF46Harpendn",
+  "fwis_type":"W",
+  "direction":"u",
+  "value":"2.1",
+  "threshold_type":"FW RES FW",
+  "rloi_id":7332,
+  "river_name":"River Lee",
+  "agency_name":"Harpenden",
+  "status":"Active",
+  "iswales":false,
+  "latest_level":"0.935",
+  "threshold_value":"1.6",
+  "value_timestamp":"2024-09-26T15:30:00.000Z",
+  "ta_name":"River Lee at Harpenden",
+  "severity_value":2
+}
diff --git a/test/models/lib/process-imtd-thresholds.js b/test/models/lib/process-imtd-thresholds.js
index aecbb088c..628c7214d 100644
--- a/test/models/lib/process-imtd-thresholds.js
+++ b/test/models/lib/process-imtd-thresholds.js
@@ -1,10 +1,11 @@
 const Lab = require('@hapi/lab')
 const Code = require('@hapi/code')
+const data = require('../../data')
 const lab = exports.lab = Lab.script()
 const processImtdThresholds = require('../../../server/models/views/lib/process-imtd-thresholds')
 
 const alertExpectedText = { id: 'alertThreshold', description: 'Low lying land flooding is possible above this level. One or more flood alerts may be issued', shortname: 'Possible flood alerts' }
-const warningExpectedText = { id: 'warningThreshold', description: 'Property flooding is possible above this level. One or more flood warnings may be issued', shortname: 'Possible flood warnings' }
+const warningExpectedText = { id: 'warningThreshold', description: 'Flood Warning issued: <a href="/target-area/062FWF46Harpendn">River Lee at Harpenden</a>', shortname: 'Possible flood warnings' }
 
 function expectThresholds (thresholds, warningThreshold, alertThreshold) {
   Code.expect(thresholds.length).to.equal(2)
@@ -15,7 +16,7 @@ function expectThresholds (thresholds, warningThreshold, alertThreshold) {
 lab.experiment('process IMTD thresholds test', () => {
   lab.experiment('given post processing is set to false', () => {
     lab.test('then thresholds should be returned as is', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 0, 0, false)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 0, 0, false)
       expectThresholds(thresholds, '2.10', '1.10')
     })
     lab.test('then single null thresholds should not be returned', async () => {
@@ -34,35 +35,35 @@ lab.experiment('process IMTD thresholds test', () => {
   })
   lab.experiment('given post processing is set to true', () => {
     lab.test('then thresholds should be returned as is when stageDatum is zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 0, 0, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 0, 0, true)
       expectThresholds(thresholds, '2.10', '1.10')
     })
     lab.test('then thresholds should be returned as adjusted when stageDatum is greater than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 2.2, 0, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 2.2, 0, true)
       expectThresholds(thresholds, '-0.10', '-1.10')
     })
     lab.test('then thresholds should be returned as is when stageDatum is less than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, -2.2, 0, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, -2.2, 0, true)
       expectThresholds(thresholds, '2.10', '1.10')
     })
     lab.test('then thresholds should be returned as adjusted when stageDatum is less than zero and stationSubtract is greater than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, -2.2, 0.5, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, -2.2, 0.5, true)
       expectThresholds(thresholds, '1.60', '0.60')
     })
     lab.test('then thresholds should be returned as is when stageDatum is less than zero and stationSubtract is less than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, -2.2, -0.5, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, -2.2, -0.5, true)
       expectThresholds(thresholds, '2.10', '1.10')
     })
     lab.test('then thresholds should be returned as is when stageDatum is equal to zero and stationSubtract is less than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 0, -0.5, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 0, -0.5, true)
       expectThresholds(thresholds, '2.10', '1.10')
     })
     lab.test('then thresholds should be returned as adjusted when stageDatum is equal to zero and stationSubtract is greater than than zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 0, 0.5, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 0, 0.5, true)
       expectThresholds(thresholds, '1.60', '0.60')
     })
     lab.test('then thresholds should be returned as is when stageDatum is equal to zero and stationSubtract is zero', async () => {
-      const thresholds = processImtdThresholds({ alert: 1.1, warning: 2.1 }, 0, 0, true)
+      const thresholds = processImtdThresholds({ alert: 1.1, warning: data.warning }, 0, 0, true)
       expectThresholds(thresholds, '2.10', '1.10')
     })
   })
diff --git a/test/routes/target-area.js b/test/routes/target-area.js
index 19343980c..04ab378a2 100644
--- a/test/routes/target-area.js
+++ b/test/routes/target-area.js
@@ -192,9 +192,9 @@ lab.experiment('Target-area tests', () => {
     Code.expect(response.payload).to.contain('<h2 class="defra-live__title">Latest levels</h2>')
     Code.expect(response.payload).to.contain('<p>The River Pinn level at Eastcote Road was 0.35 metres. Property flooding is possible when it goes above 1.40 metres.')
     Code.expect(response.payload).to.contain('<p>The River Pinn level at Avenue Road was 0.18 metres. Property flooding is possible when it goes above 1.46 metres.')
-    Code.expect(response.payload).to.contain(' <a href="/station/7173">Monitor the River Pinn level at Avenue Road</a>')
+    Code.expect(response.payload).to.contain('<a href="/station/7173?tid=123465">Monitor the River Pinn level at Avenue Road</a>')
     Code.expect(response.payload).to.contain('<p>The River Pinn level at Moss Close was 0.13 metres. Property flooding is possible when it goes above 1.15 metres.')
-    Code.expect(response.payload).to.contain('<a href="/station/7201">Monitor the River Pinn level at Moss Close</a>')
+    Code.expect(response.payload).to.contain('<a href="/station/7201?tid=123457">Monitor the River Pinn level at Moss Close</a>')
   })
   lab.test('Check flood severity banner link for Flood warning', async () => {
     const floodService = require('../../server/services/flood')