diff --git a/app/assets/sass/patterns/_check-your-answers.scss b/app/assets/sass/patterns/_check-your-answers.scss
index 1f36e7aac5..c8db2a6cf3 100644
--- a/app/assets/sass/patterns/_check-your-answers.scss
+++ b/app/assets/sass/patterns/_check-your-answers.scss
@@ -1,14 +1,7 @@
 .check-your-answers {
-
-  td {
-    @include core-19;
-    vertical-align: top;
-  }
+  border-bottom: 1px solid $border-colour;
 
   .change-answer {
-    text-align: right;
     font-weight: bold;
-    padding-right: 0;
   }
-
 }
diff --git a/docs/views/examples/check-your-answers-page.html b/docs/views/examples/check-your-answers-page.html
index d27aeed686..e6822ecae7 100644
--- a/docs/views/examples/check-your-answers-page.html
+++ b/docs/views/examples/check-your-answers-page.html
@@ -8,124 +8,90 @@
 
 <main id="content" role="main">
 
-  <h1 class="heading-large">
-    Check your answers before sending your application
-  </h1>
-
-  <table class="check-your-answers">
-
-    <thead>
-      <tr>
-        <th colspan="2">
-          <h2 class="heading-medium">
-            Organisations involved
-          </h2>
-        </th>
-        <th>
-        </th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <tr>
-        <td>
-          Exporter
-        </td>
-        <td>
-          Exporter name<br>
-          First line of address<br>
-          Second line of address<br>
-          Contact: Contact Name<br>
-          Tel: 01234 567 890<br>
-          Email: email@email.com
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Exporter name</span>
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          Producer
-        </td>
-        <td>
-          Producer name
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Producer name</span>
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          Site of export
-        </td>
-        <td>
-          Site of export name
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Site of export name</span>
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          Importer
-        </td>
-        <td>
-          Importer name<br>
-          First line of address<br>
-          Second line of address<br>
-          Contact: Contact Name<br>
-          Tel: 01234 567 890<br>
-          Email: email@email.com
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Importer name</span>
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          Recovery facilities
-        </td>
-        <td>
-          Recovery facilities name
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Recovery facilities name</span>
-          </a>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          Recovery site
-        </td>
-        <td>
-          Recovery site name
-        </td>
-        <td class="change-answer">
-          <a href="#">
-            Change <span class="visuallyhidden">Recovery site name</span>
-          </a>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h2 class="heading-medium">Now send your application</h2>
-
-  <p class="text">
-    By submitting this notification you are confirming that, to the best of your knowledge, the details you are providing are correct.
-  </p>
-
-  <div class="form-group">
-    <a href="confirmation-page" class="button">Accept and send application</a>
+  <div class="grid-row">
+
+    <div class="column-two-thirds">
+
+      <h1 class="heading-large">
+        Check your answers
+      </h1>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Exporter</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>ACME Exports<br />
+          First line of address<br />
+          Second line of address<br />
+          Contact: Contact Name<br />
+          Tel: 01234 567 890<br />
+          Email: email@email.com</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Exporter</span></a></p>
+        </footer>
+      </div>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Producer</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>ACME Products</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Producer</span></a></p>
+        </footer>
+      </div>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Site of export</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>Site of export name</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Site of export</span></a></p>
+        </footer>
+      </div>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Importer</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>ACME Imports<br>
+          First line of address<br />
+          Second line of address<br />
+          Contact: Contact Name<br />
+          Tel: 01234 567 890<br />
+          Email: email@email.com</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Importer</span></a></p>
+        </footer>
+      </div>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Recovery facilities</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>Recovery facilities name</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Recovery facilities</span></a></p>
+        </footer>
+      </div>
+
+      <div class="check-your-answers">
+        <h2 class="heading-small">Recovery site</h2>
+        <span class="visuallyhidden">Answer</span>
+        <p>Recovery site name</p>
+        <footer class="group">
+          <p><a href="#" class="change-answer">Edit<span class="visuallyhidden"> your answer for Recovery site</span></a></p>
+        </footer>
+      </div>
+
+      <h2 class="heading-medium">Now send your application</h2>
+
+      <p class="text">
+        By submitting this notification you are confirming that, to the best of your knowledge, the details you are providing are correct.
+      </p>
+
+      <div class="form-group">
+        <a href="confirmation-page" class="button">Accept and send application</a>
+      </div>
+
+    </div>
+
   </div>
 
 </main>