diff --git a/plugins/Commands.form b/plugins/Commands.form
index eeecdcd..56217c9 100644
--- a/plugins/Commands.form
+++ b/plugins/Commands.form
@@ -24,24 +24,36 @@
                   <Component id="btSete" linkSize="1" alignment="0" max="32767" attributes="0"/>
               </Group>
               <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Component id="spEnergy" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="168" max="32767" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="deviceValuePanel1" linkSize="4" min="-2" pref="91" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Component id="spEnergy" linkSize="4" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace pref="111" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" attributes="0">
               <EmptySpace min="-2" pref="56" max="-2" attributes="0"/>
               <Component id="btRock" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="separate" max="-2" attributes="0"/>
               <Component id="btFbm" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="btSete" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="spEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="2" attributes="0">
+                  <Component id="btSete" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="spEnergy" linkSize="2" alignment="2" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="210" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="2" attributes="0">
+                  <Component id="jLabel1" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="deviceValuePanel1" linkSize="2" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace pref="184" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -78,5 +90,15 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="kev"/>
+      </Properties>
+    </Component>
+    <Component class="ch.psi.pshell.swing.DeviceValuePanel" name="deviceValuePanel1">
+      <Properties>
+        <Property name="deviceName" type="java.lang.String" value="energy"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/plugins/Commands.java b/plugins/Commands.java
index e489257..4e3894e 100644
--- a/plugins/Commands.java
+++ b/plugins/Commands.java
@@ -2,15 +2,10 @@
  * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
  */
 
-import ch.psi.pshell.core.Controller;
 import ch.psi.pshell.ui.Panel;
 import ch.psi.utils.swing.SwingUtils;
 import ch.psi.utils.State;
 import java.awt.Component;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.script.ScriptException;
 
 /**
  *
@@ -20,11 +15,12 @@ public class Commands extends Panel {
     public Commands() {
         initComponents();
     }
+    
 
      //Overridable callbacks
     @Override
     public void onInitialize(int runCount) {
-
+        
     }
 
     @Override
@@ -52,6 +48,8 @@ public class Commands extends Panel {
         btFbm = new javax.swing.JButton();
         btSete = new javax.swing.JButton();
         spEnergy = new javax.swing.JSpinner();
+        jLabel1 = new javax.swing.JLabel();
+        deviceValuePanel1 = new ch.psi.pshell.swing.DeviceValuePanel();
 
         btRock.setText("Rock");
         btRock.addActionListener(new java.awt.event.ActionListener() {
@@ -76,6 +74,10 @@ public class Commands extends Panel {
 
         spEnergy.setModel(new javax.swing.SpinnerNumberModel(6.0d, 4.7d, 17.5d, 0.1d));
 
+        jLabel1.setText("kev");
+
+        deviceValuePanel1.setDeviceName("energy");
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -87,12 +89,19 @@ public class Commands extends Panel {
                     .addComponent(btRock, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(btSete, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addGap(18, 18, 18)
-                .addComponent(spEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(168, Short.MAX_VALUE))
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 91, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(jLabel1))
+                    .addComponent(spEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(111, Short.MAX_VALUE))
         );
 
         layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btFbm, btRock, btSete});
 
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {deviceValuePanel1, spEnergy});
+
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
@@ -101,11 +110,18 @@ public class Commands extends Panel {
                 .addGap(18, 18, 18)
                 .addComponent(btFbm)
                 .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(btSete)
                     .addComponent(spEnergy, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(210, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel1)
+                    .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(184, Short.MAX_VALUE))
         );
+
+        layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {deviceValuePanel1, spEnergy});
+
     }// </editor-fold>//GEN-END:initComponents
 
     private void btRockActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btRockActionPerformed
@@ -138,6 +154,8 @@ public class Commands extends Panel {
     private javax.swing.JButton btFbm;
     private javax.swing.JButton btRock;
     private javax.swing.JButton btSete;
+    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel1;
+    private javax.swing.JLabel jLabel1;
     private javax.swing.JSpinner spEnergy;
     // End of variables declaration//GEN-END:variables
 }