diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml
index 024914f2..d52d506f 100644
--- a/calibration-gui/pom.xml
+++ b/calibration-gui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<artifactId>calibration-gui</artifactId>
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/AbstractMeasurementController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/AbstractMeasurementController.java
index 7136e1d2..ddf3ad63 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/AbstractMeasurementController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/AbstractMeasurementController.java
@@ -65,6 +65,7 @@
 import gov.llnl.gnem.apps.coda.common.gui.plotting.PlotPoint;
 import gov.llnl.gnem.apps.coda.common.gui.plotting.SymbolStyleMapFactory;
 import gov.llnl.gnem.apps.coda.common.gui.util.CellBindingUtils;
+import gov.llnl.gnem.apps.coda.common.gui.util.HiddenHeaderTableView;
 import gov.llnl.gnem.apps.coda.common.gui.util.MaybeNumericStringComparator;
 import gov.llnl.gnem.apps.coda.common.gui.util.NumberFormatFactory;
 import gov.llnl.gnem.apps.coda.common.gui.util.SnapshotUtils;
@@ -90,6 +91,7 @@
 import javafx.scene.control.Tab;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellDataFeatures;
+import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
@@ -218,11 +220,14 @@ public abstract class AbstractMeasurementController implements MapListeningContr
     @FXML
     protected TableColumn<MeasuredMwDetails, String> bandCoverageCol;
 
+    @FXML
+    protected TableColumn<MeasuredMwDetails, String> likelyPoorlyConstrainedCol;
+
     @FXML
     protected TableColumn<LabeledPlotPoint, String> stationCol;
 
     @FXML
-    protected TableView<Pair<String, String>> summaryTable;
+    protected HiddenHeaderTableView<Pair<String, String>> summaryTable;
 
     @FXML
     protected TableColumn<Pair<String, String>, String> summaryNameCol;
