diff --git a/Software/PC_Application/Traces/tracexyplot.cpp b/Software/PC_Application/Traces/tracexyplot.cpp
index e95c560..503d1f8 100644
--- a/Software/PC_Application/Traces/tracexyplot.cpp
+++ b/Software/PC_Application/Traces/tracexyplot.cpp
@@ -19,6 +19,12 @@ const set<TraceXYPlot::YAxisType> TraceXYPlot::YAxisTypes = {TraceXYPlot::YAxisT
                                            TraceXYPlot::YAxisType::Magnitude,
                                            TraceXYPlot::YAxisType::Phase,
                                            TraceXYPlot::YAxisType::VSWR,
+                                           TraceXYPlot::YAxisType::Real,
+                                           TraceXYPlot::YAxisType::Imaginary,
+                                           TraceXYPlot::YAxisType::SeriesR,
+                                           TraceXYPlot::YAxisType::Capacitance,
+                                           TraceXYPlot::YAxisType::Inductance,
+                                           TraceXYPlot::YAxisType::QualityFactor,
                                            TraceXYPlot::YAxisType::ImpulseReal,
                                            TraceXYPlot::YAxisType::ImpulseMag,
                                            TraceXYPlot::YAxisType::Step,
@@ -782,6 +788,8 @@ QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type)
     case YAxisType::Magnitude: return "Magnitude";
     case YAxisType::Phase: return "Phase";
     case YAxisType::VSWR: return "VSWR";
+    case YAxisType::Real: return "Real (R)";
+    case YAxisType::Imaginary: return "Imaginary (X)";
     case YAxisType::SeriesR: return "Resistance";
     case YAxisType::Capacitance: return "Capacitance";
     case YAxisType::Inductance: return "Inductance";
@@ -887,6 +895,12 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
     case YAxisType::VSWR:
         ret.setY(Util::SparamToVSWR(data.y));
         break;
+    case YAxisType::Real:
+        ret.setY(data.y.real());
+        break;
+    case YAxisType::Imaginary:
+        ret.setY(data.y.imag());
+        break;
     case YAxisType::SeriesR:
         ret.setY(Util::SparamToResistance(data.y));
         break;
diff --git a/Software/PC_Application/Traces/tracexyplot.h b/Software/PC_Application/Traces/tracexyplot.h
index 90c0185..3b256da 100644
--- a/Software/PC_Application/Traces/tracexyplot.h
+++ b/Software/PC_Application/Traces/tracexyplot.h
@@ -17,6 +17,8 @@ public:
         Magnitude,
         Phase,
         VSWR,
+        Real,
+        Imaginary,
         // derived parameter options
         SeriesR,
         Capacitance,
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
index 001ebf2..0c8e49d 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.cpp
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
@@ -12,6 +12,8 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
     ui->setupUi(this);
     ui->Y1type->clear();
     ui->Y2type->clear();
+    ui->Y1type->setMaxVisibleItems(20);
+    ui->Y2type->setMaxVisibleItems(20);
 
     for(int i=0;i<(int) TraceXYPlot::YAxisType::Last;i++) {
         ui->Y1type->addItem(TraceXYPlot::AxisTypeToName((TraceXYPlot::YAxisType) i));
@@ -186,6 +188,8 @@ std::set<TraceXYPlot::YAxisType> XYplotAxisDialog::supportedYAxis(TraceXYPlot::X
         ret.insert(TraceXYPlot::YAxisType::Magnitude);
         ret.insert(TraceXYPlot::YAxisType::Phase);
         ret.insert(TraceXYPlot::YAxisType::VSWR);
+        ret.insert(TraceXYPlot::YAxisType::Real);
+        ret.insert(TraceXYPlot::YAxisType::Imaginary);
         ret.insert(TraceXYPlot::YAxisType::SeriesR);
         ret.insert(TraceXYPlot::YAxisType::Capacitance);
         ret.insert(TraceXYPlot::YAxisType::Inductance);
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 83039fa..d236cb7 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -495,6 +495,7 @@ VNA::VNA(AppWindow *window)
         }
         cbSweepType->setCurrentIndex((int) sw);
     });
+    configureToolbarForFrequencySweep();
     // initial setup is frequency sweep
     configureToolbarForFrequencySweep();
     SetSweepType(SweepType::Frequency);