diff --git a/_fonts/.DS_Store b/_fonts/.DS_Store
index 1002665fb0..ae8e260d82 100644
Binary files a/_fonts/.DS_Store and b/_fonts/.DS_Store differ
diff --git a/_prototypes/end-to-end/confirm-address.html b/_prototypes/end-to-end/confirm-address.html
deleted file mode 100644
index 5c8df7ca15..0000000000
--- a/_prototypes/end-to-end/confirm-address.html
+++ /dev/null
@@ -1,163 +0,0 @@
----
-title: Version 1
-project: End to end prototype
-globalcss: false
-layout: eq-default-extras
-footer: census-transactional
-assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
-noONSLogoLink: true
----
-
-<link rel="stylesheet" href="../style.css"/>
-<div class="page__subheader"></div>
-
-<div class="page__container container">
-    <div class="grid grid--reverse">
-        <div class="grid__col col-4@m">
-        </div>
-        <div class="grid__col col-8@m">
-            <main role="main" id="main" class="page__main">
-                <div class="feedback__inline js-feedback-inline is-collapsed">
-                    <div class="feedback__border">
-                    </div>
-                </div>
-                <div class="panel panel--error u-mb-m js-error-box u-d-no">
-                    <div class="panel__header">
-                        <div class="panel__title u-fs-r--b">There 
-                      <span class="js-piping">is a {x} problem{s}</span> with your answer
-                    </div>
-                    </div>
-                    <div class="panel__body">
-                        
-                        <ol class="list list--bare">
-                            <li class="list__item js-address-correct-yes u-d-no">
-                                1. <a href="#error-message-address-correct-yes" class="list__link js-inpagelink">
-                                    Select an answer to continue
-                                </a>
-                            </li>
-                       </ol>
-                    </div>
-                </div>
-                <form name="trav" class="form qa-questionnaire-form u-mb-xl"
-                      role="form" autocomplete="new-password" novalidate="">
-                    <div class="group">
-                        <div class="block">
-                            <section class="section">
-                                <div class="question u-mb-s">
-                                    <h1 class="question__title u-fs-xl">
-                                        Is this the correct address?
-                                    </h1>
-                                </div>
-
-                                <p for="address-correct-yes"><span
-                                        class="full-address-text">Address not
-                                    set</span></p>
-
-                                <div class="answer__fields question__answer js-fields" id="radios">
-                                    <div class="field field--radio field--multiplechoice">
-                                        <fieldset>
-                                            <div class="field__item js-focusable-box">
-                                                <input required autocomplete="new-password" class="input input--radio js-focusable" type="radio"
-                                                       name="address-correct" id="address-correct-yes" data-error-msg="Select an answer to continue">
-                                                <label class="label label--inline" for="address-correct-yes">Yes, this is the correct address</label>
-                                            </div>
-
-                                            <div class="field__item js-focusable-box">
-                                                <input autocomplete="new-password" class="input input--radio js-focusable" type="radio"
-                                                       name="address-correct" id="address-correct-no">
-                                                <label class="label label--inline" for="address-correct-no">No, this is not the correct address
-                                                </label>
-                                            </div>
-                                        </fieldset>
-                                    </div>
-                                </div>
-                            </section>
-                        </div>
-                    </div>
-                </form>
-            </main>
-        </div>
-    </div>
-
-    <button class="qa-btn-submit btn btn-submit btn--primary btn--lg" data-qa="btn-submit" type="submit"
-            name="action[save_continue]">Continue
-    </button>
-</div>
-
-<script src='/js/compiled/end-to-end/bundle.js'></script>
-
-<script>
-    var yesbox = document.getElementById("address-correct-yes"),
-        nobox = document.getElementById("address-correct-no"),
-        hasErrors = false,
-        currentPage = 'confirm-address';
-
-    $('.qa-btn-submit').on('click', function (e) {
-        e.preventDefault();
-        const testFails = ($('input[type=radio]:checked').size() === 0);
-        window.ONS.utils.validateInputs(testFails, "input[type=radio]");
-        if (hasErrors) {
-            window.ONS.utils.calcErrors();
-            hasErrors = false;
-            return false;
-        } else {
-            if (yesbox.checked && sessionStorage.getItem("wlh_bookmark")) {
-                var path = sessionStorage.getItem("wlh_bookmark");
-                var loc = '..' + path.replace("/end-to-end", "") + (path === "/end-to-end/hub/" ? "" : "?continuing=true");
-            } else if (yesbox.checked) {
-                var loc = "../section-intro";
-            } else if (nobox.checked) {
-                var loc = '../uac-request-address/';
-                var currentJourney = 'unlinked-uac';
-            } else {
-                var loc = "../uac-request-address/"
-            }
-            document.trav.action = loc;
-            window.location = loc + '?' + 'previous=' + currentPage + '&current-journey=' + currentJourney;
-        }
-	});
-</script>
-
-<script>
-    var searchParams = new URLSearchParams(window.location.search),
-        previousPage = searchParams.get('previous'),
-        addressParam = searchParams.get('address');
-
-    if (addressParam) {
-        var address = JSON.parse(addressParam),
-            addressParts = [];
-
-        Object.keys(address)
-            .filter(function(key) { return !!address[key] })
-            .forEach(function (key) {
-                sessionStorage.setItem(key, address[key]);
-                addressParts.push(address[key]);
-            })
-
-        sessionStorage.setItem('address', addressParts.join(', '));
-    }
-
-	$(function () {
-	  if(sessionStorage.getItem('address')) {
-		$('.full-address-text').html((sessionStorage.getItem('address') || '').replace(/,/g, '<br />'));
-      }
-	});
-
-	$(function () {
-		var oneWeekAgo = new Date();
-		oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
-		var options = {year: 'numeric', month: 'long', day: 'numeric'};
-		$('.one-week-ago').text(oneWeekAgo.toLocaleString('en-GB', options));
-	});
-
-    function updateAllLinks() {
-        if (previousPage === 'uac-entry') {
-            console.log(previousPage);
-            $('.js-previous-link').hide();
-        } else {
-            $('.js-previous-link').attr('href', '../' + previousPage + '?edit=true');
-        }
-    }
-
-    $(updateAllLinks);
-</script>
diff --git a/_prototypes/end-to-end/confirm-rh-address.html b/_prototypes/end-to-end/confirm-rh-address.html
index 07ea3c2cd9..c7cdd15e56 100644
--- a/_prototypes/end-to-end/confirm-rh-address.html
+++ b/_prototypes/end-to-end/confirm-rh-address.html
@@ -51,7 +51,7 @@ <h1 class="question__title u-fs-xl">
                                             <div class="field__item js-focusable-box">
                                                 <input autocomplete="new-password" class="input input--radio js-focusable" type="radio"
                                                        name="address-correct" id="address-correct-no">
