diff --git a/src/main/java/ch/psi/mxsc/BasePlatePanel.java b/src/main/java/ch/psi/mxsc/BasePlatePanel.java
index 37812d1..a28233f 100644
--- a/src/main/java/ch/psi/mxsc/BasePlatePanel.java
+++ b/src/main/java/ch/psi/mxsc/BasePlatePanel.java
@@ -50,7 +50,7 @@ public class BasePlatePanel extends DevicePanel {
                 int sample = clickedSample.getNumber();
                 int puck = clickedPuck.getNumber();
                 char segment = clickedPuck.getSegment();
-                Controller.instance.execute("mount('" + segment + "'," + puck + "," + sample + ")");                                        
+                Controller.instance.execute("mount('" + segment + "'," + puck + "," + sample + ", auto_unmount=True)");                                           
             } catch (Exception ex) {
                 SwingUtils.showException(this, ex);
             }
@@ -387,7 +387,7 @@ public class BasePlatePanel extends DevicePanel {
     }
     
     void onSamplePressed(MouseEvent e, Sample sample){
-        if (getSelectionMode()==SelectionMode.Samples){
+        //if (getSelectionMode()==SelectionMode.Samples){
             if (TOGGLE_SELECTION){
                 sample.toggleSelected(true);
             } else {
@@ -395,7 +395,8 @@ public class BasePlatePanel extends DevicePanel {
             }
             repaint();
             Controller.getInstance().onSamplePressed(sample);
-        } else if (getSelectionMode()==SelectionMode.Pucks){
+        //} else 
+        if (getSelectionMode()==SelectionMode.Pucks){
             onPuckPressed(e, sample.getPuck());
         }
     }
@@ -405,13 +406,12 @@ public class BasePlatePanel extends DevicePanel {
     }
     
     void onSamplePopupMenu(MouseEvent e,Sample sample){
-        if (getSelectionMode()==SelectionMode.Samples){
-            //menuLoadSample.setEnabled(sample.isPresent() && getDevice().getLoadedSample()==null);
-            //menuUnloadSample.setEnabled(!sample.isPresent() && getDevice().getLoadedSample()!=null);
-            menuMountSample.setEnabled(!sample.isLoaded() && getDevice().getLoadedSample()==null);
+        //if (getSelectionMode()==SelectionMode.Samples){
+            //menuMountSample.setEnabled(!sample.isLoaded() && getDevice().getLoadedSample()==null);
+            menuMountSample.setEnabled(!sample.isLoaded());
             menuUnmountSample.setEnabled(sample.isLoaded() && getDevice().getLoadedSample()!=null);
             samplePopupMenu.show(e.getComponent(), e.getX(), e.getY());
-        }
+        //}
     }
     
     void onSampleDoubleClicked(MouseEvent e,Sample sample){
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index 674f478..6ede867 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -31,7 +31,7 @@
           <Group type="102" alignment="1" attributes="0">
               <Component id="panelTop" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-              <Component id="panelBottom" pref="79" max="32767" attributes="0"/>
+              <Component id="panelBottom" pref="80" max="32767" attributes="0"/>
               <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -278,12 +278,12 @@
                 <DimensionLayout dim="0">
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" attributes="0">
-                          <EmptySpace pref="20" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                           <Group type="103" groupAlignment="0" max="-2" attributes="0">
                               <Component id="buttonClearDet" linkSize="4" max="32767" attributes="0"/>
                               <Component id="buttonPuckDet" max="32767" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="20" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
@@ -346,9 +346,9 @@
                 <DimensionLayout dim="1">
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
-                          <EmptySpace pref="17" max="32767" attributes="0"/>
+                          <EmptySpace pref="18" max="32767" attributes="0"/>
                           <Component id="hexiposiPanel" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="12" max="32767" attributes="0"/>
+                          <EmptySpace pref="13" max="32767" attributes="0"/>
                           <Component id="buttonDetectCover" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                       </Group>
@@ -896,7 +896,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-                      <Component id="panelDetail" pref="111" max="32767" attributes="0"/>
+                      <Component id="panelDetail" pref="112" max="32767" attributes="0"/>
                       <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                       <Component id="panelDevices" min="-2" pref="280" max="-2" attributes="0"/>
                       <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
@@ -1004,9 +1004,9 @@
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                           <Component id="devicesPanel" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace pref="22" max="32767" attributes="0"/>
+                          <EmptySpace pref="26" max="32767" attributes="0"/>
                           <Component id="panelExpert" min="-2" pref="93" max="-2" attributes="0"/>
-                          <EmptySpace pref="22" max="32767" attributes="0"/>
+                          <EmptySpace pref="27" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
@@ -1018,7 +1018,7 @@
                               <Component id="panelExpert" max="32767" attributes="0"/>
                               <Component id="devicesPanel" pref="236" max="32767" attributes="0"/>
                           </Group>
-                          <EmptySpace pref="10" max="32767" attributes="0"/>
+                          <EmptySpace pref="11" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index d4a0f8d..e11b967 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -98,10 +98,13 @@ public class MainPanel extends Panel {
             panelLegend.setVisible(false);
             panelLN2Level.setVisible(false);
             panelDisplayMode.setVisible(false);
-            panelBottom.setPreferredSize(panelTop.getPreferredSize());
-            panelBottom.setMinimumSize(panelTop.getMinimumSize());
-            panelBottom.setSize(panelTop.getSize());
+            //panelBottom.setMinimumSize(panelTop.getMinimumSize());
+            panelTop.setMinimumSize(new Dimension(panelTop.getMinimumSize().width, panelTop.getMinimumSize().height-150));
+            panelBottom.setMinimumSize(new Dimension(panelBottom.getMinimumSize().width, panelBottom.getMinimumSize().height+150));            
             panelDatamatrix.setVisible(false);
+            panelDetail.setVisible(false);
+            
+            ((GroupLayout)panelTop.getLayout()).replace(panelRight, panelDevices);
         }
 
         ((DefaultTableModel)tablePucks.getModel()).setNumRows(BasePlate.numberOfPucks);
@@ -1099,11 +1102,11 @@ public class MainPanel extends Panel {
         panelDetectionLayout.setHorizontalGroup(
             panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelDetectionLayout.createSequentialGroup()
-                .addContainerGap(14, Short.MAX_VALUE)
+                .addContainerGap(26, Short.MAX_VALUE)
                 .addGroup(panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
                     .addComponent(buttonClearDet, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(buttonPuckDet, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap(14, Short.MAX_VALUE))
+                .addContainerGap(26, Short.MAX_VALUE))
         );
         panelDetectionLayout.setVerticalGroup(
             panelDetectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1130,18 +1133,18 @@ public class MainPanel extends Panel {
         panelHexiposiLayout.setHorizontalGroup(
             panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelHexiposiLayout.createSequentialGroup()
-                .addContainerGap(9, Short.MAX_VALUE)
+                .addContainerGap(14, Short.MAX_VALUE)
                 .addGroup(panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(buttonDetectCover)
                     .addComponent(hexiposiPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(9, Short.MAX_VALUE))
+                .addContainerGap(15, Short.MAX_VALUE))
         );
         panelHexiposiLayout.setVerticalGroup(
             panelHexiposiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelHexiposiLayout.createSequentialGroup()
-                .addContainerGap(14, Short.MAX_VALUE)
+                .addContainerGap(18, Short.MAX_VALUE)
                 .addComponent(hexiposiPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 9, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 13, Short.MAX_VALUE)
                 .addComponent(buttonDetectCover)
                 .addContainerGap())
         );
@@ -1168,11 +1171,11 @@ public class MainPanel extends Panel {
         panelViewTypeLayout.setHorizontalGroup(
             panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelViewTypeLayout.createSequentialGroup()
-                .addContainerGap(8, Short.MAX_VALUE)
+                .addContainerGap(21, Short.MAX_VALUE)
                 .addGroup(panelViewTypeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(buttonDrawing)
                     .addComponent(buttonCamera))
-                .addContainerGap(8, Short.MAX_VALUE))
+                .addContainerGap(21, Short.MAX_VALUE))
         );
 
         panelViewTypeLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonCamera, buttonDrawing});
@@ -1628,18 +1631,18 @@ public class MainPanel extends Panel {
             .addGroup(panelDevicesLayout.createSequentialGroup()
                 .addGap(0, 0, 0)
                 .addComponent(devicesPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 26, Short.MAX_VALUE)
                 .addComponent(panelExpert, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(27, Short.MAX_VALUE))
         );
         panelDevicesLayout.setVerticalGroup(
             panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelDevicesLayout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addContainerGap(10, Short.MAX_VALUE)
                 .addGroup(panelDevicesLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(panelExpert, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(devicesPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 235, Short.MAX_VALUE))
-                .addContainerGap(8, Short.MAX_VALUE))
+                    .addComponent(devicesPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 236, Short.MAX_VALUE))
+                .addContainerGap(11, Short.MAX_VALUE))
         );
 
         javax.swing.GroupLayout panelRightLayout = new javax.swing.GroupLayout(panelRight);
@@ -1658,7 +1661,7 @@ public class MainPanel extends Panel {
             panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelRightLayout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 108, Short.MAX_VALUE)
+                .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 112, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
                 .addComponent(panelDevices, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, 0)
@@ -1722,7 +1725,7 @@ public class MainPanel extends Panel {
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                .addComponent(panelTableSamples, javax.swing.GroupLayout.DEFAULT_SIZE, 50, Short.MAX_VALUE)
+                .addComponent(panelTableSamples, javax.swing.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE)
                 .addGap(0, 0, 0))
         );
 
@@ -1829,7 +1832,7 @@ public class MainPanel extends Panel {
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addComponent(panelTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
-                .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 76, Short.MAX_VALUE)
+                .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 80, Short.MAX_VALUE)
                 .addGap(1, 1, 1))
         );
     }// </editor-fold>//GEN-END:initComponents