diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.cpp b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.cpp
index fed8c53..b79f58f 100644
--- a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.cpp
@@ -254,6 +254,61 @@ void CalibrationViewDialog::populateScene()
         drawText(marginLeft - portSize/2, marginTop + i*portHeight - portHeight/2 + portReverseYOffset, "b"+QString::number(i), colorF, Qt::AlignRight, Qt::AlignCenter);
     }
 
-    // create the ports of the VNA
-
+    // Fill the measurement correction table
+    ui->table->clear();
+    ui->table->setRowCount(ports*ports);
+    ui->table->setColumnCount(2);
+    ui->table->setHorizontalHeaderLabels({"Parameter", "Calibration Status"});
+    for(unsigned int i=1;i<=ports;i++) {
+        for(unsigned int j=1;j<=ports;j++) {
+            auto row = (i-1)*ports+j-1;
+            // add parameter
+            ui->table->setItem(row, 0, new QTableWidgetItem("S"+QString::number(j)+QString::number(i)));
+            // check the calibration status
+            QString status = "Uncalibrated";
+            if(i == j) {
+                // check reflection parameters
+                if(cal->hasSourceMatch(i) && cal->hasDirectivity(i) && cal->hasReflectionTracking(i)) {
+                    // we are calibrated
+                    status = "Calibrated";
+                    // check if we have enhanced responses
+                    QList<int> enhanced;
+                    for(unsigned int k=1;k<=ports;k++) {
+                        if(k==i) {
+                            continue;
+                        }
+                        if(cal->hasReceiverMatch(i, k)) {
+                            enhanced.append(k);
+                        }
+                    }
+                    if(enhanced.size() == 1) {
+                        status += " with enhanced response from port "+QString::number(enhanced[0]);
+                    } else if(enhanced.size() > 1) {
+                        status += " with enhanced response from ports ";
+                        for(unsigned int k=0;k<enhanced.size();k++) {
+                            if(k == enhanced.size() - 1) {
+                                status += " and "+QString::number(enhanced[k]);
+                            } else if(k > 0) {
+                                status += ", ";
+                            }
+                            status += QString::number(enhanced[k]);
+                        }
+                    }
+                }
+            } else {
+                // check transmission calibration
+                if(cal->hasTransmissionTracking(i, j)) {
+                    // we are calibrated
+                    status = "Calibrated";
+                    // check if we have isolation terms
+                    if(cal->hasIsolation(i, j)) {
+                        status += " with isolation measurement";
+                    }
+                }
+            }
+            // add calibration status
+            ui->table->setItem(row, 1, new QTableWidgetItem(status));
+        }
+    }
+    ui->table->resizeColumnsToContents();
 }
diff --git a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.ui b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.ui
index de23638..89a2e78 100644
--- a/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.ui
+++ b/Software/PC_Application/LibreVNA-GUI/Calibration/calibrationviewdialog.ui
@@ -6,70 +6,111 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>818</width>
-    <height>623</height>
+    <width>1106</width>
+    <height>665</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Calibration Error Term Model</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>View error term model when stimulus is at port</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="port">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>8</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style='color: darkgreen;'&gt;Green&lt;/span&gt; error terms have been calculated from calibration measurements.&lt;/p&gt;&lt;p&gt;&lt;span style='color: darkred;'&gt;Red&lt;/span&gt; error terms are at their default values (either 1 or 0).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGraphicsView" name="view">
-     <property name="dragMode">
-      <enum>QGraphicsView::DragMode::ScrollHandDrag</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;D: Directivity, R: Reflection tracking, S: Source match, L: Receiver match, T: Transmission tracking, I: Isolation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>View error term model when stimulus is at port</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="port">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>8</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style='color: darkgreen;'&gt;Green&lt;/span&gt; error terms have been calculated from calibration measurements.&lt;/p&gt;&lt;p&gt;&lt;span style='color: darkred;'&gt;Red&lt;/span&gt; error terms are at their default values (either 1 or 0).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGraphicsView" name="view">
+         <property name="dragMode">
+          <enum>QGraphicsView::DragMode::ScrollHandDrag</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;D: Directivity, R: Reflection tracking, S: Source match, L: Receiver match, T: Transmission tracking, I: Isolation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Which measurements are being corrected?</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTableWidget" name="table">
+         <property name="editTriggers">
+          <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::SelectionMode::NoSelection</enum>
+         </property>
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="verticalHeaderVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>