diff --git a/cove_ofds/templates/cove_ofds/additional_checks_table.html b/cove_ofds/templates/cove_ofds/additional_checks_table.html
index 24fa00d..924d3ff 100644
--- a/cove_ofds/templates/cove_ofds/additional_checks_table.html
+++ b/cove_ofds/templates/cove_ofds/additional_checks_table.html
@@ -15,35 +15,35 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Node Id we can\'t find' %}</th>
-                <th class="">{% trans 'Span Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Span Id' %}</th>
+                <th class="">{% trans 'Node Id we can\'t find' %}</th>
             </tr>
         </thead>
         <tbody>
             {% for additional_check in additional_checks.span_start_node_not_found %}
                 <tr>
                     <td>
-                        {{ additional_check.missing_node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
                         {{ additional_check.span_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.missing_node_id }}
                     </td>
                 </tr>
             {% endfor %}
             {% for additional_check in additional_checks.span_end_node_not_found %}
                 <tr>
                     <td>
-                        {{ additional_check.missing_node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
                         {{ additional_check.span_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.missing_node_id }}
                     </td>
                 </tr>
             {% endfor %}
@@ -64,8 +64,8 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Type' %}</th>
             </tr>
         </thead>
@@ -73,10 +73,10 @@ <h4>
             {% for additional_check in additional_checks.node_location_type_incorrect %}
                 <tr>
                     <td>
-                        {{ additional_check.node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.node_id }}
                     </td>
                     <td>
                         {{ additional_check.incorrect_type }}
@@ -100,8 +100,8 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Coordinates' %}</th>
             </tr>
         </thead>
@@ -109,10 +109,10 @@ <h4>
             {% for additional_check in additional_checks.node_location_coordinates_incorrect %}
                 <tr>
                     <td>
-                        {{ additional_check.node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.node_id }}
                     </td>
                     <td>
                         {{ additional_check.incorrect_coordinates }}
@@ -136,8 +136,8 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Span Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Span Id' %}</th>
                 <th class="">{% trans 'Type' %}</th>
             </tr>
         </thead>
@@ -145,10 +145,10 @@ <h4>
             {% for additional_check in additional_checks.span_route_type_incorrect %}
                 <tr>
                     <td>
-                        {{ additional_check.span_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.span_id }}
                     </td>
                     <td>
                         {{ additional_check.incorrect_type }}
@@ -172,8 +172,8 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Span Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Span Id' %}</th>
                 <th class="">{% trans 'Coordinates' %}</th>
             </tr>
         </thead>
@@ -181,10 +181,10 @@ <h4>
             {% for additional_check in additional_checks.span_route_coordinates_incorrect %}
                 <tr>
                     <td>
-                        {{ additional_check.span_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.span_id }}
                     </td>
                     <td>
                         {{ additional_check.incorrect_coordinates }}
@@ -209,8 +209,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Phase reference' %}</th>
                 </tr>
             </thead>
@@ -218,10 +218,10 @@ <h4>
                 {% for additional_check in additional_checks.node_phase_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.node_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.node_id }}
                         </td>
                         <td>
                             {{ additional_check.phase_id_not_found }}
@@ -235,8 +235,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Phase reference' %}</th>
                 </tr>
             </thead>
@@ -244,10 +244,10 @@ <h4>
                 {% for additional_check in additional_checks.span_phase_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.span_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.span_id }}
                         </td>
                         <td>
                             {{ additional_check.phase_id_not_found }}
@@ -261,8 +261,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Contract Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Contract Id' %}</th>
                     <th class="">{% trans 'Phase reference' %}</th>
                 </tr>
             </thead>
@@ -270,10 +270,10 @@ <h4>
                 {% for additional_check in additional_checks.contract_related_phase_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.contract_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.contract_id }}
                         </td>
                         <td>
                             {{ additional_check.phase_id_not_found }}
@@ -301,8 +301,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Phase reference name' %}</th>
                 </tr>
             </thead>
@@ -310,10 +310,10 @@ <h4>
                 {% for additional_check in additional_checks.node_phase_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.node_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.node_id }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -327,8 +327,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Phase reference name' %}</th>
                 </tr>
             </thead>
@@ -336,10 +336,10 @@ <h4>
                 {% for additional_check in additional_checks.span_phase_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.span_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.span_id }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -353,8 +353,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Contract Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Contract Id' %}</th>
                     <th class="">{% trans 'Phase reference name' %}</th>
                 </tr>
             </thead>
@@ -362,10 +362,10 @@ <h4>
                 {% for additional_check in additional_checks.contract_related_phase_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.contract_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.contract_id }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -391,9 +391,9 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Field' %}</th>
-                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Node Id' %}</th>
+                    <th class="">{% trans 'Field' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -401,13 +401,13 @@ <h4>
                 {% for additional_check in additional_checks.node_organisation_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.field }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
                             {{ additional_check.node_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.field }}
                         </td>
                         <td>
                             {{ additional_check.organisation_id_not_found }}
@@ -421,9 +421,9 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Field' %}</th>
-                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Span Id' %}</th>
+                    <th class="">{% trans 'Field' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -431,13 +431,13 @@ <h4>
                 {% for additional_check in additional_checks.span_organisation_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.field }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
                             {{ additional_check.span_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.field }}
                         </td>
                         <td>
                             {{ additional_check.organisation_id_not_found }}
@@ -451,8 +451,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Phase Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Phase Id' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -460,10 +460,10 @@ <h4>
                 {% for additional_check in additional_checks.phase_organisation_reference_id_not_found %}
                     <tr>
                         <td>
-                            {{ additional_check.phase_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.phase_id }}
                         </td>
                         <td>
                             {{ additional_check.organisation_id_not_found }}
@@ -490,9 +490,9 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Field' %}</th>
-                    <th class="">{% trans 'Node Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Node Id' %}</th>
+                    <th class="">{% trans 'Field' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -500,13 +500,13 @@ <h4>
                 {% for additional_check in additional_checks.node_organisation_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.field }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
                             {{ additional_check.node_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.field }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -520,9 +520,9 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Field' %}</th>
-                    <th class="">{% trans 'Span Id' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Span Id' %}</th>
+                    <th class="">{% trans 'Field' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -530,13 +530,13 @@ <h4>
                 {% for additional_check in additional_checks.span_organisation_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.field }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
                             {{ additional_check.span_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.field }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -550,8 +550,8 @@ <h4>
         <table class="table">
             <thead>
                 <tr>
-                    <th class="">{% trans 'Phase ID' %}</th>
                     <th class="">{% trans 'Network ID' %}</th>
+                    <th class="">{% trans 'Phase ID' %}</th>
                     <th class="">{% trans 'Organisation reference' %}</th>
                 </tr>
             </thead>
@@ -559,10 +559,10 @@ <h4>
                 {% for additional_check in additional_checks.phase_organisation_reference_name_does_not_match %}
                     <tr>
                         <td>
-                            {{ additional_check.phase_id }}
+                            {{ additional_check.network_id }}
                         </td>
                         <td>
-                            {{ additional_check.network_id }}
+                            {{ additional_check.phase_id }}
                         </td>
                         <td>
                             {{ additional_check.name_in_reference }}
@@ -587,18 +587,18 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Node Id' %}</th>
             </tr>
         </thead>
         <tbody>
             {% for additional_check in additional_checks.node_international_connections_country_not_set %}
                 <tr>
                     <td>
-                        {{ additional_check.node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.node_id }}
                     </td>
                 </tr>
             {% endfor %}
@@ -616,18 +616,18 @@ <h4>
     <table class="table">
         <thead>
             <tr>
-                <th class="">{% trans 'Node Id' %}</th>
                 <th class="">{% trans 'Network ID' %}</th>
+                <th class="">{% trans 'Node Id' %}</th>
             </tr>
         </thead>
         <tbody>
             {% for additional_check in additional_checks.node_not_used_in_any_spans %}
                 <tr>
                     <td>
-                        {{ additional_check.node_id }}
+                        {{ additional_check.network_id }}
                     </td>
                     <td>
-                        {{ additional_check.network_id }}
+                        {{ additional_check.node_id }}
                     </td>
                 </tr>
             {% endfor %}