diff --git a/imagechipviewsettings_widget_base.ui b/imagechipviewsettings_widget_base.ui
index 69123a651bd4b9cca679e4ee810eb0d3dc1ecf83..1dd7dac1b218fae8370c26190acb15e616d07fbe 100644
--- a/imagechipviewsettings_widget_base.ui
+++ b/imagechipviewsettings_widget_base.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>196</width>
-    <height>106</height>
+    <width>198</width>
+    <height>97</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -33,19 +33,19 @@
     <enum>QLayout::SetMinimumSize</enum>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>1</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>1</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>9</number>
+    <number>1</number>
    </property>
    <property name="spacing">
-    <number>2</number>
+    <number>1</number>
    </property>
    <item row="4" column="1">
     <widget class="QComboBox" name="cb_g">
diff --git a/sensecarbon_tsv.py b/sensecarbon_tsv.py
index ad3e3888af26fde0375d68aaf8ab0796149c0398..c8ada3cbb497fa02b7b4a72d6e7d861d769cbe43 100644
--- a/sensecarbon_tsv.py
+++ b/sensecarbon_tsv.py
@@ -264,7 +264,8 @@ class BandView(object):
         if sensor not in self.bandMappings.keys():
             #self.bandMappings[sensor] = ((0, 0, 5000), (1, 0, 5000), (2, 0, 5000))
             #x = imagechipviewsettings_widget.ImageChipViewSettings(sensor)
-            x = tsv_widgets.BandViewSettings(sensor)
+            #x = tsv_widgets.BandViewSettings(sensor)
+            x = tsv_widgets.ImageChipViewSettings(sensor)
             x.create()
             self.bandMappings[sensor] = x
 
@@ -359,12 +360,22 @@ class SensorConfiguration(object):
 
 
 class ImageChipLabel(QLabel):
-    def __init__(self, parent=None, iface=None, path=None, bands=None):
+    def __init__(self, parent=None, iface=None, TSD=None, bands=None):
         super(ImageChipLabel, self).__init__(parent)
-        self.path=path
+        self.TSD = TSD
+        self.bn = os.path.basename(self.TSD.pathImg)
         self.iface=iface
         self.bands=bands
         self.setContextMenuPolicy(Qt.DefaultContextMenu)
+        self.setFrameShape(QFrame.StyledPanel)
+        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+
+        tt = ['Date: {}'.format(TSD.date) \
+             ,'Name: {}'.format(self.bn) \
+             ,'RGB:  {}'.format(','.join([str(b) for b in bands]))]
+
+        self.setToolTip(list2str(tt))
+
 
     def contextMenuEvent(self, event):
         menu = QMenu()
@@ -374,8 +385,8 @@ class ImageChipLabel(QLabel):
 
         #add QGIS specific options
         if self.iface:
-            action = menu.addAction('Show image in QGIS')
-            action.triggered.connect(lambda : qgis_add_ins.add_QgsRasterLayer(self.iface, self.path, self.bands))
+            action = menu.addAction('Add {} to QGIS layers'.format(self.bn))
+            action.triggered.connect(lambda : qgis_add_ins.add_QgsRasterLayer(self.iface, self.TSD.pathImg, self.bands))
 
         menu.exec_(event.globalPos())
 
@@ -1157,7 +1168,7 @@ class ImageChipBuffer(object):
         nl, ns = chipData[bands[0]].shape
 
         dtype= 'uint8'
-        array_data = np.ndarray((ns, nl, nb), dtype=dtype)
+        array_data = np.ndarray((nl,ns, nb), dtype=dtype)
 
         if mode == 'rgb':
             ch_dst = [0,1,2]
@@ -1717,13 +1728,11 @@ class SenseCarbon_TSV:
                     #imv = QGraphicsView(self.dlg.scrollArea_imageChip_content)
                     #imv = MyGraphicsView(self.dlg.scrollArea_imageChip_content, iface=self.iface, path=TSD.pathImg, bands=bands)
                     #imv = pg.ImageView(view=None)
-                    imgLabel = ImageChipLabel()
-                    imgLabel.setFrameShape(QFrame.StyledPanel)
+                    imgLabel = ImageChipLabel(iface=self.iface, TSD=TSD, bands=bands)
+
                     imgLabel.setMinimumSize(size_x, size_y)
                     imgLabel.setMaximumSize(size_x, size_y)
-                    imgLabel.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-                    tt = [TSD.date, TSD.pathImg, 'RGB={}'.format(','.join([str(b) for b in bands]))]
-                    imgLabel.setToolTip(list2str(tt))
+
 
                     viewList.append(imgLabel)
                     self.ICP.addWidget(imgLabel, j, cnt_chips)
diff --git a/sensecarbon_tsv_gui_base.ui b/sensecarbon_tsv_gui_base.ui
index eb9fb3eaafc68bbfbbf3234324a87fbd1f8f52a0..a6a5f7bdb3d2e4ef687916a8c63117382af6ff22 100644
--- a/sensecarbon_tsv_gui_base.ui
+++ b/sensecarbon_tsv_gui_base.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>898</width>
-    <height>873</height>
+    <height>926</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -299,8 +299,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>754</width>
-              <height>204</height>
+              <width>81</width>
+              <height>28</height>
              </rect>
             </property>
             <property name="sizePolicy">
@@ -597,7 +597,7 @@
            <string>Entire Time Series</string>
           </property>
           <property name="checked">
-           <bool>true</bool>
+           <bool>false</bool>
           </property>
          </widget>
         </item>
@@ -609,6 +609,9 @@
           <property name="text">
            <string>Time Window:</string>
           </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item row="2" column="0" rowspan="2" colspan="3">