-                                                <label class="label label--inline" for="address-correct-no">No, search for address again</label>
+                                                <label id="address-correct-no-label" class="label label--inline" for="address-correct-no">No, search for address again</label>
                                             </div>
                                         </fieldset>
                                     </div>
@@ -74,6 +74,7 @@ <h1 class="question__title u-fs-xl">
 
 <script>
 	var yesbox = document.getElementById("address-correct-yes");
+	var nobox = document.getElementById("address-correct-no");
     var urlParams = new URLSearchParams(window.location.search);
     var previousPage = urlParams.get('previous');
     var addressParam = urlParams.get('address');
@@ -89,34 +90,57 @@ <h1 class="question__title u-fs-xl">
     var addressLine3 = addressLines[2];
     var addressLine4 = addressLines[3];
     var roomNumber = (sessionStorage.getItem('ce-room-number') || '');
-
+console.log(currentJourney);
 	$('.qa-btn-submit').on('click', function (e) {
         e.preventDefault();
 
         /**
         * Routing
         */
+        // Correct address
         if (yesbox.checked) {
-            if (addressCountry === 'S') {
-                var url = '../address-in-scotland';
-            } else if (addressCountry != 'S' && addressType === 'CE') {
-                var url = '../confirm-rh-address-ce';
-            } else if (currentJourney === 'new-hh-paper') {
-                var url  = '../paper-request-hh-number';
-            } else if (currentJourney === 'unlinked-uac') {
-                var url  = '../section-intro';
+            // UAC entered
+            if (previousPage === 'uac-entry') {
+                var url = '../section-intro';
+            }
+            // Fulfilment
+            else if (previousPage === 'uac-request-address' && currentJourney != 'address-correction') {
+                // Address in England or Wales
+                if (addressCountry === 'E' || addressCountry === 'W') {
+                    // CE address
+                    if (addressType === 'CE') {
+                        var url = '../confirm-rh-address-ce';
+                    }
+                    // Household address
+                    else {
+                        // HH Paper fulfilment
+                        if (currentJourney === 'new-hh-paper') {
+                            var url = '../paper-request-hh-number';
+                        // HH Code fulfilment
+                        } else {
+                            var url = '../uac-request-method';
+                        }
+                    }
+                }
+                // Address outside England or Wales
+                else {
+                    var url = '../address-in-scotland';
+                }
             } else {
-                var url  = '../uac-request-method';
+                var url = '../section-intro';
             }
-            sessionStorage.setItem('address-line-1', addressLine1);
-            sessionStorage.setItem('address-line-2', addressLine2);
-            sessionStorage.setItem('address-town', addressLine3);
-            sessionStorage.setItem('address-postcode', addressLine4);
+
+        sessionStorage.setItem('address-line-1', addressLine1);
+        sessionStorage.setItem('address-line-2', addressLine2);
+        sessionStorage.setItem('address-town', addressLine3);
+        sessionStorage.setItem('address-postcode', addressLine4);
+
+        window.location.href = url + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + currentJourney;
         }
-        else {
+        else if (nobox.checked) {
             var url = '../uac-request-address';
+            window.location.href = url + '?' + 'previous=' + currentPage + '&' + 'current-journey=address-correction';
         }
-        window.location.href = url + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + currentJourney;
     });
 
     if (addressParam) {
@@ -169,12 +193,13 @@ <h1 class="question__title u-fs-xl">
         }
     }
 
-    function updateAnswer() {
-        if (addressCountry === 'S') {
-            $('.js-change-address').hide();
+    function updateTemplate() {
+        if (previousPage === 'uac-entry') {
+            $('#address-correct-no-label').html('No, this is not the correct address');
+           // $('.complete-later').hide();
         }
     }
 
     $(updateAllLinks);
-    $(updateAnswer);
+    $(updateTemplate);
 </script>
diff --git a/_prototypes/end-to-end/index.html b/_prototypes/end-to-end/index.html
index 7f5191014b..d725ec437c 100644
--- a/_prototypes/end-to-end/index.html
+++ b/_prototypes/end-to-end/index.html
@@ -156,6 +156,22 @@
     sessionStorage.setItem('address-town', document.getElementById('address-town').value);
     sessionStorage.setItem('address-postcode', document.getElementById('address-postcode').value);
 
+    // Temporary manual update address type for CEs  
+    var addressLine1 = document.getElementById('address-line-1').value.toLowerCase();
+    var addressLine2 = document.getElementById('address-line-2').value.toLowerCase();
+    var address = addressLine1 + addressLine2;
+    var array = [
+    "university", 
+    "howden apartments",
+    "care home",
+    "halls of residence",
+    "hall of residence"
+    ];
+
+    if (array.some(val => address.includes(val))) {
+    sessionStorage.setItem('address-type', 'CE');
+    }
+
     window.location = '../home/';
     }
   });
