diff --git a/spikeinterface_gui/layout_presets.py b/spikeinterface_gui/layout_presets.py
index 73d3097..8619257 100644
--- a/spikeinterface_gui/layout_presets.py
+++ b/spikeinterface_gui/layout_presets.py
@@ -93,12 +93,12 @@ def get_layout_description(preset_name, layout=None):
 
 merge_focus_layout = dict(
     zone1=['merge', 'unitlist'],
-    zone2=['waveform'],
+    zone2=['curation'],
     zone3=['spikeamplitude'],
     zone4=['ndscatter'],
     zone5=['probe'],
     zone6=[],
-    zone7=['spikerate'],
+    zone7=['waveform'],
     zone8=['correlogram'],
 )
 
diff --git a/spikeinterface_gui/tests/test_mainwindow_panel.py b/spikeinterface_gui/tests/test_mainwindow_panel.py
index 05d5e19..219e1b8 100644
--- a/spikeinterface_gui/tests/test_mainwindow_panel.py
+++ b/spikeinterface_gui/tests/test_mainwindow_panel.py
@@ -20,7 +20,7 @@ def teardown_module():
     clean_all(test_folder)
 
 
-def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_extensions=False, events=False, port=0):
+def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_extensions=False, events=False, port=0, layout="default"):
 
 
     analyzer = load_sorting_analyzer(test_folder / "sorting_analyzer")
@@ -78,7 +78,7 @@ def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_ext
         curation=curation, curation_dict=curation_dict, 
         displayed_unit_properties=None,
         extra_unit_properties=extra_unit_properties,
-        layout_preset='default',
+        layout_preset=layout,
         # address="10.69.168.40",
         port=port,
         events=events_dict
@@ -112,6 +112,7 @@ def test_launcher(verbose=True):
 parser = ArgumentParser()
 parser.add_argument('--dataset', default="small", help='Path to the dataset folder')
 parser.add_argument('--events', action="store_true", help='Simulate and add events')
+parser.add_argument('--layout', default="default", help='Layout of the GUI, default is "default"')
 
 if __name__ == '__main__':
     args = parser.parse_args()
@@ -123,7 +124,7 @@ def test_launcher(verbose=True):
     if not test_folder.is_dir():
         setup_module()
 
-    win = test_mainwindow(start_app=True, verbose=True, curation=True, events=args.events, port=0)
+    win = test_mainwindow(start_app=True, verbose=True, curation=True, events=args.events, port=0, layout=args.layout)
 
     # test_launcher(verbose=True)
 
diff --git a/spikeinterface_gui/tests/test_mainwindow_qt.py b/spikeinterface_gui/tests/test_mainwindow_qt.py
index 0fbc3ef..8aeaa30 100644
--- a/spikeinterface_gui/tests/test_mainwindow_qt.py
+++ b/spikeinterface_gui/tests/test_mainwindow_qt.py
@@ -35,7 +35,7 @@ def teardown_module():
     clean_all(test_folder)
 
 
-def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_extensions=False, events=False):
+def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_extensions=False, events=False, layout="default"):
 
 
     analyzer = load_sorting_analyzer(test_folder / "sorting_analyzer")
@@ -108,7 +108,7 @@ def test_mainwindow(start_app=False, verbose=True, curation=False, only_some_ext
         curation=curation, curation_dict=curation_dict, 
         displayed_unit_properties=None,
         extra_unit_properties=extra_unit_properties,
-        layout_preset='default',
+        layout_preset=layout,
         events=events_dict
         # user_settings={"mainsettings": {"color_mode": "color_by_visibility", "max_visible_units": 5}}
     )
@@ -144,6 +144,7 @@ def test_launcher(verbose=True):
 parser = ArgumentParser()
 parser.add_argument('--dataset', default="small", help='Path to the dataset folder')
 parser.add_argument('--events', action="store_true", help='Simulate and add events')
+parser.add_argument('--layout', default="default", help='Enable layout preset')
 
 if __name__ == '__main__':
     args = parser.parse_args()
@@ -155,7 +156,7 @@ def test_launcher(verbose=True):
     if not test_folder.is_dir():
         setup_module()
 
-    win = test_mainwindow(start_app=True, verbose=True, curation=True, events=args.events)
+    win = test_mainwindow(start_app=True, verbose=True, curation=True, events=args.events, layout=args.layout)
     # win = test_mainwindow(start_app=True, verbose=True, curation=False)
 
     # test_launcher(verbose=True)
diff --git a/spikeinterface_gui/tests/testingtools.py b/spikeinterface_gui/tests/testingtools.py
index ed0f0a5..e44b4a0 100644
--- a/spikeinterface_gui/tests/testingtools.py
+++ b/spikeinterface_gui/tests/testingtools.py
@@ -138,9 +138,9 @@ def make_analyzer_folder(test_folder, case="small", unit_dtype="str"):
     sorting_analyzer.compute("correlograms", window_ms=50., bin_ms=1.)
     sorting_analyzer.compute("template_similarity", method="l1")
     sorting_analyzer.compute("principal_components", n_components=3, mode='by_channel_global', whiten=True, **job_kwargs)
+    sorting_analyzer.compute(["spike_amplitudes", "spike_locations"], **job_kwargs)
     sorting_analyzer.compute("quality_metrics", metric_names=["snr", "firing_rate"])
     sorting_analyzer.compute("template_metrics")
-    sorting_analyzer.compute(["spike_amplitudes", "spike_locations"], **job_kwargs)
 
 
 def make_curation_dict(analyzer):