diff --git a/groundStation/gui/MicroCART/mainwindow.cpp b/groundStation/gui/MicroCART/mainwindow.cpp
index 01f6bd1cbb9231961a6cc64c0b2f4008ecebe6c9..e4916dcbeeb7a0dc8264ab3c655a55b2360ab878 100644
--- a/groundStation/gui/MicroCART/mainwindow.cpp
+++ b/groundStation/gui/MicroCART/mainwindow.cpp
@@ -332,6 +332,7 @@ void MainWindow::on_pbMoveUp_clicked()
         int current = findChild<QListView *>("setpointList")->currentIndex().row();
         if (current > 0) {
             setpointList->insertRow(current - 1, setpointList->takeItem(current));
+            setpointList->removeRow(current + 1);
         }
     }
 }
@@ -341,7 +342,8 @@ void MainWindow::on_pbMoveDown_clicked()
     if (findChild<QListView *>("setpointList")->currentIndex().isValid()) {
         int current = findChild<QListView *>("setpointList")->currentIndex().row();
         if (current < (setpointList->rowCount() - 1)) {
-            setpointList->insertRow(current - 1, setpointList->takeItem(current));
+            setpointList->insertRow(current + 2, setpointList->takeItem(current));
+            setpointList->removeRow(current);
         }
     }
 }
@@ -353,8 +355,8 @@ void MainWindow::on_pbInsertSetpoint_clicked()
         current = findChild<QListView *>("setpointList")->currentIndex().row();
     }
 
-    QString str("[" + findChild<QLineEdit *>("xActual")->text() + ", "+
-            findChild<QLineEdit *>("yActual")->text() + ", " +
-            findChild<QLineEdit *>("zActual")->text() + "]");
+    QString str("[" + findChild<QLineEdit *>("xSetpoint")->text() + ", "+
+            findChild<QLineEdit *>("ySetpoint")->text() + ", " +
+            findChild<QLineEdit *>("zSetpoint")->text() + "]");
     setpointList->insertRow(current, new QStandardItem(str));
 }