diff --git a/Software/PC_Application/Traces/XYPlotConstantLineEditDialog.ui b/Software/PC_Application/Traces/XYPlotConstantLineEditDialog.ui
index d238bab..f1d3867 100644
--- a/Software/PC_Application/Traces/XYPlotConstantLineEditDialog.ui
+++ b/Software/PC_Application/Traces/XYPlotConstantLineEditDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Edit line</string>
   </property>
   <property name="modal">
    <bool>true</bool>
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
index 147d9b5..a642253 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.cpp
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
@@ -3,7 +3,12 @@
 #include "ui_xyplotaxisdialog.h"
 #include "traceaxis.h"
 
+#include <QFileDialog>
 #include <QStandardItemModel>
+#include <fstream>
+#include <iomanip>
+
+#include <CustomWidgets/informationbox.h>
 
 using namespace std;
 
@@ -183,16 +188,68 @@ XYplotAxisDialog::XYplotAxisDialog(TraceXYPlot *plot) :
         ui->removeLine->setEnabled(true);
         editLine(line);
         connect(line, &XYPlotConstantLine::editingFinished, [=](){
-            item->setText(line->getDescription());
+            if(line->getPoints().size() < 2) {  // must have 2 points to be a line
+                int index = ui->lineList->currentRow();
+                removeLine(index);
+            } else {
+                item->setText(line->getDescription());
+            }
         });
     });
     connect(ui->removeLine, &QPushButton::clicked, [=](){
-        auto index = ui->lineList->currentRow();
-        delete ui->lineList->takeItem(index);
-        delete plot->constantLines[index];
-        plot->constantLines.erase(plot->constantLines.begin() + index);
-        if(plot->constantLines.size() == 0) {
-            ui->removeLine->setEnabled(false);
+        int index = ui->lineList->currentRow();
+        removeLine(index);
+    });
+    connect(ui->exportLines, &QPushButton::clicked, [=](){
+        QString filename = QFileDialog::getSaveFileName(nullptr, "Save limit lines", "", "Limit files (*.limits)", nullptr, QFileDialog::DontUseNativeDialog);
+        if(filename.isEmpty()) {
+            // aborted selection
+            return;
+        }
+        if(!filename.endsWith(".limits")) {
+            filename.append(".limits");
+        }
+
+        nlohmann::json jlines;
+        for(auto l : plot->constantLines ) {
+            jlines.push_back(l->toJSON());
+        }
+        nlohmann::json j;
+        j["limitLines"] = jlines;
+
+        ofstream file;
+        file.open(filename.toStdString());
+        file << setw(4) << j << endl;
+        file.close();
+
+    });
+    connect(ui->importLines, &QPushButton::clicked, [=](){
+        QString filename = QFileDialog::getOpenFileName(nullptr, "Load limit lines", "", "Limit files (*.limits)", nullptr, QFileDialog::DontUseNativeDialog);
+        ifstream file;
+        file.open(filename.toStdString());
+        if(!file.is_open()) {
+            qWarning() << "Unable to open file:" << filename;
+            return;
+        }
+        nlohmann::json j;
+        try {
+            file >> j;
+        } catch (exception &e) {
+            InformationBox::ShowError("Error", "Failed to parse file (" + QString(e.what()) + ")");
+            qWarning() << "Parsing of limits file failed: " << e.what();
+            file.close();
+            return;
+        }
+        file.close();
+        if(j.contains("limitLines")) {
+            for(auto jline : j["limitLines"]) {
+                auto line = new XYPlotConstantLine;
+                line->fromJSON(jline);
+                plot->constantLines.push_back(line);
+                auto item = new QListWidgetItem(line->getDescription());
+                ui->lineList->addItem(item);
+
+            }
         }
     });
 
@@ -276,3 +333,15 @@ bool XYplotAxisDialog::isSupported(XAxis::Type type)
 {
     return XAxis::isSupported(type, plot->getModel().getSource());
 }
+
+void XYplotAxisDialog::removeLine(int index) {
+    if (index < 0) {
+        return;
+    }
+    delete ui->lineList->takeItem(index);
+    delete plot->constantLines[index];
+    plot->constantLines.erase(plot->constantLines.begin() + index);
+    if(plot->constantLines.size() == 0) {
+        ui->removeLine->setEnabled(false);
+    }
+}
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.h b/Software/PC_Application/Traces/xyplotaxisdialog.h
index e14b434..5ab211d 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.h
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.h
@@ -26,6 +26,7 @@ private:
     bool isSupported(XAxis::Type type);
     Ui::XYplotAxisDialog *ui;
     TraceXYPlot *plot;
+    void removeLine(int index);
 };
 
 #endif // XYPLOTAXISDIALOG_H
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.ui b/Software/PC_Application/Traces/xyplotaxisdialog.ui
index 76147d5..6db0d45 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.ui
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.ui
@@ -489,6 +489,34 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QPushButton" name="exportLines">
+          <property name="toolTip">
+           <string>Export</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/export.png</normaloff>:/icons/export.png</iconset>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="importLines">
+          <property name="toolTip">
+           <string>Import</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/import.png</normaloff>:/icons/import.png</iconset>
+          </property>
+         </widget>
+        </item>
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
@@ -564,8 +592,8 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="Y2group"/>
   <buttongroup name="Y1group"/>
   <buttongroup name="Xgroup"/>
+  <buttongroup name="Y2group"/>
  </buttongroups>
 </ui>