diff --git a/Software/PC_Application/Calibration/calibration.cpp b/Software/PC_Application/Calibration/calibration.cpp
index 875af02..a68667c 100644
--- a/Software/PC_Application/Calibration/calibration.cpp
+++ b/Software/PC_Application/Calibration/calibration.cpp
@@ -621,6 +621,55 @@ std::vector<Trace *> Calibration::getErrorTermTraces()
     return traces;
 }
 
+std::vector<Trace *> Calibration::getMeasurementTraces()
+{
+    std::vector<Trace*> traces;
+    for(auto m : measurements) {
+        auto info = getMeasurementInfo(m.first);
+        if(info.points > 0) {
+            vector<QString> usedPrefixes;
+            switch(m.first) {
+            case Measurement::Port1Load:
+            case Measurement::Port1Open:
+            case Measurement::Port1Short:
+                usedPrefixes = {"S11"};
+                break;
+            case Measurement::Port2Load:
+            case Measurement::Port2Open:
+            case Measurement::Port2Short:
+                usedPrefixes = {"S22"};
+                break;
+            case Measurement::Through:
+            case Measurement::Line:
+            case Measurement::Isolation:
+                usedPrefixes = {"S11", "S12", "S21", "S22"};
+                break;
+            }
+            for(auto prefix : usedPrefixes) {
+                auto t = new Trace(prefix + " " + info.name);
+                t->setCalibration(true);
+                t->setReflection(prefix == "S11" || prefix == "S22");
+                for(auto p : m.second.datapoints) {
+                    Trace::Data d;
+                    d.frequency = p.frequency;
+                    if(prefix == "S11") {
+                        d.S = complex<double>(p.real_S11, p.imag_S11);
+                    } else if(prefix == "S12") {
+                        d.S = complex<double>(p.real_S12, p.imag_S12);
+                    } else if(prefix == "S21") {
+                        d.S = complex<double>(p.real_S21, p.imag_S21);
+                    } else {
+                        d.S = complex<double>(p.real_S22, p.imag_S22);
+                    }
+                    t->addData(d);
+                }
+                traces.push_back(t);
+            }
+        }
+    }
+    return traces;
+}
+
 bool Calibration::openFromFile(QString filename)
 {
     if(filename.isEmpty()) {
diff --git a/Software/PC_Application/Calibration/calibration.h b/Software/PC_Application/Calibration/calibration.h
index 87d68a1..47b496d 100644
--- a/Software/PC_Application/Calibration/calibration.h
+++ b/Software/PC_Application/Calibration/calibration.h
@@ -80,6 +80,7 @@ public:
     }
 
     std::vector<Trace*> getErrorTermTraces();
+    std::vector<Trace*> getMeasurementTraces();
 
     bool openFromFile(QString filename = QString());
     bool saveToFile(QString filename = QString());
diff --git a/Software/PC_Application/Calibration/calkitdialog.ui b/Software/PC_Application/Calibration/calkitdialog.ui
index a457b25..4048d94 100644
--- a/Software/PC_Application/Calibration/calkitdialog.ui
+++ b/Software/PC_Application/Calibration/calkitdialog.ui
@@ -32,7 +32,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -112,7 +112,7 @@
                <item row="3" column="0">
                 <widget class="QLabel" name="label_11">
                  <property name="text">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L0 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-12&lt;/span&gt;F]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L0 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-12&lt;/span&gt;H]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -122,7 +122,7 @@
                <item row="4" column="0">
                 <widget class="QLabel" name="label_12">
                  <property name="text">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L1 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-24&lt;/span&gt;F/Hz]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L1 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-24&lt;/span&gt;H/Hz]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -132,7 +132,7 @@
                <item row="5" column="0">
                 <widget class="QLabel" name="label_13">
                  <property name="text">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L2 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-33&lt;/span&gt;F/Hz&lt;span style=&quot; vertical-align:super;&quot;&gt;2&lt;/span&gt;]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L2 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-33&lt;/span&gt;H/Hz&lt;span style=&quot; vertical-align:super;&quot;&gt;2&lt;/span&gt;]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -142,7 +142,7 @@
                <item row="6" column="0">
                 <widget class="QLabel" name="label_14">
                  <property name="text">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L3 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-42&lt;/span&gt;F/Hz&lt;span style=&quot; vertical-align:super;&quot;&gt;3&lt;/span&gt;]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L3 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-42&lt;/span&gt;H/Hz&lt;span style=&quot; vertical-align:super;&quot;&gt;3&lt;/span&gt;]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -288,7 +288,7 @@
                <item row="6" column="0">
                 <widget class="QLabel" name="label_6">
                  <property name="text">
