diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index 038bdcb..c13b823 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -192,9 +192,9 @@ public class MainPanel extends Panel {
     void refresh(){
         repaint();
         for (Puck p : Controller.getInstance().basePlate.getPucks()) {
-            //int index = (p.getSegment() - new Character('A')) * 5 + p.getNumber();
-            tablePucks.getModel().setValueAt(p.getStatus(), p.getIndex(), 1);
-            tablePucks.getModel().setValueAt(p.getId(), p.getIndex(), 2);
+            int index = p.getUserIndex();
+            tablePucks.getModel().setValueAt(p.getStatus(), index, 1);
+            tablePucks.getModel().setValueAt(p.getId(), index, 2);
         }    
     }
 
diff --git a/src/main/java/ch/psi/mxsc/Puck.java b/src/main/java/ch/psi/mxsc/Puck.java
index 4f96f97..b779032 100644
--- a/src/main/java/ch/psi/mxsc/Puck.java
+++ b/src/main/java/ch/psi/mxsc/Puck.java
@@ -247,6 +247,10 @@ public class Puck extends DeviceBase {
     public int getAddress() {
         return address;
     }
+    
+    public int getUserIndex(){
+         return (getSegment() - new Character('A')) * 5 + getNumber() - 1;
+    }
 
     boolean enabled;