diff --git a/.env.local b/.env.local
index 1abbff2b..66ddea7d 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
 //ESNR Tenant
 TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
 //WGO Tenant
-TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
+//TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
 GRANT_TYPE = "client_credentials"
 
 HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
@@ -12,11 +12,11 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
 
 
 //Dev oauth ESNR
-//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
-//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
-//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
-//RELAYURI = "dev-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "dev-pedw-hc"
+CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
+CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
+RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+RELAYPATH = "dev-pedw-hc"
 
 
 //Test Oauth ESNR
@@ -28,11 +28,11 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
 
 
 //Preprod Oauth WGO
-CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
-CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
-RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
-RELAYURI = "pp-pedw-ns.servicebus.windows.net"
-RELAYPATH = "pp-pedw-hc"
+//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
+//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
+//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "pp-pedw-hc"
 
 
 
diff --git a/actions/index.js b/actions/index.js
index 9abf2817..3f7a91e8 100644
--- a/actions/index.js
+++ b/actions/index.js
@@ -492,6 +492,7 @@ export const getAppealID = (
                 caseReference
         )
         .then((res) => {
+            console.log(res.data);
             var appealID = res.data.value[0][primaryAttribute];
             return appealID;
         })
@@ -762,7 +763,7 @@ export const updateCase = async (
     primaryAttribute,
     caseReference
 ) => {
-    var data = JSON.stringify(updateBody);
+    var data = updateBody;
 
     var appealObj = await getAppealID(
         caseReference,
diff --git a/components/case/documents.js b/components/case/documents.js
index c440fb99..dc26bae0 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -178,25 +178,51 @@ const DocumentDetails = (props) => {
                                                 key={key}
                                             >
                                                 <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
-                                                    <a
+                                                    {showDownloadingState ===
+                                                        key && (
+                                                        <div className="coverLoadingLink downloading">
+                                                            {/* <img
+                                                                className="data-loading-icon"
+                                                                src="/assets/images/loading.gif"
+                                                                alt={
+                                                                    router.locale ==
+                                                                    "cy"
+                                                                        ? "Nôl data"
+                                                                        : "Fetching data"
+                                                                }
+                                                            /> */}
+                                                        </div>
+                                                    )}
+
+                                                    <Link
+                                                        scroll={false}
                                                         href={
                                                             detailsObj.pinswg_hashlink
                                                         }
                                                     >
-                                                        <span className="results-visually-hidden">
-                                                            {t(
-                                                                "case:documents-name-label"
-                                                            )}
-                                                            :
-                                                        </span>
-                                                        {_.has(historyObj, [
-                                                            "_pinswg_documentid_value@OData.Community.Display.V1.FormattedValue",
-                                                        ])
-                                                            ? historyObj[
-                                                                  "_pinswg_documentid_value@OData.Community.Display.V1.FormattedValue"
-                                                              ]
-                                                            : ""}
-                                                    </a>
+                                                        <a
+                                                            key={key}
+                                                            onClick={() => {
+                                                                toggleDownLoadLink(
+                                                                    key
+                                                                );
+                                                            }}
+                                                        >
+                                                            <span className="results-visually-hidden">
+                                                                {t(
+                                                                    "case:documents-name-label"
+                                                                )}
+                                                                :
+                                                            </span>
+                                                            {_.has(historyObj, [
+                                                                "_pinswg_documentid_value@OData.Community.Display.V1.FormattedValue",
+                                                            ])
+                                                                ? historyObj[
+                                                                      "_pinswg_documentid_value@OData.Community.Display.V1.FormattedValue"
+                                                                  ]
+                                                                : ""}
+                                                        </a>
+                                                    </Link>
                                                 </dd>
                                                 <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                                     <span className="results-visually-hidden">
@@ -416,6 +442,19 @@ const DocumentDetails = (props) => {
 
     const [showSpinnerState, setShowSpinnerState] = useState(false);
 
+    const [showDownloadingState, setShowDownloadingState] = useState(null);
+
+    const toggleDownLoadLink = (i) => {
+        setShowDownloadingState(i);
+
+        const downloadTime = setTimeout(hideDownloadCover, 5000);
+        downloadTime;
+    };
+
+    function hideDownloadCover() {
+        setShowDownloadingState(null);
+    }
+
     let spinnerState = () => {
         showSpinnerState == true
             ? setShowSpinnerState(false)
@@ -442,6 +481,7 @@ const DocumentDetails = (props) => {
                 ? setfieldSortState("asc")
                 : setfieldSortState("desc")
             : setfieldSortState("asc");
+        setCurrentPage(1);
         setShowSpinnerState(true);
     };
 
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index c7d2db65..95c6ac98 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -143,7 +143,7 @@ const TopThree = (props) => {
             <div className="cardModuleItem" key={index}>
                 <div className="cardModuleDetails">
                     <div className="cardModuleReference">
-                        <b>{t("myportal:case-reference")}:</b>{" "}
+                        <b>{t("myportal:case-reference")}:</b>
                         <Link
                             href={
                                 topThreeType == "awaitingSubmission"
@@ -212,6 +212,10 @@ const TopThree = (props) => {
                                       ]}
                             </a>
                         </Link>
+                        {topThreeType == "awaitingSubmission" &&
+                            showTopThreeArr[key][
+                                "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+                            ]}
                     </div>
                     {topThreeType != "awaitingSubmission" ? (
                         <div className="carModuleAddress">
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index 0d050c8f..855f9386 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -5,6 +5,7 @@ import { setCurrentReference } from "../../store/currentView/action";
 import { connect } from "react-redux";
 import jsonpath from "jsonpath";
 import transLookup from "../../data/lookuptranslations.json";
+import { getFormCollectionByID } from "../../components/utils";
 
 const ViewAllResults = (props) => {
     const {
@@ -23,6 +24,22 @@ const ViewAllResults = (props) => {
     var resultsArr = props[currentView.viewKey][currentView.viewKey].value || [
         {},
     ];
+
+    function formatDates(dateObj) {
+        var dateObj = new Date(dateObj);
+        var dd = String(dateObj.getDate()).padStart(2, "0");
+        var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
+        var yyyy = dateObj.getFullYear();
+
+        return dd + "/" + mm + "/" + yyyy;
+    }
+
+    console.log(
+        currentView.viewKey,
+        props[currentView.viewKey],
+        props[currentView.viewKey][currentView.viewKey].value
+    );
+
     var searchDetailsObj =
         props[currentView.viewKey][currentView.viewKey + "Details"] || {};
     let resultsRowArr = [];
@@ -38,7 +55,25 @@ const ViewAllResults = (props) => {
                 <dd className="govuk-summary-list__value govuk-!-font-size-16  govuk-!-padding-left-2">
                     <Link
                         href={
-                            router.locale == "cy"
+                            currentView.viewKey == "awaitingSubmission"
+                                ? router.locale == "cy"
+                                    ? "/fymhorth/parhauigyflwyno"
+                                    : "/myportal" +
+                                      "/" +
+                                      getFormCollectionByID(
+                                          resultsArr[key].pinswg_appealcasetype
+                                      ).UrlName +
+                                      "?lpa=" +
+                                      resultsArr[key][
+                                          "_pinswg_associatedlpa_value"
+                                      ] +
+                                      "&apt=" +
+                                      resultsArr[key].pinswg_appealcasetype +
+                                      "&casereference=" +
+                                      resultsArr[key].pinswg_title +
+                                      "&inid=" +
+                                      resultsArr[key].incidentid
+                                : router.locale == "cy"
                                 ? myportal == true
                                     ? "/fymhorth/achos"
                                     : "/achos"
@@ -119,12 +154,16 @@ const ViewAllResults = (props) => {
                 </dd>
                 <dd className="govuk-summary-list__value govuk-!-font-size-16">
                     <span className="results-visually-hidden">
-                        {t("search:searchresults-applicant-label")}:
+                        {currentView.viewKey == "awaitingSubmission"
+                            ? "Created on"
+                            : t("search:searchresults-applicant-label")}
                     </span>
 
-                    {_.has(detailsObj, [
-                        "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
-                    ])
+                    {currentView.viewKey == "awaitingSubmission"
+                        ? formatDates(item.createdon)
+                        : _.has(detailsObj, [
+                              "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
+                          ])
                         ? detailsObj[
                               "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
                           ]
@@ -207,9 +246,15 @@ const ViewAllResults = (props) => {
                             <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t("search:searchresults-site-address-label")}
                             </dd>
-                            <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                                {t("search:searchresults-applicant-label")}
-                            </dd>
+                            {currentView.viewKey == "awaitingSubmission" ? (
+                                <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                    Created on
+                                </dd>
+                            ) : (
+                                <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                    {t("search:searchresults-applicant-label")}
+                                </dd>
+                            )}
                             <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t("search:searchresults-authority-label")}
                             </dd>
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index fbac81a8..def05873 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -56,7 +56,7 @@ let BuildCheckSection = (props) => {
     };
 
     return (
-        <div className="govuk-grid-row">
+        <div className="govuk-grid-row" key={1222}>
             <div className="govuk-grid-column-full">
                 <div>
                     <h1 className="govuk-heading-m">
@@ -64,7 +64,7 @@ let BuildCheckSection = (props) => {
                     </h1>
                     <dl className="govuk-summary-list ">
                         {Object.keys(titles).map((key) => (
-                            <>
+                            <div key={key}>
                                 {/* <h2 className="govuk-heading-m">
                                 {titles[key].value}
                             </h2> */}
@@ -77,7 +77,7 @@ let BuildCheckSection = (props) => {
                                     key={key}
                                     mandatoryFieldsData={mandatoryFieldsData}
                                 />
-                            </>
+                            </div>
                         ))}
                     </dl>
                     <dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list"></dl>
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index 6acb0b31..3e7f9968 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -20,7 +20,9 @@ let CompleteAppeal = (props) => {
             props.appealType.appealTypeID
         );
         let updateBindAppealTypeToIncident =
-            appTypeCollection.LogicalName + "Ids";
+            appTypeCollection.NavigationProperty;
+
+        console.log(props.appealType.appealTypeID, appTypeCollection);
 
         Object.assign(updateBody, {
             "pinswg_Appellant@odata.bind":
@@ -58,23 +60,6 @@ let CompleteAppeal = (props) => {
         props.appealType.appealTypeID,
     ]);
 
-    const getFormCollection = (formtype) => {
-        const collectionName = jsonpath.query(
-            data,
-            "$..[?(@.LogicalName=='" + formtype + "')]"
-        );
-        //console.log(collectionName[0]);
-        return collectionName[0];
-    };
-
-    const getPrimaryAttr = (formtype) => {
-        const attrName = jsonpath.query(
-            data,
-            "$..[?(@.LogicalName=='" + formtype + "')].PrimaryIdAttribute"
-        );
-        return attrName[0];
-    };
-
     let { t } = useTranslation();
 
     const router = useRouter();
@@ -90,23 +75,6 @@ let CompleteAppeal = (props) => {
     } = props;
 
     const currentSection = props.appealType.currentSection;
-    const parser = new DOMParser();
-    var doc = parser.parseFromString(props.formXML, "text/xml");
-    var titles = xpath.select(
-        "//form/tabs/tab[" + currentSection + " ]/labels/label/@description",
-        doc
-    );
-    var rowXML = xpath.select(
-        "/form/tabs/tab[" +
-            currentSection +
-            "]/columns//sections/section/rows/row",
-        doc
-    );
-
-    var titleList = xpath.select(
-        "//form/tabs/tab[*]/labels/label/@description",
-        doc
-    );
 
     const handleParam = (setValue) => (e) => setValue(e.target.value);
 
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 0a76257f..6b703ec2 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -340,6 +340,7 @@ const DNSSearchResults = (props) => {
                 ? setfieldSortState("asc")
                 : setfieldSortState("desc")
             : setfieldSortState("asc");
+        setCurrentPage(1);
         setShowSpinnerState(true);
     };
 
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 8365208b..74ae97c9 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -584,6 +584,7 @@ const SearchResults = (props) => {
                 ? setfieldSortState("asc")
                 : setfieldSortState("desc")
             : setfieldSortState("asc");
+        setCurrentPage(1);
         setShowSpinnerState(true);
     };
 
diff --git a/data/collections.json b/data/collections.json
index 38bd23d0..a6599123 100644
--- a/data/collections.json
+++ b/data/collections.json
@@ -1,60 +1,13 @@
 {
     "value": [
-        {
-            "LogicalCollectionName": "pinswg_planningobligationss106flows",
-            "LogicalName": "pinswg_planningobligationss106flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "efb4c590-19be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_dnsflows",
-            "LogicalName": "pinswg_dnsflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "328e015f-dabe-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_harbourrevisionorderflows",
-            "LogicalName": "pinswg_harbourrevisionorderflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "98bbb26e-e7be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_transportandworkactflows",
-            "LogicalName": "pinswg_transportandworkactflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "ad4bfc8c-e1be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_maintenanceoflands127flows",
-            "LogicalName": "pinswg_maintenanceoflands127flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "2b26362c-d3be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_environmentalpermittingflows",
-            "LogicalName": "pinswg_environmentalpermittingflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "74dd4767-f2be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
         {
             "LogicalCollectionName": "pinswg_dnses",
             "LogicalName": "pinswg_dns",
             "PrimaryIdAttribute": "pinswg_dnsid",
             "UrlName": "dns",
             "MetadataId": "36f07225-4a82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040011"
+            "appealTypeID": "846040011",
+            "NavigationProperty": "pinswg_DNSIds"
         },
         {
             "LogicalCollectionName": "pinswg_planningobligationappeals106s",
@@ -62,7 +15,8 @@
             "PrimaryIdAttribute": "pinswg_planningobligationappeals106id",
             "UrlName": "planningobligationappeals106",
             "MetadataId": "cb8beeae-8f81-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040003"
+            "appealTypeID": "846040003",
+            "NavigationProperty": "pinswg_PlanningObligationAppealS106Ids"
         },
         {
             "LogicalCollectionName": "pinswg_planningconditionss73s79s",
@@ -70,7 +24,8 @@
             "PrimaryIdAttribute": "pinswg_planningconditionss73s79id",
             "UrlName": "planningconditionss73s79",
             "MetadataId": "093bf9ff-8d81-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040001"
+            "appealTypeID": "846040001",
+            "NavigationProperty": "pinswg_PlanningConditionsS73S79Ids"
         },
         {
             "LogicalCollectionName": "pinswg_rows",
@@ -78,7 +33,8 @@
             "PrimaryIdAttribute": "pinswg_rowid",
             "UrlName": "row",
             "MetadataId": "4ccc6e93-4f82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040015"
+            "appealTypeID": "846040015",
+            "NavigationProperty": "pinswg_ROWIds"
         },
         {
             "LogicalCollectionName": "pinswg_transportandworkacts",
@@ -86,7 +42,8 @@
             "PrimaryIdAttribute": "pinswg_transportandworkactid",
             "UrlName": "transportandworkact",
             "MetadataId": "bc3edc4b-7d82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040013"
+            "appealTypeID": "846040013",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_transportandworkacts",
@@ -94,7 +51,8 @@
             "PrimaryIdAttribute": "pinswg_transportandworkactid",
             "UrlName": "transportandworkact",
             "MetadataId": "bc3edc4b-7d82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040013"
+            "appealTypeID": "846040013",
+            "NavigationProperty": "pinswg_TransportandWorkActIdspinswg_TransportandWorkActIds"
         },
         {
             "LogicalCollectionName": "pinswg_transportandworkacts",
@@ -102,23 +60,8 @@
             "PrimaryIdAttribute": "pinswg_transportandworkactid",
             "UrlName": "transportandworksact",
             "MetadataId": "bc3edc4b-7d82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040013"
-        },
-        {
-            "LogicalCollectionName": "pinswg_wayleaveflows",
-            "LogicalName": "pinswg_wayleaveflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "a28054b9-e3be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_planningappeals78flows",
-            "LogicalName": "pinswg_planningappeals78flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "ddaebde1-0fbe-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040013",
+            "NavigationProperty": "pinswg_TransportandWorkActIdspinswg_TransportandWorkActIds"
         },
         {
             "LogicalCollectionName": "pinswg_harbourrevisionorders",
@@ -126,7 +69,8 @@
             "PrimaryIdAttribute": "pinswg_harbourrevisionorderid",
             "UrlName": "harbourrevisionorder",
             "MetadataId": "dc8dcd0d-4f82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040014"
+            "appealTypeID": "846040014",
+            "NavigationProperty": "pinswg_HarbourRevisionOrderIds"
         },
         {
             "LogicalCollectionName": "pinswg_miscellaneouscaseworks",
@@ -134,7 +78,8 @@
             "PrimaryIdAttribute": "pinswg_miscellaneouscasewordid",
             "UrlName": "miscellaneouscasework",
             "MetadataId": "f519aa8e-5782-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040022"
+            "appealTypeID": "846040022",
+            "NavigationProperty": "pinswg_MiscellaneousCasewordIds"
         },
         {
             "LogicalCollectionName": "pinswg_miscellaneouscaseworks",
@@ -142,7 +87,8 @@
             "PrimaryIdAttribute": "pinswg_miscellaneouscasewordid",
             "UrlName": "miscellaneouscasework",
             "MetadataId": "f519aa8e-5782-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040022"
+            "appealTypeID": "846040022",
+            "NavigationProperty": "pinswg_MiscellaneousCasewordIds"
         },
         {
             "LogicalCollectionName": "pinswg_localdevelopmentplanses",
@@ -150,7 +96,8 @@
             "PrimaryIdAttribute": "businessprocessflowinstanceid",
             "UrlName": "localdevelopmentplans",
             "MetadataId": "38ed3835-c1e0-eb11-aac5-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_planningappeals78s",
@@ -158,15 +105,8 @@
             "PrimaryIdAttribute": "pinswg_planningappeals78id",
             "UrlName": "planningappeals78",
             "MetadataId": "8d7f813a-4183-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040000"
-        },
-        {
-            "LogicalCollectionName": "pinswg_enforcementnoticeappealsflow174s",
-            "LogicalName": "pinswg_enforcementnoticeappealsflow174",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "enforcementnoticeappealsflow174",
-            "MetadataId": "a933cf28-20be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040000",
+            "NavigationProperty": "pinswg_PlanningAppealS78Ids"
         },
         {
             "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates",
@@ -174,7 +114,8 @@
             "PrimaryIdAttribute": "pinswg_lawfuldevelopmentcertificatappid",
             "UrlName": "lawfuldevelopmentcertificate",
             "MetadataId": "184e4861-9681-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040008"
+            "appealTypeID": "846040008",
+            "NavigationProperty": "pinswg_LawfulDevelopmentCertificatAppIds"
         },
         {
             "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates",
@@ -182,7 +123,8 @@
             "PrimaryIdAttribute": "pinswg_lawfuldevelopmentcertificatappid",
             "UrlName": "lawfuldevelopmentcertificateappeals1941",
             "MetadataId": "184e4861-9681-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040008"
+            "appealTypeID": "846040008",
+            "NavigationProperty": "pinswg_LawfulDevelopmentCertificatAppIds"
         },
         {
             "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates",
@@ -190,23 +132,17 @@
             "PrimaryIdAttribute": "pinswg_lawfuldevelopmentcertificatappid",
             "UrlName": "lawfuldevelopmentcertificate",
             "MetadataId": "184e4861-9681-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040008"
-        },
-        {
-            "LogicalCollectionName": "pinswg_highhedgestreepreservationflows",
-            "LogicalName": "pinswg_highhedgestreepreservationflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "c365b924-f3be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040008",
+            "NavigationProperty": "pinswg_LawfulDevelopmentCertificatAppIds"
         },
         {
             "LogicalCollectionName": "pinswg_householderappealhases",
-            "LogicalName": "pinswg_HouseholderAppealHAS",
+            "LogicalName": "pinswg_householderappealhas",
             "PrimaryIdAttribute": "pinswg_householderappealhasid",
             "UrlName": "householderappealhas",
             "MetadataId": "a6c728b0-9081-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040004"
+            "appealTypeID": "846040004",
+            "NavigationProperty": "pinswg_HouseholderAppealHASIds"
         },
         {
             "LogicalCollectionName": "pinswg_enforcementlistedbuildingconservationaps",
@@ -214,7 +150,8 @@
             "PrimaryIdAttribute": "pinswg_enforcementlistedbuildingconseid",
             "UrlName": "enforcementlistedbuildingconservationap",
             "MetadataId": "c697be96-9481-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040006"
+            "appealTypeID": "846040006",
+            "NavigationProperty": "pinswg_EnforcementListedBuildingConseIds"
         },
         {
             "LogicalCollectionName": "pinswg_enforcementlistedbuildingconservationaps",
@@ -222,7 +159,8 @@
             "PrimaryIdAttribute": "pinswg_enforcementlistedbuildingconseid",
             "UrlName": "enforcementlistedbuildingconservationap",
             "MetadataId": "c697be96-9481-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040006"
+            "appealTypeID": "846040006",
+            "NavigationProperty": "pinswg_EnforcementListedBuildingConseIds"
         },
         {
             "LogicalCollectionName": "pinswg_enforcementlistedbuildingconservationaps",
@@ -230,7 +168,8 @@
             "PrimaryIdAttribute": "pinswg_enforcementlistedbuildingconseid",
             "UrlName": "enforcementlistedbuildingconservationap",
             "MetadataId": "c697be96-9481-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040006"
+            "appealTypeID": "846040006",
+            "NavigationProperty": "pinswg_EnforcementListedBuildingConseIds"
         },
         {
             "LogicalCollectionName": "pinswg_callinss77s",
@@ -238,7 +177,8 @@
             "PrimaryIdAttribute": "pinswg_callinss77id",
             "UrlName": "callinss77",
             "MetadataId": "dd309e51-4982-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040010"
+            "appealTypeID": "846040010",
+            "NavigationProperty": "pinswg_CallInsS77Ids"
         },
         {
             "LogicalCollectionName": "pinswg_commonlands",
@@ -246,7 +186,8 @@
             "PrimaryIdAttribute": "pinswg_commonlandid",
             "UrlName": "commonland",
             "MetadataId": "4161a618-5082-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040016"
+            "appealTypeID": "846040016",
+            "NavigationProperty": "pinswg_CommonLandIds"
         },
         {
             "LogicalCollectionName": "pinswg_advertses",
@@ -254,7 +195,8 @@
             "PrimaryIdAttribute": "pinswg_advertsid",
             "UrlName": "adverts",
             "MetadataId": "0735866b-5482-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040018"
+            "appealTypeID": "846040018",
+            "NavigationProperty": "pinswg_AdvertsIds"
         },
         {
             "LogicalCollectionName": "pinswg_hedgeshedgerowstreepreservationreplacems",
@@ -262,7 +204,8 @@
             "PrimaryIdAttribute": "pinswg_hedgeshedgerowstreepreservatioid",
             "UrlName": "hedgeshedgerowstreepreservationreplacem",
             "MetadataId": "60f38fed-5382-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040017"
+            "appealTypeID": "846040017",
+            "NavigationProperty": "pinswg_HedgesHedgerowsTreePreservatioIds"
         },
         {
             "LogicalCollectionName": "pinswg_hedgeshedgerowstreepreservationreplacems",
@@ -270,7 +213,8 @@
             "PrimaryIdAttribute": "pinswg_hedgeshedgerowstreepreservatioid",
             "UrlName": "hedgeshedgerowstreepreservationreplacem",
             "MetadataId": "60f38fed-5382-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040017"
+            "appealTypeID": "846040017",
+            "NavigationProperty": "pinswg_HedgesHedgerowsTreePreservatioIds"
         },
         {
             "LogicalCollectionName": "pinswg_hedgeshedgerowstreepreservationreplacems",
@@ -278,7 +222,8 @@
             "PrimaryIdAttribute": "pinswg_hedgeshedgerowstreepreservatioid",
             "UrlName": "hedgeshedgerowstreepreservationreplacem",
             "MetadataId": "60f38fed-5382-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040017"
+            "appealTypeID": "846040017",
+            "NavigationProperty": "pinswg_HedgesHedgerowsTreePreservatioIds"
         },
         {
             "LogicalCollectionName": "pinswg_compulsorypurchaseorderses",
@@ -286,7 +231,8 @@
             "PrimaryIdAttribute": "pinswg_compulsorypurchaseordersid",
             "UrlName": "compulsorypurchaseorders",
             "MetadataId": "054da4c7-5582-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040019"
+            "appealTypeID": "846040019",
+            "NavigationProperty": "pinswg_CompulsoryPurchaseOrdersIds"
         },
         {
             "LogicalCollectionName": "pinswg_communityinfrastructurelevys117118119s",
@@ -294,7 +240,8 @@
             "PrimaryIdAttribute": "pinswg_communityinfrastructurelevyid",
             "UrlName": "communityinfrastructurelevys117118119",
             "MetadataId": "0c309f3c-4882-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040009"
+            "appealTypeID": "846040009",
+            "NavigationProperty": "pinswg_CommunityInfrastructureLevyIds"
         },
         {
             "LogicalCollectionName": "pinswg_objectiveconfigs",
@@ -302,7 +249,8 @@
             "PrimaryIdAttribute": "pinswg_objectiveconfigid",
             "UrlName": "objectiveconfig",
             "MetadataId": "f89ae20c-4777-eb11-aabd-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_nonvalidations",
@@ -310,15 +258,8 @@
             "PrimaryIdAttribute": "pinswg_nonvalidationid",
             "UrlName": "nonvalidation",
             "MetadataId": "37f31a93-5882-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040024"
-        },
-        {
-            "LogicalCollectionName": "pinswg_rightofwayflows",
-            "LogicalName": "pinswg_rightofwayflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "b26c1d43-efbe-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040024",
+            "NavigationProperty": "pinswg_NonValidationIds"
         },
         {
             "LogicalCollectionName": "pinswg_caseinvolvements",
@@ -326,23 +267,8 @@
             "PrimaryIdAttribute": "pinswg_caseinvolvementid",
             "UrlName": "caseinvolvement",
             "MetadataId": "65677cd9-4aae-eb11-aac3-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_commonlandflows",
-            "LogicalName": "pinswg_commonlandflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "338fac85-e6be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates195flows",
-            "LogicalName": "pinswg_lawfuldevelopmentcertificates195flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "0b8f5046-1dbe-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_advertisementappealanddiscontinuances",
@@ -350,7 +276,8 @@
             "PrimaryIdAttribute": "businessprocessflowinstanceid",
             "UrlName": "advertisementappealanddiscontinuance",
             "MetadataId": "79b9ab3a-f1be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_documenthistories",
@@ -358,7 +285,8 @@
             "PrimaryIdAttribute": "pinswg_documenthistoryid",
             "UrlName": "documenthistory",
             "MetadataId": "0d8e78a7-33a3-eb11-aac3-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_documents",
@@ -366,23 +294,8 @@
             "PrimaryIdAttribute": "pinswg_documentid",
             "UrlName": "documents",
             "MetadataId": "e6cbbbca-026a-eb11-aabb-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_electricityactflows",
-            "LogicalName": "pinswg_electricityactflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "699c4318-e3be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_planningconditionss73s79flows",
-            "LogicalName": "pinswg_planningconditionss73s79flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "510154b1-15be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "",
+            "NavigationProperty": ""
         },
         {
             "LogicalCollectionName": "pinswg_wayleaves",
@@ -390,7 +303,8 @@
             "PrimaryIdAttribute": "pinswg_wayleaveid",
             "UrlName": "wayleave",
             "MetadataId": "a0652117-5782-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040021"
+            "appealTypeID": "846040021",
+            "NavigationProperty": "pinswg_WayleaveIds"
         },
         {
             "LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens",
@@ -398,7 +312,8 @@
             "PrimaryIdAttribute": "pinswg_listedbuildingandconservationrid",
             "UrlName": "listedbuildingandconservationareaconsen",
             "MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040025"
+            "appealTypeID": "846040025",
+            "NavigationProperty": "pinswg_ListedBuildingandConservationrIds"
         },
         {
             "LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens",
@@ -406,31 +321,8 @@
             "PrimaryIdAttribute": "pinswg_listedbuildingandconservationrid",
             "UrlName": "listedbuildingandconservationareaconsen",
             "MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040025"
-        },
-        {
-            "LogicalCollectionName": "pinswg_callinapplicationss77flows",
-            "LogicalName": "pinswg_callinapplicationss77flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "2a4f3d43-d4be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_transfercodes",
-            "LogicalName": "pinswg_transfercode",
-            "PrimaryIdAttribute": "pinswg_transfercodeid",
-            "UrlName": "transfercode",
-            "MetadataId": "a551ad5c-29f5-eb11-aac7-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_compulsorypurchaseordersflows",
-            "LogicalName": "pinswg_compulsorypurchaseordersflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "a94f098b-f0be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040025",
+            "NavigationProperty": "pinswg_ListedBuildingandConservationrIds"
         },
         {
             "LogicalCollectionName": "pinswg_environmentalpermittings",
@@ -438,15 +330,8 @@
             "PrimaryIdAttribute": "pinswg_environmentalpermittingid",
             "UrlName": "environmentalpermitting",
             "MetadataId": "62d4aa9a-5682-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040020"
-        },
-        {
-            "LogicalCollectionName": "pinswg_nonvaidationflows",
-            "LogicalName": "pinswg_nonvaidationflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "e5ca3ceb-c1e0-eb11-aac5-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040020",
+            "NavigationProperty": "pinswg_EnvironmentalPermittingIds"
         },
         {
             "LogicalCollectionName": "pinswg_enforcementnoticeappeals174s",
@@ -454,7 +339,8 @@
             "PrimaryIdAttribute": "pinswg_enforcementnoticeappeals174id",
             "UrlName": "enforcementnoticeappeals174",
             "MetadataId": "930a3cc4-9181-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040005"
+            "appealTypeID": "846040005",
+            "NavigationProperty": "pinswg_EnforcementNoticeAppealS174Ids"
         },
         {
             "LogicalCollectionName": "pinswg_ldps",
@@ -462,7 +348,8 @@
             "PrimaryIdAttribute": "pinswg_ldpid",
             "UrlName": "ldp",
             "MetadataId": "af424d4d-5882-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040023"
+            "appealTypeID": "846040023",
+            "NavigationProperty": "pinswg_LDPIds"
         },
         {
             "LogicalCollectionName": "pinswg_maintenanceoflands217s",
@@ -470,47 +357,8 @@
             "PrimaryIdAttribute": "pinswg_maintenanceoflands217id",
             "UrlName": "maintenanceoflands217",
             "MetadataId": "bb302784-9581-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040007"
-        },
-        {
-            "LogicalCollectionName": "pinswg_enforcelistbuild39flows",
-            "LogicalName": "pinswg_enforcelistbuild39flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "9423206e-d2be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_householderappealflows",
-            "LogicalName": "pinswg_householderappealflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "330541bd-d5be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_miscellaneouscaseworkflows",
-            "LogicalName": "pinswg_miscellaneouscaseworkflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "87db8649-f4be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_communityinfrastructurelevyflows",
-            "LogicalName": "pinswg_communityinfrastructurelevyflow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "92bc1e3d-e0be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
-        },
-        {
-            "LogicalCollectionName": "pinswg_listedbuildconserv20flows",
-            "LogicalName": "pinswg_listedbuildconserv20flow",
-            "PrimaryIdAttribute": "businessprocessflowinstanceid",
-            "UrlName": "",
-            "MetadataId": "4c11cbe9-27be-eb11-aac4-00224800be9c",
-            "appealTypeID": ""
+            "appealTypeID": "846040007",
+            "NavigationProperty": "pinswg_MaintenanceofLandS217Ids"
         },
         {
             "LogicalCollectionName": "pinswg_electricityacts",
@@ -518,7 +366,8 @@
             "PrimaryIdAttribute": "pinswg_electricityactid",
             "UrlName": "electricityact",
             "MetadataId": "6aedaab1-4a82-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040012"
+            "appealTypeID": "846040012",
+            "NavigationProperty": "pinswg_ElectricityActIds"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/formsxml/adverts.xml b/data/formsxml/adverts.xml
index 23b48982..fdd2dfbd 100644
--- a/data/formsxml/adverts.xml
+++ b/data/formsxml/adverts.xml
@@ -574,97 +574,6 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{e081695b-0720-3bc0-767d-51038392b446}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{b7640093-2cbb-d95b-a18b-cc5562b2b943}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Agricultural Holding" languagecode="1033" />
-										</labels>
-										<control id="pinswg_agriculturalholding" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{874c7d3d-8773-da03-49ba-e1c682e086c2}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{1b4188d0-010b-7560-7ade-41dcd07525ee}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Area of Site in Hectares" languagecode="1033" />
-										</labels>
-										<control id="pinswg_areofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areofsiteinhectaresdec" disabled="false" uniqueid="{a22a912c-38bc-40b0-d23a-3864915e17d4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{16b245d4-9b76-e039-3732-22c2eb9434eb}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Development affect setting of a listed building" languagecode="1033" />
-										</labels>
-										<control id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{a8a3d732-13b2-9b73-c8bc-0ea089aa6c18}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2de6095c-c422-22ac-2d50-371daac67c59}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Floor Space In Square Meters" languagecode="1033" />
-										</labels>
-										<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{ce237a68-9004-ad8a-3b63-0562b465b923}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{cbb336a1-1460-1c0b-e09b-6891b45001b4}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="In CA/relates to CA" languagecode="1033" />
-										</labels>
-										<control id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{deb55343-c1ad-c1bb-7dda-6d14d474e36c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{759219a6-c3b7-5e00-96c7-3e24cabac601}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is flooding and Issue" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{65605529-0844-2b29-957a-06c1ddd8a57a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{dd0da9e6-79e9-607a-2385-73d4d0753696}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is the site within an AONB" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{90342a8c-7739-c9da-61be-c4930e47ee83}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9885cb44-03c1-8453-eb84-91c9252144bc}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landuse" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landuse" disabled="false" uniqueid="{579517d1-ebdb-2d5c-0c7c-4337ec7b49a1}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{cc80c371-4dca-6926-0599-2b24b655d329}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use Catagory" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landusecatagory" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landusecatagory" disabled="false" uniqueid="{b0d3ee64-7db5-8089-e2d5-754d54e13b98}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{847e0ce3-c603-c426-0bb1-33387c2c9579}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Listed Building Grade" languagecode="1033" />
-										</labels>
-										<control id="pinswg_listedbuildinggrade" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildinggrade" disabled="false" uniqueid="{e1453ace-6269-1cd9-bab0-0840817794dd}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{3bc3a12c-d4ab-3bcd-112c-c5e8d0ae316a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -756,6 +665,97 @@
 						</section>
 					</sections>
 				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{e081695b-0720-3bc0-767d-51038392b446}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{b7640093-2cbb-d95b-a18b-cc5562b2b943}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Agricultural Holding" languagecode="1033" />
+										</labels>
+										<control id="pinswg_agriculturalholding" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{874c7d3d-8773-da03-49ba-e1c682e086c2}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1b4188d0-010b-7560-7ade-41dcd07525ee}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Area of Site in Hectares" languagecode="1033" />
+										</labels>
+										<control id="pinswg_areofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areofsiteinhectaresdec" disabled="false" uniqueid="{a22a912c-38bc-40b0-d23a-3864915e17d4}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{16b245d4-9b76-e039-3732-22c2eb9434eb}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Development affect setting of a listed building" languagecode="1033" />
+										</labels>
+										<control id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{a8a3d732-13b2-9b73-c8bc-0ea089aa6c18}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2de6095c-c422-22ac-2d50-371daac67c59}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Floor Space In Square Meters" languagecode="1033" />
+										</labels>
+										<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{ce237a68-9004-ad8a-3b63-0562b465b923}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{cbb336a1-1460-1c0b-e09b-6891b45001b4}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="In CA/relates to CA" languagecode="1033" />
+										</labels>
+										<control id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{deb55343-c1ad-c1bb-7dda-6d14d474e36c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{759219a6-c3b7-5e00-96c7-3e24cabac601}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is flooding and Issue" languagecode="1033" />
+										</labels>
+										<control id="pinswg_isfloodingandissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodingandissue" disabled="false" uniqueid="{65605529-0844-2b29-957a-06c1ddd8a57a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{dd0da9e6-79e9-607a-2385-73d4d0753696}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is the site within an AONB" languagecode="1033" />
+										</labels>
+										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{90342a8c-7739-c9da-61be-c4930e47ee83}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9885cb44-03c1-8453-eb84-91c9252144bc}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Land Use" languagecode="1033" />
+										</labels>
+										<control id="pinswg_landuse" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landuse" disabled="false" uniqueid="{579517d1-ebdb-2d5c-0c7c-4337ec7b49a1}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{cc80c371-4dca-6926-0599-2b24b655d329}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Land Use Catagory" languagecode="1033" />
+										</labels>
+										<control id="pinswg_landusecatagory" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landusecatagory" disabled="false" uniqueid="{b0d3ee64-7db5-8089-e2d5-754d54e13b98}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{847e0ce3-c603-c426-0bb1-33387c2c9579}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Listed Building Grade" languagecode="1033" />
+										</labels>
+										<control id="pinswg_listedbuildinggrade" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildinggrade" disabled="false" uniqueid="{e1453ace-6269-1cd9-bab0-0840817794dd}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 			</columns>
 		</tab>
 		<!--
diff --git a/data/formsxml/callinss77.xml b/data/formsxml/callinss77.xml
index 7f743310..046af648 100644
--- a/data/formsxml/callinss77.xml
+++ b/data/formsxml/callinss77.xml
@@ -574,97 +574,6 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{06374cb2-5ca6-907e-6d33-7891041386bd}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{49d00148-7200-3124-b2b4-5c00d3de67e5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Agricultural Holding" languagecode="1033" />
-										</labels>
-										<control id="pinswg_agriculturalholding" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{db13cc6d-b6ce-099c-9213-aab8c219b7be}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5595e295-cb8e-c6b1-5dbd-19e6773b8529}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Area Of Site in Hectares" languagecode="1033" />
-										</labels>
-										<control id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5418275e-6c20-83e2-8bc7-5d8c44e261de}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Development affect setting of a listed building" languagecode="1033" />
-										</labels>
-										<control id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{49d0642c-222e-36c3-bab5-2ba5d345e71c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{bdb1b691-6240-7b39-59cc-029a5b94e586}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Floor Space in Square Meters" languagecode="1033" />
-										</labels>
-										<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{35a11628-58bc-36c1-89c1-9edc7b2792eb}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{0888d36c-bc5d-bea2-36d0-2cee2e54a029}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="In CA/relates to CA" languagecode="1033" />
-										</labels>
-										<control id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{ebc2d6ec-5c12-b049-3941-26487419c286}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{05e33bbe-b445-89da-516d-305c17809037}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is Flooding an Issue" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isfloodinganissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodinganissue" disabled="false" uniqueid="{4048c5d2-e5e2-6512-8180-433cd6a2c429}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{62030779-753c-895b-4565-ca2b8b78b783}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Is the Site within an AONB" languagecode="1033" />
-										</labels>
-										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{c6d3d87c-9305-1871-bd20-5b164ced674b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{47d07bc9-4be3-3957-7e01-c365406a7811}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landuse" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landuse" disabled="false" uniqueid="{20a86249-4d68-a104-8187-14ebc90e37a0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9c429102-a8c4-8db9-c58c-3a217dc486e9}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Land Use Category" languagecode="1033" />
-										</labels>
-										<control id="pinswg_landusecategory" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landusecategory" disabled="false" uniqueid="{7eec16d3-4d14-14b2-75ad-634be5cc3b8d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{47ca57b8-c7c9-eb9e-4662-e1d30503b376}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Listed Building Grade" languagecode="1033" />
-										</labels>
-										<control id="pinswg_listedbuildinggrade" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildinggrade" disabled="false" uniqueid="{0182926e-374d-6728-066a-58627593da03}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{24b1c74d-0b45-7851-50b2-249aa4606174}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -756,6 +665,97 @@
 						</section>
 					</sections>
 				</column>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{06374cb2-5ca6-907e-6d33-7891041386bd}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{49d00148-7200-3124-b2b4-5c00d3de67e5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Agricultural Holding" languagecode="1033" />
+										</labels>
+										<control id="pinswg_agriculturalholding" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_agriculturalholding" disabled="false" uniqueid="{db13cc6d-b6ce-099c-9213-aab8c219b7be}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5595e295-cb8e-c6b1-5dbd-19e6773b8529}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Area Of Site in Hectares" languagecode="1033" />
+										</labels>
+										<control id="pinswg_areaofsiteinhectaresdec" classid="{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}" datafieldname="pinswg_areaofsiteinhectaresdec" disabled="false" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5418275e-6c20-83e2-8bc7-5d8c44e261de}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Development affect setting of a listed building" languagecode="1033" />
+										</labels>
+										<control id="pinswg_developmentaffectsettingofalisted" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_developmentaffectsettingofalisted" disabled="false" uniqueid="{49d0642c-222e-36c3-bab5-2ba5d345e71c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{bdb1b691-6240-7b39-59cc-029a5b94e586}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Floor Space in Square Meters" languagecode="1033" />
+										</labels>
+										<control id="pinswg_floorspaceinsquaremeters" classid="{C6D124CA-7EDA-4a60-AEA9-7FB8D318B68F}" datafieldname="pinswg_floorspaceinsquaremeters" disabled="false" uniqueid="{35a11628-58bc-36c1-89c1-9edc7b2792eb}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{0888d36c-bc5d-bea2-36d0-2cee2e54a029}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="In CA/relates to CA" languagecode="1033" />
+										</labels>
+										<control id="pinswg_incarelatestoca" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_incarelatestoca" disabled="false" uniqueid="{ebc2d6ec-5c12-b049-3941-26487419c286}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{05e33bbe-b445-89da-516d-305c17809037}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is Flooding an Issue" languagecode="1033" />
+										</labels>
+										<control id="pinswg_isfloodinganissue" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isfloodinganissue" disabled="false" uniqueid="{4048c5d2-e5e2-6512-8180-433cd6a2c429}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{62030779-753c-895b-4565-ca2b8b78b783}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Is the Site within an AONB" languagecode="1033" />
+										</labels>
+										<control id="pinswg_isthesitewithinanaonb" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_isthesitewithinanaonb" disabled="false" uniqueid="{c6d3d87c-9305-1871-bd20-5b164ced674b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{47d07bc9-4be3-3957-7e01-c365406a7811}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Land Use" languagecode="1033" />
+										</labels>
+										<control id="pinswg_landuse" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landuse" disabled="false" uniqueid="{20a86249-4d68-a104-8187-14ebc90e37a0}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9c429102-a8c4-8db9-c58c-3a217dc486e9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Land Use Category" languagecode="1033" />
+										</labels>
+										<control id="pinswg_landusecategory" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_landusecategory" disabled="false" uniqueid="{7eec16d3-4d14-14b2-75ad-634be5cc3b8d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{47ca57b8-c7c9-eb9e-4662-e1d30503b376}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Listed Building Grade" languagecode="1033" />
+										</labels>
+										<control id="pinswg_listedbuildinggrade" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_listedbuildinggrade" disabled="false" uniqueid="{0182926e-374d-6728-066a-58627593da03}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1140,7 +1140,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/commonland.xml b/data/formsxml/commonland.xml
index 5efd2eff..bacceeec 100644
--- a/data/formsxml/commonland.xml
+++ b/data/formsxml/commonland.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{60c353dc-89a7-a6e8-2de8-1d84c4e98795}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{1594a474-e948-c846-6141-3547793483a0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name Of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{03d81433-11d3-3d42-38a1-7a72667302ee}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c0e272b1-1aa5-460e-c4b9-477487b92b0c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership of Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipofcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipofcertificate" disabled="false" uniqueid="{014b35d6-20b4-53b0-7590-4346a0de1356}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{350d3e6a-aee0-e9a7-1310-cd3255ccbba8}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{8b58e87e-c22c-66b2-655d-974c73602c83}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1d83eb22-931e-a1b8-60b9-724c49928d24}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{ce4b4459-e013-3dd7-0ab8-849d2e9442b5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{bb571a44-ab5b-713e-d1a5-eb2d490dde00}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{d0c793d8-20b1-cab5-26a6-be788be3131e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{73ce3758-9996-d4cb-48dd-46374a3bd8c9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{81a2deab-9d12-c310-3b11-8200cc81db6e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a4988e00-8330-7e44-1752-37cb83acee78}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{0c1650ad-868e-ab07-3d22-23e29c17be60}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d8b6a946-ccb8-ed75-51e2-1796d9586aab}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{4d91c7a9-0810-acd5-c021-9da954084820}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9163d54a-1135-9198-bb8d-2d0cc785c0da}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{8dc801a0-e1dc-9057-b8e4-b38b639cce98}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{ac2e587e-6660-e402-74b3-d83aa6529257}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{a1e1eee7-a7b8-b964-eaea-9c4c15676d49}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{ed620664-6e8b-2c16-ea39-b1bcd4e84b5a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{60c353dc-89a7-a6e8-2de8-1d84c4e98795}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{1594a474-e948-c846-6141-3547793483a0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name Of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{03d81433-11d3-3d42-38a1-7a72667302ee}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c0e272b1-1aa5-460e-c4b9-477487b92b0c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership of Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipofcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipofcertificate" disabled="false" uniqueid="{014b35d6-20b4-53b0-7590-4346a0de1356}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{73ce3758-9996-d4cb-48dd-46374a3bd8c9}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{81a2deab-9d12-c310-3b11-8200cc81db6e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{350d3e6a-aee0-e9a7-1310-cd3255ccbba8}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{8b58e87e-c22c-66b2-655d-974c73602c83}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{1d83eb22-931e-a1b8-60b9-724c49928d24}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{ce4b4459-e013-3dd7-0ab8-849d2e9442b5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a4988e00-8330-7e44-1752-37cb83acee78}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{0c1650ad-868e-ab07-3d22-23e29c17be60}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{bb571a44-ab5b-713e-d1a5-eb2d490dde00}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{d0c793d8-20b1-cab5-26a6-be788be3131e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d8b6a946-ccb8-ed75-51e2-1796d9586aab}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{4d91c7a9-0810-acd5-c021-9da954084820}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9163d54a-1135-9198-bb8d-2d0cc785c0da}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{8dc801a0-e1dc-9057-b8e4-b38b639cce98}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{ac2e587e-6660-e402-74b3-d83aa6529257}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{a1e1eee7-a7b8-b964-eaea-9c4c15676d49}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1002,7 +1002,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/communityinfrastructurelevys117118119.xml b/data/formsxml/communityinfrastructurelevys117118119.xml
index 7e373c90..ae396e93 100644
--- a/data/formsxml/communityinfrastructurelevys117118119.xml
+++ b/data/formsxml/communityinfrastructurelevys117118119.xml
@@ -574,6 +574,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{59c13a11-5d3c-25e4-0a17-954a4bae4be6}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{38ec8164-087e-da4d-82de-731691e8269c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{e41784e0-b903-558d-41e2-2d7cb6171793}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a18530ed-06d2-6be9-098e-79331a38ea84}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{225627e8-31ed-5544-c519-0050400a760a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c3537b78-33b4-d429-021a-537cbee7d278}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{c3a12e35-a8b3-5473-c311-755b4b17cbc0}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e91e4877-6895-c9c7-ac18-28cd665c4944}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{453a176d-bbab-d08e-89c9-dc303a344463}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5cc0a425-598b-2c86-d152-53630e05929e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{06080c77-7203-568d-8a3c-d445d813148e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b69913ae-3067-038c-20c3-174b4d9d2b2b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{7681623e-51e2-145d-c7e8-82e549a03114}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b8a06b97-4504-b6c7-ab38-80a7007103e0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{8c73450d-97c7-01cc-cdba-d26803241967}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{0519ebe7-e4a5-a09b-3bdb-0e27498615a9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{0233d5e4-6b4c-24a2-eb61-e98a6ae50872}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{75bc556b-048d-0c27-8e31-8d8e1baa0e07}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{000be2d0-84ec-5448-a2d5-9ecaab567091}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{004b5133-97ea-291a-eac0-3b14401e8a72}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d7034766-d971-91cb-e450-db43e096542a}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{5c733510-c9e6-856a-6144-db7a6106c4c1}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -665,97 +756,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{59c13a11-5d3c-25e4-0a17-954a4bae4be6}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{38ec8164-087e-da4d-82de-731691e8269c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{e41784e0-b903-558d-41e2-2d7cb6171793}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a18530ed-06d2-6be9-098e-79331a38ea84}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{225627e8-31ed-5544-c519-0050400a760a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b69913ae-3067-038c-20c3-174b4d9d2b2b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{7681623e-51e2-145d-c7e8-82e549a03114}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c3537b78-33b4-d429-021a-537cbee7d278}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{c3a12e35-a8b3-5473-c311-755b4b17cbc0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e91e4877-6895-c9c7-ac18-28cd665c4944}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{453a176d-bbab-d08e-89c9-dc303a344463}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b8a06b97-4504-b6c7-ab38-80a7007103e0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{8c73450d-97c7-01cc-cdba-d26803241967}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5cc0a425-598b-2c86-d152-53630e05929e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{06080c77-7203-568d-8a3c-d445d813148e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{0519ebe7-e4a5-a09b-3bdb-0e27498615a9}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{0233d5e4-6b4c-24a2-eb61-e98a6ae50872}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{75bc556b-048d-0c27-8e31-8d8e1baa0e07}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{000be2d0-84ec-5448-a2d5-9ecaab567091}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{004b5133-97ea-291a-eac0-3b14401e8a72}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d7034766-d971-91cb-e450-db43e096542a}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<tab name="Community Infrastructure Levy" id="{a40bd30d-8467-5274-1745-bd2aadcdccd7}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
@@ -1035,7 +1035,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/compulsorypurchaseorders.xml b/data/formsxml/compulsorypurchaseorders.xml
index 11f07ab1..fca8613d 100644
--- a/data/formsxml/compulsorypurchaseorders.xml
+++ b/data/formsxml/compulsorypurchaseorders.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{57962497-3cb9-50b6-725e-949304d50158}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{8e9ad123-eaaa-d70b-8480-7bc9459d7516}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{3737a60b-3d35-1220-ed01-90e419a1bd13}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{05a94d0c-2046-978a-1999-3dd13b988e8d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{aedb1b67-bb19-a92a-9bc2-8ccde1a9c982}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8b2ad727-13c9-3b1b-c0d3-c258009ed12a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{b800d9e3-e701-b5b7-8513-3d4de5cc8872}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a7084e2a-6443-dd8d-ca63-70d95e8e31a2}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{a16dd99c-b533-eb88-9e7a-a21e0d04654b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{7309b835-0635-e37e-3725-5232c2d8dcbd}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{7e19e4c9-7c9c-4227-8513-a38460ccd3c5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1734a743-931b-156b-9664-3d7817e57795}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{2432dc58-61b1-01c2-d615-d8976d8d540b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a47a8563-d050-3aed-1707-6d5c72135dda}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{57291070-a574-626d-6a06-985428d82b74}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{498d4dad-4416-522a-cd03-174242b68d0e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{a421a7d8-8959-e191-8cee-a2e318ed0820}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{0d09c189-89b0-4337-09b2-7450486e1762}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{ced972e9-c972-ccbe-7186-05ec70a7072e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6c1eb636-7c59-32b5-c61a-e24b968a152b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{90dd56b7-1bc5-cb83-35db-e1d78246a502}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{9a7a0a89-5a2a-89cc-7ee4-6ac6dc488672}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{57962497-3cb9-50b6-725e-949304d50158}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{8e9ad123-eaaa-d70b-8480-7bc9459d7516}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{3737a60b-3d35-1220-ed01-90e419a1bd13}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{05a94d0c-2046-978a-1999-3dd13b988e8d}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{aedb1b67-bb19-a92a-9bc2-8ccde1a9c982}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{1734a743-931b-156b-9664-3d7817e57795}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{2432dc58-61b1-01c2-d615-d8976d8d540b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8b2ad727-13c9-3b1b-c0d3-c258009ed12a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{b800d9e3-e701-b5b7-8513-3d4de5cc8872}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a7084e2a-6443-dd8d-ca63-70d95e8e31a2}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{a16dd99c-b533-eb88-9e7a-a21e0d04654b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a47a8563-d050-3aed-1707-6d5c72135dda}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{57291070-a574-626d-6a06-985428d82b74}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{7309b835-0635-e37e-3725-5232c2d8dcbd}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{7e19e4c9-7c9c-4227-8513-a38460ccd3c5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{498d4dad-4416-522a-cd03-174242b68d0e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{a421a7d8-8959-e191-8cee-a2e318ed0820}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{0d09c189-89b0-4337-09b2-7450486e1762}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{ced972e9-c972-ccbe-7186-05ec70a7072e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6c1eb636-7c59-32b5-c61a-e24b968a152b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{90dd56b7-1bc5-cb83-35db-e1d78246a502}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1002,7 +1002,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/dns.xml b/data/formsxml/dns.xml
index b72c564d..fc56d887 100644
--- a/data/formsxml/dns.xml
+++ b/data/formsxml/dns.xml
@@ -1170,7 +1170,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/electricityact.xml b/data/formsxml/electricityact.xml
index b8bc9939..243c5684 100644
--- a/data/formsxml/electricityact.xml
+++ b/data/formsxml/electricityact.xml
@@ -1083,7 +1083,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/enforcementlistedbuildingconservationap.xml b/data/formsxml/enforcementlistedbuildingconservationap.xml
index 1155515e..5fdc2697 100644
--- a/data/formsxml/enforcementlistedbuildingconservationap.xml
+++ b/data/formsxml/enforcementlistedbuildingconservationap.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{4045a784-753a-aaa8-d18e-0e5b20b50d07}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{d18852d2-7114-d600-4506-982ae35851ec}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{904553ac-13cc-61ec-bdc6-4330197089ee}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{38778d31-3683-5767-7461-b356a31115c6}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{9a492023-6cc8-a776-2893-2539802a843d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{011eab82-ce62-1364-6e9a-72bc77da592c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{0bd9b101-7001-ac63-b0ee-2e8c1a7a7e13}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{ebcd1ec3-a9d7-99d5-aea6-2014d4206027}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{ce8294bd-4898-4683-2aa5-18426767da60}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8dcc4119-5b44-e288-33a3-0c4431579903}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ad04e0aa-be7e-54b1-83ab-b0c80c8a2d51}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{950d5a26-7906-7495-e39b-a6a3b1eb6b7a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{30437b09-2cbe-c1cb-8d27-7b5e743021b9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8a8d6009-2ab9-a12a-b6a8-575c99b20a1c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{935ce100-c265-31a9-30c0-aa50435a04d9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{59263ad8-44a6-2cbe-de51-d86913e0734d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{a14c8de0-7a30-1641-a2b5-02c674e20039}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{71d8e347-02ac-3148-40c8-9b6b12dca7a0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{d74e8012-3649-8905-bdc8-3a7581b58424}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d8044686-23e6-39b7-e7a0-7d72a5159410}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{a3b38060-52ad-5051-a363-9917bebbddc1}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{8431c831-ca0c-2eea-18ae-57e17e325ca6}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{4045a784-753a-aaa8-d18e-0e5b20b50d07}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{d18852d2-7114-d600-4506-982ae35851ec}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{904553ac-13cc-61ec-bdc6-4330197089ee}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{38778d31-3683-5767-7461-b356a31115c6}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{9a492023-6cc8-a776-2893-2539802a843d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{950d5a26-7906-7495-e39b-a6a3b1eb6b7a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{30437b09-2cbe-c1cb-8d27-7b5e743021b9}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{011eab82-ce62-1364-6e9a-72bc77da592c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{0bd9b101-7001-ac63-b0ee-2e8c1a7a7e13}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{ebcd1ec3-a9d7-99d5-aea6-2014d4206027}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{ce8294bd-4898-4683-2aa5-18426767da60}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8a8d6009-2ab9-a12a-b6a8-575c99b20a1c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{935ce100-c265-31a9-30c0-aa50435a04d9}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8dcc4119-5b44-e288-33a3-0c4431579903}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ad04e0aa-be7e-54b1-83ab-b0c80c8a2d51}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{59263ad8-44a6-2cbe-de51-d86913e0734d}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{a14c8de0-7a30-1641-a2b5-02c674e20039}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{71d8e347-02ac-3148-40c8-9b6b12dca7a0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{d74e8012-3649-8905-bdc8-3a7581b58424}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d8044686-23e6-39b7-e7a0-7d72a5159410}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{a3b38060-52ad-5051-a363-9917bebbddc1}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1095,7 +1095,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/enforcementnoticeappeals174.xml b/data/formsxml/enforcementnoticeappeals174.xml
index c284a722..c321758f 100644
--- a/data/formsxml/enforcementnoticeappeals174.xml
+++ b/data/formsxml/enforcementnoticeappeals174.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_7_section_2" showlabel="false" showbar="false" locklevel="0" id="{a20a3d0d-03d4-270e-4a84-6c1bae049175}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{325b9a09-8338-551c-11d7-e95174aa1313}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{585ed3be-0b8a-c22c-b14b-573915d3454e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8c0d3ad5-a9d2-ee57-a451-49a54b7c4dc7}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{e8436139-2892-57bd-5949-683683a33995}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d67228e8-d894-507b-da0b-46c51854d6a3}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{807b95d9-c8ec-b61c-a625-7c561515dc8a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{88970d7e-342c-6a32-bccd-9e9dd597cb73}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{c969eba1-54b1-e66c-08ac-80890ed02248}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{aa52ebe9-b76e-6175-453a-bb45ad2c98e7}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{49ba3314-38be-dc77-6e98-e5e151e2c517}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d18e30e4-c553-3d07-c672-5748bb63135a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{37061d9d-a65d-d53e-655c-da9a10c09dd5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{17d10e32-9372-e96e-14e3-90a11a93ce26}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{5382e0e2-e266-ca38-5227-0edb36d089d0}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{473d7b43-e21a-ccdd-351e-18dd50966cae}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{88b49425-a669-288b-7c11-a857771dda83}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b7c572d8-e6ea-55c8-7d1e-a98c6d5038cb}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{15ad7645-9143-3023-ecc3-8b49107a89a8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{09207005-2050-43b3-0d85-9517338d2ba0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{60a4b8d6-96b0-d3d2-5476-ac45297c250b}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_7_section_1" showlabel="false" showbar="false" locklevel="0" id="{98c570cd-8182-d242-ee2d-a2d56ee3d9e2}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_7_section_2" showlabel="false" showbar="false" locklevel="0" id="{a20a3d0d-03d4-270e-4a84-6c1bae049175}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{325b9a09-8338-551c-11d7-e95174aa1313}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{585ed3be-0b8a-c22c-b14b-573915d3454e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8c0d3ad5-a9d2-ee57-a451-49a54b7c4dc7}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{e8436139-2892-57bd-5949-683683a33995}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d18e30e4-c553-3d07-c672-5748bb63135a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{37061d9d-a65d-d53e-655c-da9a10c09dd5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d67228e8-d894-507b-da0b-46c51854d6a3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{807b95d9-c8ec-b61c-a625-7c561515dc8a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{88970d7e-342c-6a32-bccd-9e9dd597cb73}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{c969eba1-54b1-e66c-08ac-80890ed02248}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{17d10e32-9372-e96e-14e3-90a11a93ce26}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{5382e0e2-e266-ca38-5227-0edb36d089d0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{aa52ebe9-b76e-6175-453a-bb45ad2c98e7}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{49ba3314-38be-dc77-6e98-e5e151e2c517}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{473d7b43-e21a-ccdd-351e-18dd50966cae}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{88b49425-a669-288b-7c11-a857771dda83}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b7c572d8-e6ea-55c8-7d1e-a98c6d5038cb}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{15ad7645-9143-3023-ecc3-8b49107a89a8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{09207005-2050-43b3-0d85-9517338d2ba0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{60a4b8d6-96b0-d3d2-5476-ac45297c250b}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1208,7 +1208,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/environmentalpermitting.xml b/data/formsxml/environmentalpermitting.xml
index 835d1834..d719ba73 100644
--- a/data/formsxml/environmentalpermitting.xml
+++ b/data/formsxml/environmentalpermitting.xml
@@ -343,6 +343,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{a719a85d-690c-c8c9-17e5-c8d81291a305}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{5da8a715-85e2-e574-8c5a-e73d99357e3c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{5daaa62a-e998-4945-0975-331a26a06786}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{52e056de-0b27-6188-23e2-e3e720474aae}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certification" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertification" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertification" disabled="false" uniqueid="{634e8c9b-7201-3133-0d0d-6c95d93262bb}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6896b53b-d36a-760c-5b69-502e3c603e0c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{55b59d9d-d526-aa90-819b-83b145cb6e7c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a25c3549-1dc5-9aac-3c14-b29bb9ea9ed5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{c923e40a-7864-9319-0760-7ecd111ee67d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{ade0b2e1-de06-c206-c9cb-07817c94016e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{03b725b0-1bbc-1c15-0731-aa163cc34c8e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e197b709-386e-9b17-90ed-4990e61642e3}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9a5db876-3549-4e7d-5a09-c991d2d8c595}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6a7550da-bed3-2173-087e-1590ce891104}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{2306c0c1-743e-9542-0462-1cd3a6448ed7}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9c300c4e-d166-8c0c-7acc-ab632993e93a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{abe5c991-0b0a-255e-b9a0-08cb1eac7cc7}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{98c74690-bdb3-3c3e-67a0-b067b87502a6}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{94c199a4-48d8-5486-7889-7c308b8288b1}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{65611478-7b6c-4c9c-4957-3b7aceb95295}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{16b3bbd9-b0bb-2a5a-cc82-43140220e66e}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{ab03c225-1061-36dc-c00a-5b7e672d42a3}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -434,97 +525,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{a719a85d-690c-c8c9-17e5-c8d81291a305}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{5da8a715-85e2-e574-8c5a-e73d99357e3c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{5daaa62a-e998-4945-0975-331a26a06786}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{52e056de-0b27-6188-23e2-e3e720474aae}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certification" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertification" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertification" disabled="false" uniqueid="{634e8c9b-7201-3133-0d0d-6c95d93262bb}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e197b709-386e-9b17-90ed-4990e61642e3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9a5db876-3549-4e7d-5a09-c991d2d8c595}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6896b53b-d36a-760c-5b69-502e3c603e0c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{55b59d9d-d526-aa90-819b-83b145cb6e7c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a25c3549-1dc5-9aac-3c14-b29bb9ea9ed5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{c923e40a-7864-9319-0760-7ecd111ee67d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6a7550da-bed3-2173-087e-1590ce891104}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{2306c0c1-743e-9542-0462-1cd3a6448ed7}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{ade0b2e1-de06-c206-c9cb-07817c94016e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{03b725b0-1bbc-1c15-0731-aa163cc34c8e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9c300c4e-d166-8c0c-7acc-ab632993e93a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{abe5c991-0b0a-255e-b9a0-08cb1eac7cc7}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{98c74690-bdb3-3c3e-67a0-b067b87502a6}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{94c199a4-48d8-5486-7889-7c308b8288b1}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{65611478-7b6c-4c9c-4957-3b7aceb95295}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{16b3bbd9-b0bb-2a5a-cc82-43140220e66e}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1005,7 +1005,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/harbourrevisionorder.xml b/data/formsxml/harbourrevisionorder.xml
index 9f9aa7fe..d111d6b2 100644
--- a/data/formsxml/harbourrevisionorder.xml
+++ b/data/formsxml/harbourrevisionorder.xml
@@ -1022,7 +1022,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml b/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
index 6e8fa1b2..cdd8c5f3 100644
--- a/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
+++ b/data/formsxml/hedgeshedgerowstreepreservationreplacem.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{0462ecae-273b-c740-ab83-62d53a5119c5}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{02251e53-65ab-1026-4152-b8e2320e3d63}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name Of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{bee00955-a455-7773-203a-5754774523de}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{31453606-e61c-20da-5a71-37aa6903e00e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{3c4b45b0-6cb6-470b-ec90-3166dc57db50}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{432a2e5b-4691-e3cd-e89c-7630937ae59e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{0334db21-a14a-454c-ee90-4601e1a236d9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e3b249d4-c9d8-509e-a03d-c727e8e09a1a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{5d9b7480-36b8-808e-86a3-5ee96b71cb80}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b6b2e8bb-6187-2703-16cb-dbad908449e0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed7111e5-4675-054b-eba5-7a91b09cc860}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{32306930-20bb-144d-65b7-58076c3de911}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{ebab30a3-1139-22a8-15e7-e1487084a637}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9645d22a-cea1-495c-dabc-333d4d897264}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{94a1b0cc-54db-18a2-2943-536166c4c8a3}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6bab3539-aa26-ac19-7280-ba102119101b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{84020715-7927-9874-c76c-bd41a184c763}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e0269901-4dea-a31a-c70a-bc03992ddbaa}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{d2814680-e225-b909-a631-646aa7b7c48a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6c954748-953e-2226-2138-92e1ac04dcee}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{23cc6800-61e9-6940-16e9-752c3734d037}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{71ed198c-708d-7798-776a-7bc97d05eeb7}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{0462ecae-273b-c740-ab83-62d53a5119c5}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{02251e53-65ab-1026-4152-b8e2320e3d63}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name Of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{bee00955-a455-7773-203a-5754774523de}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{31453606-e61c-20da-5a71-37aa6903e00e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{3c4b45b0-6cb6-470b-ec90-3166dc57db50}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9645d22a-cea1-495c-dabc-333d4d897264}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{94a1b0cc-54db-18a2-2943-536166c4c8a3}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{432a2e5b-4691-e3cd-e89c-7630937ae59e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{0334db21-a14a-454c-ee90-4601e1a236d9}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e3b249d4-c9d8-509e-a03d-c727e8e09a1a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{5d9b7480-36b8-808e-86a3-5ee96b71cb80}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{32306930-20bb-144d-65b7-58076c3de911}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{ebab30a3-1139-22a8-15e7-e1487084a637}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b6b2e8bb-6187-2703-16cb-dbad908449e0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed7111e5-4675-054b-eba5-7a91b09cc860}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6bab3539-aa26-ac19-7280-ba102119101b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{84020715-7927-9874-c76c-bd41a184c763}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e0269901-4dea-a31a-c70a-bc03992ddbaa}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{d2814680-e225-b909-a631-646aa7b7c48a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6c954748-953e-2226-2138-92e1ac04dcee}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{23cc6800-61e9-6940-16e9-752c3734d037}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1002,7 +1002,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml
index c3d9666f..d9453489 100644
--- a/data/formsxml/householderappealhas.xml
+++ b/data/formsxml/householderappealhas.xml
@@ -566,6 +566,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{06687d69-cc4a-0bd8-8778-4b6b9aa317a2}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{2a25bdad-757d-4946-708c-845bce54ca0b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{34ca7087-494d-ac07-0946-50e6eec4c0ed}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2ac885a1-7b38-ac3d-97b7-abc8a1aa3c30}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{089b8561-8383-79ce-3c3e-3e66c25520c3}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{454eed12-a4d0-81b0-e6a0-077693d5b875}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{24c917a0-c18d-4448-3920-5a7aea73ba64}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2daa9e16-4c95-144d-b421-4001d4c7ab44}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{15b72639-d585-7e7b-b4ae-3eb210a8be98}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5550aa20-25c1-0e76-2c94-5679729748cc}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{82b1334d-986a-40e6-7d3e-7ae6ec167110}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b3c12c91-193d-783d-52b3-853ca01b147b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{6e5ece31-741b-1a64-641e-a7d332be113d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a85814d2-9087-bd18-dcae-c12d82849b2a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{a90ead07-1668-279d-ee98-da92e43bda4b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{80a6c02d-c5c4-a39e-d249-e46586e93706}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{7eea7112-8c04-36e2-84ac-ab70db026be6}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c75576b9-e041-a649-14c8-6186095826c6}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{47be8eab-c0dc-2d9c-ab7e-9853847232dd}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a364a12b-6d23-8336-c704-63de85255947}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{4eb46690-d08e-5725-1566-611d78c407ac}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{26ec9198-1034-1916-8605-ba58c81d73ac}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -657,97 +748,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{06687d69-cc4a-0bd8-8778-4b6b9aa317a2}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{2a25bdad-757d-4946-708c-845bce54ca0b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{34ca7087-494d-ac07-0946-50e6eec4c0ed}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2ac885a1-7b38-ac3d-97b7-abc8a1aa3c30}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{089b8561-8383-79ce-3c3e-3e66c25520c3}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b3c12c91-193d-783d-52b3-853ca01b147b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{6e5ece31-741b-1a64-641e-a7d332be113d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{454eed12-a4d0-81b0-e6a0-077693d5b875}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{24c917a0-c18d-4448-3920-5a7aea73ba64}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2daa9e16-4c95-144d-b421-4001d4c7ab44}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{15b72639-d585-7e7b-b4ae-3eb210a8be98}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a85814d2-9087-bd18-dcae-c12d82849b2a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{a90ead07-1668-279d-ee98-da92e43bda4b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5550aa20-25c1-0e76-2c94-5679729748cc}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{82b1334d-986a-40e6-7d3e-7ae6ec167110}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{80a6c02d-c5c4-a39e-d249-e46586e93706}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{7eea7112-8c04-36e2-84ac-ab70db026be6}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c75576b9-e041-a649-14c8-6186095826c6}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{47be8eab-c0dc-2d9c-ab7e-9853847232dd}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a364a12b-6d23-8336-c704-63de85255947}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{4eb46690-d08e-5725-1566-611d78c407ac}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1132,7 +1132,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/lawfuldevelopmentcertificate.xml b/data/formsxml/lawfuldevelopmentcertificate.xml
index f9b4d648..889a8c39 100644
--- a/data/formsxml/lawfuldevelopmentcertificate.xml
+++ b/data/formsxml/lawfuldevelopmentcertificate.xml
@@ -577,6 +577,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{750aa233-23ae-0e12-5eeb-101ea149da74}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{b46ecb7a-8061-8c32-47d8-e3c2bce1d836}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{0dcc7b3d-4b4d-a5ac-395e-7d98587e2591}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{dc8b0b88-b290-34d1-338a-32b0e1b6ddb5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{b05726d8-7846-2e09-19e9-08d76b5aeb34}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{22dce918-8b9e-784b-0d63-9771036b4c6b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{550c423d-d7ce-a060-a074-1b0010c67c79}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b367289c-3861-438e-dc3c-43571b44140b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{dcdb7ecc-abed-89e6-426d-431d0d74aa4e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{be64bbb8-b847-0e40-1b37-943a07e51dcd}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{364bc37a-6dbe-a6a1-464d-d4ade37bdbc4}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{42d61bee-1e46-5524-ee29-45a36523ec1a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9561039d-d6ac-5128-482e-48723c890a6e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1ccc3b43-7382-c6d6-64db-05de9ebdce14}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{3619cbc3-eb57-66d8-1589-91c2050816c7}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{90c811e6-8424-75bd-36a3-e0c64a3059d7}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{cb86ebb0-0856-87cd-9315-0a40bc769ced}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2bb6e6c1-5d50-7d93-b084-634a6299eab9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{bdabb9ec-5b42-e712-c135-c0639a67e0e5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{00a3b53c-282a-e981-4cd3-ee489d27361c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{c203b6d4-c25d-309a-4778-4d5c75ccb2b2}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{1ab70890-7c37-4db7-4c40-ed20a08aa24a}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -668,97 +759,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{750aa233-23ae-0e12-5eeb-101ea149da74}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{b46ecb7a-8061-8c32-47d8-e3c2bce1d836}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{0dcc7b3d-4b4d-a5ac-395e-7d98587e2591}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{dc8b0b88-b290-34d1-338a-32b0e1b6ddb5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{b05726d8-7846-2e09-19e9-08d76b5aeb34}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{42d61bee-1e46-5524-ee29-45a36523ec1a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9561039d-d6ac-5128-482e-48723c890a6e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{22dce918-8b9e-784b-0d63-9771036b4c6b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{550c423d-d7ce-a060-a074-1b0010c67c79}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{b367289c-3861-438e-dc3c-43571b44140b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{dcdb7ecc-abed-89e6-426d-431d0d74aa4e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{1ccc3b43-7382-c6d6-64db-05de9ebdce14}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{3619cbc3-eb57-66d8-1589-91c2050816c7}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{be64bbb8-b847-0e40-1b37-943a07e51dcd}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{364bc37a-6dbe-a6a1-464d-d4ade37bdbc4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{90c811e6-8424-75bd-36a3-e0c64a3059d7}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{cb86ebb0-0856-87cd-9315-0a40bc769ced}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2bb6e6c1-5d50-7d93-b084-634a6299eab9}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{bdabb9ec-5b42-e712-c135-c0639a67e0e5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{00a3b53c-282a-e981-4cd3-ee489d27361c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{c203b6d4-c25d-309a-4778-4d5c75ccb2b2}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1038,7 +1038,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/ldp.xml b/data/formsxml/ldp.xml
index cb93afe3..cb43c25b 100644
--- a/data/formsxml/ldp.xml
+++ b/data/formsxml/ldp.xml
@@ -444,7 +444,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/listedbuildingandconservationareaconsen.xml b/data/formsxml/listedbuildingandconservationareaconsen.xml
index 94983947..36800a45 100644
--- a/data/formsxml/listedbuildingandconservationareaconsen.xml
+++ b/data/formsxml/listedbuildingandconservationareaconsen.xml
@@ -564,6 +564,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{e5c9b3d3-4394-da14-acb1-6e0a20926593}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{6cc809b0-5aba-40bd-0b90-62e794190219}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{6492745c-c7b2-cb98-c3b2-be31c224736a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a880da98-a67e-4122-b2db-6d11290631b5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{35c3b03b-9659-6232-7c42-e33a2aa62ca0}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8e74ad7b-d64d-1ba4-e5e8-79cb9d3e21d4}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{2bda6e7d-7a22-0b65-2a57-e53870e1460d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{eed9b78d-8723-56d3-3499-3373aa5ec580}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{d9d15169-1d14-5d79-4b15-9528240d8336}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{325590c1-2169-80ed-5810-c34733ed27be}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{e1403eac-5ace-97c4-21e4-c2310e5ed497}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{edd310ee-c3e5-6bd5-9a71-75019010c000}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{b00c2417-9596-4204-8b3b-77009e577619}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{66932114-0395-ee74-6b67-858ab3141b0c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site PostCode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitepostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitepostcode" disabled="false" uniqueid="{b97978c4-042d-67d4-28cc-e8d77835096d}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9842dc70-e192-1a38-a001-58d881edb8d8}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{e5240066-5e7d-2542-9a31-5ab76ed2157a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{ac6ad516-b717-1930-3d71-85438e16304a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{07100e89-3cb6-1007-5781-d5abb833c998}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5c24e6da-42b4-ab65-bb2a-36adc0661336}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{55ca246d-d8e9-2ad7-bab6-c3616848e263}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{665c07c8-87e4-a90b-3b77-58bab16c66b1}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -655,97 +746,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{e5c9b3d3-4394-da14-acb1-6e0a20926593}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{6cc809b0-5aba-40bd-0b90-62e794190219}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{6492745c-c7b2-cb98-c3b2-be31c224736a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a880da98-a67e-4122-b2db-6d11290631b5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{35c3b03b-9659-6232-7c42-e33a2aa62ca0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{edd310ee-c3e5-6bd5-9a71-75019010c000}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{b00c2417-9596-4204-8b3b-77009e577619}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8e74ad7b-d64d-1ba4-e5e8-79cb9d3e21d4}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{2bda6e7d-7a22-0b65-2a57-e53870e1460d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{eed9b78d-8723-56d3-3499-3373aa5ec580}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{d9d15169-1d14-5d79-4b15-9528240d8336}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{66932114-0395-ee74-6b67-858ab3141b0c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site PostCode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitepostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitepostcode" disabled="false" uniqueid="{b97978c4-042d-67d4-28cc-e8d77835096d}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{325590c1-2169-80ed-5810-c34733ed27be}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{e1403eac-5ace-97c4-21e4-c2310e5ed497}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9842dc70-e192-1a38-a001-58d881edb8d8}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{e5240066-5e7d-2542-9a31-5ab76ed2157a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{ac6ad516-b717-1930-3d71-85438e16304a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{07100e89-3cb6-1007-5781-d5abb833c998}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5c24e6da-42b4-ab65-bb2a-36adc0661336}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{55ca246d-d8e9-2ad7-bab6-c3616848e263}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1025,7 +1025,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/maintenanceoflands217.xml b/data/formsxml/maintenanceoflands217.xml
index 0d2b6620..316be01d 100644
--- a/data/formsxml/maintenanceoflands217.xml
+++ b/data/formsxml/maintenanceoflands217.xml
@@ -343,6 +343,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{5845db9c-3cca-81eb-9aa1-a843e66bde65}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{512c291d-b56a-1619-5c13-16a74dd479ed}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{c8e61c6b-83c8-9cab-a015-559b73268e58}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{01c135e0-8b18-2013-3831-4123496deddc}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{03e67ded-6235-9909-611b-617427775303}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2b2ee221-2538-2de3-19a5-8c197a945415}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{43574761-5a03-82e0-5ea9-a5c6bd5a44cc}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{41275b76-0007-2a83-4185-47a337533eb5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{3b950136-8d40-008d-11b6-ad6e2aa4bb85}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{26dc4179-b221-7d6d-44d9-a4a6849e2a7b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{dc60a23b-a04a-1926-0672-7e7583046aa4}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{cda0799a-a518-9094-e3a1-b64be1401702}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{569bb4e4-c359-a3ed-9ae4-ddd2e69eee68}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{14c49d25-9a4a-687e-1e11-c20224cc5092}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{020dbeed-4e4d-ea34-c6c8-843bac62a193}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{90d6cba4-4cc3-3175-4681-c3cc45c61d9b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{267b181d-6629-2b8c-7ebe-a9c41d60b38e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{2b9947ee-46e5-69ad-8b4c-7190dc75719e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{aa01217a-2bd5-0b5e-07a7-23ed331cbe8c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c0668641-5567-2e57-a887-bcbc2eccdcee}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{bc9b6ea3-1609-ce17-5b90-dc03da3c5890}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{382c76b6-429a-a1b7-da70-3bd3b16e4293}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -434,97 +525,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{5845db9c-3cca-81eb-9aa1-a843e66bde65}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{512c291d-b56a-1619-5c13-16a74dd479ed}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{c8e61c6b-83c8-9cab-a015-559b73268e58}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{01c135e0-8b18-2013-3831-4123496deddc}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{03e67ded-6235-9909-611b-617427775303}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{cda0799a-a518-9094-e3a1-b64be1401702}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{569bb4e4-c359-a3ed-9ae4-ddd2e69eee68}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2b2ee221-2538-2de3-19a5-8c197a945415}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{43574761-5a03-82e0-5ea9-a5c6bd5a44cc}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{41275b76-0007-2a83-4185-47a337533eb5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{3b950136-8d40-008d-11b6-ad6e2aa4bb85}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{14c49d25-9a4a-687e-1e11-c20224cc5092}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{020dbeed-4e4d-ea34-c6c8-843bac62a193}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{26dc4179-b221-7d6d-44d9-a4a6849e2a7b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{dc60a23b-a04a-1926-0672-7e7583046aa4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{90d6cba4-4cc3-3175-4681-c3cc45c61d9b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{267b181d-6629-2b8c-7ebe-a9c41d60b38e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{2b9947ee-46e5-69ad-8b4c-7190dc75719e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{aa01217a-2bd5-0b5e-07a7-23ed331cbe8c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c0668641-5567-2e57-a887-bcbc2eccdcee}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{bc9b6ea3-1609-ce17-5b90-dc03da3c5890}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1090,7 +1090,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/miscellaneouscasework.xml b/data/formsxml/miscellaneouscasework.xml
index 0ff80000..ab15d2ca 100644
--- a/data/formsxml/miscellaneouscasework.xml
+++ b/data/formsxml/miscellaneouscasework.xml
@@ -336,6 +336,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{a51e7bb9-9667-3124-4439-c4d0daa7734b}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{40b318b9-4b3d-73b3-77c9-80e36ecc8ce1}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{ee24dc05-ac71-9a57-8e01-9b9a07233dcd}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a038477c-bc9d-db8c-71e8-8b25be178e12}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{a76b8bc6-1103-d0c5-8c61-ca464a2aa272}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{7084d71d-56d4-1634-d436-a03c9deb9957}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{6e414aab-014e-eb82-e668-e074e2175bd8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{62952ec7-30be-4005-a86e-a46be9a15b22}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{aae3b337-2e4a-8869-9804-54243b9ae3b2}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{608a22c7-a371-2a3c-1762-35e9ad4c345b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{66eb3e50-805e-03ea-06c1-2b8b95d825a8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6d2815d7-3593-5766-772a-db544d230cc6}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{06121916-8347-bc4b-c0ab-108b291425a0}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{25d10382-b30e-4c13-274d-1aab951538d6}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{dac4338c-2ae3-2d16-4dce-c031d1eea579}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{c02027dd-2825-dd63-e630-c639cc74e5ce}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{309581c6-ca01-96ca-6b4e-c19d5e240155}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{e52c39ae-8b52-8c55-4607-4a5767a75d23}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{170bb40c-8809-0170-1b40-bc8265918295}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3543e661-4708-d9b1-e2ee-e6d0864b5b16}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d9ad1640-782c-783a-ce0b-797c48149da5}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{1967db15-9cb1-74c2-95b7-15c2946919ac}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -427,97 +518,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{a51e7bb9-9667-3124-4439-c4d0daa7734b}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{40b318b9-4b3d-73b3-77c9-80e36ecc8ce1}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{ee24dc05-ac71-9a57-8e01-9b9a07233dcd}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a038477c-bc9d-db8c-71e8-8b25be178e12}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{a76b8bc6-1103-d0c5-8c61-ca464a2aa272}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6d2815d7-3593-5766-772a-db544d230cc6}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{06121916-8347-bc4b-c0ab-108b291425a0}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{7084d71d-56d4-1634-d436-a03c9deb9957}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{6e414aab-014e-eb82-e668-e074e2175bd8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{62952ec7-30be-4005-a86e-a46be9a15b22}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{aae3b337-2e4a-8869-9804-54243b9ae3b2}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{25d10382-b30e-4c13-274d-1aab951538d6}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{dac4338c-2ae3-2d16-4dce-c031d1eea579}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{608a22c7-a371-2a3c-1762-35e9ad4c345b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{66eb3e50-805e-03ea-06c1-2b8b95d825a8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{c02027dd-2825-dd63-e630-c639cc74e5ce}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{309581c6-ca01-96ca-6b4e-c19d5e240155}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{e52c39ae-8b52-8c55-4607-4a5767a75d23}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{170bb40c-8809-0170-1b40-bc8265918295}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3543e661-4708-d9b1-e2ee-e6d0864b5b16}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d9ad1640-782c-783a-ce0b-797c48149da5}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<tab name="Event" id="{eb53bb94-4d1e-a6aa-a170-5d411dcc04d4}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
@@ -1190,7 +1190,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/nonvalidation.xml b/data/formsxml/nonvalidation.xml
index 585d7714..6103d6aa 100644
--- a/data/formsxml/nonvalidation.xml
+++ b/data/formsxml/nonvalidation.xml
@@ -118,6 +118,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_4_section_2" showlabel="false" showbar="false" locklevel="0" id="{8a86e105-9093-a1e1-4a44-680ecc7158ba}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{96892dc3-c88e-32b4-d71b-7dd5a0395c2c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{c346955e-7b2a-5606-25a2-b1220085c93e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{45722a7a-7b00-22a5-19b2-d544d4b78b8a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{291142bc-9c1e-7728-9ab6-53444e83b2b4}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{56b71819-0ba7-5e7e-1ed1-0b1a47dc39d0}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{be55c557-1796-086a-7847-4e1a7ac09b7c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{576bd370-e476-26be-d851-814b04e123b3}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{476ea2aa-6ae3-e152-e20d-5b3d2d1d7c2b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d1734442-8bb0-6223-31bd-eac9c53cc319}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{556a5b94-2ad7-b1c9-cda8-346292087d15}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{890d4651-b894-94ad-cea4-467b33d90ec2}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{367ec047-86e0-43c3-1e71-ae7e9c30a8c3}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3a1ee6b7-7136-015b-9e32-163a9eb9d13c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{9566b85d-e2a4-057d-3983-7c2d865788d1}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{39c9a0ed-4d70-3930-0c71-93b968074951}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable From Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{b75e857d-848a-170d-4d56-12c6a95abb52}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d7158695-2b16-cb8c-a733-c8a01b058197}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{eea4c979-db91-e90b-7805-6187bacda12b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{ad21492a-5551-2264-879a-e282115c1c7a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{ac95d50a-a987-7d60-1a3b-c209d7d5484c}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_4_section_1" showlabel="false" showbar="false" locklevel="0" id="{40d0cae4-9bed-85a9-e241-1578a41b119c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -209,97 +300,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_4_section_2" showlabel="false" showbar="false" locklevel="0" id="{8a86e105-9093-a1e1-4a44-680ecc7158ba}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{96892dc3-c88e-32b4-d71b-7dd5a0395c2c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{c346955e-7b2a-5606-25a2-b1220085c93e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{45722a7a-7b00-22a5-19b2-d544d4b78b8a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{291142bc-9c1e-7728-9ab6-53444e83b2b4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{890d4651-b894-94ad-cea4-467b33d90ec2}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{367ec047-86e0-43c3-1e71-ae7e9c30a8c3}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{56b71819-0ba7-5e7e-1ed1-0b1a47dc39d0}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{be55c557-1796-086a-7847-4e1a7ac09b7c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{576bd370-e476-26be-d851-814b04e123b3}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{476ea2aa-6ae3-e152-e20d-5b3d2d1d7c2b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3a1ee6b7-7136-015b-9e32-163a9eb9d13c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{9566b85d-e2a4-057d-3983-7c2d865788d1}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d1734442-8bb0-6223-31bd-eac9c53cc319}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{556a5b94-2ad7-b1c9-cda8-346292087d15}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{39c9a0ed-4d70-3930-0c71-93b968074951}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable From Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{b75e857d-848a-170d-4d56-12c6a95abb52}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d7158695-2b16-cb8c-a733-c8a01b058197}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{eea4c979-db91-e90b-7805-6187bacda12b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{ad21492a-5551-2264-879a-e282115c1c7a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{ac95d50a-a987-7d60-1a3b-c209d7d5484c}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<tab name="Notice" id="{44d89b66-9839-da55-9e69-d605c22d09ae}" IsUserDefined="0" locklevel="0" showlabel="true" expanded="true">
@@ -520,7 +520,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
index f6d80273..048d3014 100644
--- a/data/formsxml/planningappeals78.xml
+++ b/data/formsxml/planningappeals78.xml
@@ -577,6 +577,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{de675e87-9a30-9016-8dce-94101c6363d1}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{82689d9b-362c-ec69-cd26-c8b4bda7d132}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{7b8ccad3-4c70-8d3d-7263-8b6c5751d089}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{060e23c0-9e75-771c-3ad3-d04aeaccbd4a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{739745e3-8b97-4b3b-949e-94ad5e9cbad9}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{12a91c81-69b9-0226-16ec-3d0620ab6a75}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{4dbe62ae-c9c6-8161-74d1-b7d6c1681b2b}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{0779b467-013d-a849-d39e-253bce234754}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d2015db9-0794-1198-5742-67a3475e611c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed422834-2434-d428-a8db-70d51540c844}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{30a859c0-e591-7dd9-a40d-86380de30193}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{407764c4-23c3-9ae7-4add-4d495032e4a5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5b7b2b78-0954-8c8b-cd11-3068760e0291}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{42523297-441d-d55a-cee4-c4d0baa18ad8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5e4de7cc-0ac5-8a43-24d9-473d266016c2}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{e352d69a-1dd2-2c74-7ba9-543585538201}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{60bc0e11-4479-1de0-4bdd-d23dee5764db}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -668,97 +759,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{de675e87-9a30-9016-8dce-94101c6363d1}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{82689d9b-362c-ec69-cd26-c8b4bda7d132}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{7b8ccad3-4c70-8d3d-7263-8b6c5751d089}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{164eb8e5-6562-923d-5d29-824723d3177a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{060e23c0-9e75-771c-3ad3-d04aeaccbd4a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{30a859c0-e591-7dd9-a40d-86380de30193}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{407764c4-23c3-9ae7-4add-4d495032e4a5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{739745e3-8b97-4b3b-949e-94ad5e9cbad9}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{12a91c81-69b9-0226-16ec-3d0620ab6a75}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{4dbe62ae-c9c6-8161-74d1-b7d6c1681b2b}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{0779b467-013d-a849-d39e-253bce234754}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5b7b2b78-0954-8c8b-cd11-3068760e0291}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{42523297-441d-d55a-cee4-c4d0baa18ad8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d2015db9-0794-1198-5742-67a3475e611c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{ed422834-2434-d428-a8db-70d51540c844}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{756ca75e-735a-2737-685d-955178539a80}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{8ae0bec2-e68d-c498-7133-aee32be5e359}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5e4de7cc-0ac5-8a43-24d9-473d266016c2}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{e352d69a-1dd2-2c74-7ba9-543585538201}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{88d4e7d2-7d30-2b68-c37b-a17a57c2074d}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{0299a512-3e1a-5e83-3660-756ad4b016b9}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1135,7 +1135,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/planningconditionss73s79.xml b/data/formsxml/planningconditionss73s79.xml
index 26b4a67c..c0a0b149 100644
--- a/data/formsxml/planningconditionss73s79.xml
+++ b/data/formsxml/planningconditionss73s79.xml
@@ -571,6 +571,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{28710a16-09ee-be92-6977-c6aaab156cdc}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{041296c5-05de-da2e-82a6-88d52d6b9592}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{2a7c782c-7d2b-2040-4c6c-834ec3dca005}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{da232037-b1c6-01d9-ea67-67b011247b90}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{55a1a904-9c89-309b-3835-6837c32bb3a4}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3442b432-3de8-301c-84a9-aecc2b1d2e60}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{1a9e528d-0b7a-da87-9045-8bd45c2dcbd8}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{bd889da5-2e23-2075-88cb-90751d596ccc}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{43ae6d16-0d85-d87b-25ac-d5c51262e372}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{5228caee-7792-8d4a-3e8a-a5c61e03868c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{30550785-4cb0-5eec-4949-3296e2ade938}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{99ebd4a6-c631-0be3-cb14-c348d61b57eb}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{b8e3e25a-ab2d-a192-545e-e1acb5c6a288}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3eb982a8-9e36-3269-b2b1-1516787bd866}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{8200a9ba-bcd2-e132-7502-e4b50279d55c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6a6e1010-0311-9d9a-5b25-8b8be9583643}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{444c83ad-2418-9c77-eeb6-7e5ddd4a5d34}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{70ae66aa-75a9-0e47-0592-76bb05c65c3e}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site within a Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{8ec791c4-9cab-c7b8-7e43-b714b4dabe64}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d7ab6b9c-1bec-aab6-515c-936597d44214}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{54227324-0953-96c1-d421-bb0370a52647}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_6_section_1" showlabel="false" showbar="false" locklevel="0" id="{e105dce1-8752-b9a2-2dc1-83d2c0dcbea9}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -662,97 +753,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_6_section_2" showlabel="false" showbar="false" locklevel="0" id="{28710a16-09ee-be92-6977-c6aaab156cdc}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{041296c5-05de-da2e-82a6-88d52d6b9592}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{2a7c782c-7d2b-2040-4c6c-834ec3dca005}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{da232037-b1c6-01d9-ea67-67b011247b90}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{55a1a904-9c89-309b-3835-6837c32bb3a4}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{99ebd4a6-c631-0be3-cb14-c348d61b57eb}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{b8e3e25a-ab2d-a192-545e-e1acb5c6a288}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3442b432-3de8-301c-84a9-aecc2b1d2e60}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{1a9e528d-0b7a-da87-9045-8bd45c2dcbd8}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{bd889da5-2e23-2075-88cb-90751d596ccc}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{43ae6d16-0d85-d87b-25ac-d5c51262e372}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3eb982a8-9e36-3269-b2b1-1516787bd866}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{8200a9ba-bcd2-e132-7502-e4b50279d55c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{5228caee-7792-8d4a-3e8a-a5c61e03868c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{30550785-4cb0-5eec-4949-3296e2ade938}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6a6e1010-0311-9d9a-5b25-8b8be9583643}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{444c83ad-2418-9c77-eeb6-7e5ddd4a5d34}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{70ae66aa-75a9-0e47-0592-76bb05c65c3e}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site within a Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinagreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinagreenbelt" disabled="false" uniqueid="{8ec791c4-9cab-c7b8-7e43-b714b4dabe64}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d7ab6b9c-1bec-aab6-515c-936597d44214}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{54227324-0953-96c1-d421-bb0370a52647}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1137,7 +1137,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/planningobligationappeals106.xml b/data/formsxml/planningobligationappeals106.xml
index 88aa768b..89baf284 100644
--- a/data/formsxml/planningobligationappeals106.xml
+++ b/data/formsxml/planningobligationappeals106.xml
@@ -688,14 +688,6 @@
 										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{6c8233a6-0384-2391-3366-d1a930157190}" />
 									</cell>
 								</row>
-								<row>
-									<cell id="{a713c600-c0ea-1ec0-3ee0-198d9dd5618c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{5cd909ed-c111-27de-a903-21d8c39420de}" />
-									</cell>
-								</row>
 								<row>
 									<cell id="{bb9e1ec8-3c27-306d-3a90-36984244bc8a}" showlabel="true" locklevel="0">
 										<labels>
@@ -712,14 +704,6 @@
 										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{28444c2d-7e18-9d4b-6947-9c54ccdc17dc}" />
 									</cell>
 								</row>
-								<row>
-									<cell id="{b8eee6b4-d1c7-c57a-0578-49b2e28c2782}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{96170184-1e89-7344-b16e-7d14b07e0482}" />
-									</cell>
-								</row>
 								<row>
 									<cell id="{b4826567-5293-cc28-1c71-b01210538b57}" showlabel="true" locklevel="0">
 										<labels>
@@ -728,6 +712,22 @@
 										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{2a44a2b2-a010-3213-8a69-6b062e520e39}" />
 									</cell>
 								</row>
+								<row>
+									<cell id="{a713c600-c0ea-1ec0-3ee0-198d9dd5618c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{5cd909ed-c111-27de-a903-21d8c39420de}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{b8eee6b4-d1c7-c57a-0578-49b2e28c2782}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{96170184-1e89-7344-b16e-7d14b07e0482}" />
+									</cell>
+								</row>
 								<row>
 									<cell id="{7980128b-97d3-0885-8420-2e0ece820cbb}" showlabel="true" locklevel="0">
 										<labels>
@@ -1027,7 +1027,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/row.xml b/data/formsxml/row.xml
index 5ae7ed0d..9a2ff3be 100644
--- a/data/formsxml/row.xml
+++ b/data/formsxml/row.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{b01bc7c6-97e7-5a22-8383-2c9a17c755e4}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{5005669c-906a-0886-1e16-24a3be1623a1}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{91591c35-ac33-a5c3-8947-72ecb1a5b79c}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d15a489e-cd2e-8a71-ba79-e66c81b52375}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certification" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertification" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertification" disabled="false" uniqueid="{ba1bd8cd-102a-2724-7a17-119d2b056c45}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{0ac54c1d-4a0a-67e6-04e0-8b79e795c308}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{bc18b31a-6774-8e7a-8109-726572565ed5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3bad6cc5-6b6d-6421-b4b2-de4cd63e523a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{32298430-1264-8136-63cb-12a02d6caeca}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{11d9d81d-47bd-d0a9-7e7b-429dd07be9b5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{2bd3c4e1-a03c-6c3c-4ebd-611ba1784449}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8a3e7e6a-8484-238d-191a-ca3eedcc6ad8}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitecounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitecounty" disabled="false" uniqueid="{c87a72b9-d600-558e-1261-51620c861e23}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d4ce118d-9aeb-4a8a-3b10-e1da46be0613}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{67c4c796-856a-4106-1dec-d14254ee7e9a}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{a6c80078-e2b9-c38c-181e-272e88460e91}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{0ea46e22-b8c4-29a4-6689-ad28c443714e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{77bdc7ec-dd2e-39c0-a5e5-4c946a5a1090}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{3c60206d-3905-3d0c-b30c-a47d193c2229}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{9a614112-4436-498d-9c06-d7ba99e81a93}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{92eaa8ee-0246-9230-abce-780da0ce631d}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{4e5d3503-bbeb-c762-5911-8cd991ad3bc8}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{b01bc7c6-97e7-5a22-8383-2c9a17c755e4}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{5005669c-906a-0886-1e16-24a3be1623a1}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{91591c35-ac33-a5c3-8947-72ecb1a5b79c}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d15a489e-cd2e-8a71-ba79-e66c81b52375}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certification" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertification" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertification" disabled="false" uniqueid="{ba1bd8cd-102a-2724-7a17-119d2b056c45}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{0ac54c1d-4a0a-67e6-04e0-8b79e795c308}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{bc18b31a-6774-8e7a-8109-726572565ed5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3bad6cc5-6b6d-6421-b4b2-de4cd63e523a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{32298430-1264-8136-63cb-12a02d6caeca}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d4ce118d-9aeb-4a8a-3b10-e1da46be0613}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{67c4c796-856a-4106-1dec-d14254ee7e9a}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{11d9d81d-47bd-d0a9-7e7b-429dd07be9b5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{2bd3c4e1-a03c-6c3c-4ebd-611ba1784449}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8a3e7e6a-8484-238d-191a-ca3eedcc6ad8}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitecounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitecounty" disabled="false" uniqueid="{c87a72b9-d600-558e-1261-51620c861e23}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{a6c80078-e2b9-c38c-181e-272e88460e91}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{0ea46e22-b8c4-29a4-6689-ad28c443714e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{77bdc7ec-dd2e-39c0-a5e5-4c946a5a1090}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{3c60206d-3905-3d0c-b30c-a47d193c2229}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{9a614112-4436-498d-9c06-d7ba99e81a93}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{92eaa8ee-0246-9230-abce-780da0ce631d}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1002,7 +1002,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/transportandworkact.xml b/data/formsxml/transportandworkact.xml
index 9f9cdc15..58c09271 100644
--- a/data/formsxml/transportandworkact.xml
+++ b/data/formsxml/transportandworkact.xml
@@ -1022,7 +1022,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/data/formsxml/wayleave.xml b/data/formsxml/wayleave.xml
index 62a82510..233fa4c7 100644
--- a/data/formsxml/wayleave.xml
+++ b/data/formsxml/wayleave.xml
@@ -340,6 +340,97 @@
 				<label description="Case Site" languagecode="1033" />
 			</labels>
 			<columns>
+				<column width="50%">
+					<sections>
+						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{6e7b8ee0-1c01-e79a-15ed-dcb325e2e17b}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
+							<labels>
+								<label description="Section" languagecode="1033" />
+							</labels>
+							<rows>
+								<row>
+									<cell id="{78011e93-0b05-367b-914e-696ce3d2226c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Name of Common Or Village Green" languagecode="1033" />
+										</labels>
+										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{ee6d8276-126d-214a-b0de-d9ebac384ed5}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{26c5e130-7b76-2cd1-94a3-85e6e154498c}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Ownership Certificate" languagecode="1033" />
+										</labels>
+										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{7b7b4877-9b02-1567-0b06-1b3ae754b35b}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{33b90145-8019-7ee5-69a8-97297a7612b1}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 1" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{e5a74000-ec7c-a3bd-b0b7-940895b96eaa}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{d64b33c4-c846-a924-b112-45054dc22349}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Line 2" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{26b69aa4-b987-a2b9-8658-111258a57b61}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{59cb3441-a56b-56a9-5ed4-2e18d936a5a5}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Town" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{a5b75801-5543-1b7c-e5a9-518eb37176e9}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{1d039388-6a2e-b6dc-e854-2486dadb4383}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address County" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9a099865-cced-79d0-b5b8-66c9de1e1583}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{8407346c-a4bc-bb87-014e-c7b892ec79dc}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Address Postcode" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{45b798d8-ac96-ee7b-29d4-6eb5b0dc05bc}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{3d1b7eed-d1c3-5d0e-21c9-b26cba351237}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Viewable from Road" languagecode="1033" />
+										</labels>
+										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{6e7306d1-7a2d-3d1b-a726-5275a198e31e}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{6d6a02c4-046c-7433-3511-6370a1b76c49}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within Green Belt" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{62836395-be37-6a22-2add-a0bca87203ce}" />
+									</cell>
+								</row>
+								<row>
+									<cell id="{92ab90c6-1865-7463-b5e4-2b345a49a55a}" showlabel="true" locklevel="0">
+										<labels>
+											<label description="Site Within SSSI" languagecode="1033" />
+										</labels>
+										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d5d26b01-b925-0aa8-1296-ad83aaa27387}" />
+									</cell>
+								</row>
+							</rows>
+						</section>
+					</sections>
+				</column>
 				<column width="50%">
 					<sections>
 						<section name="tab_5_section_1" showlabel="false" showbar="false" locklevel="0" id="{c0a8b69c-45a8-472d-908c-d0401b1d220c}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
@@ -431,97 +522,6 @@
 						</section>
 					</sections>
 				</column>
-				<column width="50%">
-					<sections>
-						<section name="tab_5_section_2" showlabel="false" showbar="false" locklevel="0" id="{6e7b8ee0-1c01-e79a-15ed-dcb325e2e17b}" IsUserDefined="0" layout="varwidth" columns="1" labelwidth="115">
-							<labels>
-								<label description="Section" languagecode="1033" />
-							</labels>
-							<rows>
-								<row>
-									<cell id="{78011e93-0b05-367b-914e-696ce3d2226c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Name of Common Or Village Green" languagecode="1033" />
-										</labels>
-										<control id="pinswg_nameofcommonorvillagegreen" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_nameofcommonorvillagegreen" disabled="false" uniqueid="{ee6d8276-126d-214a-b0de-d9ebac384ed5}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{26c5e130-7b76-2cd1-94a3-85e6e154498c}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Ownership Certificate" languagecode="1033" />
-										</labels>
-										<control id="pinswg_ownershipcertificate" classid="{3EF39988-22BB-4f0b-BBBE-64B5A3748AEE}" datafieldname="pinswg_ownershipcertificate" disabled="false" uniqueid="{7b7b4877-9b02-1567-0b06-1b3ae754b35b}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{1d039388-6a2e-b6dc-e854-2486dadb4383}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address County" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresscounty" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresscounty" disabled="false" uniqueid="{9a099865-cced-79d0-b5b8-66c9de1e1583}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{33b90145-8019-7ee5-69a8-97297a7612b1}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 1" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline1" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline1" disabled="false" uniqueid="{e5a74000-ec7c-a3bd-b0b7-940895b96eaa}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{d64b33c4-c846-a924-b112-45054dc22349}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Line 2" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddressline2" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddressline2" disabled="false" uniqueid="{26b69aa4-b987-a2b9-8658-111258a57b61}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{8407346c-a4bc-bb87-014e-c7b892ec79dc}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Postcode" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresspostcode" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresspostcode" disabled="false" uniqueid="{45b798d8-ac96-ee7b-29d4-6eb5b0dc05bc}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{59cb3441-a56b-56a9-5ed4-2e18d936a5a5}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Address Town" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteaddresstown" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_siteaddresstown" disabled="false" uniqueid="{a5b75801-5543-1b7c-e5a9-518eb37176e9}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{3d1b7eed-d1c3-5d0e-21c9-b26cba351237}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Viewable from Road" languagecode="1033" />
-										</labels>
-										<control id="pinswg_siteviewablefromroad" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_siteviewablefromroad" disabled="false" uniqueid="{6e7306d1-7a2d-3d1b-a726-5275a198e31e}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{6d6a02c4-046c-7433-3511-6370a1b76c49}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within Green Belt" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithingreenbelt" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithingreenbelt" disabled="false" uniqueid="{62836395-be37-6a22-2add-a0bca87203ce}" />
-									</cell>
-								</row>
-								<row>
-									<cell id="{92ab90c6-1865-7463-b5e4-2b345a49a55a}" showlabel="true" locklevel="0">
-										<labels>
-											<label description="Site Within SSSI" languagecode="1033" />
-										</labels>
-										<control id="pinswg_sitewithinsssi" classid="{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}" datafieldname="pinswg_sitewithinsssi" disabled="false" uniqueid="{d5d26b01-b925-0aa8-1296-ad83aaa27387}" />
-									</cell>
-								</row>
-							</rows>
-						</section>
-					</sections>
-				</column>
 			</columns>
 		</tab>
 		<!--
@@ -1010,7 +1010,7 @@
 										<labels>
 											<label description="File upload" languagecode="1033" />
 										</labels>
-										<control id="pinswg_fileUpload" classid="{4273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
+										<control id="pinswg_fileUpload" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload" disabled="false" uniqueid="{5a91c72e-ce0a-4589-ad92-6433524fb090}" />
 									</cell>
 								</row>
 							</rows>
diff --git a/pages/api/documents/download/[id].js b/pages/api/documents/download/[id].js
index 4acc9afa..24493903 100644
--- a/pages/api/documents/download/[id].js
+++ b/pages/api/documents/download/[id].js
@@ -64,6 +64,9 @@ export default async function ApiProxy(req, res) {
             configDocument(token.access_token)
         )
         .then((response) => {
+            const bytes = response.data.byteLength;
+            console.log(bytes);
+
             res.setHeader(
                 "content-disposition",
                 "attachment; filename=" +
@@ -71,7 +74,12 @@ export default async function ApiProxy(req, res) {
                         "filename="
                     )[1]
             );
-            res.status(200).send(response.data);
+            return res.status(200).send(response.data);
+        })
+        .then(() => {
+            console.log("has downloaded");
+
+            return "downloadComplete";
         })
         .catch(({ err }) => {
             res.status(400).json(err);
diff --git a/pages/api/endpoint/getportalmoduledetailsproxy_api.js b/pages/api/endpoint/getportalmoduledetailsproxy_api.js
index df4dcb4b..4b6401d7 100644
--- a/pages/api/endpoint/getportalmoduledetailsproxy_api.js
+++ b/pages/api/endpoint/getportalmoduledetailsproxy_api.js
@@ -1,6 +1,7 @@
 import axios from "axios";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
+import { getSelectQuery } from "../../../actions/selectQueryTypes";
 
 const WORDKEY = process.env.HASHKEY;
 
diff --git a/pages/api/endpoint/updatecase_api.js b/pages/api/endpoint/updatecase_api.js
index 0d7b8a06..44622474 100644
--- a/pages/api/endpoint/updatecase_api.js
+++ b/pages/api/endpoint/updatecase_api.js
@@ -21,7 +21,7 @@ const hashAPIPath = (queryPath) => {
 };
 
 export default async function ApiProxy(req, res) {
-    var data = req.body;
+    var data = JSON.stringify(req.body);
     var appealObj = req.query.appealObj;
     var incidentID = req.query.incident;
 
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 0a488344..587a0ca5 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -811,6 +811,30 @@ textarea,
     .govuk-summary-list__key:last-of-type {
         width: 20%;
     }
+
+    .govuk-summary-list__value {
+        position: relative;
+    }
+    .coverLoadingLink {
+        &.downloading {
+            background-color: transparent;
+            position: absolute;
+            /* display: block; */
+            width: 100%;
+            z-index: 200;
+            top: 0px;
+            left: 0px;
+            height: 100%;
+            opacity: 50%;
+            content: " ";
+            display: block;
+        }
+        .data-loading-icon {
+            left: calc(100% - 40px);
+            height: 20px;
+            top: calc(50% - 10px);
+        }
+    }
 }
 
 .results .govuk-summary-list__row {