-                  <string>C0 [10&lt;sup&gt;-45&lt;/sup&gt;F/Hz&lt;sup&gt;3&lt;/sup&gt;]:</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;C3 [10&lt;span style=&quot; vertical-align:super;&quot;&gt;-45&lt;/span&gt;F/Hz&lt;span style=&quot; vertical-align:super;&quot;&gt;3&lt;/span&gt;]:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
@@ -845,17 +845,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SIUnitEdit</class>
+   <extends>QLineEdit</extends>
+   <header>CustomWidgets/siunitedit.h</header>
+  </customwidget>
   <customwidget>
    <class>TouchstoneImport</class>
    <extends>QWidget</extends>
    <header>CustomWidgets/touchstoneimport.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>SIUnitEdit</class>
-   <extends>QLineEdit</extends>
-   <header>CustomWidgets/siunitedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>open_Z0</tabstop>
@@ -933,10 +933,10 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="ThroughType"/>
   <buttongroup name="TRL_Rtype"/>
+  <buttongroup name="LoadType"/>
+  <buttongroup name="ThroughType"/>
   <buttongroup name="ShortType"/>
   <buttongroup name="OpenType"/>
-  <buttongroup name="LoadType"/>
  </buttongroups>
 </ui>
diff --git a/Software/PC_Application/Traces/tracemodel.cpp b/Software/PC_Application/Traces/tracemodel.cpp
index e90eab7..e30d663 100644
--- a/Software/PC_Application/Traces/tracemodel.cpp
+++ b/Software/PC_Application/Traces/tracemodel.cpp
@@ -97,7 +97,7 @@ QVariant TraceModel::data(const QModelIndex &index, int role) const
             return QVariant();
         }
     } else if (index.column() == 1) {
-        if (role == Qt::DecorationRole && !traces[index.row()]->isTouchstone()) {
+        if (role == Qt::DecorationRole && traces[index.row()]->isLive()) {
             if (traces[index.row()]->isPaused()) {
                 return QIcon(":/icons/pause.svg");
             } else {
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 132fa97..96ab4fb 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -119,13 +119,6 @@ VNA::VNA(AppWindow *window)
        StartCalibrationDialog();
     });
 
-    auto calImport = calMenu->addAction("Import error terms as traces");
-    calImport->setEnabled(false);
-    connect(calImport, &QAction::triggered, [=](){
-        auto import = new TraceImportDialog(traceModel, cal.getErrorTermTraces());
-        import->show();
-    });
-
     auto calEditKit = calMenu->addAction("Edit Calibration Kit");
     connect(calEditKit, &QAction::triggered, [=](){
         cal.getCalibrationKit().edit([=](){
@@ -134,6 +127,22 @@ VNA::VNA(AppWindow *window)
             }
         });
     });
+
+    calMenu->addSeparator();
+
+    auto calImportTerms = calMenu->addAction("Import error terms as traces");
+    calImportTerms->setEnabled(false);
+    connect(calImportTerms, &QAction::triggered, [=](){
+        auto import = new TraceImportDialog(traceModel, cal.getErrorTermTraces());
+        import->show();
+    });
+    auto calImportMeas = calMenu->addAction("Import measurements as traces");
+    calImportMeas->setEnabled(false);
+    connect(calImportMeas, &QAction::triggered, [=](){
+        auto import = new TraceImportDialog(traceModel, cal.getMeasurementTraces());
+        import->show();
+    });
+
     portExtension.setCalkit(&cal.getCalibrationKit());
 
     // Tools menu
@@ -319,7 +328,8 @@ VNA::VNA(AppWindow *window)
         cbEnableCal->setCheckState(Qt::CheckState::Unchecked);
         cbType->blockSignals(false);
         cbEnableCal->blockSignals(false);
-        calImport->setEnabled(false);
+        calImportTerms->setEnabled(false);
+        calImportMeas->setEnabled(false);
         saveCal->setEnabled(false);
     });
     connect(calDisable, &QAction::triggered, this, &VNA::DisableCalibration);
@@ -335,7 +345,8 @@ VNA::VNA(AppWindow *window)
         cbEnableCal->setCheckState(Qt::CheckState::Checked);
         cbType->blockSignals(false);
         cbEnableCal->blockSignals(false);
-        calImport->setEnabled(true);
+        calImportTerms->setEnabled(true);
+        calImportMeas->setEnabled(true);
         saveCal->setEnabled(true);
     });