diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index bece8a81..7515c2f7 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -28,7 +28,7 @@
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="panelPositioners" linkSize="8" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="jPanel3" linkSize="8" min="-2" max="-2" attributes="0"/>
+              <Component id="panelScan" linkSize="8" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
@@ -40,7 +40,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="panelPositioners" pref="543" max="32767" attributes="0"/>
                   <Component id="panelSensors" pref="543" max="32767" attributes="0"/>
-                  <Component id="jPanel3" alignment="0" pref="543" max="32767" attributes="0"/>
+                  <Component id="panelScan" alignment="0" pref="543" max="32767" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -511,7 +511,7 @@
         </Component>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="jPanel3">
+    <Container class="javax.swing.JPanel" name="panelScan">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
@@ -609,7 +609,7 @@
         <Component class="javax.swing.JLabel" name="jLabel2">
           <Properties>
             <Property name="horizontalAlignment" type="int" value="11"/>
-            <Property name="text" type="java.lang.String" value="Total time(min):"/>
+            <Property name="text" type="java.lang.String" value="Total time:"/>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="textTotalTime">
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index a69a3bd8..e8894deb 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -87,8 +87,7 @@ public class HoloScan extends Panel {
 
     @Override
     public void setEnabled(boolean value) {
-        super.setEnabled(value);         
-        buttonAbort.setEnabled(value && getState().isInitialized());
+        super.setEnabled(value);                 
 
         boolean enableControls = (value && (getState()==State.Ready));
         for (Component c : panelSensors.getComponents()) {
@@ -97,8 +96,11 @@ public class HoloScan extends Panel {
         for (Component c : panelPositioners.getComponents()) {
             c.setEnabled(enableControls);
         }            
-        buttonStart.setEnabled(enableControls);
-        checkEndScan.setEnabled(enableControls);
+        for (Component c : panelScan.getComponents()) {
+            c.setEnabled(enableControls);
+        }            
+
+        buttonAbort.setEnabled(value && getState().isInitialized());
         
         spinnerStepSizePhi.setEnabled(enableControls && radioStepSize.isSelected());
         spinnerStepsPhi.setEnabled(enableControls && radioSteps.isSelected());
@@ -187,7 +189,7 @@ public class HoloScan extends Panel {
         checkCur2 = new javax.swing.JCheckBox();
         checkCur3 = new javax.swing.JCheckBox();
         buttonScientaSetup = new javax.swing.JButton();
-        jPanel3 = new javax.swing.JPanel();
+        panelScan = new javax.swing.JPanel();
         buttonStart = new javax.swing.JButton();
         buttonAbort = new javax.swing.JButton();
         checkEndScan = new javax.swing.JCheckBox();
@@ -487,8 +489,8 @@ public class HoloScan extends Panel {
                 .addGap(26, 26, 26))
         );
 
-        jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
-        jPanel3.setPreferredSize(new java.awt.Dimension(239, 119));
+        panelScan.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
+        panelScan.setPreferredSize(new java.awt.Dimension(239, 119));
 
         buttonStart.setText("Start");
         buttonStart.addActionListener(new java.awt.event.ActionListener() {
@@ -510,52 +512,52 @@ public class HoloScan extends Panel {
         jLabel1.setText("Acquisition time(s):");
 
         jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
-        jLabel2.setText("Total time(min):");
+        jLabel2.setText("Total time:");
 
         textTotalTime.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         textTotalTime.setBorder(javax.swing.BorderFactory.createTitledBorder(""));
 
-        javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
-        jPanel3.setLayout(jPanel3Layout);
-        jPanel3Layout.setHorizontalGroup(
-            jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel3Layout.createSequentialGroup()
+        javax.swing.GroupLayout panelScanLayout = new javax.swing.GroupLayout(panelScan);
+        panelScan.setLayout(panelScanLayout);
+        panelScanLayout.setHorizontalGroup(
+            panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(panelScanLayout.createSequentialGroup()
                 .addContainerGap()
-                .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(panelScanLayout.createSequentialGroup()
+                        .addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(jLabel1)
                             .addComponent(jLabel2))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(textTotalTime, javax.swing.GroupLayout.Alignment.TRAILING)
                             .addComponent(dvpAcqTime, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))
                         .addGap(0, 0, Short.MAX_VALUE))
-                    .addGroup(jPanel3Layout.createSequentialGroup()
+                    .addGroup(panelScanLayout.createSequentialGroup()
                         .addComponent(checkEndScan)
                         .addGap(53, 53, 53)))
                 .addContainerGap())
         );
 
-        jPanel3Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel2});
+        panelScanLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel2});
 
-        jPanel3Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
+        panelScanLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
 
-        jPanel3Layout.setVerticalGroup(
-            jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
+        panelScanLayout.setVerticalGroup(
+            panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScanLayout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(buttonStart)
                 .addGap(18, 18, 18)
                 .addComponent(buttonAbort)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                .addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel1)
                     .addComponent(dvpAcqTime, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                .addGroup(panelScanLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(textTotalTime)
                     .addComponent(jLabel2))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -563,7 +565,7 @@ public class HoloScan extends Panel {
                 .addGap(26, 26, 26))
         );
 
-        jPanel3Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
+        panelScanLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
@@ -575,11 +577,11 @@ public class HoloScan extends Panel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(panelPositioners, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(panelScan, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioners});
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {panelPositioners, panelScan});
 
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -588,7 +590,7 @@ public class HoloScan extends Panel {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(panelPositioners, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE)
                     .addComponent(panelSensors, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE)
-                    .addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE))
+                    .addComponent(panelScan, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE))
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
@@ -656,10 +658,10 @@ public class HoloScan extends Panel {
     private javax.swing.JLabel jLabel7;
     private javax.swing.JLabel jLabel8;
     private javax.swing.JLabel jLabel9;
-    private javax.swing.JPanel jPanel3;
     private ch.psi.pshell.swing.MotorReadoutPanel motorPanelPhi;
     private ch.psi.pshell.swing.MotorReadoutPanel motorPanelTheta;
     private javax.swing.JPanel panelPositioners;
+    private javax.swing.JPanel panelScan;
     private javax.swing.JPanel panelSensors;
     private javax.swing.JRadioButton radioStepSize;
     private javax.swing.JRadioButton radioSteps;