diff --git a/_prototypes/end-to-end/uac-entry.html b/_prototypes/end-to-end/uac-entry.html
index e92bcee760..1ad2f0c142 100644
--- a/_prototypes/end-to-end/uac-entry.html
+++ b/_prototypes/end-to-end/uac-entry.html
@@ -5,7 +5,6 @@
 layout: eq-default-extras
 footer: census-transactional
 assetPrefixUrl: https://sdc-global-design-patterns.netlify.com
-hideSaveLater: true
 logoUrl: ../home
 ---
 
@@ -130,7 +129,7 @@ <h3 class="collapsible__title js-collapsible-title icon--collapsible-simple u-fs
         if (uacInput.value == 'unl1 nk3d acc3 55c0') {
             window.location = '../uac-request-address/?previous=uac-entry&current-journey=unlinked-uac';
         } else {
-            window.location = '../confirm-address/';
+            window.location = '../confirm-rh-address/?previous=uac-entry';
         }
     }
   });
diff --git a/_prototypes/end-to-end/uac-request-address.html b/_prototypes/end-to-end/uac-request-address.html
index c4bfe8ca5c..66e12a71ea 100644
--- a/_prototypes/end-to-end/uac-request-address.html
+++ b/_prototypes/end-to-end/uac-request-address.html
@@ -110,7 +110,7 @@
     currentJourney = urlParams.get('current-journey'),
     currentPage = 'uac-request-address',
     hasErrors = false;
-
+console.log(currentJourney);
   $('.btn-submit').click(function(e) {
     e.preventDefault(); // do not submit the form like usual
     if (($("input[id='rh-proto-address']").val() == '') || ($('#address-typeahead-listbox').html().length)) {
@@ -146,20 +146,12 @@
 
       if (array.some(val => address.includes(val))) {
         sessionStorage.setItem('address-type', 'CE');
-        var currentJourney = 'new-ce-resident-uac';
-      } else {
-        var currentJourney = urlParams.get('current-journey');
       }
 
       window.location = '../confirm-rh-address/?' + 'previous=' + 'uac-request-address' + '&' + 'current-journey=' + currentJourney;
     }
   });
 
-  if(currentJourney === 'unlinked-uac'){
-    $('.js-question-description').hide();
-    $('.js-previous-link').hide();
-  }
-
   if (window.location.search == '?edit=true') {
     function updateEditableAddress() {
       $('#rh-proto-address').val(sessionStorage.getItem('address'));
@@ -182,6 +174,14 @@
   }
 
   function updateAllLinks() {
+
+    if(currentJourney === 'unlinked-uac'){
+      $('.js-question-description').hide();
+      $('.js-previous-link').hide();
+    } else if(currentJourney === 'address-correction'){
+      $('.js-question-description').hide();
+    }
+
       if (previousPage) {
         $('.js-previous-link').attr('href', '../' + previousPage);
       } else {
diff --git a/_prototypes/end-to-end/uac-request-confirm-address.html b/_prototypes/end-to-end/uac-request-confirm-address.html
index 8a948276c9..1eb84ee4cf 100644
--- a/_prototypes/end-to-end/uac-request-confirm-address.html
+++ b/_prototypes/end-to-end/uac-request-confirm-address.html
@@ -134,6 +134,8 @@ <h2 class="u-fs-m">Large print</h2>
             } else {
                 $('.js-name-address').html('<strong>' + addresseeName + '</strong>' + ', ' + roomNumber + '<br>' + addressLine1);
             }
+        } else {
+            $('.js-name-address').html('<strong>' + addresseeName + '</strong>' + '<br>' + addressLine1);
         }
     }