@@ -317,6 +322,7 @@ protected AbstractMeasurementController(final SpectraClient spectraClient, final
 
     public void initialize() {
         evidCombo.setItems(evids);
+        evidCombo.setVisibleRowCount(5);
 
         configureAxisShrink(xAxisShrink, () -> {
             shouldXAxisShrink = !shouldXAxisShrink;
@@ -335,6 +341,7 @@ public void initialize() {
         final AxisLimits mwXaxis = new AxisLimits(Axis.Type.X, 0.0, 10.0);
         final AxisLimits mwYaxis = new AxisLimits(Axis.Type.Y, 0.0, 10.0);
         mwPlot.setAxisLimits(mwXaxis, mwYaxis);
+        mwPlot.setMargin(30, 40, 50, 50);
         mwPlot.attachToDisplayNode(mwPlotPane);
 
         stressPlot = plotFactory.basicPlot();
@@ -344,14 +351,16 @@ public void initialize() {
         final AxisLimits stressXaxis = new AxisLimits(Axis.Type.X, 1.0, 1.0);
         final AxisLimits stressYaxis = new AxisLimits(Axis.Type.Y, 1.0, 1.0);
         stressPlot.setAxisLimits(stressXaxis, stressYaxis);
+        stressPlot.setMargin(30, 40, 70, 50);
         stressPlot.attachToDisplayNode(stressPlotPane);
 
         sdPlot = plotFactory.basicPlot();
-        sdPlot.getTitle().setText("Site correction overview");
+        sdPlot.getTitle().setText("Site correction overview (# stations)");
         sdPlot.getTitle().setFontSize(16);
         sdPlot.addAxes(plotFactory.axis(Axis.Type.LOG_X, "Frequency (Hz)"), plotFactory.axis(Axis.Type.Y, "Standard Deviation"));
         sdPlot.setAxisLimits(new AxisLimits(Axis.Type.LOG_X, 0.0, 1.0), new AxisLimits(Axis.Type.Y, 0.0, 2.0));
         sdPlot.showLegend(false);
+        sdPlot.setMargin(30, 40, 50, null);
         sdPlot.attachToDisplayNode(sdPlotPane);
 
         energyVsMomentPlot = plotFactory.basicPlot();
@@ -362,6 +371,7 @@ public void initialize() {
         rightAxis.setTickFormat(TickFormat.LOG10_DYNE_CM_TO_MW);
         energyVsMomentPlot.addAxes(rightAxis);
         energyVsMomentPlot.showLegend(false);
+        energyVsMomentPlot.setMargin(30, 40, 50, 50);
         energyVsMomentPlot.attachToDisplayNode(energyVsMomentPane);
 
         apparentStressVsMomentPlot = plotFactory.basicPlot();
@@ -372,6 +382,7 @@ public void initialize() {
         rightAxis.setTickFormat(TickFormat.LOG10_DYNE_CM_TO_MW);
         apparentStressVsMomentPlot.addAxes(rightAxis);
         apparentStressVsMomentPlot.showLegend(false);
+        apparentStressVsMomentPlot.setMargin(30, 40, 50, 50);
         apparentStressVsMomentPlot.attachToDisplayNode(apparentStressVsMomentPane);
 
         cornerFreqVsMomentPlot = plotFactory.basicPlot();
@@ -382,6 +393,7 @@ public void initialize() {
         rightAxis.setTickFormat(TickFormat.LOG10_DYNE_CM_TO_MW);
         cornerFreqVsMomentPlot.addAxes(rightAxis);
         cornerFreqVsMomentPlot.showLegend(false);
+        cornerFreqVsMomentPlot.setMargin(30, 40, 50, 50);
         cornerFreqVsMomentPlot.attachToDisplayNode(cornerFreqVsMomentPane);
 
         evidCombo.valueProperty().addListener((observable, oldValue, newValue) -> {
@@ -417,6 +429,7 @@ public void initialize() {
         CellBindingUtils.attachTextCellFactories(measuredMwUq2LowCol, MeasuredMwDetails::getMw2Min, dfmt4);
         CellBindingUtils.attachTextCellFactories(measuredMwUq2HighCol, MeasuredMwDetails::getMw2Max, dfmt4);
         CellBindingUtils.attachTextCellFactories(bandCoverageCol, MeasuredMwDetails::getBandCoverage, dfmt4);
+        CellBindingUtils.attachTextCellFactoriesString(likelyPoorlyConstrainedCol, mw -> mw.isLikelyPoorlyConstrained().toString());
 
         stationCountCol.setCellValueFactory(
                 x -> Bindings.createIntegerBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(MeasuredMwDetails::getStationCount).orElseGet(() -> 0)).asObject());
@@ -436,6 +449,16 @@ public void initialize() {
         menu.getItems().add(exclude);
 
         summaryTable.setItems(summaryValues);
+        summaryTable.setRowFactory(table -> new TableRow<Pair<String, String>>() {
+            @Override
+            protected void updateItem(Pair<String, String> entry, boolean b) {
+                super.updateItem(entry, b);
+                if (entry != null && entry.getLeft() != null && entry.getLeft().contains("(Model Fit)")) {
+                    setStyle("-fx-font-weight:bold;");
+                }
+            }
+        });
+
         CellBindingUtils.attachTextCellFactoriesString(summaryNameCol, Pair::getLeft);
         CellBindingUtils.attachTextCellFactoriesString(summaryValueCol, Pair::getRight);
         summaryNameCol.setCellFactory(param -> new TextWrappingTableCell());
@@ -469,6 +492,9 @@ private void plotSpectra() {
         });
 
         final List<Spectra> fittingSpectra;
+        boolean likelyPoorlyConstrained = false;
+        MeasuredMwDetails mwDetails = null;
+
         if (evidCombo != null && evidCombo.getSelectionModel().getSelectedIndex() > 0) {
             filteredMeasurements = filterToEvent(evidCombo.getSelectionModel().getSelectedItem(), spectralMeasurements);
             fittingSpectra = getFitSpectra();
@@ -476,45 +502,59 @@ private void plotSpectra() {
             fittingSpectra.add(referenceSpectra);
             final Spectra validationSpectra = spectraClient.getValidationSpectra(evidCombo.getSelectionModel().getSelectedItem()).block(Duration.ofSeconds(2));
             fittingSpectra.add(validationSpectra);
+
             if (filteredMeasurements != null && !filteredMeasurements.isEmpty() && filteredMeasurements.get(0).getWaveform() != null) {
                 final Event event = filteredMeasurements.get(0).getWaveform().getEvent();
-                summaryValues.add(new Pair<>("Date", DateTimeFormatter.ISO_LOCAL_DATE.withZone(ZoneId.of("UTC")).format(event.getOriginTime().toInstant())));
-                summaryValues.add(new Pair<>("JDay", Integer.toString(new TimeT(event.getOriginTime().toInstant().getEpochSecond()).getJDay())));
+                String date = DateTimeFormatter.ISO_LOCAL_DATE.withZone(ZoneId.of("UTC")).format(event.getOriginTime().toInstant());
+                String jDay = Integer.toString(new TimeT(event.getOriginTime()).getJdate()).substring(4);
+                summaryValues.add(new Pair<>("Date", String.format("%s (%s)", date, jDay)));
                 summaryValues.add(new Pair<>("Origin Time", DateTimeFormatter.ISO_TIME.withZone(ZoneId.of("UTC")).format(event.getOriginTime().toInstant())));
-
                 summaryValues.add(new Pair<>("Latitude", dfmt4.format(event.getLatitude())));
                 summaryValues.add(new Pair<>("Longitude", dfmt4.format(event.getLongitude())));
-                summaryValues.add(new Pair<>("Depth", dfmt2.format(event.getDepth())));
+                summaryValues.add(new Pair<>("Depth (km)", dfmt2.format(event.getDepth())));
+                summaryValues.add(null); // Adds space between sections
 
+                if (mwParameters != null && !mwParameters.isEmpty()) {
+                    mwDetails = mwParameters.stream().filter(mwDetail -> event.getEventId().equalsIgnoreCase(mwDetail.getEventId())).findAny().orElseGet(MeasuredMwDetails::new);
+                    likelyPoorlyConstrained = mwDetails.isLikelyPoorlyConstrained();
+                }
             } else {
                 filteredMeasurements = Collections.emptyList();
             }
 
             final Spectra fitSpectra = fittingSpectra.get(0);
-            summaryValues.add(new Pair<>("Observed Total Energy", dfmt2.format(fitSpectra.getLogTotalEnergy()) + " J"));
-            summaryValues.add(new Pair<>("Observed Apparent Stress", dfmt2.format(fitSpectra.getObsAppStress()) + " MPa"));
-            summaryValues.add(new Pair<>("Observed to Extrapolated energy", dfmt2.format(100.0 * (Math.pow(10, fitSpectra.getObsEnergy()) / Math.pow(10, fitSpectra.getLogTotalEnergy())))));
+            summaryValues.add(new Pair<>("Mw (Model Fit)", dfmt2.format(fitSpectra.getMw())));
 
-            summaryValues.add(new Pair<>("Model Fit Mw", dfmt2.format(fitSpectra.getMw())));
-            if (fitSpectra.getApparentStress() != 0.0) {
-                summaryValues.add(new Pair<>("Model Fit Apparent Stress", dfmt2.format(fitSpectra.getApparentStress()) + " MPa"));
+            if (fitSpectra.getApparentStress() > 0.0) {
+                summaryValues.add(new Pair<>("Apparent Stress (Model Fit)", dfmt2.format(fitSpectra.getApparentStress()) + " MPa"));
             }
-            summaryValues.add(new Pair<>("Model Fit Energy", dfmt2.format(fitSpectra.getlogTotalEnergyMDAC()) + " J"));
+            summaryValues.add(new Pair<>("Energy (Model Fit)", dfmt2.format(fitSpectra.getlogTotalEnergyMDAC()) + " J"));
+
+            summaryValues.add(new Pair<>("Observed Total Energy", dfmt2.format(fitSpectra.getLogTotalEnergy()) + " J"));
+            summaryValues.add(new Pair<>("Observed Apparent Stress", dfmt2.format(fitSpectra.getObsAppStress()) + " MPa"));
+            summaryValues.add(new Pair<>("Observed / Total Energy", dfmt2.format(100.0 * (Math.pow(10, fitSpectra.getObsEnergy()) / Math.pow(10, fitSpectra.getLogTotalEnergy()))) + " %"));
+            summaryValues.add(
+                    new Pair<>("Extrapolated / Total Energy", dfmt2.format(100.0 - (100.0 * (Math.pow(10, fitSpectra.getObsEnergy()) / Math.pow(10, fitSpectra.getLogTotalEnergy())))) + " %"));
 
             if (referenceSpectra != null && SPECTRA_TYPES.REF.equals(referenceSpectra.getType())) {
                 summaryValues.add(new Pair<>("Reference Mw", dfmt2.format(referenceSpectra.getMw())));
-                if (referenceSpectra.getApparentStress() != 0.0) {
+                if (referenceSpectra.getApparentStress() > 0.0) {
                     summaryValues.add(new Pair<>("Reference Apparent Stress", dfmt2.format(referenceSpectra.getApparentStress()) + " MPa"));
                 }
             }
 
-            if (validationSpectra != null && SPECTRA_TYPES.REF.equals(validationSpectra.getType())) {
+            if (validationSpectra != null && SPECTRA_TYPES.VAL.equals(validationSpectra.getType())) {
                 summaryValues.add(new Pair<>("Validation Mw", dfmt2.format(validationSpectra.getMw())));
-                if (validationSpectra.getApparentStress() != 0.0) {
+                if (validationSpectra.getApparentStress() > 0.0) {
                     summaryValues.add(new Pair<>("Validation Apparent Stress", dfmt2.format(validationSpectra.getApparentStress()) + " MPa"));
                 }
             }
 
+            if (mwDetails != null) {
+                summaryValues.add(null);
+                summaryValues.add(new Pair<>("Iterations", Integer.toString(mwDetails.getIterations())));
+                summaryValues.add(new Pair<>("Data Count", Integer.toString(mwDetails.getDataCount())));
+            }
         } else {
             filteredMeasurements = spectralMeasurements;
             fittingSpectra = null;
@@ -522,6 +562,8 @@ private void plotSpectra() {
 
         final List<SpectraMeasurement> selectedEventMeasurements = filteredMeasurements;
 
+        final boolean showPoorlyConstrainedBanner = likelyPoorlyConstrained;
+
         spectraControllers.forEach(spc -> {
             if (fittingSpectra != null && spc.shouldShowFits()) {
                 spc.getSpectralPlot().plotXYdata(toPlotPoints(selectedEventMeasurements, spc.getDataFunc()), fittingSpectra);
@@ -529,6 +571,8 @@ private void plotSpectra() {
                 spc.getSpectralPlot().plotXYdata(toPlotPoints(selectedEventMeasurements, spc.getDataFunc()), null);
             }
             spc.getSpectraMeasurementMap().putAll(mapSpectraToPoint(selectedEventMeasurements, spc.getDataFunc()));
+
+            spc.showConstraintWarningBanner(showPoorlyConstrainedBanner);
         });
         mapMeasurements(selectedEventMeasurements);
 
@@ -669,8 +713,8 @@ protected void reloadData() {
                     double maxMw = 0.0;
                     double minEnergy = 10.0;
                     double maxEnergy = 0.0;
-                    double minStress = 1.0;
-                    double maxStress = 0.0;
+                    double minStress = 0.01;
+                    double maxStress = 100.0;
                     for (final MeasuredMwDetails ev : evs) {
                         mwParameters.add(ev);
 
@@ -712,7 +756,7 @@ protected void reloadData() {
                                     maxMw = ref;
                                 }
 
-                                final Symbol mwSym = plotFactory.createSymbol(SymbolStyles.CIRCLE, "Reference", mw, ref, Color.RED, Color.RED, Color.RED, ev.getEventId(), false);
+                                final Symbol mwSym = plotFactory.createSymbol(SymbolStyles.CIRCLE, "Ref.", mw, ref, Color.RED, Color.RED, Color.RED, ev.getEventId(), false);
                                 mwPlotSymbols.add(mwSym);
                             }
 
@@ -725,7 +769,7 @@ protected void reloadData() {
                                     maxMw = valMw;
                                 }
 
-                                final Symbol valSym = plotFactory.createSymbol(SymbolStyles.SQUARE, "Validation", mw, valMw, Color.BLACK, Color.BLACK, Color.BLACK, ev.getEventId(), false);
+                                final Symbol valSym = plotFactory.createSymbol(SymbolStyles.SQUARE, "Val.", mw, valMw, Color.BLACK, Color.BLACK, Color.BLACK, ev.getEventId(), false);
                                 valSym.setZindex(VALIDATION_Z_ORDER);
                                 mwPlotSymbols.add(valSym);
                             }
@@ -753,7 +797,7 @@ protected void reloadData() {
                                         maxStress = refStress;
                                     }
 
-                                    final Symbol stressSym = plotFactory.createSymbol(SymbolStyles.CIRCLE, "Reference", stress, refStress, Color.RED, Color.RED, Color.RED, ev.getEventId(), false);
+                                    final Symbol stressSym = plotFactory.createSymbol(SymbolStyles.CIRCLE, "Ref.", stress, refStress, Color.RED, Color.RED, Color.RED, ev.getEventId(), false);
                                     stressPlotSymbols.add(stressSym);
                                 }
 
@@ -766,7 +810,7 @@ protected void reloadData() {
                                         maxStress = valStress;
                                     }
 
-                                    final Symbol valSym = plotFactory.createSymbol(SymbolStyles.SQUARE, "Validation", stress, valStress, Color.BLACK, Color.BLACK, Color.BLACK, ev.getEventId(), false);
+                                    final Symbol valSym = plotFactory.createSymbol(SymbolStyles.SQUARE, "Val.", stress, valStress, Color.BLACK, Color.BLACK, Color.BLACK, ev.getEventId(), false);
                                     valSym.setZindex(VALIDATION_Z_ORDER);
                                     stressPlotSymbols.add(valSym);
                                 }
@@ -1067,38 +1111,47 @@ private void listener(final WaveformChangeEvent wce) {
     protected void handlePlotObjectClicked(final PlotObjectClick poc, final Function<Point2D, SpectraMeasurement> measurementFunc) {
         List<Point2D> points = poc.getPlotPoints();
         Set<Waveform> waveforms = new HashSet<>();
+        List<Waveform> selectedData = spectraControllers.stream()
+                                                        .flatMap(spc -> spc.getSpectralPlot().getSelectedPoints().stream())
+                                                        .map(measurementFunc::apply)
+                                                        .map(SpectraMeasurement::getWaveform)
+                                                        .collect(Collectors.toList());
+
+        if (poc.getMouseEvent().isPrimaryButtonDown() || selectedData.isEmpty()) {
+            // FIXME: This entire scheme is tremendously inefficient and needs a rework at
+            // some point.
+            for (SpectraPlotController spc : spectraControllers) {
+                spc.getSpectralPlot().deselectAllPoints();
+            }
 
-        // FIXME: This entire scheme is tremendously inefficient and needs a rework at
-        // some point.
-        for (SpectraPlotController spc : spectraControllers) {
-            spc.getSpectralPlot().deselectAllPoints();
-        }
-
-        for (Point2D point : points) {
-            SpectraMeasurement spectra = measurementFunc.apply(point);
-            if (spectra != null && spectra.getWaveform() != null) {
-                waveforms.add(spectra.getWaveform());
-                for (SpectraPlotController spc : spectraControllers) {
-                    if (poc.getMouseEvent().isPrimaryButtonDown()) {
-                        final Map<Point2D, List<Symbol>> symbolMap = spc.getSymbolMap();
-                        final SpectralPlot plot = spc.getSpectralPlot();
-                        //Dyne-cm to Newton-meter
-                        Point2D testPoint = new Point2D(point.getX(), point.getY() - 7.0);
-                        final boolean existsInPlot = symbolMap.containsKey(testPoint);
-                        if (existsInPlot) {
-                            plot.selectPoint(testPoint);
+            for (Point2D point : points) {
+                SpectraMeasurement spectra = measurementFunc.apply(point);
+                if (spectra != null && spectra.getWaveform() != null) {
+                    waveforms.add(spectra.getWaveform());
+                    for (SpectraPlotController spc : spectraControllers) {
+                        if (poc.getMouseEvent().isPrimaryButtonDown()) {
+                            final Map<Point2D, List<Symbol>> symbolMap = spc.getSymbolMap();
+                            final SpectralPlot plot = spc.getSpectralPlot();
+                            //Dyne-cm to Newton-meter
+                            Point2D testPoint = new Point2D(point.getX(), point.getY() - 7.0);
+                            final boolean existsInPlot = symbolMap.containsKey(testPoint);
+                            if (existsInPlot) {
+                                plot.selectPoint(testPoint);
+                            }
                         }
                     }
                 }
             }
-        }
 
-        spectraControllers.forEach(spc -> spc.getSpectralPlot().getSubplot().replot());
-
-        if (poc.getMouseEvent().isPrimaryButtonDown()) {
-            showWaveformPopup(waveforms.stream().map(Waveform::getId).collect(Collectors.toSet()).toArray(new Long[0]));
-            Platform.runLater(() -> menu.hide());
+            spectraControllers.forEach(spc -> spc.getSpectralPlot().getSubplot().replot());
+            if (poc.getMouseEvent().isPrimaryButtonDown()) {
+                showWaveformPopup(waveforms.stream().map(Waveform::getId).collect(Collectors.toSet()).toArray(new Long[0]));
+                Platform.runLater(() -> menu.hide());
+            } else {
+                showContextMenu(waveforms, points, poc.getMouseEvent(), this::setSymbolsActive);
+            }
         } else if (poc.getMouseEvent().isSecondaryButtonDown()) {
+            waveforms.addAll(selectedData);
             showContextMenu(waveforms, points, poc.getMouseEvent(), this::setSymbolsActive);
         }
     }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataController.java
index 5445aa65..1491d690 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataController.java
@@ -29,6 +29,7 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.PreDestroy;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +57,6 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContextMenu;
@@ -72,374 +72,363 @@
 @Component
 public class DataController implements MapListeningController, RefreshableController {
 
-	private static final Logger log = LoggerFactory.getLogger(DataController.class);
+    private static final Logger log = LoggerFactory.getLogger(DataController.class);
 
-	@FXML
-	private MenuItem importWaveforms;
+    @FXML
+    private MenuItem importWaveforms;
 
-	@FXML
-	private ScrollPane scrollPane;
+    @FXML
+    private ScrollPane scrollPane;
 
-	@FXML
-	private TableView<Waveform> tableView;
-
-	@FXML
-	private CheckBox selectAllCheckbox;
-
-	@FXML
-	private TableColumn<Waveform, CheckBox> usedCol;
-
-	@FXML
-	private TableColumn<Waveform, String> stationCol;
-
-	@FXML
-	private TableColumn<Waveform, String> networkCol;
-
-	@FXML
-	private TableColumn<Waveform, String> eventCol;
-
-	@FXML
-	private TableColumn<Waveform, String> lowFreqCol;
-
-	@FXML
-	private TableColumn<Waveform, String> highFreqCol;
-
-	@FXML
-	private TableColumn<Waveform, String> depthCol;
-
-	private ObservableList<Waveform> listData = FXCollections
-			.synchronizedObservableList(FXCollections.observableArrayList());
-
-	private GeoMap mapImpl;
-
-	private MapPlottingUtilities iconFactory;
-
-	private WaveformClient client;
-
-	private EventBus bus;
-
-	private NumberFormat dfmt2 = NumberFormatFactory.twoDecimalOneLeadingZero();
-
-	private EventStaFreqStringComparator eventStaFreqComparator = new EventStaFreqStringComparator();
-
-	private ListChangeListener<? super Waveform> tableChangeListener;
-
-	private final BiConsumer<Boolean, String> eventSelectionCallback;
-	private final BiConsumer<Boolean, String> stationSelectionCallback;
-	private ScheduledExecutorService scheduled = Executors.newSingleThreadScheduledExecutor(r -> {
-		Thread thread = new Thread(r);
-		thread.setName("Data-Scheduled");
-		thread.setDaemon(true);
-		return thread;
-	});
-
-	private List<Long> dataUpdateList = Collections.synchronizedList(new ArrayList<>());
-	private List<Long> dataDeleteList = Collections.synchronizedList(new ArrayList<>());
-	private List<Waveform> updatedData = Collections.synchronizedList(new ArrayList<>());
-
-	private boolean isVisible = false;
-
-	@Autowired
-	public DataController(WaveformClient client, GeoMap mapImpl, MapPlottingUtilities iconFactory, EventBus bus) {
-		super();
-		this.client = client;
-		this.mapImpl = mapImpl;
-		this.iconFactory = iconFactory;
-		this.bus = bus;
-		bus.register(this);
-		tableChangeListener = buildTableListener();
-		scheduled.scheduleWithFixedDelay(() -> updateData(), 1000l, 1000l, TimeUnit.MILLISECONDS);
-
-		eventSelectionCallback = (selected, eventId) -> {
-			selectDataByCriteria(bus, selected,
-					(w) -> w.getEvent() != null && w.getEvent().getEventId().equalsIgnoreCase(eventId));
-		};
-
-		stationSelectionCallback = (selected, stationId) -> {
-			selectDataByCriteria(bus, selected, (w) -> w.getStream() != null && w.getStream().getStation() != null
-					&& w.getStream().getStation().getStationName().equalsIgnoreCase(stationId));
-		};
-	}
-
-	private void selectDataByCriteria(EventBus bus, Boolean selected, Function<Waveform, Boolean> matchCriteria) {
-		List<Waveform> selection = new ArrayList<>();
-		List<Integer> selectionIndices = new ArrayList<>();
-		tableView.getSelectionModel().clearSelection();
-		if (selected) {
-			tableView.getSelectionModel().getSelectedItems().removeListener(tableChangeListener);
-			synchronized (listData) {
-				for (int i = 0; i < listData.size(); i++) {
-					Waveform w = listData.get(i);
-					if (matchCriteria.apply(w)) {
-						selection.add(w);
-						tableView.getSelectionModel().select(i);
-					}
-				}
-			}
-			tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
-			if (!selection.isEmpty()) {
-				selection.sort(eventStaFreqComparator);
-				Long[] ids = selection.stream().sequential().map(w -> w.getId()).collect(Collectors.toList())
-						.toArray(new Long[0]);
-				bus.post(new WaveformSelectionEvent(ids));
-			}
-		} else {
-			selection.addAll(tableView.getSelectionModel().getSelectedItems());
-			selectionIndices.addAll(tableView.getSelectionModel().getSelectedIndices());
-			for (int i = 0; i < selection.size(); i++) {
-				if (matchCriteria.apply(selection.get(i))) {
-					tableView.getSelectionModel().clearSelection(selectionIndices.get(i));
-				}
-			}
-		}
-	}
-
-	private ListChangeListener<? super Waveform> buildTableListener() {
-		return (ListChangeListener<Waveform>) change -> {
-			List<Waveform> selection = new ArrayList<>();
-			selection.addAll(tableView.getSelectionModel().getSelectedItems());
-			selection.sort(eventStaFreqComparator);
-			Long[] ids = getIds(selection).toArray(new Long[0]);
-			bus.post(new WaveformSelectionEvent(ids));
-		};
-	}
-
-	private List<Long> getIds(List<Waveform> selection) {
-		return selection.stream().sequential().map(w -> w.getId()).collect(Collectors.toList());
-	}
-
-	@FXML
-	private void reloadTable(ActionEvent e) {
-		CompletableFuture.runAsync(getRefreshFunction());
-	}
-
-	@FXML
-	public void initialize() {
-		tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-		eventCol.setCellValueFactory(
-				x -> Bindings.createStringBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue)
-						.map(Waveform::getEvent).map(Event::getEventId).orElseGet(String::new)));
-		eventCol.comparatorProperty().set(new MaybeNumericStringComparator());
-
-		CellBindingUtils.attachTextCellFactories(lowFreqCol, Waveform::getLowFrequency, dfmt2);
-		CellBindingUtils.attachTextCellFactories(highFreqCol, Waveform::getHighFrequency, dfmt2);
-
-		depthCol.setCellValueFactory(
-				x -> Bindings.createStringBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue)
-						.map(Waveform::getEvent).map(ev -> dfmt2.format(ev.getDepth())).orElseGet(String::new)));
-		depthCol.comparatorProperty().set(new MaybeNumericStringComparator());
-
-		usedCol.setCellValueFactory(x -> Bindings
-				.createObjectBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(waveform -> {
-					CheckBox box = new CheckBox();
-					box.setSelected(waveform.isActive());
-					if (!waveform.isActive()) {
-						box.setStyle("-fx-background-color: red");
-					} else {
-						box.setStyle("");
-					}
-					box.selectedProperty().addListener((obs, o, n) -> {
-						if (n != null && !o.equals(n)) {
-							client.setWaveformsActiveByIds(Collections.singletonList(waveform.getId()), n).subscribe();
-						}
-					});
-					return box;
-				}).orElseGet(CheckBox::new)));
-		usedCol.comparatorProperty().set((c1, c2) -> Boolean.compare(c1.isSelected(), c2.isSelected()));
-
-		stationCol.setCellValueFactory(x -> Bindings.createStringBinding(
-				() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getStream)
-						.map(Stream::getStation).map(Station::getStationName).orElseGet(String::new)));
-
-		networkCol.setCellValueFactory(x -> Bindings.createStringBinding(
-				() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getStream)
-						.map(Stream::getStation).map(Station::getNetworkName).orElseGet(String::new)));
-
-		tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
-		// Workaround for https://bugs.openjdk.java.net/browse/JDK-8095943, for now we
-		// just clear the selection to avoid dumping a stack trace in the logs and
-		// mucking up event bubbling
-		tableView.setOnSort(event -> {
-			if (tableView.getSelectionModel().getSelectedIndices().size() > 1) {
-				tableView.getSelectionModel().clearSelection();
-			}
-		});
-
-		ContextMenu menu = new ContextMenu();
-		MenuItem include = new MenuItem("Include Selected");
-		include.setOnAction(evt -> includeWaveforms());
-		menu.getItems().add(include);
-		MenuItem exclude = new MenuItem("Exclude Selected");
-		exclude.setOnAction(evt -> excludeWaveforms());
-		menu.getItems().add(exclude);
-
-		tableView.addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
-			@Override
-			public void handle(MouseEvent t) {
-
-				if (MouseButton.SECONDARY == t.getButton()) {
-					menu.show(tableView, t.getScreenX(), t.getScreenY());
-				} else {
-					menu.hide();
-				}
-			}
-		});
-		tableView.setItems(listData);
-
-		DataFilterController<Waveform> filterController = new DataFilterController<>(tableView);
-
-		filterController.addFilterToColumn(eventCol, (data, item) -> data.getEvent().getEventId().equals(item));
-		filterController.addFilterToColumn(depthCol,
-				(data, item) -> dfmt2.format(data.getEvent().getDepth()).equals(item));
-		filterController.addFilterToColumn(lowFreqCol, (data, item) -> data.getLowFrequency().toString().equals(item));
-		filterController.addFilterToColumn(highFreqCol,
-				(data, item) -> data.getHighFrequency().toString().equals(item));
-		filterController.addFilterToColumn(stationCol,
-				(data, item) -> data.getStream().getStation().getStationName().equals(item));
-		filterController.addFilterToColumn(networkCol,
-				(data, item) -> data.getStream().getStation().getNetworkName().equals(item));
-	}
-
-	@Override
-	public void refreshView() {
-		CompletableFuture.runAsync(() -> {
-			synchronized (listData) {
-				if (!listData.isEmpty()) {
-					refreshMap();
-				}
-			}
-			Platform.runLater(() -> {
-				if (tableView != null) {
-					tableView.refresh();
-				}
-			});
-		});
-	}
-
-	private void refreshMap() {
-		if (isVisible) {
-			mapImpl.clearIcons();
-			synchronized (listData) {
-				mapImpl.addIcons(
-						iconFactory.genIconsFromWaveforms(eventSelectionCallback, stationSelectionCallback, listData));
-			}
-		}
-	}
-
-	@Override
-	public Runnable getRefreshFunction() {
-		return () -> requestData();
-	}
-
-	private void requestData() {
-		synchronized (listData) {
-			listData.clear();
-		}
-		mapImpl.clearIcons();
-		client.getUniqueEventStationMetadataForStacks().filter(Objects::nonNull).doOnComplete(() -> {
-			tableView.sort();
-			refreshView();
-		}).subscribe(waveform -> {
-			synchronized (listData) {
-				listData.add(waveform);
-			}
-		}, err -> log.error(err.getMessage(), err));
-	}
-
-	private void requestUpdates() {
-		List<Long> updates = new ArrayList<>();
-		List<Long> deletes = new ArrayList<>();
-		synchronized (dataUpdateList) {
-			updates.addAll(dataUpdateList);
-			dataUpdateList.clear();
-			deletes.addAll(dataDeleteList);
-			dataDeleteList.clear();
-		}
-
-		if (!deletes.isEmpty()) {
-			synchronized (listData) {
-				deletes.forEach(id -> {
-					synchronized (listData) {
-						int idx = -1;
-						for (int i = 0; i < listData.size(); i++) {
-							if (listData.get(i).getId().equals(id)) {
-								idx = i;
-								break;
-							}
-						}
-						if (idx >= 0) {
-							listData.remove(idx);
-						}
-					}
-				});
-			}
-		}
-
-		client.getWaveformMetadataFromIds(updates).filter(Objects::nonNull)
-				.subscribe(waveform -> updatedData.add(waveform), err -> log.error(err.getMessage(), err));
-	}
-
-	private void updateData() {
-		List<Waveform> updates = new ArrayList<>();
-		synchronized (updatedData) {
-			updates.addAll(updatedData);
-			updatedData.clear();
-		}
-		if (!updates.isEmpty()) {
-			synchronized (listData) {
-				tableView.getSelectionModel().getSelectedItems().removeListener(tableChangeListener);
-				updates.forEach(waveform -> {
-					int idx = -1;
-					for (int i = 0; i < listData.size(); i++) {
-						if (listData.get(i).getId().equals(waveform.getId())) {
-							idx = i;
-							break;
-						}
-					}
-					if (idx >= 0) {
-						listData.set(idx, waveform);
-					} else {
-						listData.add(waveform);
-					}
-				});
-				tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
-			}
-			refreshMap();
-		}
-	}
-
-	private void excludeWaveforms() {
-		client.setWaveformsActiveByIds(getSelectedWaveforms(), false).subscribe();
-	}
-
-	private void includeWaveforms() {
-		client.setWaveformsActiveByIds(getSelectedWaveforms(), true).subscribe();
-	}
-
-	private List<Long> getSelectedWaveforms() {
-		return getIds(tableView.getSelectionModel().getSelectedItems());
-	}
-
-	@Subscribe
-	private void listener(WaveformChangeEvent wce) {
-		List<Long> nonNull = wce.getIds().stream().filter(Objects::nonNull).collect(Collectors.toList());
-		synchronized (dataUpdateList) {
-			if (wce.isAddOrUpdate()) {
-				dataUpdateList.addAll(nonNull);
-			} else if (wce.isDelete()) {
-				dataDeleteList.addAll(nonNull);
-			}
-		}
-		requestUpdates();
-	}
-
-	@PreDestroy
-	private void cleanup() {
-		scheduled.shutdownNow();
-	}
-
-	@Override
-	public void setVisible(boolean visible) {
-		isVisible = visible;
-	}
+    @FXML
+    private TableView<Waveform> tableView;
+
+    @FXML
+    private CheckBox selectAllCheckbox;
+
+    @FXML
+    private TableColumn<Waveform, CheckBox> usedCol;
+
+    @FXML
+    private TableColumn<Waveform, String> stationCol;
+
+    @FXML
+    private TableColumn<Waveform, String> networkCol;
+
+    @FXML
+    private TableColumn<Waveform, String> eventCol;
+
+    @FXML
+    private TableColumn<Waveform, String> lowFreqCol;
+
+    @FXML
+    private TableColumn<Waveform, String> highFreqCol;
+
+    @FXML
+    private TableColumn<Waveform, String> depthCol;
+
+    private ObservableList<Waveform> listData = FXCollections.synchronizedObservableList(FXCollections.observableArrayList());
+
+    private GeoMap mapImpl;
+
+    private MapPlottingUtilities iconFactory;
+
+    private WaveformClient client;
+
+    private EventBus bus;
+
+    private NumberFormat dfmt2 = NumberFormatFactory.twoDecimalOneLeadingZero();
+
+    private EventStaFreqStringComparator eventStaFreqComparator = new EventStaFreqStringComparator();
+
+    private ListChangeListener<? super Waveform> tableChangeListener;
+
+    private final BiConsumer<Boolean, String> eventSelectionCallback;
+    private final BiConsumer<Boolean, String> stationSelectionCallback;
+    private ScheduledExecutorService scheduled = Executors.newSingleThreadScheduledExecutor(r -> {
+        Thread thread = new Thread(r);
+        thread.setName("Data-Scheduled");
+        thread.setDaemon(true);
+        return thread;
+    });
+
+    private List<Long> dataUpdateList = Collections.synchronizedList(new ArrayList<>());
+    private List<Long> dataDeleteList = Collections.synchronizedList(new ArrayList<>());
+    private List<Waveform> updatedData = Collections.synchronizedList(new ArrayList<>());
+
+    private boolean isVisible = false;
+
+    @Autowired
+    public DataController(WaveformClient client, GeoMap mapImpl, MapPlottingUtilities iconFactory, EventBus bus) {
+        this.client = client;
+        this.mapImpl = mapImpl;
+        this.iconFactory = iconFactory;
+        this.bus = bus;
+        bus.register(this);
+        tableChangeListener = buildTableListener();
+        scheduled.scheduleWithFixedDelay(this::updateData, 1000l, 1000l, TimeUnit.MILLISECONDS);
+
+        eventSelectionCallback = (selected, eventId) -> {
+            selectDataByCriteria(bus, selected, w -> w.getEvent() != null && w.getEvent().getEventId().equalsIgnoreCase(eventId));
+        };
+
+        stationSelectionCallback = (selected, stationId) -> {
+            selectDataByCriteria(bus, selected, w -> w.getStream() != null && w.getStream().getStation() != null && w.getStream().getStation().getStationName().equalsIgnoreCase(stationId));
+        };
+    }
+
+    private void selectDataByCriteria(EventBus bus, Boolean selected, Function<Waveform, Boolean> matchCriteria) {
+        List<Waveform> selection = new ArrayList<>();
+        List<Integer> selectionIndices = new ArrayList<>();
+        tableView.getSelectionModel().clearSelection();
+        if (selected) {
+            tableView.getSelectionModel().getSelectedItems().removeListener(tableChangeListener);
+            synchronized (listData) {
+                for (int i = 0; i < listData.size(); i++) {
+                    Waveform w = listData.get(i);
+                    if (matchCriteria.apply(w)) {
+                        selection.add(w);
+                        tableView.getSelectionModel().select(i);
+                    }
+                }
+            }
+            tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
+            if (!selection.isEmpty()) {
+                if (tableView.getSortOrder().isEmpty()) {
+                    selection.sort(eventStaFreqComparator);
+                }
+                Long[] ids = selection.stream().sequential().map(Waveform::getId).collect(Collectors.toList()).toArray(new Long[0]);
+                bus.post(new WaveformSelectionEvent(ids));
+            }
+        } else {
+            selection.addAll(tableView.getSelectionModel().getSelectedItems());
+            selectionIndices.addAll(tableView.getSelectionModel().getSelectedIndices());
+            for (int i = 0; i < selection.size(); i++) {
+                if (matchCriteria.apply(selection.get(i))) {
+                    tableView.getSelectionModel().clearSelection(selectionIndices.get(i));
+                }
+            }
+        }
+    }
+
+    private ListChangeListener<? super Waveform> buildTableListener() {
+        return (ListChangeListener<Waveform>) change -> {
+            if (!change.getList().isEmpty()) {
+                List<Waveform> selection = new ArrayList<>(tableView.getSelectionModel().getSelectedItems());
+                if (tableView.getSortOrder().isEmpty()) {
+                    selection.sort(eventStaFreqComparator);
+                }
+                Long[] ids = getIds(selection).toArray(new Long[0]);
+                bus.post(new WaveformSelectionEvent(ids));
+            }
+        };
+    }
+
+    private List<Long> getIds(List<Waveform> selection) {
+        return selection.stream().sequential().map(Waveform::getId).collect(Collectors.toList());
+    }
+
+    @FXML
+    private void reloadTable(ActionEvent e) {
+        CompletableFuture.runAsync(getRefreshFunction());
+    }
+
+    @FXML
+    public void initialize() {
+        tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        eventCol.setCellValueFactory(
+                x -> Bindings.createStringBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getEvent).map(Event::getEventId).orElseGet(String::new)));
+        eventCol.comparatorProperty().set(new MaybeNumericStringComparator());
+
+        CellBindingUtils.attachTextCellFactories(lowFreqCol, Waveform::getLowFrequency, dfmt2);
+        CellBindingUtils.attachTextCellFactories(highFreqCol, Waveform::getHighFrequency, dfmt2);
+
+        depthCol.setCellValueFactory(
+                x -> Bindings.createStringBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getEvent).map(ev -> dfmt2.format(ev.getDepth())).orElseGet(String::new)));
+        depthCol.comparatorProperty().set(new MaybeNumericStringComparator());
+
+        usedCol.setCellValueFactory(x -> Bindings.createObjectBinding(() -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(waveform -> {
+            CheckBox box = new CheckBox();
+            box.setSelected(waveform.isActive());
+            if (!waveform.isActive()) {
+                box.setStyle("-fx-background-color: red");
+            } else {
+                box.setStyle("");
+            }
+            box.selectedProperty().addListener((obs, o, n) -> {
+                if (n != null && !o.equals(n)) {
+                    client.setWaveformsActiveByIds(Collections.singletonList(waveform.getId()), n).subscribe();
+                }
+            });
+            return box;
+        }).orElseGet(CheckBox::new)));
+        usedCol.comparatorProperty().set((c1, c2) -> Boolean.compare(c1.isSelected(), c2.isSelected()));
+
+        stationCol.setCellValueFactory(
+                x -> Bindings.createStringBinding(
+                        () -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getStream).map(Stream::getStation).map(Station::getStationName).orElseGet(String::new)));
+
+        networkCol.setCellValueFactory(
+                x -> Bindings.createStringBinding(
+                        () -> Optional.ofNullable(x).map(CellDataFeatures::getValue).map(Waveform::getStream).map(Stream::getStation).map(Station::getNetworkName).orElseGet(String::new)));
+
+        tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
+        // Workaround for https://bugs.openjdk.java.net/browse/JDK-8095943, for now we
+        // just clear the selection to avoid dumping a stack trace in the logs and
+        // mucking up event bubbling
+        tableView.setOnSort(event -> {
+            if (tableView.getSelectionModel().getSelectedIndices().size() > 1) {
+                tableView.getSelectionModel().clearSelection();
+            }
+        });
+
+        ContextMenu menu = new ContextMenu();
+        MenuItem include = new MenuItem("Include Selected");
+        include.setOnAction(evt -> includeWaveforms());
+        menu.getItems().add(include);
+        MenuItem exclude = new MenuItem("Exclude Selected");
+        exclude.setOnAction(evt -> excludeWaveforms());
+        menu.getItems().add(exclude);
+
+        tableView.addEventHandler(MouseEvent.MOUSE_CLICKED, t -> {
+
+            if (MouseButton.SECONDARY == t.getButton()) {
+                menu.show(tableView, t.getScreenX(), t.getScreenY());
+            } else {
+                menu.hide();
+            }
+        });
+
+        //The filter controller will manage the list so don't add the listData directly
+        //to the table, otherwise the event handlers will trip over themselves
+        DataFilterController<Waveform> filterController = new DataFilterController<>(tableView, listData);
+
+        filterController.addFilterToColumn(eventCol, (data, item) -> data.getEvent().getEventId().equals(item));
+        filterController.addFilterToColumn(depthCol, (data, item) -> dfmt2.format(data.getEvent().getDepth()).equals(item));
+        filterController.addFilterToColumn(lowFreqCol, (data, item) -> data.getLowFrequency().toString().equals(item));
+        filterController.addFilterToColumn(highFreqCol, (data, item) -> data.getHighFrequency().toString().equals(item));
+        filterController.addFilterToColumn(stationCol, (data, item) -> data.getStream().getStation().getStationName().equals(item));
+        filterController.addFilterToColumn(networkCol, (data, item) -> data.getStream().getStation().getNetworkName().equals(item));
+    }
+
+    @Override
+    public void refreshView() {
+        CompletableFuture.runAsync(() -> {
+            synchronized (listData) {
+                if (!listData.isEmpty()) {
+                    refreshMap();
+                }
+            }
+            Platform.runLater(() -> {
+                if (tableView != null) {
+                    tableView.refresh();
+                }
+            });
+        });
+    }
+
+    private void refreshMap() {
+        if (isVisible) {
+            mapImpl.clearIcons();
+            synchronized (listData) {
+                mapImpl.addIcons(iconFactory.genIconsFromWaveforms(eventSelectionCallback, stationSelectionCallback, listData));
+            }
+        }
+    }
+
+    @Override
+    public Runnable getRefreshFunction() {
+        return this::requestData;
+    }
+
+    private void requestData() {
+        synchronized (listData) {
+            listData.clear();
+        }
+        mapImpl.clearIcons();
+        client.getUniqueEventStationMetadataForStacks().filter(Objects::nonNull).doOnComplete(() -> {
+            tableView.sort();
+            refreshView();
+        }).subscribe(waveform -> {
+            synchronized (listData) {
+                listData.add(waveform);
+            }
+        }, err -> log.error(err.getMessage(), err));
+    }
+
+    private void requestUpdates() {
+        List<Long> updates = new ArrayList<>();
+        List<Long> deletes = new ArrayList<>();
+        synchronized (dataUpdateList) {
+            updates.addAll(dataUpdateList);
+            dataUpdateList.clear();
+            deletes.addAll(dataDeleteList);
+            dataDeleteList.clear();
+        }
+
+        if (!deletes.isEmpty()) {
+            synchronized (listData) {
+                deletes.forEach(id -> {
+                    synchronized (listData) {
+                        int idx = -1;
+                        for (int i = 0; i < listData.size(); i++) {
+                            if (listData.get(i).getId().equals(id)) {
+                                idx = i;
+                                break;
+                            }
+                        }
+                        if (idx >= 0) {
+                            listData.remove(idx);
+                        }
+                    }
+                });
+            }
+        }
+
+        client.getWaveformMetadataFromIds(updates).filter(Objects::nonNull).subscribe(waveform -> updatedData.add(waveform), err -> log.error(err.getMessage(), err));
+    }
+
+    private void updateData() {
+        List<Waveform> updates = new ArrayList<>();
+        synchronized (updatedData) {
+            updates.addAll(updatedData);
+            updatedData.clear();
+        }
+        if (!updates.isEmpty()) {
+            synchronized (listData) {
+                tableView.getSelectionModel().getSelectedItems().removeListener(tableChangeListener);
+                updates.forEach(waveform -> {
+                    int idx = -1;
+                    for (int i = 0; i < listData.size(); i++) {
+                        if (listData.get(i).getId().equals(waveform.getId())) {
+                            idx = i;
+                            break;
+                        }
+                    }
+                    if (idx >= 0) {
+                        listData.set(idx, waveform);
+                    } else {
+                        listData.add(waveform);
+                    }
+                });
+                tableView.getSelectionModel().getSelectedItems().addListener(tableChangeListener);
+            }
+            refreshMap();
+        }
+    }
+
+    private void excludeWaveforms() {
+        client.setWaveformsActiveByIds(getSelectedWaveforms(), false).subscribe();
+    }
+
+    private void includeWaveforms() {
+        client.setWaveformsActiveByIds(getSelectedWaveforms(), true).subscribe();
+    }
+
+    private List<Long> getSelectedWaveforms() {
+        return getIds(tableView.getSelectionModel().getSelectedItems());
+    }
+
+    @Subscribe
+    private void listener(WaveformChangeEvent wce) {
+        List<Long> nonNull = wce.getIds().stream().filter(Objects::nonNull).collect(Collectors.toList());
+        synchronized (dataUpdateList) {
+            if (wce.isAddOrUpdate()) {
+                dataUpdateList.addAll(nonNull);
+            } else if (wce.isDelete()) {
+                dataDeleteList.addAll(nonNull);
+            }
+        }
+        requestUpdates();
+    }
+
+    @PreDestroy
+    private void cleanup() {
+        scheduled.shutdownNow();
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        isVisible = visible;
+    }
 }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataFilterController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataFilterController.java
index eda9188d..6102c21e 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataFilterController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/DataFilterController.java
@@ -13,7 +13,6 @@
 */
 package gov.llnl.gnem.apps.coda.calibration.gui.controllers;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -24,16 +23,15 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+import javafx.collections.transformation.SortedList;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 
 class DataFilterController<T> {
-    TableView<T> tableView;
     // The list of unfiltered table items
     ObservableList<T> items;
     FilterDialogController filterDialog;
@@ -41,38 +39,41 @@ class DataFilterController<T> {
     // The filter buttons attached to columns
     private List<Button> buttons;
     private HashMap<TableColumn<T, ?>, ObservableList<Object>> columnFilterLists;
-    private Image filterIcon;
+    private FilteredList<T> filteredItems;
 
-    DataFilterController(final TableView<T> tableView) {
-        this.tableView = tableView;
-        this.items = tableView.getItems();
+    DataFilterController(final TableView<T> tableView, final ObservableList<T> items) {
+        this.items = items;
         this.buttons = new ArrayList<>();
         this.columnFilterLists = new HashMap<>();
         this.filterDialog = new FilterDialogController();
         this.predicateBuilder = new PredicateBuilder<>();
 
+        filteredItems = items.filtered(null);
+        //Unfortunately filtered/sorted lists are immutable so some
+        //extra legwork needed to bind it correctly to the tableview
+        SortedList<T> sortedItems = new SortedList<>(filteredItems);
+        sortedItems.comparatorProperty().bind(tableView.comparatorProperty());
+        tableView.setItems(sortedItems);
+
         // Disable filter button if no items to filter
         this.items.addListener((ListChangeListener<? super T>) change -> {
             if (change.getList().isEmpty()) {
                 setFiltersDisabled(true);
-                tableView.setItems(items);
                 filterDialog.clearComboSelections();
             } else {
                 setFiltersDisabled(false);
                 updateFilterLists(change);
             }
         });
-        InputStream icon2 = this.getClass().getResourceAsStream("/filter_icon.png");
-        this.filterIcon = new Image(icon2, 16, 16, true, true);
 
         filterDialog.setFilterAction(e -> {
             filterTableViewResults();
             filterDialog.hide();
         });
         filterDialog.setClearFiltersAction(e -> {
-            tableView.setItems(items);
             filterDialog.clearComboSelections();
             filterDialog.hide();
+            filteredItems.setPredicate(null);
         });
     }
 
@@ -80,9 +81,12 @@ public void addFilterToColumn(TableColumn<T, ?> column, PredicateBuilder.ValueCo
 
         // Create the checkbox that opens the filter panel/dialog
         Button filterBtn = new Button();
-        final ImageView icon = new ImageView(filterIcon);
         filterBtn.setDisable(true);
-        filterBtn.setGraphic(icon);
+        Label label = new Label("\uEF4F");
+        label.getStyleClass().add("material-icons-medium");
+        label.setMaxHeight(16);
+        label.setMinWidth(16);
+        filterBtn.setGraphic(label);
         filterBtn.setOnMouseClicked(e -> filterDialog.show());
         buttons.add(filterBtn);
 
@@ -142,12 +146,12 @@ public void updateFilterLists(final Change<? extends T> change) {
     }
 
     public void filterTableViewResults() {
+        Predicate<T> predicate;
         if (filterDialog.useAndPredicate()) {
-            Predicate<T> predicate = predicateBuilder.getAndPredicate();
-            tableView.setItems(items.filtered(predicate));
+            predicate = predicateBuilder.getAndPredicate();
         } else {
-            Predicate<T> predicate = predicateBuilder.getOrPredicate();
-            tableView.setItems(items.filtered(predicate));
+            predicate = predicateBuilder.getOrPredicate();
         }
+        filteredItems.setPredicate(predicate);
     }
 }
\ No newline at end of file
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/MeasuredMwsController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/MeasuredMwsController.java
index be3e3de6..e781a936 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/MeasuredMwsController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/MeasuredMwsController.java
@@ -134,6 +134,7 @@ public double getProgress() {
         final SpectralPlot plot = spectra.getSpectralPlot();
         plot.getSubplot().addPlotObjectObserver(getPlotpointObserver(spectra::getSpectraMeasurementMap));
         plot.setLabels("Moment Rate Spectra", X_AXIS_LABEL, "log10(N-m)");
+        plot.getSubplot().setMargin(65, 40, 50, null);
         final Axis rightAxis = new BasicAxis(Axis.Type.Y_RIGHT, "Mw");
         rightAxis.setTickFormat(TickFormat.LOG10_DYNE_CM_TO_MW);
         plot.getSubplot().addAxes(rightAxis);
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java
index df55eead..61c3f85c 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java
@@ -78,6 +78,7 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import llnl.gnem.core.gui.plotting.api.Axis;
+import llnl.gnem.core.gui.plotting.api.AxisLimits;
 import llnl.gnem.core.gui.plotting.api.BasicPlot;
 import llnl.gnem.core.gui.plotting.api.Line;
 import llnl.gnem.core.gui.plotting.api.LineStyles;
@@ -256,7 +257,12 @@ public void initialize() {
         sdPlot.addAxes(plotFactory.axis(Axis.Type.X, "Inter-Station Distance (km)"), plotFactory.axis(Axis.Type.Y, "σ(|deviation|)"));
 
         sdPlot.setSymbolSize(8);
+        sdPlot.getTitle().setFontSize(16);
+        sdPlot.setMargin(30, 40, 50, null);
+
         stationPlot.setSymbolSize(10);
+        stationPlot.getTitle().setFontSize(16);
+        stationPlot.setMargin(30, 40, 50, null);
 
         stationPlot.attachToDisplayNode(stationPlotPane);
         sdPlot.attachToDisplayNode(sdPlotPane);
@@ -513,8 +519,8 @@ private void plotSd() {
             sdPlot.clear();
             Double xmin = null;
             Double xmax = null;
-            Double ymin = 0.0;
-            Double ymax = 2.0;
+            Double ymin = null;
+            Double ymax = null;
 
             final Map<Pair<Station, Station>, DescriptiveStatistics> beforeStatsStaPairs = new HashMap<>();
             final Map<Pair<Station, Station>, DescriptiveStatistics> afterStatsStaPairs = new HashMap<>();
@@ -617,6 +623,12 @@ private void plotSd() {
                         if (xmin == null) {
                             xmin = plotObj.getX();
                         }
+                        if (ymax == null) {
+                            ymax = plotObj.getY();
+                        }
+                        if (ymin == null) {
+                            ymin = plotObj.getY();
+                        }
                         if (plotObj.getX() > xmax) {
                             xmax = plotObj.getX();
                         }
@@ -652,6 +664,12 @@ private void plotSd() {
                     }
                 }
                 sdPlot.getTitle().setText("σ(Before) = " + dfmt2.format(overallBeforeStats.getStandardDeviation()) + "; σ(After) = " + dfmt2.format(overallAfterStats.getStandardDeviation()));
+                Double xAxisPaddingPercent = 0.1;
+                Double yAxisPaddingPercent = 0.3;
+
+                sdPlot.setAxisLimits(
+                        new AxisLimits(Axis.Type.X, xmin - ((xmax - xmin) * xAxisPaddingPercent), xmax + ((xmax - xmin) * xAxisPaddingPercent)),
+                            new AxisLimits(Axis.Type.Y, ymin - ((ymax - ymin) * yAxisPaddingPercent), ymax + ((ymax - ymin) * yAxisPaddingPercent)));
             }
         }
     }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/ShapeController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/ShapeController.java
index 11fd45c9..90a422e1 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/ShapeController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/ShapeController.java
@@ -292,6 +292,9 @@ public void initialize() {
 
         fitPlot = plotFactory.basicPlot();
         fitPlot.getTitle().setText("Shape Parameters");
+        fitPlot.getTitle().setFontSize(16);
+        fitPlot.setMargin(30, 40, 50, 50);
+        fitPlot.showLegend(false);
 
         Axis xAxis = plotFactory.axis(Type.X, null);
         xAxis.setMin(minX.get());
@@ -302,23 +305,26 @@ public void initialize() {
         axis.setMin(VEL_Y_MIN);
         axis.setMax(VEL_Y_MAX);
         velFitPlot.addAxes(axis, xAxis);
+        velFitPlot.showLegend(false);
 
         betaFitPlot = fitPlot.createSubPlot();
-        axis = plotFactory.axis(Type.Y, "Beta");
+        axis = plotFactory.axis(Type.Y, "b");
         axis.setMin(BETA_Y_MIN);
         axis.setMax(BETA_Y_MAX);
         betaFitPlot.addAxes(axis, xAxis);
+        betaFitPlot.showLegend(false);
 
         gammaFitPlot = fitPlot.createSubPlot();
-        axis = plotFactory.axis(Type.Y, "Gamma");
+        axis = plotFactory.axis(Type.Y, "γ");
         axis.setMin(GAMMA_Y_MIN);
         axis.setMax(GAMMA_Y_MAX);
         gammaFitPlot.addAxes(axis);
 
-        xAxis = plotFactory.axis(Type.X, "Distance");
+        xAxis = plotFactory.axis(Type.X, "Distance (km)");
         xAxis.setMin(minX.get());
         xAxis.setMax(maxX.get());
         gammaFitPlot.addAxes(xAxis);
+        gammaFitPlot.showLegend(false);
 
         fitPlot.attachToDisplayNode(plotContainer);
 
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SiteController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SiteController.java
index 8e138f2f..facafea0 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SiteController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SiteController.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -45,8 +46,11 @@
 import gov.llnl.gnem.apps.coda.common.mapping.api.GeoMap;
 import gov.llnl.gnem.apps.coda.common.model.domain.Waveform;
 import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.geometry.Point2D;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.StackPane;
@@ -80,6 +84,14 @@ public class SiteController extends AbstractMeasurementController {
     private StackPane siteTermsPlotPane;
     private BasicPlot siteTermsPlot;
 
+    @FXML
+    private ComboBox<String> siteTermStationCombo;
+    private ObservableList<String> stationList;
+
+    @FXML
+    private StackPane relativeSiteTermsPlotPane;
+    private BasicPlot relativeSiteTermsPlot;
+
     @FXML
     private TitledPane rawTitledPane;
 
@@ -96,6 +108,7 @@ private SiteController(final SpectraClient spectraClient, final ParameterClient
     @FXML
     public void initialize() {
         spectraPlotPanel = sitePane;
+        stationList = FXCollections.observableArrayList();
         super.initialize();
 
         final SpectraPlotController raw = new SpectraPlotController(SpectraMeasurement::getRawAtMeasurementTime);
@@ -109,6 +122,7 @@ public void initialize() {
         plot = site.getSpectralPlot();
         plot.getSubplot().addPlotObjectObserver(getPlotpointObserver(site::getSpectraMeasurementMap));
         plot.setLabels("Moment Rate Spectra", X_AXIS_LABEL, "log10(N-m)");
+        plot.getSubplot().setMargin(60, 40, 50, null);
         final Axis rightAxis = new BasicAxis(Axis.Type.Y_RIGHT, "Mw");
         rightAxis.setTickFormat(TickFormat.LOG10_DYNE_CM_TO_MW);
         plot.getSubplot().addAxes(rightAxis);
@@ -130,12 +144,32 @@ public void initialize() {
             }
         });
 
-        siteTermsPlot = plotFactory.basicPlot();
-        siteTermsPlot.getTitle().setText("Site corrections");
+        siteTermsPlot = plotFactory.lineAndMarkerScatterPlot();
+        siteTermsPlot.getTitle().setText("Site and transfer function corrections");
         siteTermsPlot.getTitle().setFontSize(16);
-        siteTermsPlot.addAxes(plotFactory.axis(Axis.Type.LOG_X, "Frequency (Hz)"), plotFactory.axis(Axis.Type.Y, "Site correction log10(N-m)"));
+        siteTermsPlot.setSymbolSize(12);
+        siteTermsPlot.addAxes(plotFactory.axis(Axis.Type.LOG_X, "Frequency (Hz)"), plotFactory.axis(Axis.Type.Y, "Site and transfer correction log10(N-m)"));
         siteTermsPlot.setAxisLimits(new AxisLimits(Axis.Type.X, 0.0, 10.0), new AxisLimits(Axis.Type.Y, 0.0, 2.0));
+        siteTermsPlot.setMargin(30, 40, 50, null);
         siteTermsPlot.attachToDisplayNode(siteTermsPlotPane);
+
+        siteTermStationCombo.setItems(stationList);
+        siteTermStationCombo.setVisibleRowCount(5);
+        siteTermStationCombo.valueProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null && !newValue.equals(oldValue) && siteTermStationCombo.isVisible()) {
+                refreshRelativeSitePlot(newValue);
+            }
+        });
+
+        relativeSiteTermsPlot = plotFactory.lineAndMarkerScatterPlot();
+        relativeSiteTermsPlot.getTitle().setText("Relative site and transfer function corrections");
+        relativeSiteTermsPlot.getTitle().setFontSize(16);
+        relativeSiteTermsPlot.setSymbolSize(12);
+        relativeSiteTermsPlot.addAxes(plotFactory.axis(Axis.Type.LOG_X, "Frequency (Hz)"), plotFactory.axis(Axis.Type.Y, "Site and transfer correction log10(N-m)"));
+        relativeSiteTermsPlot.setAxisLimits(new AxisLimits(Axis.Type.X, 0.0, 10.0), new AxisLimits(Axis.Type.Y, 0.0, 2.0));
+        relativeSiteTermsPlot.setMargin(60, 40, 50, null);
+        relativeSiteTermsPlotPane.setPickOnBounds(false);
+        relativeSiteTermsPlot.attachToDisplayNode(relativeSiteTermsPlotPane);
     }
 
     @Override
@@ -174,15 +208,21 @@ protected void reloadData() {
         try {
             runGuiUpdate(() -> {
                 siteTermsPlot.clear();
+                relativeSiteTermsPlot.clear();
+                stationList.clear();
+                Set<String> stationSet = new TreeSet<>();
 
                 double minSite = 1E2;
                 double maxSite = -1E2;
                 double minCenterFreq = 1E2;
                 double maxCenterFreq = -1E2;
 
+                siteTerms.sort((l, r) -> Double.compare(l.getLowFrequency(), r.getLowFrequency()));
+
                 for (SiteFrequencyBandParameters val : siteTerms) {
                     if (val != null && val.getStation() != null) {
                         final String key = val.getStation().getStationName();
+                        stationSet.add(key);
                         final PlotPoint pp = getPlotPoint(key, true);
                         double centerFreq = centerFreq(val.getLowFrequency(), val.getHighFrequency());
                         //Dyne-cm to nm for plot, in log
@@ -211,7 +251,7 @@ protected void reloadData() {
                 if (minSite > maxSite) {
                     minSite = maxSite - .1;
                 } else {
-                    minSite = Math.max(0.0, minSite - .1);
+                    minSite = minSite - .1;
                 }
 
                 maxCenterFreq = maxCenterFreq + .1;
@@ -223,12 +263,94 @@ protected void reloadData() {
 
                 siteTermsPlot.setAxisLimits(new AxisLimits(Axis.Type.X, minCenterFreq, maxCenterFreq), new AxisLimits(Axis.Type.Y, minSite, maxSite));
                 siteTermsPlot.replot();
+
+                stationList.addAll(stationSet);
+                if (!stationList.isEmpty()) {
+                    siteTermStationCombo.getSelectionModel().select(0);
+                }
             });
         } catch (InvocationTargetException | InterruptedException e) {
             //nop
         }
     }
 
+    private void refreshRelativeSitePlot(String stationName) {
+        List<SiteFrequencyBandParameters> siteTerms = paramClient.getSiteSpecificFrequencyBandParameters().filter(Objects::nonNull).collectList().block(Duration.of(10l, ChronoUnit.SECONDS));
+
+        try {
+            runGuiUpdate(() -> {
+                relativeSiteTermsPlot.clear();
+
+                double minSite = Double.MAX_VALUE;
+                double maxSite = -Double.MAX_VALUE;
+                double minCenterFreq = Double.MAX_VALUE;
+                double maxCenterFreq = -Double.MAX_VALUE;
+
+                siteTerms.sort((l, r) -> Double.compare(l.getLowFrequency(), r.getLowFrequency()));
+
+                if (stationName != null) {
+                    List<SiteFrequencyBandParameters> relativeTerms = siteTerms.stream()
+                                                                               .filter(sfb -> stationName.equalsIgnoreCase(sfb.getStation().getStationName()))
+                                                                               .sorted((l, r) -> Double.compare(l.getLowFrequency(), r.getLowFrequency()))
+                                                                               .collect(Collectors.toList());
+
+                    if (relativeTerms != null && !relativeTerms.isEmpty()) {
+                        for (SiteFrequencyBandParameters val : siteTerms) {
+                            if (val != null && val.getStation() != null) {
+                                final String key = val.getStation().getStationName();
+                                final PlotPoint pp = getPlotPoint(key, true);
+                                double centerFreq = centerFreq(val.getLowFrequency(), val.getHighFrequency());
+
+                                SiteFrequencyBandParameters relativeTerm = relativeTerms.stream().filter(sfb -> val.getLowFrequency() == sfb.getLowFrequency()).findAny().get();
+                                if (relativeTerm != null) {
+                                    double site = val.getSiteTerm() - relativeTerm.getSiteTerm();
+
+                                    if (site < minSite) {
+                                        minSite = site;
+                                    }
+                                    if (site > maxSite) {
+                                        maxSite = site;
+                                    }
+                                    if (centerFreq < minCenterFreq) {
+                                        minCenterFreq = centerFreq;
+                                    }
+                                    if (centerFreq > maxCenterFreq) {
+                                        maxCenterFreq = centerFreq;
+                                    }
+
+                                    final LabeledPlotPoint point = new LabeledPlotPoint(key, new PlotPoint(centerFreq, site, pp.getStyle(), pp.getColor(), pp.getColor()));
+                                    Symbol symbol = plotFactory.createSymbol(point.getStyle(), key, point.getX(), point.getY(), point.getColor(), Color.BLACK, point.getColor(), key, true);
+                                    relativeSiteTermsPlot.addPlotObject(symbol);
+                                }
+                            }
+                        }
+
+                        maxSite = maxSite + .1;
+                        if (minSite > maxSite) {
+                            minSite = maxSite - .1;
+                        } else {
+                            minSite = minSite - .1;
+                        }
+
+                        maxCenterFreq = maxCenterFreq + .1;
+                        if (minCenterFreq > maxCenterFreq) {
+                            minCenterFreq = maxCenterFreq - .1;
+                        } else {
+                            minCenterFreq = minCenterFreq - 1.0;
+                        }
+
+                        relativeSiteTermsPlot.setAxisLimits(new AxisLimits(Axis.Type.X, minCenterFreq, maxCenterFreq), new AxisLimits(Axis.Type.Y, minSite, maxSite));
+                        relativeSiteTermsPlot.replot();
+                    }
+                }
+            });
+        } catch (InvocationTargetException |
+
+                InterruptedException interrupted) {
+            // NOP
+        }
+    }
+
     @Override
     protected List<MeasuredMwDetails> getEvents() {
         return referenceEventClient.getMeasuredEventDetails()
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SpectraPlotController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SpectraPlotController.java
index b0384c33..b54a5370 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SpectraPlotController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/SpectraPlotController.java
@@ -76,4 +76,8 @@ public boolean shouldShowFits() {
     public void setShouldShowFits(final boolean shouldShowFits) {
         this.shouldShowFits = shouldShowFits;
     }
+
+    public void showConstraintWarningBanner(boolean visible) {
+        spectraPlot.showConstraintWarningBanner(visible);
+    }
 }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/parameters/SharedBandController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/parameters/SharedBandController.java
index 07f7d87a..002a74a9 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/parameters/SharedBandController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/parameters/SharedBandController.java
@@ -175,6 +175,8 @@ public void initialize() {
         CellBindingUtils.attachEditableTextCellFactories(measureTimeCol, SharedFrequencyBandParameters::getMeasurementTime, SharedFrequencyBandParameters::setMeasurementTime);
 
         codaSharedTableView.setItems(sharedFbData);
+        lowFreqCol.setSortType(TableColumn.SortType.ASCENDING); // Default sort is low_freq ASC
+        codaSharedTableView.getSortOrder().add(lowFreqCol);
         codaSharedTableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
     }
 
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlot.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlot.java
index 18648473..d7dfc437 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlot.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlot.java
@@ -16,7 +16,6 @@
 
 import java.text.NumberFormat;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,7 +30,6 @@
 import gov.llnl.gnem.apps.coda.calibration.gui.data.client.api.ParameterClient;
 import gov.llnl.gnem.apps.coda.calibration.gui.data.client.api.PeakVelocityClient;
 import gov.llnl.gnem.apps.coda.calibration.gui.data.client.api.ShapeMeasurementClient;
-import gov.llnl.gnem.apps.coda.calibration.model.domain.VelocityConfiguration;
 import gov.llnl.gnem.apps.coda.common.gui.data.client.api.WaveformClient;
 import gov.llnl.gnem.apps.coda.common.gui.util.NumberFormatFactory;
 import gov.llnl.gnem.apps.coda.common.model.domain.Event;
@@ -219,7 +217,7 @@ public void setWaveform(final Waveform waveform, final SyntheticCoda synth) {
                         pickTime = endEpochTime;
                     }
                     pickTime = pickTime + originTimeZeroOffset;
-                    final Collection<VerticalLine> pickLines = addPickToAll(pick.getPickName(), pickTime);
+                    addPickToAll(pick.getPickName(), pickTime);
                     pickLineMap.put(pick.getPickName(), pick);
                     this.replot();
                 }
@@ -304,6 +302,7 @@ public void setWaveform(final Waveform waveform, final SyntheticCoda synth) {
         } else {
             plotIdentifier = "";
         }
+        this.replot();
     }
 
     private double calcWindowTime(final double time, final SharedFrequencyBandParameters params, final Waveform waveform, final double distance) {
@@ -324,44 +323,44 @@ private void setWindowLines(final SharedFrequencyBandParameters params, final Wa
             double plotLength = waveform.getData().size() / waveform.getSampleRate() + originTimeOffset;
             if (maxWindowTime != 0 && maxWindowTime < plotLength) {
                 maxWindowLine = new VerticalLine(maxWindowTime, 90, "Max");
-                maxWindowLine.setFillColor(Color.GRAY);
+                maxWindowLine.setFillColor(Color.rgb(128, 128, 128, 0.7)); // Dark grey
                 addPlotObject(maxWindowLine, PLOT_ORDERING.PICKS.getZOrder());
             }
             minWindowLine = new VerticalLine(minWindowTime, 90, "Min");
-            minWindowLine.setFillColor(Color.GRAY);
+            minWindowLine.setFillColor(Color.rgb(128, 128, 128, 0.7)); // Dark grey
             addPlotObject(minWindowLine, PLOT_ORDERING.PICKS.getZOrder());
             setWindowLineVisbility();
         }
     }
 
     private void setGroupVelocityLines(double distance) {
-        VelocityConfiguration veloConfig = paramClient.getVelocityConfiguration().block();
-
-        if (veloConfig != null) {
-            double critDistance = veloConfig.getDistanceThresholdInKm();
-            double startGV1Lt = veloConfig.getGroupVelocity1InKmsLtDistance();
-            double endGV2Lt = veloConfig.getGroupVelocity2InKmsLtDistance();
-            double startGV1Gt = veloConfig.getGroupVelocity1InKmsGtDistance();
-            double endGV2Gt = veloConfig.getGroupVelocity2InKmsGtDistance();
-
-            double startTime = (distance / startGV1Gt);
-            double endTime = (distance / endGV2Gt);
-            if (distance < critDistance) {
-                startTime = (distance / startGV1Lt);
-                endTime = (distance / endGV2Lt);
-            }
+        paramClient.getVelocityConfiguration().doOnSuccess(veloConfig -> {
+            if (veloConfig != null) {
+                double critDistance = veloConfig.getDistanceThresholdInKm();
+                double startGV1Lt = veloConfig.getGroupVelocity1InKmsLtDistance();
+                double endGV2Lt = veloConfig.getGroupVelocity2InKmsLtDistance();
+                double startGV1Gt = veloConfig.getGroupVelocity1InKmsGtDistance();
+                double endGV2Gt = veloConfig.getGroupVelocity2InKmsGtDistance();
+
+                double startTime = (distance / startGV1Gt);
+                double endTime = (distance / endGV2Gt);
+                if (distance < critDistance) {
+                    startTime = (distance / startGV1Lt);
+                    endTime = (distance / endGV2Lt);
+                }
 
-            groupVelocityLineStart = new VerticalLine(startTime, 90, "Start");
-            groupVelocityLineEnd = new VerticalLine(endTime, 90, "End");
+                groupVelocityLineStart = new VerticalLine(startTime, 90, "Start");
+                groupVelocityLineEnd = new VerticalLine(endTime, 90, "End");
 
-            groupVelocityLineStart.setFillColor(Color.ORANGE);
-            groupVelocityLineEnd.setFillColor(Color.ORANGE);
+                groupVelocityLineStart.setFillColor(Color.rgb(255, 165, 0, 0.7)); // Orange
+                groupVelocityLineEnd.setFillColor(Color.rgb(255, 165, 0, 0.7)); // Orange
 
-            addPlotObject(groupVelocityLineStart, PLOT_ORDERING.PICKS.getZOrder());
-            addPlotObject(groupVelocityLineEnd, PLOT_ORDERING.PICKS.getZOrder());
+                addPlotObject(groupVelocityLineStart, PLOT_ORDERING.PICKS.getZOrder());
+                addPlotObject(groupVelocityLineEnd, PLOT_ORDERING.PICKS.getZOrder());
 
-            setGroupVelocityVisbility();
-        }
+                setGroupVelocityVisbility();
+            }
+        }).subscribe();
     }
 
     private void plotSynthetic(final Waveform waveform, final SyntheticCoda synth, final TimeT beginTime, final float[] waveformSegment, final Event event, final double distance,
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlotManager.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlotManager.java
index 0153c9e9..6972cff5 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlotManager.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/CodaWaveformPlotManager.java
@@ -16,6 +16,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Duration;
@@ -50,17 +51,21 @@
 import gov.llnl.gnem.apps.coda.common.model.domain.SyntheticCoda;
 import gov.llnl.gnem.apps.coda.common.model.domain.Waveform;
 import javafx.event.EventHandler;
+import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import reactor.core.scheduler.Schedulers;
@@ -75,6 +80,10 @@ public class CodaWaveformPlotManager {
     private static final String GROUP_VELOCITY_LABEL = "GV";
     private static final String TIME_SECONDS_FROM_ORIGIN = "Time (seconds from origin)";
     private static final String WAVEFORM_PREFIX = "Waveform_";
+    private static final String CLICK_TO_PICK_TOOLTIP = "Toggle click-to-pick mode";
+    private static final String CLICK_TO_PICK_ICON = "/click_picking_mode_icon.png";
+    private static final String CLICK_TO_PICK_LABEL = "Picking";
+
     private static final Logger log = LoggerFactory.getLogger(CodaWaveformPlotManager.class);
     private final WaveformClient waveformClient;
     private final ShapeMeasurementClient shapeClient;
@@ -115,6 +124,11 @@ public class CodaWaveformPlotManager {
     final ToggleButton groupVelToggle3 = new ToggleButton(GROUP_VELOCITY_LABEL);
     final ToggleButton windowLineToggle3 = new ToggleButton(WINDOW_LINE_LABEL);
 
+    final ToggleButton clickToPickMode = new ToggleButton();
+    final ToggleButton clickToPickMode2 = new ToggleButton();
+    final ToggleButton clickToPickMode3 = new ToggleButton();
+    private boolean clickToPickModeBoolean = false;
+
     private final EventHandler<InputEvent> forwardAction = event -> {
         if ((currentPage + 1) < totalPages) {
             currentPage++;
@@ -188,6 +202,28 @@ public class CodaWaveformPlotManager {
         }
     };
 
+    private final EventHandler<InputEvent> clickPickToggleAction = event -> {
+        clickToPickModeBoolean = !clickToPickModeBoolean;
+        clickToPickMode.setSelected(clickToPickModeBoolean);
+        clickToPickMode2.setSelected(clickToPickModeBoolean);
+        clickToPickMode3.setSelected(clickToPickModeBoolean);
+        if (clickToPickModeBoolean) {
+            clickToPickMode.setStyle("-fx-background-color: DarkSeaGreen");
+            clickToPickMode2.setStyle("-fx-background-color: DarkSeaGreen");
+            clickToPickMode3.setStyle("-fx-background-color: DarkSeaGreen");
+        } else {
+            clickToPickMode.setStyle(null);
+            clickToPickMode2.setStyle(null);
+            clickToPickMode3.setStyle(null);
+        }
+        if (orderedWaveformPlots.size() > 0) {
+            orderedWaveformPlots.values().forEach(plot -> plot.setClickPickingModeEnabled(clickToPickModeBoolean));
+        }
+        if (selectedSinglePlot != null) {
+            selectedSinglePlot.setClickPickingModeEnabled(clickToPickModeBoolean);
+        }
+    };
+
     public CodaWaveformPlotManager(final WaveformClient waveformClient, final ShapeMeasurementClient shapeClient, final ParameterClient paramsClient, final PeakVelocityClient peakVelocityClient,
             final GeoMap map, final MapPlottingUtilities mapPlotUtils) {
         this.waveformClient = waveformClient;
@@ -224,20 +260,42 @@ public CodaWaveformPlotManager(final WaveformClient waveformClient, final ShapeM
         windowLineToggle3.addEventHandler(MouseEvent.MOUSE_CLICKED, windowLineToggleAction::handle);
         windowLineToggle3.setTooltip(new Tooltip(WINDOW_LINE_TOOLTIP));
 
+        clickToPickMode.addEventHandler(MouseEvent.MOUSE_CLICKED, clickPickToggleAction::handle);
+        clickToPickMode2.addEventHandler(MouseEvent.MOUSE_CLICKED, clickPickToggleAction::handle);
+        clickToPickMode3.addEventHandler(MouseEvent.MOUSE_CLICKED, clickPickToggleAction::handle);
+
+        try (InputStream is = this.getClass().getResourceAsStream(CLICK_TO_PICK_ICON)) {
+            Image clickPickingIcon = new Image(is);
+            createPickingIcon(clickToPickMode, clickPickingIcon, windowLineToggle);
+            createPickingIcon(clickToPickMode2, clickPickingIcon, windowLineToggle2);
+            createPickingIcon(clickToPickMode3, clickPickingIcon, windowLineToggle3);
+        } catch (IOException | NullPointerException ex) {
+            clickToPickMode.setText(CLICK_TO_PICK_LABEL);
+            clickToPickMode2.setText(CLICK_TO_PICK_LABEL);
+            clickToPickMode3.setText(CLICK_TO_PICK_LABEL);
+        }
+
+        clickToPickMode.setTooltip(new Tooltip(CLICK_TO_PICK_TOOLTIP));
+        clickToPickMode2.setTooltip(new Tooltip(CLICK_TO_PICK_TOOLTIP));
+        clickToPickMode3.setTooltip(new Tooltip(CLICK_TO_PICK_TOOLTIP));
+
         multiPageToolbar.getItems().add(backButton);
         multiPageToolbar.getItems().add(pagingLabel);
         multiPageToolbar.getItems().add(forwardButton);
         multiPageToolbar.getItems().add(groupVelToggle);
         multiPageToolbar.getItems().add(windowLineToggle);
+        multiPageToolbar.getItems().add(clickToPickMode);
 
         multiFrequencyToolbar.getItems().add(freqBandLabel);
         multiFrequencyToolbar.getItems().add(prevButton);
         multiFrequencyToolbar.getItems().add(nextButton);
         multiFrequencyToolbar.getItems().add(groupVelToggle2);
         multiFrequencyToolbar.getItems().add(windowLineToggle2);
+        multiFrequencyToolbar.getItems().add(clickToPickMode2);
 
         multiPlotToolbar.getItems().add(groupVelToggle3);
         multiPlotToolbar.getItems().add(windowLineToggle3);
+        multiPlotToolbar.getItems().add(clickToPickMode3);
 
         final Font sizedFont = Font.font(forwardButton.getFont().getFamily(), 12f);
         forwardButton.setFont(sizedFont);
@@ -250,6 +308,9 @@ public CodaWaveformPlotManager(final WaveformClient waveformClient, final ShapeM
         windowLineToggle.setFont(sizedFont);
         windowLineToggle2.setFont(sizedFont);
         windowLineToggle3.setFont(sizedFont);
+        clickToPickMode.setFont(sizedFont);
+        clickToPickMode2.setFont(sizedFont);
+        clickToPickMode3.setFont(sizedFont);
 
         forwardButton.setFocusTraversable(false);
         backButton.setFocusTraversable(false);
@@ -261,6 +322,24 @@ public CodaWaveformPlotManager(final WaveformClient waveformClient, final ShapeM
         windowLineToggle.setFocusTraversable(false);
         windowLineToggle2.setFocusTraversable(false);
         windowLineToggle3.setFocusTraversable(false);
+        clickToPickMode.setFocusTraversable(false);
+        clickToPickMode2.setFocusTraversable(false);
+        clickToPickMode3.setFocusTraversable(false);
+    }
+
+    private void createPickingIcon(ToggleButton clickToPickButton, Image img, Region layoungBindingNode) {
+        ImageView imgView = new ImageView(img);
+        imgView.setPreserveRatio(true);
+        imgView.fitHeightProperty().bind(layoungBindingNode.heightProperty());
+        imgView.fitWidthProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.prefHeightProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.minHeightProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.maxHeightProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.prefWidthProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.minWidthProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.maxWidthProperty().bind(layoungBindingNode.heightProperty());
+        clickToPickButton.setGraphic(imgView);
+        clickToPickButton.setAlignment(Pos.CENTER);
     }
 
     private void setFrequencyDisplayText(Waveform wave) {
@@ -288,7 +367,6 @@ private void plotWaveform(long waveformId) {
         final CodaWaveformPlot plot = plotPair.getRight();
 
         if (waveform != null) {
-
             final Collection<Icon> icons = mapWaveform(waveform);
             mappedIcons.addAll(icons);
             map.addIcons(icons);
@@ -299,6 +377,10 @@ private void plotWaveform(long waveformId) {
                 selectedSinglePlot = plot;
             }
         }
+
+        if (plot != null) {
+            plot.setClickPickingModeEnabled(clickToPickModeBoolean);
+        }
     }
 
     private void setWaveformsByEventStation(long waveformId) {
@@ -364,7 +446,6 @@ private CodaWaveformPlot getOrCreatePlot() {
                 plot = new CodaWaveformPlot(waveformClient, shapeClient, paramsClient, peakVelocityClient, () -> groupVelToggle.isSelected(), () -> windowLineToggle.isSelected());
             }
         }
-
         return plot;
     }
 
@@ -491,6 +572,7 @@ private void setPlots(final List<Pair<Waveform, CodaWaveformPlot>> plotPairs) {
                         plot.setMargin(null, null, null, null);
                         plot.getxAxis().setText(TIME_SECONDS_FROM_ORIGIN);
                     }
+                    plot.setClickPickingModeEnabled(clickToPickModeBoolean);
                     plot.attachToDisplayNode(waveformPanel);
                     plot.replot();
                 }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/PlotlyPlotFactory.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/PlotlyPlotFactory.java
index 8865109c..e78850ce 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/PlotlyPlotFactory.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/PlotlyPlotFactory.java
@@ -28,7 +28,10 @@
 import llnl.gnem.core.gui.plotting.plotly.BasicAxis;
 import llnl.gnem.core.gui.plotting.plotly.BasicLine;
 import llnl.gnem.core.gui.plotting.plotly.BasicSymbol;
+import llnl.gnem.core.gui.plotting.plotly.BasicTitle;
 import llnl.gnem.core.gui.plotting.plotly.PlotlyPlot;
+import llnl.gnem.core.gui.plotting.plotly.PlotlyPlotData;
+import llnl.gnem.core.gui.plotting.plotly.PlotlyTrace;
 
 @Service
 public class PlotlyPlotFactory implements PlotFactory {
@@ -38,6 +41,11 @@ public BasicPlot basicPlot() {
         return new PlotlyPlot();
     }
 
+    @Override
+    public BasicPlot lineAndMarkerScatterPlot() {
+        return new PlotlyPlot(false, new PlotlyPlotData(new PlotlyTrace(PlotlyTrace.Style.SCATTER_MARKER_AND_LINE), Color.WHITE, new BasicTitle()));
+    }
+
     @Override
     public Axis axis(final Type axisType, final String label) {
         return new BasicAxis(axisType, label);
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/SpectralPlot.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/SpectralPlot.java
index 15f19f96..0f8b5126 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/SpectralPlot.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/plotting/SpectralPlot.java
@@ -27,8 +27,17 @@
 import gov.llnl.gnem.apps.coda.common.gui.plotting.PlotPoint;
 import gov.llnl.gnem.apps.coda.common.gui.util.NumberFormatFactory;
 import gov.llnl.gnem.apps.coda.common.model.util.SPECTRA_TYPES;
+import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import llnl.gnem.core.gui.plotting.api.Axis;
 import llnl.gnem.core.gui.plotting.api.AxisLimits;
@@ -42,6 +51,10 @@
 import llnl.gnem.core.gui.plotting.api.SymbolStyles;
 
 public class SpectralPlot extends Pane implements Serializable {
+
+    private static final String MATERIAL_ICONS_LARGE = "material-icons-large";
+    private static final String LIKELY_POORLY_CONSTRAINED = "Likely poorly constrained!";
+
     private static final long serialVersionUID = 1L;
 
     private static final String AVG_MW_LEGEND_LABEL = "Avg";
@@ -53,7 +66,7 @@ public class SpectralPlot extends Pane implements Serializable {
     private double xmin = 1.0;
     private double xmax = -xmin;
     private double ymin = xmin;
-    private double ymax = xmax;
+    private double ymax = -xmax;
 
     private double defaultXMin = 1.0;
     private double defaultXMax = 1.0;
@@ -78,7 +91,14 @@ public class SpectralPlot extends Pane implements Serializable {
     private final transient List<Symbol> selectedData = new ArrayList<>();
     private final transient Object selectedDataLock = new Object();
 
+    private BorderPane plotContainerPane;
+    private HBox warningPane;
+
     public SpectralPlot() {
+        plotContainerPane = new BorderPane();
+        plotContainerPane.prefHeightProperty().bind(this.heightProperty());
+        plotContainerPane.prefWidthProperty().bind(this.widthProperty());
+        this.getChildren().add(plotContainerPane);
         plotFactory = new PlotlyPlotFactory();
         setupPlot();
     }
@@ -91,9 +111,30 @@ private void setupPlot() {
         plot.addAxes(yAxis, xAxis);
 
         plot.getTitle().setText("Title String");
-        plot.getTitle().setFontSize(14);
-        plot.setSymbolSize(8);
-        plot.attachToDisplayNode(this);
+        plot.getTitle().setFontSize(16);
+        plot.setSymbolSize(12);
+
+        StackPane wrapper = new StackPane();
+        wrapper.prefWidth(Double.MAX_VALUE);
+        wrapper.prefHeight(Double.MAX_VALUE);
+        plot.attachToDisplayNode(wrapper);
+        plot.setMargin(30, 40, 50, null);
+
+        plotContainerPane.setCenter(wrapper);
+        plotContainerPane.setPickOnBounds(false);
+
+        warningPane = new HBox();
+        warningPane.setBackground(new Background(new BackgroundFill(Color.RED, CornerRadii.EMPTY, Insets.EMPTY)));
+        Label warningIcon = new Label("\uE000");
+        warningIcon.getStyleClass().add(MATERIAL_ICONS_LARGE);
+        warningIcon.setPrefSize(32.0, 32.0);
+        warningIcon.setAlignment(Pos.CENTER);
+
+        Label warningText = new Label(LIKELY_POORLY_CONSTRAINED);
+        warningText.setStyle("-fx-font-weight:bold; -fx-font-size: 28px;");
+
+        warningPane.getChildren().add(warningIcon);
+        warningPane.getChildren().add(warningText);
     }
 
     public void clearPlot() {
@@ -386,9 +427,8 @@ public void refreshPlotAxes() {
         double yMax;
 
         if (autoCalculateYaxisRange) {
-            //Dyne-cm to Newton meters
-            yMin = ymin - Math.abs(ymin * .1) - 7.0;
-            yMax = ymax + Math.abs(ymax * .1) - 7.0;
+            yMin = ymin - Math.abs(ymin * .3);
+            yMax = ymax + Math.abs(ymax * .3);
         } else {
             yMin = defaultYMin;
             yMax = defaultYMax;
@@ -491,6 +531,10 @@ public void deselectPoint(Point2D xyPoint) {
         }
     }
 
+    public List<Point2D> getSelectedPoints() {
+        return selectedData.stream().map(sym -> new Point2D(sym.getX(), sym.getY())).collect(Collectors.toList());
+    }
+
     public void deselectAllPoints() {
         synchronized (selectedDataLock) {
             selectedData.forEach(this::setStandardSymbolStyle);
@@ -533,4 +577,13 @@ public void showCornerFrequency(final boolean showCornerFreq) {
     public String getTitle() {
         return plot.getTitle().getText();
     }
+
+    public void showConstraintWarningBanner(boolean visible) {
+        if (visible) {
+            plotContainerPane.setBottom(warningPane);
+        } else {
+            plotContainerPane.setBottom(null);
+        }
+    }
+
 }
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/util/HiddenHeaderTableView.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/util/HiddenHeaderTableView.java
new file mode 100644
index 00000000..7cb96299
--- /dev/null
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/util/HiddenHeaderTableView.java
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2022, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
+* CODE-743439.
+* All rights reserved.
+* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool.
+*
+* Licensed under the Apache License, Version 2.0 (the “Licensee”); you may not use this file except in compliance with the License.  You may obtain a copy of the License at:
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and limitations under the license.
+*
+* This work was performed under the auspices of the U.S. Department of Energy
+* by Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
+*/
+package gov.llnl.gnem.apps.coda.common.gui.util;
+
+import javafx.scene.control.TableView;
+import javafx.scene.layout.Pane;
+
+public class HiddenHeaderTableView<S> extends TableView<S> {
+    @Override
+    public void resize(double width, double height) {
+        super.resize(width, height);
+        Pane header = (Pane) lookup("TableHeaderRow");
+        header.setMinHeight(0);
+        header.setPrefHeight(0);
+        header.setMaxHeight(0);
+        header.setVisible(false);
+    }
+}
\ No newline at end of file
diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/envelope/gui/EnvelopeGuiController.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/envelope/gui/EnvelopeGuiController.java
index 76b92f7e..ee6eab52 100644
--- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/envelope/gui/EnvelopeGuiController.java
+++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/envelope/gui/EnvelopeGuiController.java
@@ -23,8 +23,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import javax.annotation.PreDestroy;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +33,7 @@
 
 import gov.llnl.gnem.apps.coda.common.gui.events.ShowFailureReportEvent;
 import gov.llnl.gnem.apps.coda.envelope.gui.controllers.WaveformLoadingController;
+import javax.annotation.PreDestroy;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -77,8 +76,8 @@ public class EnvelopeGuiController {
     private Stage stage;
 
     @Autowired
-    public EnvelopeGuiController(WaveformLoadingController waveformLoadingController, EventBus bus, EnvelopeParamsPorter envelopeParamsPorter, ConfigurableApplicationContext springContext) throws IOException {
-        super();
+    public EnvelopeGuiController(WaveformLoadingController waveformLoadingController, EventBus bus, EnvelopeParamsPorter envelopeParamsPorter, ConfigurableApplicationContext springContext)
+            throws IOException {
         this.waveformLoadingController = waveformLoadingController;
         this.bus = bus;
         this.envelopeParamsPorter = envelopeParamsPorter;
diff --git a/calibration-gui/src/main/resources/click_picking_mode_icon.png b/calibration-gui/src/main/resources/click_picking_mode_icon.png
new file mode 100644
index 00000000..c84d193d
Binary files /dev/null and b/calibration-gui/src/main/resources/click_picking_mode_icon.png differ
diff --git a/calibration-gui/src/main/resources/filter_icon.png b/calibration-gui/src/main/resources/filter_icon.png
deleted file mode 100644
index d95691d5..00000000
Binary files a/calibration-gui/src/main/resources/filter_icon.png and /dev/null differ
diff --git a/calibration-gui/src/main/resources/fxml/CodaGui.fxml b/calibration-gui/src/main/resources/fxml/CodaGui.fxml
index e5cd31d6..bf626539 100644
--- a/calibration-gui/src/main/resources/fxml/CodaGui.fxml
+++ b/calibration-gui/src/main/resources/fxml/CodaGui.fxml
@@ -33,21 +33,21 @@
 					<menus>
 						<Menu mnemonicParsing="false" text="File">
 							<items>
-								<MenuItem fx:id="importWaveforms" mnemonicParsing="false" onAction="#openWaveformLoadingWindow" text="Import Stack Files..." />
-								<MenuItem fx:id="importWaveformDir" mnemonicParsing="false" onAction="#openWaveformDirectoryLoadingWindow" text="Import Stack Directory..." />
-								<MenuItem mnemonicParsing="false" onAction="#openCodaJsonParamWindow" text="Import Coda Param..." />
-								<Menu mnemonicParsing="false" text="Import Legacy Param Formats">
+								<MenuItem fx:id="importWaveforms" mnemonicParsing="false" onAction="#openWaveformLoadingWindow" text="Load Stack Files..." />
+								<MenuItem fx:id="importWaveformDir" mnemonicParsing="false" onAction="#openWaveformDirectoryLoadingWindow" text="Load Stack Directory..." />
+								<MenuItem mnemonicParsing="false" onAction="#openCodaJsonParamWindow" text="Load Calibration..." />
+								<Menu mnemonicParsing="false" text="Load Legacy Param Formats">
 									<items>
-										<MenuItem fx:id="importRefEvents" mnemonicParsing="false" onAction="#openReferenceEventLoadingWindow" text="Import Reference Events..." />
-										<MenuItem mnemonicParsing="false" onAction="#openCodaParamWindow" text="Import Coda Param..." />
-										<MenuItem mnemonicParsing="false" onAction="#openMdacPsWindow" text="Import MDAC Ps File..." />
-										<MenuItem mnemonicParsing="false" onAction="#openMdacFiWindow" text="Import MDAC Fi File..." />
+										<MenuItem fx:id="importRefEvents" mnemonicParsing="false" onAction="#openReferenceEventLoadingWindow" text="Load Reference Events..." />
+										<MenuItem mnemonicParsing="false" onAction="#openCodaParamWindow" text="Load Calibration..." />
+										<MenuItem mnemonicParsing="false" onAction="#openMdacPsWindow" text="Load MDAC Ps File..." />
+										<MenuItem mnemonicParsing="false" onAction="#openMdacFiWindow" text="Load MDAC Fi File..." />
 									</items>
 								</Menu>
 								<SeparatorMenuItem mnemonicParsing="false" />
-								<MenuItem mnemonicParsing="false" onAction="#openCalibrationDataSavingWindow" text="Export Calibration..." />
-								<MenuItem fx:id="exportWaveformDir" mnemonicParsing="false" onAction="#openWaveformDirectorySavingWindow" text="Export Waveforms..." />
-								<MenuItem fx:id="exportMeasuredMws" mnemonicParsing="false" onAction="#openMeasuredMwDirectorySavingWindow" text="Export Measured Mws..." />
+								<MenuItem mnemonicParsing="false" onAction="#openCalibrationDataSavingWindow" text="Save Calibration..." />
+								<MenuItem fx:id="exportWaveformDir" mnemonicParsing="false" onAction="#openWaveformDirectorySavingWindow" text="Save Waveforms..." />
+								<MenuItem fx:id="exportMeasuredMws" mnemonicParsing="false" onAction="#openMeasuredMwDirectorySavingWindow" text="Save Measured Mws..." />
 							</items>
 						</Menu>
 						<Menu mnemonicParsing="false" text="Calibration">
diff --git a/calibration-gui/src/main/resources/fxml/CommonGui.css b/calibration-gui/src/main/resources/fxml/CommonGui.css
index 9a750245..a9ea54ec 100644
--- a/calibration-gui/src/main/resources/fxml/CommonGui.css
+++ b/calibration-gui/src/main/resources/fxml/CommonGui.css
@@ -13,6 +13,21 @@
     -fx-direction: ltr;
 }
 
+.material-icons-large {
+    -fx-font-family: 'Material Icons';
+    -fx-font-weight: normal;
+    -fx-font-style: normal;
+    -fx-font-size: 32px;
+    /* Preferred icon size */
+    -fx-display: inline-block;
+    -fx-line-height: 1;
+    -fx-text-transform: none;
+    -fx-letter-spacing: normal;
+    -fx-word-wrap: normal;
+    -fx-white-space: nowrap;
+    -fx-direction: ltr;
+}
+
 .material-icons-medium {
     -fx-font-family: 'Material Icons';
     -fx-font-weight: normal;
diff --git a/calibration-gui/src/main/resources/fxml/MaterialIcons-Regular.ttf b/calibration-gui/src/main/resources/fxml/MaterialIcons-Regular.ttf
index 7015564a..be4be29c 100644
Binary files a/calibration-gui/src/main/resources/fxml/MaterialIcons-Regular.ttf and b/calibration-gui/src/main/resources/fxml/MaterialIcons-Regular.ttf differ
diff --git a/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml b/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
index 5fbe458b..09bbc928 100644
--- a/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
+++ b/calibration-gui/src/main/resources/fxml/MeasuredMws.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import gov.llnl.gnem.apps.coda.common.gui.util.HiddenHeaderTableView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
@@ -12,7 +13,6 @@
 <?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
@@ -29,69 +29,57 @@
 							<content>
 								<VBox>
 									<children>
-										<HBox prefWidth="200.0">
-											<children>
-												<Pane minWidth="30.0" prefWidth="30.0" />
-												<VBox>
-													<children>
-														<Label text="Event" />
-														<ComboBox fx:id="evidCombo" minWidth="150.0" prefWidth="150.0" />
-													</children>
-												</VBox>
-												<Pane minWidth="15.0" prefWidth="30.0" />
-												<VBox>
-													<children>
-														<Label />
-														<Button minWidth="25.0" mnemonicParsing="false" fx:id="xAxisShrink">
-															<tooltip>
-																<Tooltip text="Toggle X-Axis shrink-to-data" />
-															</tooltip>
-														</Button>
-													</children>
-												</VBox>
-												<VBox>
-													<children>
-														<Label />
-														<Button fx:id="yAxisShrink" minWidth="25.0" mnemonicParsing="false">
-															<tooltip>
-																<Tooltip text="Toggle Y-Axis shrink-to-data" />
-															</tooltip>
-														</Button>
-													</children>
-												</VBox>
-												<Pane minWidth="15.0" prefWidth="30.0" />
-												<VBox>
-													<children>
-														<TextField fx:id="eventTime" editable="false" prefWidth="5000.0" visible="false" />
-														<TextField fx:id="eventLoc" editable="false" prefWidth="5000.0" visible="false" />
-													</children>
-												</VBox>
-												<VBox layoutX="270.0" layoutY="20.0">
-													<children>
-														<TextField fx:id="obsTotalEnergy" editable="false" prefWidth="5000.0" visible="false" />
-														<TextField fx:id="obsEnergy" editable="false" prefWidth="5000.0" visible="false" />
-													</children>
-												</VBox>
-											</children>
-											<VBox.margin>
-												<Insets />
-											</VBox.margin>
-											<padding>
-												<Insets bottom="10.0" top="10.0" />
-											</padding>
-										</HBox>
 										<SplitPane dividerPositions="0.2" VBox.vgrow="ALWAYS">
 											<items>
-												<TableView fx:id="summaryTable" prefHeight="200.0" prefWidth="200.0">
+												<HiddenHeaderTableView fx:id="summaryTable" prefHeight="200.0" prefWidth="200.0">
 													<columns>
-														<TableColumn fx:id="summaryNameCol" maxWidth="500.0" minWidth="75.0" prefWidth="-1.0" text="" />
-														<TableColumn fx:id="summaryValueCol" maxWidth="1000.0" minWidth="-1.0" prefWidth="-1.0" text="" />
+														<TableColumn fx:id="summaryNameCol" editable="false" maxWidth="500.0" minWidth="75.0" prefWidth="-1.0" sortable="false" text="" />
+														<TableColumn fx:id="summaryValueCol" editable="false" maxWidth="1000.0" minWidth="-1.0" prefWidth="-1.0" sortable="false" text="" />
 													</columns>
 													<columnResizePolicy>
 														<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
 													</columnResizePolicy>
-												</TableView>
-												<StackPane fx:id="spectraPlotPane" prefHeight="160.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+												</HiddenHeaderTableView>
+                                    <StackPane pickOnBounds="false" VBox.vgrow="ALWAYS">
+                                       <children>
+      												<StackPane fx:id="spectraPlotPane" pickOnBounds="false" prefHeight="160.0" prefWidth="200.0" />
+            										<HBox pickOnBounds="false" prefWidth="200.0">
+            											<children>
+            												<Pane minWidth="15.0" prefWidth="15.0" />
+            												<VBox>
+            													<children>
+            														<Label text="Event" />
+            														<ComboBox fx:id="evidCombo" minWidth="150.0" prefWidth="150.0" />
+            													</children>
+            												</VBox>
+            												<Pane minWidth="15.0" prefWidth="15.0" />
+            												<VBox>
+            													<children>
+            														<Label />
+            														<Button minWidth="25.0" mnemonicParsing="false" fx:id="xAxisShrink">
+            															<tooltip>
+            																<Tooltip text="Toggle X-Axis shrink-to-data" />
+            															</tooltip>
+            														</Button>
+            													</children>
+            												</VBox>
+            												<VBox>
+            													<children>
+            														<Label />
+            														<Button fx:id="yAxisShrink" minWidth="25.0" mnemonicParsing="false">
+            															<tooltip>
+            																<Tooltip text="Toggle Y-Axis shrink-to-data" />
+            															</tooltip>
+            														</Button>
+            													</children>
+            												</VBox>
+            											</children>
+            											<padding>
+            												<Insets bottom="10.0" top="10.0" />
+            											</padding>
+            										</HBox>
+                                       </children>
+                                    </StackPane>
 											</items>
 										</SplitPane>
 									</children>
@@ -198,6 +186,7 @@
 																		<TableColumn fx:id="measuredMwUq2HighCol" editable="false" prefWidth="150.0" text="Misfit2 (max)" visible="false" />
 																	</columns>
 																</TableColumn>
+                                                <TableColumn fx:id="likelyPoorlyConstrainedCol" editable="false" prefWidth="150.0" text="Poorly Constrained" visible="false" />
 															</columns>
 															<columnResizePolicy>
 																<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
diff --git a/calibration-gui/src/main/resources/fxml/Path.fxml b/calibration-gui/src/main/resources/fxml/Path.fxml
index dba667b6..140c0600 100644
--- a/calibration-gui/src/main/resources/fxml/Path.fxml
+++ b/calibration-gui/src/main/resources/fxml/Path.fxml
@@ -41,7 +41,7 @@
                   <Pane prefWidth="30.0" />
                   <VBox>
                      <children>
-                        <Label text="Station Count Filter" />
+                        <Label text="Min Event Count" />
                         <Spinner fx:id="stationCountFilterField" editable="true" prefWidth="60.0">
                           <valueFactory>
 					        <SpinnerValueFactory.IntegerSpinnerValueFactory initialValue="3" max="100" min="0" />
diff --git a/calibration-gui/src/main/resources/fxml/Shape.fxml b/calibration-gui/src/main/resources/fxml/Shape.fxml
index 7cbd9e6c..253856ed 100644
--- a/calibration-gui/src/main/resources/fxml/Shape.fxml
+++ b/calibration-gui/src/main/resources/fxml/Shape.fxml
@@ -15,37 +15,38 @@
 	<children>
 		<VBox>
 			<children>
-				<HBox prefWidth="200.0">
-					<children>
-						<Pane prefWidth="30.0" />
-						<VBox>
-							<children>
-								<Label text="Frequency Band" />
-								<ComboBox fx:id="frequencyBandCombo" prefWidth="150.0" />
-							</children>
-						</VBox>
-						<Pane minWidth="15.0" />
-						<VBox>
-							<children>
-								<Label />
-	                			<Button fx:id="yAxisShrink" minWidth="20.0" mnemonicParsing="false">
-	                               <tooltip>
-	                                  <Tooltip text="Toggle Y-Axis shrink-to-data" />
-	                               </tooltip>
-	                   			</Button>
-							</children>
-						</VBox>										
-					</children>
-					<VBox.margin>
-						<Insets />
-					</VBox.margin>
-					<padding>
-						<Insets bottom="10.0" top="10.0" />
-					</padding>
-				</HBox>
 				<ScrollPane fitToHeight="true" fitToWidth="true" VBox.vgrow="ALWAYS">
 					<content>
-								<StackPane fx:id="plotContainer" minHeight="50.0" minWidth="50.0" />
+                  <StackPane pickOnBounds="false">
+                     <children>
+      								<StackPane fx:id="plotContainer" minHeight="50.0" minWidth="50.0" pickOnBounds="false" />
+            				<HBox pickOnBounds="false" prefWidth="200.0">
+            					<children>
+            						<Pane prefWidth="30.0" />
+            						<VBox>
+            							<children>
+            								<Label text="Frequency Band" />
+            								<ComboBox fx:id="frequencyBandCombo" prefWidth="150.0" />
+            							</children>
+            						</VBox>
+            						<Pane minWidth="15.0" />
+            						<VBox>
+            							<children>
+            								<Label />
+            	                			<Button fx:id="yAxisShrink" minWidth="20.0" mnemonicParsing="false">
+            	                               <tooltip>
+            	                                  <Tooltip text="Toggle Y-Axis shrink-to-data" />
+            	                               </tooltip>
+            	                   			</Button>
+            							</children>
+            						</VBox>										
+            					</children>
+            					<padding>
+            						<Insets bottom="10.0" top="10.0" />
+            					</padding>
+            				</HBox>
+                     </children>
+                  </StackPane>
 					</content>
 				</ScrollPane>
 			</children>
diff --git a/calibration-gui/src/main/resources/fxml/Site.fxml b/calibration-gui/src/main/resources/fxml/Site.fxml
index 82491a5d..7274a553 100644
--- a/calibration-gui/src/main/resources/fxml/Site.fxml
+++ b/calibration-gui/src/main/resources/fxml/Site.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import gov.llnl.gnem.apps.coda.common.gui.util.HiddenHeaderTableView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
@@ -18,10 +19,9 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
-<StackPane fx:id="sitePane" stylesheets="@CommonGui.css"
-	xmlns="http://javafx.com/javafx/16"
-	xmlns:fx="http://javafx.com/fxml/1" fx:controller="gov.llnl.gnem.apps.coda.calibration.gui.controllers.SiteController">
+<StackPane fx:id="sitePane" stylesheets="@CommonGui.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gov.llnl.gnem.apps.coda.calibration.gui.controllers.SiteController">
 	<children>
 		<VBox>
 			<children>
@@ -31,58 +31,59 @@
 							<content>
 								<VBox>
 									<children>
-										<HBox prefWidth="200.0">
-											<children>
-												<Pane minWidth="30.0" prefWidth="30.0" />
-												<VBox>
-													<children>
-														<Label text="Event" />
-														<ComboBox fx:id="evidCombo" minWidth="150.0" prefWidth="150.0" />
-													</children>
-												</VBox>
-												<Pane minWidth="15.0" prefWidth="30.0" />
-												<VBox>
-													<children>
-														<Label />
-														<Button minWidth="25.0" mnemonicParsing="false" fx:id="xAxisShrink">
-															<tooltip>
-																<Tooltip text="Toggle X-Axis shrink-to-data" />
-															</tooltip>
-														</Button>
-													</children>
-												</VBox>
-												<VBox>
-													<children>
-														<Label />
-														<Button fx:id="yAxisShrink" minWidth="25.0" mnemonicParsing="false">
-															<tooltip>
-																<Tooltip text="Toggle Y-Axis shrink-to-data" />
-															</tooltip>
-														</Button>
-													</children>
-												</VBox>
-											</children>
-											<VBox.margin>
-												<Insets />
-											</VBox.margin>
-											<padding>
-												<Insets bottom="5.0" />
-											</padding>
-										</HBox>
 										<SplitPane fx:id="rawSplitPane" dividerPositions="1.0" orientation="VERTICAL" VBox.vgrow="ALWAYS">
 											<items>
 												<SplitPane dividerPositions="0.2">
 													<items>
-														<TableView fx:id="summaryTable" prefHeight="200.0" prefWidth="200.0">
+														<HiddenHeaderTableView fx:id="summaryTable" prefHeight="200.0" prefWidth="200.0">
 															<columns>
-																<TableColumn fx:id="summaryNameCol" maxWidth="500.0" minWidth="75.0" prefWidth="-1.0" text="" />
-																<TableColumn fx:id="summaryValueCol" maxWidth="1000.0" minWidth="-1.0" prefWidth="-1.0" text="" />
+																<TableColumn fx:id="summaryNameCol" editable="false" maxWidth="500.0" minWidth="75.0" prefWidth="-1.0" sortable="false" style="-fx-font-size: 14;" text="" />
+																<TableColumn fx:id="summaryValueCol" editable="false" maxWidth="1000.0" minWidth="-1.0" prefWidth="-1.0" sortable="false" style="-fx-font-size: 14;" text="" />
 															</columns>
 															<columnResizePolicy>
 																<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
 															</columnResizePolicy>
-														</TableView>
-														<StackPane fx:id="sitePlotNode" />
+														</HiddenHeaderTableView>
+														<StackPane pickOnBounds="false">
+															<children>
+																<StackPane fx:id="sitePlotNode" pickOnBounds="false" prefHeight="150.0" prefWidth="200.0" />
+																<HBox pickOnBounds="false" prefWidth="200.0">
+																	<children>
+																		<Pane minWidth="15.0" prefWidth="15.0" />
+																		<VBox>
+																			<children>
+																				<Label text="Event" />
+																				<ComboBox fx:id="evidCombo" minWidth="150.0" prefWidth="150.0" />
+																			</children>
+																		</VBox>
+																		<Pane minWidth="10.0" prefWidth="10.0" />
+																		<VBox>
+																			<children>
+																				<Label />
+																				<Button minWidth="25.0" mnemonicParsing="false" fx:id="xAxisShrink">
+																					<tooltip>
+																						<Tooltip text="Toggle X-Axis shrink-to-data" />
+																					</tooltip>
+																				</Button>
+																			</children>
+																		</VBox>
+																		<VBox>
+																			<children>
+																				<Label />
+																				<Button fx:id="yAxisShrink" minWidth="25.0" mnemonicParsing="false">
+																					<tooltip>
+																						<Tooltip text="Toggle Y-Axis shrink-to-data" />
+																					</tooltip>
+																				</Button>
+																			</children>
+																		</VBox>
+																	</children>
+																	<padding>
+																		<Insets bottom="5.0" />
+																	</padding>
+																</HBox>
+															</children>
+														</StackPane>
 													</items>
 												</SplitPane>
 												<StackPane>
@@ -204,6 +205,7 @@
 																		<TableColumn fx:id="measuredMwUq2HighCol" editable="false" prefWidth="150.0" text="Misfit2 (max)" visible="false" />
 																	</columns>
 																</TableColumn>
+                                                <TableColumn fx:id="likelyPoorlyConstrainedCol" editable="false" prefWidth="150.0" text="Poorly Constrained" visible="false" />
 															</columns>
 															<columnResizePolicy>
 																<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@@ -230,7 +232,34 @@
 							<content>
 								<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
 									<content>
-										<StackPane fx:id="siteTermsPlotPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" />
+										<SplitPane dividerPositions="0.5" orientation="VERTICAL">
+											<items>
+												<StackPane pickOnBounds="false" prefHeight="150.0" prefWidth="200.0">
+													<children>
+														<StackPane fx:id="relativeSiteTermsPlotPane" pickOnBounds="false" prefHeight="150.0" prefWidth="200.0" />
+														<HBox pickOnBounds="false" prefWidth="200.0">
+															<children>
+																<Pane minWidth="30.0" prefWidth="30.0" />
+																<VBox>
+																	<children>
+																		<Label text="Relative to station:">
+																			<font>
+																				<Font size="14.0" />
+																			</font>
+																		</Label>
+																		<ComboBox fx:id="siteTermStationCombo" minWidth="150.0" prefWidth="150.0" />
+																	</children>
+																</VBox>
+															</children>
+															<padding>
+																<Insets bottom="5.0" />
+															</padding>
+														</HBox>
+													</children>
+												</StackPane>
+												<StackPane fx:id="siteTermsPlotPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" />
+											</items>
+										</SplitPane>
 									</content>
 								</ScrollPane>
 							</content>
diff --git a/calibration-service/calibration-application/pom.xml b/calibration-service/calibration-application/pom.xml
index 8746aaec..51b1cb9c 100644
--- a/calibration-service/calibration-application/pom.xml
+++ b/calibration-service/calibration-application/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-model/pom.xml b/calibration-service/calibration-model/pom.xml
index 4e048e10..99dfef43 100644
--- a/calibration-service/calibration-model/pom.xml
+++ b/calibration-service/calibration-model/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
         <artifactId>calibration-service</artifactId>
-        <version>1.0.15</version>
+        <version>1.0.16</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/GeoJsonPolygon.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/GeoJsonPolygon.java
index b96774a8..9c4fff4a 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/GeoJsonPolygon.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/GeoJsonPolygon.java
@@ -2,10 +2,10 @@
 * Copyright (c) 2020, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
 * CODE-743439.
 * All rights reserved.
-* 
+*
 * Licensed under the Apache License, Version 2.0 (the “Licensee”); you may not use this file except in compliance with the License.  You may obtain a copy of the License at:
 * http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and limitations under the license.
 *
 * This work was performed under the auspices of the U.S. Department of Energy
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
index cdeb433c..62f4b718 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwDetails.java
@@ -23,521 +23,581 @@
 
 public class MeasuredMwDetails {
 
-	private String eventId;
+    private String eventId;
 
-	private Double mw;
+    private Double mw;
 
-	private Double obsEnergy;
+    private Double obsEnergy;
 
-	private Double logTotalEnergy;
+    private Double logTotalEnergy;
 
-	private Double logTotalEnergyMDAC;
+    private Double logTotalEnergyMDAC;
 
-	private Double energyRatio;
+    private Double energyRatio;
 
-	private Double obsAppStress;
+    private Double obsAppStress;
 
-	private Double mwSd;
+    private Double mwSd;
 
-	private Double mw1Max;
+    private Double mw1Max;
 
-	private Double mw1Min;
+    private Double mw1Min;
 
-	private Double mw2Max;
+    private Double mw2Max;
 
-	private Double mw2Min;
+    private Double mw2Min;
 
-	private Double refMw;
+    private Double refMw;
 
-	private Double valMw;
+    private Double valMw;
 
-	private Double apparentStressInMpa;
+    private Double apparentStressInMpa;
 
-	private Double apparentStress1Max;
+    private Double apparentStress1Max;
 
-	private Double apparentStress1Min;
+    private Double apparentStress1Min;
 
-	private Double apparentStress2Max;
+    private Double apparentStress2Max;
 
-	private Double apparentStress2Min;
+    private Double apparentStress2Min;
 
-	private Double refApparentStressInMpa;
+    private Double refApparentStressInMpa;
 
-	private Double valApparentStressInMpa;
+    private Double valApparentStressInMpa;
 
-	private Double cornerFreq;
+    private Double cornerFreq;
 
-	private Double cornerFreqSd;
+    private Double cornerFreqSd;
 
-	private Integer dataCount;
+    private Integer dataCount;
 
-	private Integer stationCount;
+    private Integer stationCount;
 
-	private Double latitude;
+    private Double latitude;
 
-	private Double longitude;
+    private Double longitude;
 
-	private Double depth;
+    private Double depth;
 
-	private String datetime;
+    private String datetime;
 
-	private Integer iterations;
+    private Integer iterations;
 
-	private Double misfit;
+    private Double misfit;
 
-	private Double bandCoverage;
+    private Double bandCoverage;
 
-	public MeasuredMwDetails(MeasuredMwParameters meas, ReferenceMwParameters ref, ValidationMwParameters val,
-			Event event) {
-		if (meas != null) {
-			this.eventId = meas.getEventId();
-			this.mw = meas.getMw();
-			this.obsEnergy = meas.getObsEnergy();
-			this.logTotalEnergy = meas.getLogTotalEnergy();
-			this.logTotalEnergyMDAC = meas.getLogTotalEnergyMDAC();
-			this.energyRatio = meas.getEnergyRatio();
-			this.obsAppStress = meas.getObsAppStress();
-			this.mw1Max = meas.getMw1Max();
-			this.mw1Min = meas.getMw1Min();
-			this.mw2Max = meas.getMw2Max();
-			this.mw2Min = meas.getMw2Min();
-			this.apparentStressInMpa = meas.getApparentStressInMpa();
-			this.apparentStress1Max = meas.getApparentStress1Max();
-			this.apparentStress1Min = meas.getApparentStress1Min();
-			this.apparentStress2Max = meas.getApparentStress2Max();
-			this.apparentStress2Min = meas.getApparentStress2Min();
-			this.cornerFreq = meas.getCornerFrequency();
-			this.dataCount = meas.getDataCount();
-			this.stationCount = meas.getStationCount();
-			this.iterations = meas.getIterations();
-			this.misfit = meas.getMisfit();
-			this.bandCoverage = meas.getBandCoverage();
-		}
-		if (event != null && event.getEventId() != null) {
-			this.eventId = event.getEventId();
-			this.latitude = event.getLatitude();
-			this.longitude = event.getLongitude();
-			this.depth = event.getDepth();
-			if (event.getOriginTime() != null) {
-				this.datetime = DateTimeFormatter.ISO_INSTANT.format(event.getOriginTime().toInstant());
-			}
-		}
-		if (ref != null) {
-			if (eventId == null) {
-				this.eventId = ref.getEventId();
-			}
-			this.refApparentStressInMpa = ref.getRefApparentStressInMpa();
-			this.refMw = ref.getRefMw();
-		}
+    private Boolean likelyPoorlyConstrained;
 
-		if (val != null) {
-			if (eventId == null) {
-				this.eventId = val.getEventId();
-			}
-			this.valApparentStressInMpa = val.getApparentStressInMpa();
-			this.valMw = val.getMw();
-		}
-	}
-
-	public MeasuredMwDetails() {
-		// nop
-	}
-
-	public String getEventId() {
-		return eventId;
-	}
-
-	public MeasuredMwDetails setEventId(String eventId) {
-		this.eventId = eventId;
-		return this;
-	}
-
-	public Double getMw() {
-		return mw;
-	}
-
-	public Double getObsEnergy() {
-		return obsEnergy;
-	}
-
-	public MeasuredMwDetails setObsEnergy(Double obsEnergy) {
-		this.obsEnergy = obsEnergy;
-		return this;
-	}
-
-	public Double getTotalEnergy() {
-		return logTotalEnergy;
-	}
-
-	public MeasuredMwDetails setTotalEnergy(Double totalEnergy) {
-		this.logTotalEnergy = totalEnergy;
-		return this;
-	}
-
-	public Double getTotalEnergyMDAC() {
-		return logTotalEnergyMDAC;
-	}
-
-	public MeasuredMwDetails setTotalEnergyMDAC(Double totalEnergyMDAC) {
-		this.logTotalEnergyMDAC = totalEnergyMDAC;
-		return this;
-	}
-
-	public Double getEnergyRatio() {
-		return energyRatio;
-	}
-
-	public MeasuredMwDetails setEnergyRatio(Double energyRatio) {
-		this.energyRatio = energyRatio;
-		return this;
-	}
-
-	public Double getEnergyStress() {
-		return obsAppStress;
-	}
-
-	public MeasuredMwDetails setEnergyStress(Double energyStress) {
-		this.obsAppStress = energyStress;
-		return this;
-	}
-
-	public MeasuredMwDetails setMw(double mw) {
-		this.mw = mw;
-		return this;
-	}
-
-	public Double getMwSd() {
-		return mwSd;
-	}
-
-	public MeasuredMwDetails setMwSd(Double mwSd) {
-		this.mwSd = mwSd;
-		return this;
-	}
-
-	public Double getRefMw() {
-		return refMw;
-	}
-
-	public MeasuredMwDetails setRefMw(Double refMw) {
-		this.refMw = refMw;
-		return this;
-	}
-
-	public Double getValMw() {
-		return valMw;
-	}
-
-	public MeasuredMwDetails setValMw(Double mw) {
-		this.valMw = mw;
-		return this;
-	}
-
-	public Double getApparentStressInMpa() {
-		return apparentStressInMpa;
-	}
-
-	public MeasuredMwDetails setApparentStressInMpa(Double apparentStressInMpa) {
-		this.apparentStressInMpa = apparentStressInMpa;
-		return this;
-	}
-
-	public Double getValApparentStressInMpa() {
-		return valApparentStressInMpa;
-	}
-
-	public MeasuredMwDetails setValApparentStressInMpa(Double stressMpa) {
-		this.valApparentStressInMpa = stressMpa;
-		return this;
-	}
-
-	public Double getRefApparentStressInMpa() {
-		return refApparentStressInMpa;
-	}
-
-	public MeasuredMwDetails setRefApparentStressInMpa(Double refApparentStressInMpa) {
-		this.refApparentStressInMpa = refApparentStressInMpa;
-		return this;
-	}
-
-	public Integer getDataCount() {
-		return dataCount;
-	}
-
-	public MeasuredMwDetails setDataCount(Integer dataCount) {
-		this.dataCount = dataCount;
-		return this;
-	}
-
-	public Integer getStationCount() {
-		return stationCount;
-	}
-
-	public MeasuredMwDetails setStationCount(Integer stationCount) {
-		this.stationCount = stationCount;
-		return this;
-	}
-
-	public Double getLatitude() {
-		return latitude;
-	}
-
-	public MeasuredMwDetails setLatitude(double latitude) {
-		this.latitude = latitude;
-		return this;
-	}
-
-	public Double getLongitude() {
-		return longitude;
-	}
-
-	public MeasuredMwDetails setLongitude(double longitude) {
-		this.longitude = longitude;
-		return this;
-	}
-
-	public Double getDepth() {
-		return depth;
-	}
-
-	public MeasuredMwDetails setDepth(double depth) {
-		this.depth = depth;
-		return this;
-	}
-
-	public String getDatetime() {
-		return datetime;
-	}
-
-	public MeasuredMwDetails setDatetime(String datetime) {
-		this.datetime = datetime;
-		return this;
-	}
-
-	public Double getMw1Max() {
-		return mw1Max;
-	}
-
-	public MeasuredMwDetails setMw1Max(Double mw1Max) {
-		this.mw1Max = mw1Max;
-		return this;
-	}
-
-	public Double getMw1Min() {
-		return mw1Min;
-	}
-
-	public MeasuredMwDetails setMw1Min(Double mw1Min) {
-		this.mw1Min = mw1Min;
-		return this;
-	}
-
-	public Double getMw2Max() {
-		return mw2Max;
-	}
-
-	public MeasuredMwDetails setMw2Max(Double mw2Max) {
-		this.mw2Max = mw2Max;
-		return this;
-	}
-
-	public Double getMw2Min() {
-		return mw2Min;
-	}
-
-	public MeasuredMwDetails setMw2Min(Double mw2Min) {
-		this.mw2Min = mw2Min;
-		return this;
-	}
-
-	public Double getApparentStress1Max() {
-		return apparentStress1Max;
-	}
-
-	public MeasuredMwDetails setApparentStress1Max(Double apparentStress1Max) {
-		this.apparentStress1Max = apparentStress1Max;
-		return this;
-	}
-
-	public Double getApparentStress1Min() {
-		return apparentStress1Min;
-	}
-
-	public MeasuredMwDetails setApparentStress1Min(Double apparentStress1Min) {
-		this.apparentStress1Min = apparentStress1Min;
-		return this;
-	}
-
-	public Double getApparentStress2Max() {
-		return apparentStress2Max;
-	}
-
-	public MeasuredMwDetails setApparentStress2Max(Double apparentStress2Max) {
-		this.apparentStress2Max = apparentStress2Max;
-		return this;
-	}
-
-	public Double getApparentStress2Min() {
-		return apparentStress2Min;
-	}
-
-	public MeasuredMwDetails setApparentStress2Min(Double apparentStress2Min) {
-		this.apparentStress2Min = apparentStress2Min;
-		return this;
-	}
-
-	public Double getCornerFreq() {
-		return cornerFreq;
-	}
-
-	public MeasuredMwDetails setCornerFreq(Double cornerFreq) {
-		this.cornerFreq = cornerFreq;
-		return this;
-	}
-
-	public Double getCornerFreqSd() {
-		return cornerFreqSd;
-	}
-
-	public MeasuredMwDetails setCornerFreqSd(Double cornerFreqSd) {
-		this.cornerFreqSd = cornerFreqSd;
-		return this;
-	}
-
-	public Integer getIterations() {
-		return iterations;
-	}
-
-	public MeasuredMwDetails setIterations(Integer iterations) {
-		this.iterations = iterations;
-		return this;
-	}
-
-	public Double getMisfit() {
-		return misfit;
-	}
-
-	public MeasuredMwDetails setMisfit(Double misfit) {
-		this.misfit = misfit;
-		return this;
-	}
-
-	public Double getBandCoverage() {
-		return bandCoverage;
-	}
-
-	public MeasuredMwDetails setBandCoverage(Double bandCoverage) {
-		this.bandCoverage = bandCoverage;
-		return this;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("MeasuredMwDetails [eventId=");
-		builder.append(eventId);
-		builder.append(", mw=");
-		builder.append(mw);
-		builder.append(", totalEnergy=");
-		builder.append(logTotalEnergy);
-		builder.append(", totalEnergyMDAC=");
-		builder.append(logTotalEnergyMDAC);
-		builder.append(", mwSd=");
-		builder.append(mwSd);
-		builder.append(", mw1Max=");
-		builder.append(mw1Max);
-		builder.append(", mw1Min=");
-		builder.append(mw1Min);
-		builder.append(", mw2Max=");
-		builder.append(mw2Max);
-		builder.append(", mw2Min=");
-		builder.append(mw2Min);
-		builder.append(", refMw=");
-		builder.append(refMw);
-		builder.append(", valMw=");
-		builder.append(valMw);
-		builder.append(", apparentStressInMpa=");
-		builder.append(apparentStressInMpa);
-		builder.append(", apparentStress1Max=");
-		builder.append(apparentStress1Max);
-		builder.append(", apparentStress1Min=");
-		builder.append(apparentStress1Min);
-		builder.append(", apparentStress2Max=");
-		builder.append(apparentStress2Max);
-		builder.append(", apparentStress2Min=");
-		builder.append(apparentStress2Min);
-		builder.append(", refApparentStressInMpa=");
-		builder.append(refApparentStressInMpa);
-		builder.append(", valApparentStressInMpa=");
-		builder.append(valApparentStressInMpa);
-		builder.append(", cornerFreq=");
-		builder.append(cornerFreq);
-		builder.append(", cornerFreqSd=");
-		builder.append(cornerFreqSd);
-		builder.append(", dataCount=");
-		builder.append(dataCount);
-		builder.append(", stationCount=");
-		builder.append(stationCount);
-		builder.append(", latitude=");
-		builder.append(latitude);
-		builder.append(", longitude=");
-		builder.append(longitude);
-		builder.append(", depth=");
-		builder.append(depth);
-		builder.append(", datetime=");
-		builder.append(datetime);
-		builder.append(", iterations=");
-		builder.append(iterations);
-		builder.append(", misfit=");
-		builder.append(misfit);
-		builder.append(", bandCoverage=");
-		builder.append(bandCoverage);
-		builder.append("]");
-		return builder.toString();
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(apparentStress1Max, apparentStress1Min, apparentStress2Max, apparentStress2Min,
-				apparentStressInMpa, bandCoverage, cornerFreq, cornerFreqSd, dataCount, datetime, depth, eventId,
-				iterations, latitude, longitude, misfit, mw, mw1Max, mw1Min, mw2Max, mw2Min, mwSd,
-				refApparentStressInMpa, refMw, stationCount, logTotalEnergy, logTotalEnergyMDAC, valApparentStressInMpa,
-				valMw);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!(obj instanceof MeasuredMwDetails)) {
-			return false;
-		}
-		MeasuredMwDetails other = (MeasuredMwDetails) obj;
-		return Objects.equals(apparentStress1Max, other.apparentStress1Max)
-				&& Objects.equals(apparentStress1Min, other.apparentStress1Min)
-				&& Objects.equals(apparentStress2Max, other.apparentStress2Max)
-				&& Objects.equals(apparentStress2Min, other.apparentStress2Min)
-				&& Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
-				&& Objects.equals(bandCoverage, other.bandCoverage) && Objects.equals(cornerFreq, other.cornerFreq)
-				&& Objects.equals(cornerFreqSd, other.cornerFreqSd) && Objects.equals(dataCount, other.dataCount)
-				&& Objects.equals(datetime, other.datetime) && Objects.equals(depth, other.depth)
-				&& Objects.equals(eventId, other.eventId) && Objects.equals(iterations, other.iterations)
-				&& Objects.equals(latitude, other.latitude) && Objects.equals(longitude, other.longitude)
-				&& Objects.equals(misfit, other.misfit) && Objects.equals(mw, other.mw)
-				&& Objects.equals(mw1Max, other.mw1Max) && Objects.equals(mw1Min, other.mw1Min)
-				&& Objects.equals(mw2Max, other.mw2Max) && Objects.equals(mw2Min, other.mw2Min)
-				&& Objects.equals(mwSd, other.mwSd)
-				&& Objects.equals(refApparentStressInMpa, other.refApparentStressInMpa)
-				&& Objects.equals(refMw, other.refMw) && Objects.equals(stationCount, other.stationCount)
-				&& Objects.equals(logTotalEnergy, other.logTotalEnergy)
-				&& Objects.equals(logTotalEnergyMDAC, other.logTotalEnergyMDAC)
-				&& Objects.equals(valApparentStressInMpa, other.valApparentStressInMpa)
-				&& Objects.equals(valMw, other.valMw);
-	}
-
-	@JsonIgnore
-	public boolean isValid() {
-		return eventId != null;
-	}
+    public MeasuredMwDetails(MeasuredMwParameters meas, ReferenceMwParameters ref, ValidationMwParameters val, Event event) {
+        if (meas != null) {
+            this.eventId = meas.getEventId();
+            this.mw = meas.getMw();
+            this.obsEnergy = meas.getObsEnergy();
+            this.logTotalEnergy = meas.getLogTotalEnergy();
+            this.logTotalEnergyMDAC = meas.getLogTotalEnergyMDAC();
+            this.energyRatio = meas.getEnergyRatio();
+            this.obsAppStress = meas.getObsAppStress();
+            this.mw1Max = meas.getMw1Max();
+            this.mw1Min = meas.getMw1Min();
+            this.mw2Max = meas.getMw2Max();
+            this.mw2Min = meas.getMw2Min();
+            this.apparentStressInMpa = meas.getApparentStressInMpa();
+            this.apparentStress1Max = meas.getApparentStress1Max();
+            this.apparentStress1Min = meas.getApparentStress1Min();
+            this.apparentStress2Max = meas.getApparentStress2Max();
+            this.apparentStress2Min = meas.getApparentStress2Min();
+            this.cornerFreq = meas.getCornerFrequency();
+            this.dataCount = meas.getDataCount();
+            this.stationCount = meas.getStationCount();
+            this.iterations = meas.getIterations();
+            this.misfit = meas.getMisfit();
+            this.bandCoverage = meas.getBandCoverage();
+            this.likelyPoorlyConstrained = meas.isLikelyPoorlyConstrained();
+        }
+        if (event != null && event.getEventId() != null) {
+            this.eventId = event.getEventId();
+            this.latitude = event.getLatitude();
+            this.longitude = event.getLongitude();
+            this.depth = event.getDepth();
+            if (event.getOriginTime() != null) {
+                this.datetime = DateTimeFormatter.ISO_INSTANT.format(event.getOriginTime().toInstant());
+            }
+        }
+        if (ref != null) {
+            if (eventId == null) {
+                this.eventId = ref.getEventId();
+            }
+            this.refApparentStressInMpa = ref.getRefApparentStressInMpa();
+            this.refMw = ref.getRefMw();
+        }
+
+        if (val != null) {
+            if (eventId == null) {
+                this.eventId = val.getEventId();
+            }
+            this.valApparentStressInMpa = val.getApparentStressInMpa();
+            this.valMw = val.getMw();
+        }
+    }
+
+    public MeasuredMwDetails() {
+        // nop
+    }
+
+    public String getEventId() {
+        return eventId;
+    }
+
+    public MeasuredMwDetails setEventId(String eventId) {
+        this.eventId = eventId;
+        return this;
+    }
+
+    public Double getMw() {
+        return mw;
+    }
+
+    public Double getObsEnergy() {
+        return obsEnergy;
+    }
+
+    public MeasuredMwDetails setObsEnergy(Double obsEnergy) {
+        this.obsEnergy = obsEnergy;
+        return this;
+    }
+
+    public Double getTotalEnergy() {
+        return logTotalEnergy;
+    }
+
+    public MeasuredMwDetails setTotalEnergy(Double totalEnergy) {
+        this.logTotalEnergy = totalEnergy;
+        return this;
+    }
+
+    public Double getTotalEnergyMDAC() {
+        return logTotalEnergyMDAC;
+    }
+
+    public MeasuredMwDetails setTotalEnergyMDAC(Double totalEnergyMDAC) {
+        this.logTotalEnergyMDAC = totalEnergyMDAC;
+        return this;
+    }
+
+    public Double getEnergyRatio() {
+        return energyRatio;
+    }
+
+    public MeasuredMwDetails setEnergyRatio(Double energyRatio) {
+        this.energyRatio = energyRatio;
+        return this;
+    }
+
+    public Double getEnergyStress() {
+        return obsAppStress;
+    }
+
+    public MeasuredMwDetails setEnergyStress(Double energyStress) {
+        this.obsAppStress = energyStress;
+        return this;
+    }
+
+    public MeasuredMwDetails setMw(double mw) {
+        this.mw = mw;
+        return this;
+    }
+
+    public Double getMwSd() {
+        return mwSd;
+    }
+
+    public MeasuredMwDetails setMwSd(Double mwSd) {
+        this.mwSd = mwSd;
+        return this;
+    }
+
+    public Double getRefMw() {
+        return refMw;
+    }
+
+    public MeasuredMwDetails setRefMw(Double refMw) {
+        this.refMw = refMw;
+        return this;
+    }
+
+    public Double getValMw() {
+        return valMw;
+    }
+
+    public MeasuredMwDetails setValMw(Double mw) {
+        this.valMw = mw;
+        return this;
+    }
+
+    public Double getApparentStressInMpa() {
+        return apparentStressInMpa;
+    }
+
+    public MeasuredMwDetails setApparentStressInMpa(Double apparentStressInMpa) {
+        this.apparentStressInMpa = apparentStressInMpa;
+        return this;
+    }
+
+    public Double getValApparentStressInMpa() {
+        return valApparentStressInMpa;
+    }
+
+    public MeasuredMwDetails setValApparentStressInMpa(Double stressMpa) {
+        this.valApparentStressInMpa = stressMpa;
+        return this;
+    }
+
+    public Double getRefApparentStressInMpa() {
+        return refApparentStressInMpa;
+    }
+
+    public MeasuredMwDetails setRefApparentStressInMpa(Double refApparentStressInMpa) {
+        this.refApparentStressInMpa = refApparentStressInMpa;
+        return this;
+    }
+
+    public Integer getDataCount() {
+        return dataCount;
+    }
+
+    public MeasuredMwDetails setDataCount(Integer dataCount) {
+        this.dataCount = dataCount;
+        return this;
+    }
+
+    public Integer getStationCount() {
+        return stationCount;
+    }
+
+    public MeasuredMwDetails setStationCount(Integer stationCount) {
+        this.stationCount = stationCount;
+        return this;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public MeasuredMwDetails setLatitude(double latitude) {
+        this.latitude = latitude;
+        return this;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public MeasuredMwDetails setLongitude(double longitude) {
+        this.longitude = longitude;
+        return this;
+    }
+
+    public Double getDepth() {
+        return depth;
+    }
+
+    public MeasuredMwDetails setDepth(double depth) {
+        this.depth = depth;
+        return this;
+    }
+
+    public String getDatetime() {
+        return datetime;
+    }
+
+    public MeasuredMwDetails setDatetime(String datetime) {
+        this.datetime = datetime;
+        return this;
+    }
+
+    public Double getMw1Max() {
+        return mw1Max;
+    }
+
+    public MeasuredMwDetails setMw1Max(Double mw1Max) {
+        this.mw1Max = mw1Max;
+        return this;
+    }
+
+    public Double getMw1Min() {
+        return mw1Min;
+    }
+
+    public MeasuredMwDetails setMw1Min(Double mw1Min) {
+        this.mw1Min = mw1Min;
+        return this;
+    }
+
+    public Double getMw2Max() {
+        return mw2Max;
+    }
+
+    public MeasuredMwDetails setMw2Max(Double mw2Max) {
+        this.mw2Max = mw2Max;
+        return this;
+    }
+
+    public Double getMw2Min() {
+        return mw2Min;
+    }
+
+    public MeasuredMwDetails setMw2Min(Double mw2Min) {
+        this.mw2Min = mw2Min;
+        return this;
+    }
+
+    public Double getApparentStress1Max() {
+        return apparentStress1Max;
+    }
+
+    public MeasuredMwDetails setApparentStress1Max(Double apparentStress1Max) {
+        this.apparentStress1Max = apparentStress1Max;
+        return this;
+    }
+
+    public Double getApparentStress1Min() {
+        return apparentStress1Min;
+    }
+
+    public MeasuredMwDetails setApparentStress1Min(Double apparentStress1Min) {
+        this.apparentStress1Min = apparentStress1Min;
+        return this;
+    }
+
+    public Double getApparentStress2Max() {
+        return apparentStress2Max;
+    }
+
+    public MeasuredMwDetails setApparentStress2Max(Double apparentStress2Max) {
+        this.apparentStress2Max = apparentStress2Max;
+        return this;
+    }
+
+    public Double getApparentStress2Min() {
+        return apparentStress2Min;
+    }
+
+    public MeasuredMwDetails setApparentStress2Min(Double apparentStress2Min) {
+        this.apparentStress2Min = apparentStress2Min;
+        return this;
+    }
+
+    public Double getCornerFreq() {
+        return cornerFreq;
+    }
+
+    public MeasuredMwDetails setCornerFreq(Double cornerFreq) {
+        this.cornerFreq = cornerFreq;
+        return this;
+    }
+
+    public Double getCornerFreqSd() {
+        return cornerFreqSd;
+    }
+
+    public MeasuredMwDetails setCornerFreqSd(Double cornerFreqSd) {
+        this.cornerFreqSd = cornerFreqSd;
+        return this;
+    }
+
+    public Integer getIterations() {
+        return iterations;
+    }
+
+    public MeasuredMwDetails setIterations(Integer iterations) {
+        this.iterations = iterations;
+        return this;
+    }
+
+    public Double getMisfit() {
+        return misfit;
+    }
+
+    public MeasuredMwDetails setMisfit(Double misfit) {
+        this.misfit = misfit;
+        return this;
+    }
+
+    public Double getBandCoverage() {
+        return bandCoverage;
+    }
+
+    public MeasuredMwDetails setBandCoverage(Double bandCoverage) {
+        this.bandCoverage = bandCoverage;
+        return this;
+    }
+
+    public Boolean isLikelyPoorlyConstrained() {
+        return likelyPoorlyConstrained;
+    }
+
+    public void setLikelyPoorlyConstrained(Boolean likelyPoorlyConstrained) {
+        this.likelyPoorlyConstrained = likelyPoorlyConstrained;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("MeasuredMwDetails [eventId=")
+               .append(eventId)
+               .append(", mw=")
+               .append(mw)
+               .append(", obsEnergy=")
+               .append(obsEnergy)
+               .append(", logTotalEnergy=")
+               .append(logTotalEnergy)
+               .append(", logTotalEnergyMDAC=")
+               .append(logTotalEnergyMDAC)
+               .append(", energyRatio=")
+               .append(energyRatio)
+               .append(", obsAppStress=")
+               .append(obsAppStress)
+               .append(", mwSd=")
+               .append(mwSd)
+               .append(", mw1Max=")
+               .append(mw1Max)
+               .append(", mw1Min=")
+               .append(mw1Min)
+               .append(", mw2Max=")
+               .append(mw2Max)
+               .append(", mw2Min=")
+               .append(mw2Min)
+               .append(", refMw=")
+               .append(refMw)
+               .append(", valMw=")
+               .append(valMw)
+               .append(", apparentStressInMpa=")
+               .append(apparentStressInMpa)
+               .append(", apparentStress1Max=")
+               .append(apparentStress1Max)
+               .append(", apparentStress1Min=")
+               .append(apparentStress1Min)
+               .append(", apparentStress2Max=")
+               .append(apparentStress2Max)
+               .append(", apparentStress2Min=")
+               .append(apparentStress2Min)
+               .append(", refApparentStressInMpa=")
+               .append(refApparentStressInMpa)
+               .append(", valApparentStressInMpa=")
+               .append(valApparentStressInMpa)
+               .append(", cornerFreq=")
+               .append(cornerFreq)
+               .append(", cornerFreqSd=")
+               .append(cornerFreqSd)
+               .append(", dataCount=")
+               .append(dataCount)
+               .append(", stationCount=")
+               .append(stationCount)
+               .append(", latitude=")
+               .append(latitude)
+               .append(", longitude=")
+               .append(longitude)
+               .append(", depth=")
+               .append(depth)
+               .append(", datetime=")
+               .append(datetime)
+               .append(", iterations=")
+               .append(iterations)
+               .append(", misfit=")
+               .append(misfit)
+               .append(", bandCoverage=")
+               .append(bandCoverage)
+               .append(", likelyPoorlyConstrained=")
+               .append(likelyPoorlyConstrained)
+               .append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                apparentStress1Max,
+                    apparentStress1Min,
+                    apparentStress2Max,
+                    apparentStress2Min,
+                    apparentStressInMpa,
+                    bandCoverage,
+                    cornerFreq,
+                    cornerFreqSd,
+                    dataCount,
+                    datetime,
+                    depth,
+                    energyRatio,
+                    eventId,
+                    iterations,
+                    latitude,
+                    likelyPoorlyConstrained,
+                    logTotalEnergy,
+                    logTotalEnergyMDAC,
+                    longitude,
+                    misfit,
+                    mw,
+                    mw1Max,
+                    mw1Min,
+                    mw2Max,
+                    mw2Min,
+                    mwSd,
+                    obsAppStress,
+                    obsEnergy,
+                    refApparentStressInMpa,
+                    refMw,
+                    stationCount,
+                    valApparentStressInMpa,
+                    valMw);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof MeasuredMwDetails)) {
+            return false;
+        }
+        MeasuredMwDetails other = (MeasuredMwDetails) obj;
+        return Objects.equals(apparentStress1Max, other.apparentStress1Max)
+                && Objects.equals(apparentStress1Min, other.apparentStress1Min)
+                && Objects.equals(apparentStress2Max, other.apparentStress2Max)
+                && Objects.equals(apparentStress2Min, other.apparentStress2Min)
+                && Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
+                && Objects.equals(bandCoverage, other.bandCoverage)
+                && Objects.equals(cornerFreq, other.cornerFreq)
+                && Objects.equals(cornerFreqSd, other.cornerFreqSd)
+                && Objects.equals(dataCount, other.dataCount)
+                && Objects.equals(datetime, other.datetime)
+                && Objects.equals(depth, other.depth)
+                && Objects.equals(energyRatio, other.energyRatio)
+                && Objects.equals(eventId, other.eventId)
+                && Objects.equals(iterations, other.iterations)
+                && Objects.equals(latitude, other.latitude)
+                && Objects.equals(likelyPoorlyConstrained, other.likelyPoorlyConstrained)
+                && Objects.equals(logTotalEnergy, other.logTotalEnergy)
+                && Objects.equals(logTotalEnergyMDAC, other.logTotalEnergyMDAC)
+                && Objects.equals(longitude, other.longitude)
+                && Objects.equals(misfit, other.misfit)
+                && Objects.equals(mw, other.mw)
+                && Objects.equals(mw1Max, other.mw1Max)
+                && Objects.equals(mw1Min, other.mw1Min)
+                && Objects.equals(mw2Max, other.mw2Max)
+                && Objects.equals(mw2Min, other.mw2Min)
+                && Objects.equals(mwSd, other.mwSd)
+                && Objects.equals(obsAppStress, other.obsAppStress)
+                && Objects.equals(obsEnergy, other.obsEnergy)
+                && Objects.equals(refApparentStressInMpa, other.refApparentStressInMpa)
+                && Objects.equals(refMw, other.refMw)
+                && Objects.equals(stationCount, other.stationCount)
+                && Objects.equals(valApparentStressInMpa, other.valApparentStressInMpa)
+                && Objects.equals(valMw, other.valMw);
+    }
+
+    @JsonIgnore
+    public boolean isValid() {
+        return eventId != null;
+    }
 }
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
index 88d5f817..f469a34c 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/MeasuredMwParameters.java
@@ -32,539 +32,592 @@
 @Table(name = "Measured_Mws", indexes = { @Index(columnList = "eventId", name = "event_id_index") })
 public class MeasuredMwParameters implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "ID")
-	private Long id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "ID")
+    private Long id;
 
-	@Version
-	private Integer version = 0;
+    @Version
+    private Integer version = 0;
 
-	@Column(name = "eventId")
-	private String eventId;
+    @Column(name = "eventId")
+    private String eventId;
 
-	@NumberFormat
-	private double mw;
+    @NumberFormat
+    private double mw;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double meanMw;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double meanMw;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double mwSd;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double mwSd;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double mw1Min;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double mw1Min;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double mw1Max;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double mw1Max;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double mw2Min;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double mw2Min;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double mw2Max;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double mw2Max;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStressInMpa;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStressInMpa;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double meanApparentStressInMpa;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double meanApparentStressInMpa;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStressSd;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStressSd;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStress1Min;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStress1Min;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStress1Max;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStress1Max;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStress2Min;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStress2Min;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double apparentStress2Max;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double apparentStress2Max;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double misfit;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double misfit;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double meanMisfit;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double meanMisfit;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double misfitSd;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double misfitSd;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double cornerFrequency;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double cornerFrequency;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double cornerFrequencySd;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double cornerFrequencySd;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double bandCoverage;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double bandCoverage;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double obsEnergy;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double obsEnergy;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double logTotalEnergy;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double logTotalEnergy;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double logTotalEnergyMDAC;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double logTotalEnergyMDAC;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double energyRatio;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double energyRatio;
 
-	@NumberFormat
-	@Column(nullable = true)
-	private Double obsAppStress;
+    @NumberFormat
+    @Column(nullable = true)
+    private Double obsAppStress;
 
-	private int dataCount;
-
-	private int stationCount;
+    private int dataCount;
+
+    private int stationCount;
+
+    private int iterations;
+
+    private boolean likelyPoorlyConstrained = false;
+
+    public Long getId() {
+        return id;
+    }
+
+    public MeasuredMwParameters setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public String getEventId() {
+        return eventId;
+    }
+
+    public MeasuredMwParameters setEventId(String eventId) {
+        this.eventId = eventId;
+        return this;
+    }
+
+    public double getMw() {
+        return mw;
+    }
+
+    public MeasuredMwParameters setMw(double mw) {
+        this.mw = mw;
+        return this;
+    }
+
+    public Double getMwSd() {
+        return mwSd;
+    }
+
+    public MeasuredMwParameters setMwSd(Double mwSd) {
+        this.mwSd = mwSd;
+        return this;
+    }
+
+    public Double getMw1Min() {
+        return mw1Min;
+    }
+
+    public MeasuredMwParameters setMw1Min(Double mw1Min) {
+        this.mw1Min = mw1Min;
+        return this;
+    }
+
+    public Double getMw1Max() {
+        return mw1Max;
+    }
+
+    public MeasuredMwParameters setMw1Max(Double mw1Max) {
+        this.mw1Max = mw1Max;
+        return this;
+    }
+
+    public Double getMw2Min() {
+        return mw2Min;
+    }
+
+    public MeasuredMwParameters setMw2Min(Double mw2Min) {
+        this.mw2Min = mw2Min;
+        return this;
+    }
+
+    public Double getMw2Max() {
+        return mw2Max;
+    }
+
+    public MeasuredMwParameters setMw2Max(Double mw2Max) {
+        this.mw2Max = mw2Max;
+        return this;
+    }
+
+    public Double getApparentStressInMpa() {
+        return apparentStressInMpa;
+    }
+
+    public MeasuredMwParameters setApparentStressInMpa(Double apparentStressInMpa) {
+        this.apparentStressInMpa = apparentStressInMpa;
+        return this;
+    }
+
+    public Double getApparentStressSd() {
+        return apparentStressSd;
+    }
+
+    public MeasuredMwParameters setApparentStressSd(Double apparentStressSd) {
+        this.apparentStressSd = apparentStressSd;
+        return this;
+    }
+
+    public Double getApparentStress1Min() {
+        return apparentStress1Min;
+    }
+
+    public MeasuredMwParameters setApparentStress1Min(Double apparentStress1Min) {
+        this.apparentStress1Min = apparentStress1Min;
+        return this;
+    }
+
+    public Double getApparentStress1Max() {
+        return apparentStress1Max;
+    }
+
+    public MeasuredMwParameters setApparentStress1Max(Double apparentStress1Max) {
+        this.apparentStress1Max = apparentStress1Max;
+        return this;
+    }
+
+    public Double getApparentStress2Min() {
+        return apparentStress2Min;
+    }
+
+    public MeasuredMwParameters setApparentStress2Min(Double apparentStress2Min) {
+        this.apparentStress2Min = apparentStress2Min;
+        return this;
+    }
+
+    public Double getApparentStress2Max() {
+        return apparentStress2Max;
+    }
+
+    public MeasuredMwParameters setApparentStress2Max(Double apparentStress2Max) {
+        this.apparentStress2Max = apparentStress2Max;
+        return this;
+    }
+
+    public Double getMisfit() {
+        return misfit;
+    }
+
+    public MeasuredMwParameters setMisfit(Double misfit) {
+        this.misfit = misfit;
+        return this;
+    }
+
+    public Double getMisfitSd() {
+        return misfitSd;
+    }
+
+    public MeasuredMwParameters setMisfitSd(Double misfitSd) {
+        this.misfitSd = misfitSd;
+        return this;
+    }
+
+    public Integer getDataCount() {
+        return dataCount;
+    }
+
+    public MeasuredMwParameters setDataCount(Integer dataCount) {
+        this.dataCount = dataCount;
+        return this;
+    }
+
+    public Integer getStationCount() {
+        return stationCount;
+    }
+
+    public MeasuredMwParameters setStationCount(Integer stationCount) {
+        this.stationCount = stationCount;
+        return this;
+    }
+
+    public Double getObsEnergy() {
+        return obsEnergy;
+    }
+
+    public MeasuredMwParameters setObsEnergy(Double obsEnergy) {
+        this.obsEnergy = obsEnergy;
+        return this;
+    }
+
+    public Double getLogTotalEnergy() {
+        return logTotalEnergy;
+    }
+
+    public MeasuredMwParameters setLogTotalEnergy(Double logTotalEnergy) {
+        this.logTotalEnergy = logTotalEnergy;
+        return this;
+    }
+
+    public Double getLogTotalEnergyMDAC() {
+        return logTotalEnergyMDAC;
+    }
+
+    public MeasuredMwParameters setLogTotalEnergyMDAC(Double totalEnergyMDAC) {
+        this.logTotalEnergyMDAC = totalEnergyMDAC;
+        return this;
+    }
+
+    public Double getEnergyRatio() {
+        return energyRatio;
+    }
+
+    public MeasuredMwParameters setEnergyRatio(Double energyRatio) {
+        this.energyRatio = energyRatio;
+        return this;
+    }
+
+    public Double getObsAppStress() {
+        return obsAppStress;
+    }
+
+    public MeasuredMwParameters setObsAppStress(Double obsAppStress) {
+        this.obsAppStress = obsAppStress;
+        return this;
+    }
+
+    public Double getMeanMw() {
+        return meanMw;
+    }
+
+    public MeasuredMwParameters setMeanMw(Double meanMw) {
+        this.meanMw = meanMw;
+        return this;
+    }
+
+    public Double getMeanApparentStressInMpa() {
+        return meanApparentStressInMpa;
+    }
+
+    public MeasuredMwParameters setMeanApparentStressInMpa(Double meanApparentStressInMpa) {
+        this.meanApparentStressInMpa = meanApparentStressInMpa;
+        return this;
+    }
+
+    public Double getMeanMisfit() {
+        return meanMisfit;
+    }
+
+    public MeasuredMwParameters setMeanMisfit(Double meanMisfit) {
+        this.meanMisfit = meanMisfit;
+        return this;
+    }
+
+    public Double getCornerFrequency() {
+        return cornerFrequency;
+    }
+
+    public MeasuredMwParameters setCornerFrequency(Double cornerFrequency) {
+        this.cornerFrequency = cornerFrequency;
+        return this;
+    }
+
+    public Double getCornerFrequencySd() {
+        return cornerFrequencySd;
+    }
+
+    public MeasuredMwParameters setCornerFrequencySd(Double cornerFrequencySd) {
+        this.cornerFrequencySd = cornerFrequencySd;
+        return this;
+    }
+
+    public int getIterations() {
+        return iterations;
+    }
+
+    public MeasuredMwParameters setIterations(int iterations) {
+        this.iterations = iterations;
+        return this;
+    }
+
+    public Double getBandCoverage() {
+        return bandCoverage;
+    }
+
+    public MeasuredMwParameters setBandCoverage(Double bandCoverage) {
+        this.bandCoverage = bandCoverage;
+        return this;
+    }
+
+    public boolean isLikelyPoorlyConstrained() {
+        return likelyPoorlyConstrained;
+    }
+
+    public MeasuredMwParameters setLikelyPoorlyConstrained(boolean likelyPoorlyConstrained) {
+        this.likelyPoorlyConstrained = likelyPoorlyConstrained;
+        return this;
+    }
+
+    public MeasuredMwParameters merge(MeasuredMwParameters overlay) {
+        this.mw = overlay.getMw();
+        this.meanMw = overlay.getMeanMw();
+        this.mwSd = overlay.getMwSd();
+        this.mw1Min = overlay.getMw1Min();
+        this.mw1Max = overlay.getMw1Max();
+        this.mw2Min = overlay.getMw2Min();
+        this.mw2Max = overlay.getMw2Max();
+        this.apparentStressInMpa = overlay.getApparentStressInMpa();
+        this.meanApparentStressInMpa = overlay.getMeanApparentStressInMpa();
+        this.apparentStressSd = overlay.getApparentStressSd();
+        this.apparentStress1Min = overlay.getApparentStress1Min();
+        this.apparentStress1Max = overlay.getApparentStress1Max();
+        this.apparentStress2Min = overlay.getApparentStress2Min();
+        this.apparentStress2Max = overlay.getApparentStress2Max();
+        this.misfit = overlay.getMisfit();
+        this.meanMisfit = overlay.getMeanMisfit();
+        this.misfitSd = overlay.getMisfitSd();
+        this.dataCount = overlay.getDataCount();
+        this.stationCount = overlay.getStationCount();
+        this.bandCoverage = overlay.getBandCoverage();
+        this.iterations = overlay.getIterations();
+        this.cornerFrequency = overlay.getCornerFrequency();
+        this.cornerFrequencySd = overlay.getCornerFrequencySd();
+        this.obsEnergy = overlay.getObsEnergy();
+        this.logTotalEnergy = overlay.getLogTotalEnergy();
+        this.logTotalEnergyMDAC = overlay.getLogTotalEnergyMDAC();
+        this.energyRatio = overlay.getEnergyRatio();
+        this.obsAppStress = overlay.getObsAppStress();
+        this.likelyPoorlyConstrained = overlay.isLikelyPoorlyConstrained();
+
+        return this;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                apparentStress1Max,
+                    apparentStress1Min,
+                    apparentStress2Max,
+                    apparentStress2Min,
+                    apparentStressInMpa,
+                    apparentStressSd,
+                    bandCoverage,
+                    cornerFrequency,
+                    cornerFrequencySd,
+                    dataCount,
+                    energyRatio,
+                    eventId,
+                    id,
+                    iterations,
+                    likelyPoorlyConstrained,
+                    logTotalEnergy,
+                    logTotalEnergyMDAC,
+                    meanApparentStressInMpa,
+                    meanMisfit,
+                    meanMw,
+                    misfit,
+                    misfitSd,
+                    mw,
+                    mw1Max,
+                    mw1Min,
+                    mw2Max,
+                    mw2Min,
+                    mwSd,
+                    obsAppStress,
+                    obsEnergy,
+                    stationCount,
+                    version);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof MeasuredMwParameters)) {
+            return false;
+        }
+        MeasuredMwParameters other = (MeasuredMwParameters) obj;
+        return Objects.equals(apparentStress1Max, other.apparentStress1Max)
+                && Objects.equals(apparentStress1Min, other.apparentStress1Min)
+                && Objects.equals(apparentStress2Max, other.apparentStress2Max)
+                && Objects.equals(apparentStress2Min, other.apparentStress2Min)
+                && Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
+                && Objects.equals(apparentStressSd, other.apparentStressSd)
+                && Objects.equals(bandCoverage, other.bandCoverage)
+                && Objects.equals(cornerFrequency, other.cornerFrequency)
+                && Objects.equals(cornerFrequencySd, other.cornerFrequencySd)
+                && dataCount == other.dataCount
+                && Objects.equals(energyRatio, other.energyRatio)
+                && Objects.equals(eventId, other.eventId)
+                && Objects.equals(id, other.id)
+                && iterations == other.iterations
+                && likelyPoorlyConstrained == other.likelyPoorlyConstrained
+                && Objects.equals(logTotalEnergy, other.logTotalEnergy)
+                && Objects.equals(logTotalEnergyMDAC, other.logTotalEnergyMDAC)
+                && Objects.equals(meanApparentStressInMpa, other.meanApparentStressInMpa)
+                && Objects.equals(meanMisfit, other.meanMisfit)
+                && Objects.equals(meanMw, other.meanMw)
+                && Objects.equals(misfit, other.misfit)
+                && Objects.equals(misfitSd, other.misfitSd)
+                && Double.doubleToLongBits(mw) == Double.doubleToLongBits(other.mw)
+                && Objects.equals(mw1Max, other.mw1Max)
+                && Objects.equals(mw1Min, other.mw1Min)
+                && Objects.equals(mw2Max, other.mw2Max)
+                && Objects.equals(mw2Min, other.mw2Min)
+                && Objects.equals(mwSd, other.mwSd)
+                && Objects.equals(obsAppStress, other.obsAppStress)
+                && Objects.equals(obsEnergy, other.obsEnergy)
+                && stationCount == other.stationCount
+                && Objects.equals(version, other.version);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("MeasuredMwParameters [id=")
+               .append(id)
+               .append(", version=")
+               .append(version)
+               .append(", eventId=")
+               .append(eventId)
+               .append(", mw=")
+               .append(mw)
+               .append(", meanMw=")
+               .append(meanMw)
+               .append(", mwSd=")
+               .append(mwSd)
+               .append(", mw1Min=")
+               .append(mw1Min)
+               .append(", mw1Max=")
+               .append(mw1Max)
+               .append(", mw2Min=")
+               .append(mw2Min)
+               .append(", mw2Max=")
+               .append(mw2Max)
+               .append(", apparentStressInMpa=")
+               .append(apparentStressInMpa)
+               .append(", meanApparentStressInMpa=")
+               .append(meanApparentStressInMpa)
+               .append(", apparentStressSd=")
+               .append(apparentStressSd)
+               .append(", apparentStress1Min=")
+               .append(apparentStress1Min)
+               .append(", apparentStress1Max=")
+               .append(apparentStress1Max)
+               .append(", apparentStress2Min=")
+               .append(apparentStress2Min)
+               .append(", apparentStress2Max=")
+               .append(apparentStress2Max)
+               .append(", misfit=")
+               .append(misfit)
+               .append(", meanMisfit=")
+               .append(meanMisfit)
+               .append(", misfitSd=")
+               .append(misfitSd)
+               .append(", cornerFrequency=")
+               .append(cornerFrequency)
+               .append(", cornerFrequencySd=")
+               .append(cornerFrequencySd)
+               .append(", bandCoverage=")
+               .append(bandCoverage)
+               .append(", obsEnergy=")
+               .append(obsEnergy)
+               .append(", logTotalEnergy=")
+               .append(logTotalEnergy)
+               .append(", logTotalEnergyMDAC=")
+               .append(logTotalEnergyMDAC)
+               .append(", energyRatio=")
+               .append(energyRatio)
+               .append(", obsAppStress=")
+               .append(obsAppStress)
+               .append(", dataCount=")
+               .append(dataCount)
+               .append(", stationCount=")
+               .append(stationCount)
+               .append(", iterations=")
+               .append(iterations)
+               .append(", likelyPoorlyConstrained=")
+               .append(likelyPoorlyConstrained)
+               .append("]");
+        return builder.toString();
+    }
 
-	private int iterations;
-
-	public Long getId() {
-		return id;
-	}
-
-	public MeasuredMwParameters setId(Long id) {
-		this.id = id;
-		return this;
-	}
-
-	public Integer getVersion() {
-		return version;
-	}
-
-	public String getEventId() {
-		return eventId;
-	}
-
-	public MeasuredMwParameters setEventId(String eventId) {
-		this.eventId = eventId;
-		return this;
-	}
-
-	public double getMw() {
-		return mw;
-	}
-
-	public MeasuredMwParameters setMw(double mw) {
-		this.mw = mw;
-		return this;
-	}
-
-	public Double getMwSd() {
-		return mwSd;
-	}
-
-	public MeasuredMwParameters setMwSd(Double mwSd) {
-		this.mwSd = mwSd;
-		return this;
-	}
-
-	public Double getMw1Min() {
-		return mw1Min;
-	}
-
-	public MeasuredMwParameters setMw1Min(Double mw1Min) {
-		this.mw1Min = mw1Min;
-		return this;
-	}
-
-	public Double getMw1Max() {
-		return mw1Max;
-	}
-
-	public MeasuredMwParameters setMw1Max(Double mw1Max) {
-		this.mw1Max = mw1Max;
-		return this;
-	}
-
-	public Double getMw2Min() {
-		return mw2Min;
-	}
-
-	public MeasuredMwParameters setMw2Min(Double mw2Min) {
-		this.mw2Min = mw2Min;
-		return this;
-	}
-
-	public Double getMw2Max() {
-		return mw2Max;
-	}
-
-	public MeasuredMwParameters setMw2Max(Double mw2Max) {
-		this.mw2Max = mw2Max;
-		return this;
-	}
-
-	public Double getApparentStressInMpa() {
-		return apparentStressInMpa;
-	}
-
-	public MeasuredMwParameters setApparentStressInMpa(Double apparentStressInMpa) {
-		this.apparentStressInMpa = apparentStressInMpa;
-		return this;
-	}
-
-	public Double getApparentStressSd() {
-		return apparentStressSd;
-	}
-
-	public MeasuredMwParameters setApparentStressSd(Double apparentStressSd) {
-		this.apparentStressSd = apparentStressSd;
-		return this;
-	}
-
-	public Double getApparentStress1Min() {
-		return apparentStress1Min;
-	}
-
-	public MeasuredMwParameters setApparentStress1Min(Double apparentStress1Min) {
-		this.apparentStress1Min = apparentStress1Min;
-		return this;
-	}
-
-	public Double getApparentStress1Max() {
-		return apparentStress1Max;
-	}
-
-	public MeasuredMwParameters setApparentStress1Max(Double apparentStress1Max) {
-		this.apparentStress1Max = apparentStress1Max;
-		return this;
-	}
-
-	public Double getApparentStress2Min() {
-		return apparentStress2Min;
-	}
-
-	public MeasuredMwParameters setApparentStress2Min(Double apparentStress2Min) {
-		this.apparentStress2Min = apparentStress2Min;
-		return this;
-	}
-
-	public Double getApparentStress2Max() {
-		return apparentStress2Max;
-	}
-
-	public MeasuredMwParameters setApparentStress2Max(Double apparentStress2Max) {
-		this.apparentStress2Max = apparentStress2Max;
-		return this;
-	}
-
-	public Double getMisfit() {
-		return misfit;
-	}
-
-	public MeasuredMwParameters setMisfit(Double misfit) {
-		this.misfit = misfit;
-		return this;
-	}
-
-	public Double getMisfitSd() {
-		return misfitSd;
-	}
-
-	public MeasuredMwParameters setMisfitSd(Double misfitSd) {
-		this.misfitSd = misfitSd;
-		return this;
-	}
-
-	public Integer getDataCount() {
-		return dataCount;
-	}
-
-	public MeasuredMwParameters setDataCount(Integer dataCount) {
-		this.dataCount = dataCount;
-		return this;
-	}
-
-	public Integer getStationCount() {
-		return stationCount;
-	}
-
-	public MeasuredMwParameters setStationCount(Integer stationCount) {
-		this.stationCount = stationCount;
-		return this;
-	}
-
-	public Double getObsEnergy() {
-		return obsEnergy;
-	}
-
-	public MeasuredMwParameters setObsEnergy(Double obsEnergy) {
-		this.obsEnergy = obsEnergy;
-		return this;
-	}
-
-	public Double getLogTotalEnergy() {
-		return logTotalEnergy;
-	}
-
-	public MeasuredMwParameters setLogTotalEnergy(Double logTotalEnergy) {
-		this.logTotalEnergy = logTotalEnergy;
-		return this;
-	}
-
-	public Double getLogTotalEnergyMDAC() {
-		return logTotalEnergyMDAC;
-	}
-
-	public MeasuredMwParameters setLogTotalEnergyMDAC(Double totalEnergyMDAC) {
-		this.logTotalEnergyMDAC = totalEnergyMDAC;
-		return this;
-	}
-
-	public Double getEnergyRatio() {
-		return energyRatio;
-	}
-
-	public MeasuredMwParameters setEnergyRatio(Double energyRatio) {
-		this.energyRatio = energyRatio;
-		return this;
-	}
-
-	public Double getObsAppStress() {
-		return obsAppStress;
-	}
-
-	public MeasuredMwParameters setObsAppStress(Double obsAppStress) {
-		this.obsAppStress = obsAppStress;
-		return this;
-	}
-
-	public Double getMeanMw() {
-		return meanMw;
-	}
-
-	public MeasuredMwParameters setMeanMw(Double meanMw) {
-		this.meanMw = meanMw;
-		return this;
-	}
-
-	public Double getMeanApparentStressInMpa() {
-		return meanApparentStressInMpa;
-	}
-
-	public MeasuredMwParameters setMeanApparentStressInMpa(Double meanApparentStressInMpa) {
-		this.meanApparentStressInMpa = meanApparentStressInMpa;
-		return this;
-	}
-
-	public Double getMeanMisfit() {
-		return meanMisfit;
-	}
-
-	public MeasuredMwParameters setMeanMisfit(Double meanMisfit) {
-		this.meanMisfit = meanMisfit;
-		return this;
-	}
-
-	public Double getCornerFrequency() {
-		return cornerFrequency;
-	}
-
-	public MeasuredMwParameters setCornerFrequency(Double cornerFrequency) {
-		this.cornerFrequency = cornerFrequency;
-		return this;
-	}
-
-	public Double getCornerFrequencySd() {
-		return cornerFrequencySd;
-	}
-
-	public MeasuredMwParameters setCornerFrequencySd(Double cornerFrequencySd) {
-		this.cornerFrequencySd = cornerFrequencySd;
-		return this;
-	}
-
-	public int getIterations() {
-		return iterations;
-	}
-
-	public MeasuredMwParameters setIterations(int iterations) {
-		this.iterations = iterations;
-		return this;
-	}
-
-	public Double getBandCoverage() {
-		return bandCoverage;
-	}
-
-	public MeasuredMwParameters setBandCoverage(Double bandCoverage) {
-		this.bandCoverage = bandCoverage;
-		return this;
-	}
-
-	public MeasuredMwParameters merge(MeasuredMwParameters overlay) {
-		this.mw = overlay.getMw();
-		this.meanMw = overlay.getMeanMw();
-		this.mwSd = overlay.getMwSd();
-		this.mw1Min = overlay.getMw1Min();
-		this.mw1Max = overlay.getMw1Max();
-		this.mw2Min = overlay.getMw2Min();
-		this.mw2Max = overlay.getMw2Max();
-		this.apparentStressInMpa = overlay.getApparentStressInMpa();
-		this.meanApparentStressInMpa = overlay.getMeanApparentStressInMpa();
-		this.apparentStressSd = overlay.getApparentStressSd();
-		this.apparentStress1Min = overlay.getApparentStress1Min();
-		this.apparentStress1Max = overlay.getApparentStress1Max();
-		this.apparentStress2Min = overlay.getApparentStress2Min();
-		this.apparentStress2Max = overlay.getApparentStress2Max();
-		this.misfit = overlay.getMisfit();
-		this.meanMisfit = overlay.getMeanMisfit();
-		this.misfitSd = overlay.getMisfitSd();
-		this.dataCount = overlay.getDataCount();
-		this.stationCount = overlay.getStationCount();
-		this.bandCoverage = overlay.getBandCoverage();
-		this.iterations = overlay.getIterations();
-		this.cornerFrequency = overlay.getCornerFrequency();
-		this.cornerFrequencySd = overlay.getCornerFrequencySd();
-		this.obsEnergy = overlay.getObsEnergy();
-		this.logTotalEnergy = overlay.getLogTotalEnergy();
-		this.logTotalEnergyMDAC = overlay.getLogTotalEnergyMDAC();
-		this.energyRatio = overlay.getEnergyRatio();
-		this.obsAppStress = overlay.getObsAppStress();
-
-		return this;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(apparentStress1Max, apparentStress1Min, apparentStress2Max, apparentStress2Min,
-				apparentStressInMpa, apparentStressSd, bandCoverage, cornerFrequency, cornerFrequencySd, dataCount,
-				energyRatio, obsAppStress, eventId, id, iterations, meanApparentStressInMpa, meanMisfit, meanMw, misfit,
-				misfitSd, mw, mw1Max, mw1Min, mw2Max, mw2Min, mwSd, stationCount, obsEnergy, logTotalEnergy,
-				logTotalEnergyMDAC, version);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!(obj instanceof MeasuredMwParameters)) {
-			return false;
-		}
-		MeasuredMwParameters other = (MeasuredMwParameters) obj;
-		return Objects.equals(apparentStress1Max, other.apparentStress1Max)
-				&& Objects.equals(apparentStress1Min, other.apparentStress1Min)
-				&& Objects.equals(apparentStress2Max, other.apparentStress2Max)
-				&& Objects.equals(apparentStress2Min, other.apparentStress2Min)
-				&& Objects.equals(apparentStressInMpa, other.apparentStressInMpa)
-				&& Objects.equals(apparentStressSd, other.apparentStressSd)
-				&& Objects.equals(bandCoverage, other.bandCoverage)
-				&& Objects.equals(cornerFrequency, other.cornerFrequency)
-				&& Objects.equals(cornerFrequencySd, other.cornerFrequencySd) && dataCount == other.dataCount
-				&& Objects.equals(energyRatio, other.energyRatio) && Objects.equals(obsAppStress, other.obsAppStress)
-				&& Objects.equals(eventId, other.eventId) && Objects.equals(id, other.id)
-				&& iterations == other.iterations
-				&& Objects.equals(meanApparentStressInMpa, other.meanApparentStressInMpa)
-				&& Objects.equals(meanMisfit, other.meanMisfit) && Objects.equals(meanMw, other.meanMw)
-				&& Objects.equals(misfit, other.misfit) && Objects.equals(misfitSd, other.misfitSd)
-				&& Double.doubleToLongBits(mw) == Double.doubleToLongBits(other.mw)
-				&& Objects.equals(mw1Max, other.mw1Max) && Objects.equals(mw1Min, other.mw1Min)
-				&& Objects.equals(mw2Max, other.mw2Max) && Objects.equals(mw2Min, other.mw2Min)
-				&& Objects.equals(mwSd, other.mwSd) && stationCount == other.stationCount
-				&& Objects.equals(obsEnergy, other.obsEnergy) && Objects.equals(logTotalEnergy, other.logTotalEnergy)
-				&& Objects.equals(logTotalEnergyMDAC, other.logTotalEnergyMDAC)
-				&& Objects.equals(version, other.version);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("MeasuredMwParameters [id=");
-		builder.append(id);
-		builder.append(", version=");
-		builder.append(version);
-		builder.append(", eventId=");
-		builder.append(eventId);
-		builder.append(", mw=");
-		builder.append(mw);
-		builder.append(", meanMw=");
-		builder.append(meanMw);
-		builder.append(", mwSd=");
-		builder.append(mwSd);
-		builder.append(", mw1Min=");
-		builder.append(mw1Min);
-		builder.append(", mw1Max=");
-		builder.append(mw1Max);
-		builder.append(", mw2Min=");
-		builder.append(mw2Min);
-		builder.append(", mw2Max=");
-		builder.append(mw2Max);
-		builder.append(", apparentStressInMpa=");
-		builder.append(apparentStressInMpa);
-		builder.append(", meanApparentStressInMpa=");
-		builder.append(meanApparentStressInMpa);
-		builder.append(", apparentStressSd=");
-		builder.append(apparentStressSd);
-		builder.append(", apparentStress1Min=");
-		builder.append(apparentStress1Min);
-		builder.append(", apparentStress1Max=");
-		builder.append(apparentStress1Max);
-		builder.append(", apparentStress2Min=");
-		builder.append(apparentStress2Min);
-		builder.append(", apparentStress2Max=");
-		builder.append(apparentStress2Max);
-		builder.append(", misfit=");
-		builder.append(misfit);
-		builder.append(", meanMisfit=");
-		builder.append(meanMisfit);
-		builder.append(", misfitSd=");
-		builder.append(misfitSd);
-		builder.append(", cornerFrequency=");
-		builder.append(cornerFrequency);
-		builder.append(", cornerFrequencySd=");
-		builder.append(cornerFrequencySd);
-		builder.append(", bandCoverage=");
-		builder.append(bandCoverage);
-		builder.append(", obsEnergy=");
-		builder.append(obsEnergy);
-		builder.append(", logTotalEnergy=");
-		builder.append(logTotalEnergy);
-		builder.append(", logTotalEnergyMDAC=");
-		builder.append(logTotalEnergyMDAC);
-		builder.append(", energyRatio=");
-		builder.append(energyRatio);
-		builder.append(", obsAppStress=");
-		builder.append(obsAppStress);
-		builder.append(", dataCount=");
-		builder.append(dataCount);
-		builder.append(", stationCount=");
-		builder.append(stationCount);
-		builder.append(", iterations=");
-		builder.append(iterations);
-		builder.append("]");
-		return builder.toString();
-	}
 }
\ No newline at end of file
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/PeakVelocityMeasurement.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/PeakVelocityMeasurement.java
index c3e58f5e..8298292d 100644
--- a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/PeakVelocityMeasurement.java
+++ b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/calibration/model/domain/PeakVelocityMeasurement.java
@@ -2,11 +2,11 @@
 * Copyright (c) 2018, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
 * CODE-743439.
 * All rights reserved.
-* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool. 
-* 
+* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool.
+*
 * Licensed under the Apache License, Version 2.0 (the “Licensee”); you may not use this file except in compliance with the License.  You may obtain a copy of the License at:
 * http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and limitations under the license.
 *
 * This work was performed under the auspices of the U.S. Department of Energy
@@ -15,6 +15,7 @@
 package gov.llnl.gnem.apps.coda.calibration.model.domain;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -195,29 +196,7 @@ public PeakVelocityMeasurement setNoiseLevel(double noiseLevel) {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        long temp;
-        temp = Double.doubleToLongBits(amplitude);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(distance);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        temp = Double.doubleToLongBits(noiseEndSecondsFromOrigin);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(noiseLevel);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(noiseStartSecondsFromOrigin);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(snr);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(timeSecFromOrigin);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(velocity);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        result = prime * result + ((waveform == null) ? 0 : waveform.hashCode());
-        return result;
+        return Objects.hash(amplitude, distance, id, noiseEndSecondsFromOrigin, noiseLevel, noiseStartSecondsFromOrigin, snr, timeSecFromOrigin, velocity, version, waveform);
     }
 
     @Override
@@ -238,11 +217,7 @@ public boolean equals(Object obj) {
         if (Double.doubleToLongBits(distance) != Double.doubleToLongBits(other.distance)) {
             return false;
         }
-        if (id == null) {
-            if (other.id != null) {
-                return false;
-            }
-        } else if (!id.equals(other.id)) {
+        if (!Objects.equals(id, other.id)) {
             return false;
         }
         if (Double.doubleToLongBits(noiseEndSecondsFromOrigin) != Double.doubleToLongBits(other.noiseEndSecondsFromOrigin)) {
@@ -263,18 +238,10 @@ public boolean equals(Object obj) {
         if (Double.doubleToLongBits(velocity) != Double.doubleToLongBits(other.velocity)) {
             return false;
         }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
+        if (!Objects.equals(version, other.version)) {
             return false;
         }
-        if (waveform == null) {
-            if (other.waveform != null) {
-                return false;
-            }
-        } else if (!waveform.equals(other.waveform)) {
+        if (!Objects.equals(waveform, other.waveform)) {
             return false;
         }
         return true;
diff --git a/calibration-service/calibration-repository/pom.xml b/calibration-service/calibration-repository/pom.xml
index 63ac77e8..3c2e1591 100644
--- a/calibration-service/calibration-repository/pom.xml
+++ b/calibration-service/calibration-repository/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-repository/src/main/java/gov/llnl/gnem/apps/coda/common/repository/DetachableJpaRepoImpl.java b/calibration-service/calibration-repository/src/main/java/gov/llnl/gnem/apps/coda/common/repository/DetachableJpaRepoImpl.java
index 0d54ab28..9ffa4839 100644
--- a/calibration-service/calibration-repository/src/main/java/gov/llnl/gnem/apps/coda/common/repository/DetachableJpaRepoImpl.java
+++ b/calibration-service/calibration-repository/src/main/java/gov/llnl/gnem/apps/coda/common/repository/DetachableJpaRepoImpl.java
@@ -2,11 +2,11 @@
 * Copyright (c) 2018, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory
 * CODE-743439.
 * All rights reserved.
-* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool. 
-* 
+* This file is part of CCT. For details, see https://github.com/LLNL/coda-calibration-tool.
+*
 * Licensed under the Apache License, Version 2.0 (the “Licensee”); you may not use this file except in compliance with the License.  You may obtain a copy of the License at:
 * http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and limitations under the license.
 *
 * This work was performed under the auspices of the U.S. Department of Energy
@@ -16,11 +16,11 @@
 
 import java.io.Serializable;
 
-import javax.persistence.EntityManager;
-
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 
+import javax.persistence.EntityManager;
+
 public class DetachableJpaRepoImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID> implements DetachableJpaRepository<T, ID> {
     private EntityManager entityManager;
 
diff --git a/calibration-service/calibration-service-api/pom.xml b/calibration-service/calibration-service-api/pom.xml
index 1e059abe..1b126eb3 100644
--- a/calibration-service/calibration-service-api/pom.xml
+++ b/calibration-service/calibration-service-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-service-impl/pom.xml b/calibration-service/calibration-service-impl/pom.xml
index 341ab523..5af9f86c 100644
--- a/calibration-service/calibration-service-impl/pom.xml
+++ b/calibration-service/calibration-service-impl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
index f2236246..c056d9df 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/CalibrationServiceImpl.java
@@ -256,6 +256,13 @@ private MeasuredMwReportByEvent makeMwMeasurements(Long id, boolean autoPickingE
         log.info("Starting measurement at {}", LocalDateTime.now());
         MeasuredMwReportByEvent details = new MeasuredMwReportByEvent();
         if (stacks != null) {
+            if (persistResults) {
+                //Handle the case where this is called from the REST service, otherwise
+                // the later measurements will bomb out with transient complaints
+                //Could be handled by changing Cascade settings but that's a bit of
+                // a can of worms
+                stacks = waveformService.save(stacks);
+            }
             List<Event> eventsInStacks = stacks.stream().map(Waveform::getEvent).filter(Objects::nonNull).distinct().collect(Collectors.toList());
             VelocityConfiguration velocityConfig = configService.getVelocityConfiguration();
             Map<FrequencyBand, Map<Station, SiteFrequencyBandParameters>> stationFrequencyBandMap = mapParamsToFrequencyBands(siteParamsService.findAll());
diff --git a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/processing/SpectraCalculator.java b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/processing/SpectraCalculator.java
index 5746fcd1..a6763155 100644
--- a/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/processing/SpectraCalculator.java
+++ b/calibration-service/calibration-service-impl/src/main/java/gov/llnl/gnem/apps/coda/calibration/service/impl/processing/SpectraCalculator.java
@@ -457,6 +457,11 @@ public List<MeasuredMwParameters> measureMws(MwMeasurementInputData inputData, f
 
             EnergyInfo info = calcTotalEnergyInfo(measurements, MoMw[MW_FIT], MoMw[APP_STRESS], mdacFi);
 
+            boolean isLikelyPoorlyConstrained = (MoMw[ITR_COUNT] > 50
+                    || MoMw[CORNER_FREQ] < measurements.firstKey().getLowFrequency() + (measurements.firstKey().getHighFrequency() - measurements.firstKey().getLowFrequency()) / 2.
+                    || MoMw[CORNER_FREQ] > measurements.lastKey().getLowFrequency() + (measurements.lastKey().getHighFrequency() - measurements.lastKey().getLowFrequency()) / 2.
+                    || Math.abs(MoMw[MW_2_MIN] - MoMw[MW_2_MAX]) >= 1.5);
+
             return new MeasuredMwParameters().setEventId(entry.getKey().getEventId())
                                              .setDataCount((int) MoMw[DATA_COUNT])
                                              .setStationCount(inputData.getStationCount().get(entry.getKey().getEventId()))
@@ -485,7 +490,8 @@ public List<MeasuredMwParameters> measureMws(MwMeasurementInputData inputData, f
                                              .setMisfitSd(MoMw[FIT_SD])
                                              .setCornerFrequency(MoMw[CORNER_FREQ])
                                              .setCornerFrequencySd(MoMw[CORNER_FREQ_SD])
-                                             .setIterations((int) MoMw[ITR_COUNT]);
+                                             .setIterations((int) MoMw[ITR_COUNT])
+                                             .setLikelyPoorlyConstrained(isLikelyPoorlyConstrained);
         }).filter(Objects::nonNull).collect(Collectors.toList());
     }
 
@@ -552,7 +558,6 @@ public EnergyInfo calcTotalEnergyInfo(final SortedMap<FrequencyBand, SummaryStat
          * values
          */
         double logMoment = 0.0;
-        double mw = 0.0;
 
         /**
          * A moment magnitude scale ISSN: 0148-0227 , 2156-2202; DOI:
@@ -563,7 +568,6 @@ public EnergyInfo calcTotalEnergyInfo(final SortedMap<FrequencyBand, SummaryStat
         for (int i = 0; i < measCount - 1; i++) {
             if (logAmplitudes[i] > 0.0 && logAmplitudes[i + 1] > 0.0) {
                 logMoment = (logAmplitudes[i] + logAmplitudes[i + 1]) / 2.0;
-                mw = ((2.0 / 3.0) * logMoment - energyConstMKS);
                 break;
             }
         }
diff --git a/calibration-service/pom.xml b/calibration-service/pom.xml
index 69b92212..1673139a 100644
--- a/calibration-service/pom.xml
+++ b/calibration-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-standalone/pom.xml b/calibration-standalone/pom.xml
index 9f393246..75b465b0 100644
--- a/calibration-standalone/pom.xml
+++ b/calibration-standalone/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fbb6c7d3..038e4636 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,16 @@
 FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4
 ARG USER=1001
+ARG JAVA_OPTS="-XX:MaxRAMPercentage=80"
+ENV JAVA_OPTS=${JAVA_OPTS}
+
 USER root
 
-#The UBI appstream repo only has the headless java so we manually install the full package
-RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
-    rpm -ivh http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm http://mirror.centos.org/centos/8/extras/x86_64/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm && \
+RUN dnf upgrade -y && \
+    rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
+    rpm -ivh http://mirrors.ocf.berkeley.edu/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8-4.el8.noarch.rpm http://mirrors.ocf.berkeley.edu/centos/8-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-8-4.el8.noarch.rpm && \
     dnf install --nodocs -y glibc-langpack-en && \
     dnf install --disablerepo=ubi-8-appstream --nodocs -y \
+    java-17-openjdk \
     tigervnc-server \
     xrdp \
     xorgxrdp \
@@ -17,14 +21,12 @@ RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.
     python3-numpy \
     nodejs \
     nodejs-full-i18n \
-    xfce4-panel xfwm4 xfce4-settings xfce4-session xfdesktop && \
-    dnf install -y --nogpgcheck http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/java-11-openjdk-11.0.12.0.7-0.el8_4.x86_64.rpm && \
-    wget --no-check-certificate https://cbs.centos.org/kojifiles/packages/novnc/1.2.0/2.el8/noarch/novnc-1.2.0-2.el8.noarch.rpm -O /tmp/novnc.rpm && \
-    wget --no-check-certificate https://cbs.centos.org/kojifiles/packages/python-websockify/0.9.0/1.el8/noarch/python3-websockify-0.9.0-1.el8.noarch.rpm -O /tmp/sockify.rpm && \    
-    rpm -ivh /tmp/*rpm && \
-    rm -f /tmp/*rpm && \
+    xfce4-panel xfwm4 xfce4-settings xfce4-session xfdesktop xfce4-terminal && \
     dnf clean all
 
+RUN rpm -ivh http://mirrors.ocf.berkeley.edu/centos/8-stream/cloud/x86_64/openstack-xena/Packages/p/python3-websockify-0.9.0-1.el8.noarch.rpm
+RUN dnf install -y novnc    
+
 # Fix to be allowed to start X for xrdp when not running on a physical TTY.
 RUN echo "allowed_users = anybody" >> /etc/X11/Xwrapper.config
 
@@ -44,7 +46,8 @@ RUN useradd -u ${USER} cct && groupadd logging && usermod -aG logging cct && \
     chown root:logging /var/log && chmod 770 /var/log && \
     mkdir -p /opt/cct && chmod 777 /opt/cct && \
     mkdir -p /opt/cct/.vnc && chmod 777 /opt/cct/.vnc && \
-    chmod -R 755 /etc/pki/tls/certs/novnc.pem
+    chmod -R 755 /etc/pki/tls/certs/novnc.pem && \
+    touch /opt/cct/.bashrc && echo 'cd ${HOME}' >> /opt/cct/.bashrc
 
 COPY xclients /opt/cct/.Xclients
 
diff --git a/docker/run.sh b/docker/run.sh
index b181bf85..ebdc67fb 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -6,4 +6,4 @@ HOME="/opt/cct" USER="cct" LANG="en_US.UTF-8" /usr/sbin/xrdp --nodaemon &
 export DISPLAY=:1.0
 
 sleep 10
-java -Djava.security.disableSystemPropertiesFile=true -jar /opt/cct/coda-calibration-standalone.jar
\ No newline at end of file
+java ${JAVA_OPTS} -Djava.security.disableSystemPropertiesFile=true -jar /opt/cct/coda-calibration-standalone.jar
\ No newline at end of file
diff --git a/externals/pom.xml b/externals/pom.xml
index 05cd8358..716368e6 100644
--- a/externals/pom.xml
+++ b/externals/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<artifactId>externals</artifactId>
diff --git a/externals/src/main/java/llnl/gnem/core/gui/plotting/api/BasicPlot.java b/externals/src/main/java/llnl/gnem/core/gui/plotting/api/BasicPlot.java
index f1f95b1e..5110ebf0 100644
--- a/externals/src/main/java/llnl/gnem/core/gui/plotting/api/BasicPlot.java
+++ b/externals/src/main/java/llnl/gnem/core/gui/plotting/api/BasicPlot.java
@@ -54,4 +54,6 @@ public interface BasicPlot extends Serializable {
 
     public void clearAxes();
 
+    public void setMargin(Integer top, Integer bottom, Integer left, Integer right);
+
 }
diff --git a/externals/src/main/java/llnl/gnem/core/gui/plotting/api/PlotFactory.java b/externals/src/main/java/llnl/gnem/core/gui/plotting/api/PlotFactory.java
index 4f9b242a..d745ca9c 100644
--- a/externals/src/main/java/llnl/gnem/core/gui/plotting/api/PlotFactory.java
+++ b/externals/src/main/java/llnl/gnem/core/gui/plotting/api/PlotFactory.java
@@ -20,6 +20,8 @@ public interface PlotFactory {
 
     public BasicPlot basicPlot();
 
+    public BasicPlot lineAndMarkerScatterPlot();
+
     public Axis axis(Type axisType, String label);
 
     public Line line(double[] xVals, double[] yVals, Color color, LineStyles style, int pxThickness);
diff --git a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyPlot.java b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyPlot.java
index d7bf48e6..63fee9c3 100644
--- a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyPlot.java
+++ b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyPlot.java
@@ -89,6 +89,7 @@ public class PlotlyPlot implements BasicPlot {
 
     private transient Comparator<Integer> nullsLastIntComparator = Comparator.nullsLast(Integer::compare);
     private boolean isSubPlot;
+    private boolean clickToPickEnabled = false;
 
     public PlotlyPlot() {
         this(false, new PlotlyPlotData(new PlotlyTrace(PlotlyTrace.Style.SCATTER_MARKER), Color.WHITE, new BasicTitle()));
@@ -158,6 +159,14 @@ public boolean hasPersistentChanges() {
         return hasPersistentChanges.get();
     }
 
+    public void setClickPickingModeEnabled(boolean clickToPickEnabled) {
+        this.clickToPickEnabled = clickToPickEnabled;
+    }
+
+    public boolean isClickToPickEnabled() {
+        return clickToPickEnabled;
+    }
+
     public void fireShapeMoveEvent(final String name, final double x0, final double x1, final double y0, final double y1) {
         CompletableFuture.runAsync(() -> {
             if (propertyChange.getPropertyChangeListeners().length > 0) {
@@ -270,6 +279,13 @@ public Title getTitle() {
 
     @Override
     public void addPlotObjectObserver(final PropertyChangeListener observer) {
+        //We want these listeners to be singletons since we are using them as
+        // A) Only using them for one listener (pick moves)
+        // B) Re-using the plot by swapping around data
+        PropertyChangeListener[] propertyChangeListeners = propertyChange.getPropertyChangeListeners();
+        for (PropertyChangeListener listener : propertyChangeListeners) {
+            propertyChange.removePropertyChangeListener(listener);
+        }
         propertyChange.addPropertyChangeListener(observer);
     }
 
@@ -348,7 +364,7 @@ protected synchronized void addPlotObject(final PlotObject object, final PlotlyP
                 data.getColorData().add(symbol.getColorationValue());
             }
             if (data.getTraceStyle() == null) {
-                final PlotlyTrace traceStyle = populateStyle(symbol, Style.SCATTER_MARKER, plot);
+                final PlotlyTrace traceStyle = populateStyle(symbol, plot.getDefaultTraceStyle().getType(), plot);
                 traceStyle.setPxSize(plot.getDefaultTraceStyle().getPxSize());
                 traceStyle.setStyleName(symbol.getStyle().getStyleName());
                 traceStyle.setColorMap(symbol.getColorMap());
@@ -726,6 +742,7 @@ public BasicPlot createSubPlot() {
      * @param left
      * @param right
      */
+    @Override
     public void setMargin(Integer top, Integer bottom, Integer left, Integer right) {
         this.topMargin = top;
         this.bottomMargin = bottom;
diff --git a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyTrace.java b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyTrace.java
index ddd0e5c3..be877a98 100644
--- a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyTrace.java
+++ b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyTrace.java
@@ -44,10 +44,11 @@ public class PlotlyTrace {
     private boolean isAnnotationLogX = false;
 
     public enum Style {
-        LINE("lines", "scatter", 0), SCATTER_MARKER("markers", "scatter", 1), VERTICAL_LINE("line", "shapes", 2), HEATMAP("heatmap", "heatmap", 3);
+        LINE("lines", "scatter", 0), SCATTER_MARKER_AND_LINE("lines+markers", "scatter", 1), SCATTER_MARKER("markers", "scatter", 2), VERTICAL_LINE("line", "shapes", 3), HEATMAP("heatmap", "heatmap",
+                4);
 
-        private final String type;
         private final String mode;
+        private final String type;
         private final int order;
 
         private Style(final String mode, final String type, final int order) {
@@ -56,14 +57,14 @@ private Style(final String mode, final String type, final int order) {
             this.order = order;
         }
 
-        public String getType() {
-            return type;
-        }
-
         public String getMode() {
             return mode;
         }
 
+        public String getType() {
+            return type;
+        }
+
         public int getOrder() {
             return order;
         }
@@ -201,6 +202,11 @@ public ObjectNode getJSONObject() {
 
         if (colorMap != null) {
             switch (type) {
+            case SCATTER_MARKER_AND_LINE:
+                node.with(MARKER).put("colorscale", colorMap);
+                node.with(MARKER).put("showscale", true);
+                node.with(MARKER).put("reversescale", true);
+                break;
             case SCATTER_MARKER:
                 node.with(MARKER).put("colorscale", colorMap);
                 node.with(MARKER).put("showscale", true);
@@ -233,6 +239,10 @@ public ObjectNode getJSONObject() {
         }
         if (pxSize != null) {
             switch (type) {
+            case SCATTER_MARKER_AND_LINE:
+                node.with(MARKER).put("size", pxSize);
+                node.with(LINE).put(WIDTH, 3);
+                break;
             case SCATTER_MARKER:
                 node.with(MARKER).put("size", pxSize);
                 break;
@@ -246,6 +256,10 @@ public ObjectNode getJSONObject() {
         }
         if (styleName != null) {
             switch (type) {
+            case SCATTER_MARKER_AND_LINE:
+                node.with(LINE).put("dash", "solid");
+                node.with(MARKER).put("symbol", styleName);
+                break;
             case SCATTER_MARKER:
                 node.with(MARKER).put("symbol", styleName);
                 break;
diff --git a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyWaveformPlot.java b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyWaveformPlot.java
index 81b2b9ac..e7ea0ad5 100755
--- a/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyWaveformPlot.java
+++ b/externals/src/main/java/llnl/gnem/core/gui/plotting/plotly/PlotlyWaveformPlot.java
@@ -22,6 +22,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.scene.paint.Color;
 import llnl.gnem.core.gui.plotting.api.Line;
 import llnl.gnem.core.gui.plotting.api.LineStyles;
@@ -32,8 +35,11 @@
 public class PlotlyWaveformPlot extends PlotlyPlot {
 
     private static final long serialVersionUID = 1L;
+    private static final Logger log = LoggerFactory.getLogger(PlotlyWaveformPlot.class);
+
     private final transient List<SeismicSignal> seismograms;
     private final Map<String, Double> sharedPicks;
+    private int lastEventId = -1;
 
     public PlotlyWaveformPlot() {
         seismograms = new ArrayList<>();
@@ -125,7 +131,7 @@ private void plotPicks() {
     }
 
     private VerticalLine plotPick(final SeismicSignal seismogram, final String phase, double time) {
-        int pickLineWidth = 4;
+        int pickLineWidth = 3;
         boolean draggable = false;
         //Weed out NaNs and +-Inf and mark as "bad"
         if (!Double.isFinite(time)) {
@@ -134,11 +140,10 @@ private VerticalLine plotPick(final SeismicSignal seismogram, final String phase
 
         final Color pickColor;
         if ("f".equalsIgnoreCase(phase)) {
-            pickColor = Color.RED;
+            pickColor = Color.rgb(255, 0, 0, 0.7);
             draggable = true;
-            pickLineWidth = 6;
         } else {
-            pickColor = Color.LIGHTGRAY;
+            pickColor = Color.rgb(165, 165, 165, 0.7); // Light grey with transparency
         }
         final double startTime = getTime(seismogram);
         final double endTime = seismogram.getEndtime().subtractD(seismogram.getTime());
@@ -167,7 +172,15 @@ public void clear() {
     public void update(final PropertyChangeEvent observable) {
         if (observable.getNewValue() instanceof PlotShapeMove) {
             PlotShapeMove move = (PlotShapeMove) observable.getNewValue();
-            handlePickMovedState(move);
+            //We check this just to screen out stray extra events causing extra
+            //work.
+            int curEventId = move.hashCode();
+            synchronized (this) {
+                if (lastEventId != curEventId) {
+                    lastEventId = curEventId;
+                    handlePickMovedState(move);
+                }
+            }
         }
     }
 
diff --git a/externals/src/main/resources/plotly.html b/externals/src/main/resources/plotly.html
index 7711305e..44b44198 100644
--- a/externals/src/main/resources/plotly.html
+++ b/externals/src/main/resources/plotly.html
@@ -57,23 +57,26 @@
 			title: {
 				text: '',
 				font: {
-					size: 16
+					size: 20
 				},
 				yanchor: 'bottom'
 			},
 			xaxis: {
+				automargin: true,
 				zeroline: false,
 				linecolor: 'black',
 				linewidth: 2,
 				mirror: true
 			},
 			yaxis: {
+				automargin: true,
 				zeroline: false,
 				linecolor: 'black',
 				linewidth: 2,
 				mirror: true
 			},
 			zaxis: {
+				automargin: true,
 				zeroline: false
 			},
 			legend: {
@@ -290,6 +293,18 @@
 		});
 
 		var attachPlotDivHandlers = function () {
+			// Register clicks to move the f-marker
+			plotDiv.addEventListener('click', event => {
+				if (plotData.isClickToPickEnabled()) {
+					var clickX = event.clientX;
+					var leftMargin = plotDiv._fullLayout._size.l;
+					var xaxis = plotDiv._fullLayout.xaxis;
+					var plotX = xaxis.p2c(event.clientX-leftMargin);
+					
+					moveFmarkerToX(plotX);
+				}
+			});
+
 			plotDiv.on('plotly_click', plotClick);
 			plotDiv.on('plotly_selected', function (data) {
 				plotSelection("selection", data)
@@ -321,16 +336,7 @@
 						//nop
 					}
 				}
-			});
-			// Register clicks to move the f-marker
-			plotDiv.addEventListener('click', event => {
-				var clickX = event.clientX;
-				var leftMargin = plotDiv._fullLayout._size.l;
-				var xaxis = plotDiv._fullLayout.xaxis;
-				var plotX = xaxis.p2c(event.clientX-leftMargin);
-				
-				moveFmarkerToX(plotX);
-			});
+			});			
 		};
 		
 		Plotly.newPlot("plot", data, layout, config).then(attach);
diff --git a/mapping/pom.xml b/mapping/pom.xml
index def3a1e7..b79c7be0 100644
--- a/mapping/pom.xml
+++ b/mapping/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.15</version>
+		<version>1.0.16</version>
 	</parent>
 
 	<groupId>gov.llnl.gnem.apps.coda.common</groupId>
diff --git a/pom.xml b/pom.xml
index 122235d8..926ce082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 	<artifactId>coda-calibration</artifactId>
-	<version>1.0.15</version>
+	<version>1.0.16</version>
 	<name>coda-calibration</name>
 
 	<packaging>pom</packaging>
@@ -63,47 +63,46 @@
 	<properties>
 		<java.product.version>8</java.product.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
 
-		<maven.compile.source>1.8</maven.compile.source>
-		<maven.compile.target>1.8</maven.compile.target>
-		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-		<maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
+		<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
+		<maven.javadoc.plugin.version>3.3.2</maven.javadoc.plugin.version>
 		<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
 		<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
-		<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
+		<maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
 		<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
 
-		<jfx.version>18-ea+8</jfx.version>
+		<jfx.version>17.0.2</jfx.version>
 		<jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
-		<spring.boot.version>2.6.2</spring.boot.version>
-		<reactor.version>2020.0.14</reactor.version>
+		<spring.boot.version>2.6.4</spring.boot.version>
+		<reactor.version>2020.0.17</reactor.version>
 
 		<javax.persistence.version>2.2.1</javax.persistence.version>
-		<org.apache.xmlgraphics.batik-script.version>1.14</org.apache.xmlgraphics.batik-script.version>
+		<org.apache.xmlgraphics.batik-script.version>1.14
+		</org.apache.xmlgraphics.batik-script.version>
 		<xml.apis.ext.version>1.3.04</xml.apis.ext.version>
 		<geographiclib.java.version>1.52</geographiclib.java.version>
 		<eclipse.collections.version>11.0.0</eclipse.collections.version>
-		<jakarta.version>2.0.0-RC1</jakarta.version>
+		<javax.version>2.0.0-RC1</javax.version>
 		<jts.version>1.18.2</jts.version>
-		<jts2geojson.version>0.16.1</jts2geojson.version>
+		<jts2geojson.version>0.17.0</jts2geojson.version>
 		<native-image-version>21.0.0.2</native-image-version>
 
 		<!-- GUI Specific -->
-		<tyrus.standalone.client.version>1.18</tyrus.standalone.client.version>
+		<tyrus.standalone.client.version>1.18
+		</tyrus.standalone.client.version>
 		<commons.compress.version>1.21</commons.compress.version>
 		<commons.math3.version>3.6.1</commons.math3.version>
-		<guava.version>31.0.1-jre</guava.version>
+		<guava.version>31.1-jre</guava.version>
 		<failsafe.version>2.4.4</failsafe.version>
 
 		<!-- Testing -->
-		<spring.test.version>5.3.14</spring.test.version>
+		<spring.test.version>5.3.16</spring.test.version>
 		<junit.jupiter.version>5.8.2</junit.jupiter.version>
-		<mockito.version>4.2.0</mockito.version>
+		<mockito.version>4.4.0</mockito.version>
 		<javax.annotation.version>1.3.2</javax.annotation.version>
-		
+
 		<!-- CVE overrides -->
-		<log4j2.version>2.17.0</log4j2.version>
+		<log4j2.version>2.17.2</log4j2.version>
 	</properties>
 
 	<dependencyManagement>
@@ -118,7 +117,7 @@
 				<artifactId>log4j-api</artifactId>
 				<version>${log4j2.version}</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>org.eclipse.collections</groupId>
 				<artifactId>eclipse-collections-api</artifactId>
@@ -482,8 +481,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>${maven.compiler.plugin.version}</version>
 					<configuration>
-						<source>${java.version}</source>
-						<target>${java.version}</target>
+						<source>${java.product.version}</source>
+						<target>${java.product.version}</target>
 						<encoding>${project.build.sourceEncoding}</encoding>
 						<useIncrementalCompilation>false</useIncrementalCompilation>
 						<compilerArgument>-Xlint:deprecation</compilerArgument>
diff --git a/schema/measured-mws-output.jsonschema b/schema/measured-mws-output.jsonschema
index dd8fba49..f7119cc6 100644
--- a/schema/measured-mws-output.jsonschema
+++ b/schema/measured-mws-output.jsonschema
@@ -121,7 +121,16 @@
                         "examples": [
                             7
                         ]
-                    },               
+                    },           
+                    "likelyPoorlyConstrained": {
+                        "$id": "#/properties/reference-events/entry/properties/likelyPoorlyConstrained",
+                        "type": "boolean",
+                        "title": "Indicates when the inversion reported statistics that make this solution likely to be poorly constrained.",
+                        "default": false,
+                        "examples": [                            
+                            "true"
+                        ]
+                    },    
                     "datetime": {
                         "$id": "#/properties/reference-events/entry/properties/datetime",
                         "type": "string",