diff --git a/spikeinterface_gui/layout_presets.py b/spikeinterface_gui/layout_presets.py
index c9a4c71..ece7775 100644
--- a/spikeinterface_gui/layout_presets.py
+++ b/spikeinterface_gui/layout_presets.py
@@ -53,7 +53,7 @@ def get_layout_description(preset_name, layout=None):
 
 default_layout = dict(
     zone1=['curation', 'spikelist'],
-    zone2=['unitlist', 'mergelist'],
+    zone2=['unitlist', 'merge'],
     zone3=['trace', 'tracemap',  'spikeamplitude', 'spikedepth', 'spikerate'],
     zone4=[],
     zone5=['probe'],
@@ -67,7 +67,7 @@ def get_layout_description(preset_name, layout=None):
 # legacy layout for nostalgic people like me
 legacy_layout = dict(
     zone1=['curation', 'spikelist'],
-    zone2=['unitlist', 'mergelist'],
+    zone2=['unitlist', 'merge'],
     zone3=['trace', 'tracemap', 'waveform', 'waveformheatmap', 'isi', 'correlogram', 'spikeamplitude'],
     zone4=[],
     zone5=['probe'],
@@ -78,7 +78,7 @@ def get_layout_description(preset_name, layout=None):
 _presets['legacy'] = legacy_layout
 
 unit_focus_layout = dict(
-    zone1=['unitlist', 'mergelist', 'curation', 'spikelist'],
+    zone1=['unitlist', 'merge', 'curation', 'spikelist'],
     zone2=[],
     zone3=['trace', 'tracemap',  'spikeamplitude', 'spikedepth'],
     zone4=[],
diff --git a/spikeinterface_gui/probeview.py b/spikeinterface_gui/probeview.py
index 29cbf33..d77f8e6 100644
--- a/spikeinterface_gui/probeview.py
+++ b/spikeinterface_gui/probeview.py
@@ -180,6 +180,7 @@ def _qt_refresh(self):
             for label in self.channel_labels:
                 label.hide()
             
+        self._qt_highlight_visible_units()
     
     def _qt_update_channel_visibility_from_roi(self, emit_signals=False):
         r, x, y = circle_from_roi(self.roi_channel)
@@ -224,6 +225,9 @@ def _qt_on_roi_units_changed(self, emit_signals=True):
         self._qt_on_roi_channel_changed(emit_signals=False)
             
     def _qt_on_unit_visibility_changed(self, auto_zoom=None):
+        self._qt_highlight_visible_units(auto_zoom=auto_zoom)
+
+    def _qt_highlight_visible_units(self, auto_zoom=None):
         import pyqtgraph as pg
 
         # this change the ROI and so change also channel_visibility