diff --git a/api.py b/api.py
index 5847d487bbe8b0f29c39c2cb63fc71717c8d483c..ecacd816966040add04f78208c4bfab6eb7f30e6 100755
--- a/api.py
+++ b/api.py
@@ -189,12 +189,12 @@ class EccsResults(Resource):
           # Status;                          check[5]
           # SP-entityID-1;                   check[6]
           # SP-check-time-1;                 check[7]
-          # SP-status-1;                     check[8]
-          # SP-status-code-1;                check[9]
+          # SP-status-code-1;                check[8]
+          # SP-status-1;                     check[9]
           # SP-entityID-2;                   check[10]
           # SP-check-time-2;                 check[11]
-          # SP-status-2                      check[12]
-          # SP-status-code-2                 check[13]
+          # SP-status-code-2                 check[12]
+          # SP-status-2                      check[13]
           check = line.split(";")
 
           idp_displayname = check[0].rstrip("\n\r")
@@ -205,12 +205,12 @@ class EccsResults(Resource):
           idp_checks_status = check[5].rstrip("\n\r")
           sp1_entity_id = check[6].rstrip("\n\r")
           sp1_check_time = check[7].rstrip("\n\r")
-          sp1_check_status = check[8].rstrip("\n\r")
-          sp1_status_code = check[9].rstrip("\n\r")
+          sp1_status_code = check[8].rstrip("\n\r")
+          sp1_check_status = check[9].rstrip("\n\r")
           sp2_entity_id = check[10].rstrip("\n\r")
           sp2_check_time = check[11].rstrip("\n\r")
-          sp2_check_status = check[12].rstrip("\n\r")
-          sp2_status_code = check[13].rstrip("\n\r")
+          sp2_status_code = check[12].rstrip("\n\r")
+          sp2_check_status = check[13].rstrip("\n\r")
 
           if (idp and status):
               app.logger.info("Results for the idp '%s' with status '%s'" % (idp, status))
diff --git a/web/script.js b/web/script.js
index bbf8672c58777709578fcebe5af1af80c11e7135..8d89553afd5c3f064e7f278a1c87d9d8885beaad 100644
--- a/web/script.js
+++ b/web/script.js
@@ -13,20 +13,23 @@ function format ( d ) {
         '<tr>'+
             '<td>Support Contacts:</td>'+
             '<td>'+d.contacts.support+'</td>'+
+            '<td>Check Time</td>'+
+            '<td>Status Code</td>'+
+            '<td>Result Check</td>'+
         '</tr>'+
         '<tr>'+
             '<td>SP1:</td>'+
             '<td>'+d.sp1.entityID+'</td>'+
             '<td>'+d.sp1.checkTime+'</td>'+
-            '<td>'+d.sp1.status+'</td>'+
             '<td>'+d.sp1.statusCode+'</td>'+
+            '<td>'+d.sp1.status+'</td>'+
         '</tr>'+
         '<tr>'+
             '<td>SP2:</td>'+
             '<td>'+d.sp2.entityID+'</td>'+
             '<td>'+d.sp2.checkTime+'</td>'+
-            '<td>'+d.sp2.status+'</td>'+
             '<td>'+d.sp2.statusCode+'</td>'+
+            '<td>'+d.sp2.status+'</td>'+
         '</tr>'+
     '</table>';
 }