diff --git a/crates/bone-jig/scenarios/dialog_open.ron b/crates/bone-jig/scenarios/dialog_open.ron
index 7f38973..66ed600 100644
--- a/crates/bone-jig/scenarios/dialog_open.ron
+++ b/crates/bone-jig/scenarios/dialog_open.ron
@@ -1,8 +1,8 @@
 Scenario(
     steps: [
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Click(target: Label("Point")),
         Click(target: At(x: 700, y: 400)),
         Key(code: Named(Escape)),
diff --git a/crates/bone-jig/scenarios/dialog_open_dark.ron b/crates/bone-jig/scenarios/dialog_open_dark.ron
index 59e9c72..3c4e17a 100644
--- a/crates/bone-jig/scenarios/dialog_open_dark.ron
+++ b/crates/bone-jig/scenarios/dialog_open_dark.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Theme(Dark),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Click(target: Label("Point")),
         Click(target: At(x: 700, y: 400)),
         Key(code: Named(Escape)),
diff --git a/crates/bone-jig/scenarios/parity_brep_highlight.ron b/crates/bone-jig/scenarios/parity_brep_highlight.ron
index 8394c63..e68298d 100644
--- a/crates/bone-jig/scenarios/parity_brep_highlight.ron
+++ b/crates/bone-jig/scenarios/parity_brep_highlight.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Corner Rectangle")),
         Click(target: At(x: 710, y: 710)),
diff --git a/crates/bone-jig/scenarios/parity_convert_entities.ron b/crates/bone-jig/scenarios/parity_convert_entities.ron
index 0233ae2..2ed94d7 100644
--- a/crates/bone-jig/scenarios/parity_convert_entities.ron
+++ b/crates/bone-jig/scenarios/parity_convert_entities.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Corner Rectangle")),
         Click(target: At(x: 710, y: 710)),
diff --git a/crates/bone-jig/scenarios/parity_cut_extrude.ron b/crates/bone-jig/scenarios/parity_cut_extrude.ron
index 44d7d9d..bc88566 100644
--- a/crates/bone-jig/scenarios/parity_cut_extrude.ron
+++ b/crates/bone-jig/scenarios/parity_cut_extrude.ron
@@ -2,6 +2,16 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
+        Advance(2),
+        Click(target: Label("Corner Rectangle")),
+        Click(target: At(x: 710, y: 710)),
+        Click(target: At(x: 1190, y: 410)),
+        Key(code: Named(Escape)),
+        Advance(2),
+        Click(target: Label("Accept")),
+        Advance(4),
         Click(target: Label("Features")),
         Click(target: Label("Extruded Cut")),
         Advance(2),
diff --git a/crates/bone-jig/scenarios/parity_cut_extrude_hole.ron b/crates/bone-jig/scenarios/parity_cut_extrude_hole.ron
index ae80ba6..96d3929 100644
--- a/crates/bone-jig/scenarios/parity_cut_extrude_hole.ron
+++ b/crates/bone-jig/scenarios/parity_cut_extrude_hole.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Corner Rectangle")),
         Click(target: At(x: 710, y: 710)),
diff --git a/crates/bone-jig/scenarios/parity_property_manager.ron b/crates/bone-jig/scenarios/parity_property_manager.ron
index 1d58d5f..3280cf7 100644
--- a/crates/bone-jig/scenarios/parity_property_manager.ron
+++ b/crates/bone-jig/scenarios/parity_property_manager.ron
@@ -2,6 +2,16 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
+        Advance(2),
+        Click(target: Label("Corner Rectangle")),
+        Click(target: At(x: 710, y: 710)),
+        Click(target: At(x: 1190, y: 410)),
+        Key(code: Named(Escape)),
+        Advance(2),
+        Click(target: Label("Accept")),
+        Advance(4),
         Click(target: Label("Features")),
         Click(target: Label("Extruded Boss/Base")),
         Advance(2),
diff --git a/crates/bone-jig/scenarios/parity_revolve.ron b/crates/bone-jig/scenarios/parity_revolve.ron
index 910f0a5..6eac9ab 100644
--- a/crates/bone-jig/scenarios/parity_revolve.ron
+++ b/crates/bone-jig/scenarios/parity_revolve.ron
@@ -2,6 +2,16 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
+        Advance(2),
+        Click(target: Label("Corner Rectangle")),
+        Click(target: At(x: 710, y: 710)),
+        Click(target: At(x: 1190, y: 410)),
+        Key(code: Named(Escape)),
+        Advance(2),
+        Click(target: Label("Accept")),
+        Advance(4),
         Click(target: Label("Features")),
         Click(target: Label("Revolved Boss/Base")),
         Advance(2),
diff --git a/crates/bone-jig/scenarios/parity_sketch_entities.ron b/crates/bone-jig/scenarios/parity_sketch_entities.ron
index a45ea8d..a5e1fa2 100644
--- a/crates/bone-jig/scenarios/parity_sketch_entities.ron
+++ b/crates/bone-jig/scenarios/parity_sketch_entities.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Line")),
         Click(target: At(x: 800, y: 500)),
diff --git a/crates/bone-jig/scenarios/parity_sketch_mode.ron b/crates/bone-jig/scenarios/parity_sketch_mode.ron
index fed962f..160cd61 100644
--- a/crates/bone-jig/scenarios/parity_sketch_mode.ron
+++ b/crates/bone-jig/scenarios/parity_sketch_mode.ron
@@ -2,7 +2,9 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
+        Advance(2),
         Click(target: Label("Sketch1")),
         Advance(2),
         Snapshot("sketch-mode"),
diff --git a/crates/bone-jig/scenarios/parity_sketch_on_face.ron b/crates/bone-jig/scenarios/parity_sketch_on_face.ron
index c5c22d8..5198718 100644
--- a/crates/bone-jig/scenarios/parity_sketch_on_face.ron
+++ b/crates/bone-jig/scenarios/parity_sketch_on_face.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Corner Rectangle")),
         Click(target: At(x: 710, y: 710)),
diff --git a/crates/bone-jig/scenarios/parity_sweep.ron b/crates/bone-jig/scenarios/parity_sweep.ron
index bcd7476..fbd3bc6 100644
--- a/crates/bone-jig/scenarios/parity_sweep.ron
+++ b/crates/bone-jig/scenarios/parity_sweep.ron
@@ -2,6 +2,16 @@ Scenario(
     steps: [
         Resize(width: 1920, height: 1080),
         Advance(2),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
+        Advance(2),
+        Click(target: Label("Corner Rectangle")),
+        Click(target: At(x: 710, y: 710)),
+        Click(target: At(x: 1190, y: 410)),
+        Key(code: Named(Escape)),
+        Advance(2),
+        Click(target: Label("Accept")),
+        Advance(4),
         Click(target: Label("Features")),
         Click(target: Label("Swept Boss/Base")),
         Advance(2),
diff --git a/crates/bone-jig/scenarios/sketch_mode.ron b/crates/bone-jig/scenarios/sketch_mode.ron
index 9814670..451071a 100644
--- a/crates/bone-jig/scenarios/sketch_mode.ron
+++ b/crates/bone-jig/scenarios/sketch_mode.ron
@@ -1,8 +1,8 @@
 Scenario(
     steps: [
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Snapshot("sketch-mode"),
         DumpTree("sketch-mode"),
diff --git a/crates/bone-jig/scenarios/sketch_mode_dark.ron b/crates/bone-jig/scenarios/sketch_mode_dark.ron
index ed1ee76..c346022 100644
--- a/crates/bone-jig/scenarios/sketch_mode_dark.ron
+++ b/crates/bone-jig/scenarios/sketch_mode_dark.ron
@@ -2,8 +2,8 @@ Scenario(
     steps: [
         Theme(Dark),
         Advance(2),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Snapshot("sketch-mode-dark"),
         DumpTree("sketch-mode-dark"),
diff --git a/crates/bone-jig/scenarios/smoke.ron b/crates/bone-jig/scenarios/smoke.ron
index f6f47e6..b90b1c8 100644
--- a/crates/bone-jig/scenarios/smoke.ron
+++ b/crates/bone-jig/scenarios/smoke.ron
@@ -5,8 +5,8 @@ Scenario(
         PointerMove(Label("Point")),
         Click(target: Label("File")),
         Key(code: Named(Escape)),
-        Click(target: Label("Sketch1")),
-        Click(target: Label("Sketch1")),
+        Click(target: Label("Front Plane")),
+        Click(target: Label("Front Plane")),
         Advance(2),
         Click(target: Label("Corner Rectangle")),
         Click(target: At(x: 710, y: 710)),
@@ -19,7 +19,7 @@ Scenario(
         Click(target: Label("Extruded Boss/Base")),
         Click(target: Label("Accept")),
         Advance(4),
-        Click(target: Label("Right")),
+        Key(code: Char('4'), modifiers: [Ctrl]),
         Advance(30),
         Snapshot("final"),
         DumpTree("final"),
diff --git a/crates/bone-jig/tests/parity.rs b/crates/bone-jig/tests/parity.rs
index f7ae1ee..a59140f 100644
--- a/crates/bone-jig/tests/parity.rs
+++ b/crates/bone-jig/tests/parity.rs
@@ -178,10 +178,20 @@ fn sweep_pane_opens_with_profile_path_and_scope() {
         profile_path.y0 > header.y1,
         "profile and path group sits below the sweep header",
     );
+    let options = the_one(&dump, Role::Pane, "Options");
+    assert!(
+        options.y0 > profile_path.y1,
+        "options group sits below the profile and path group",
+    );
+    let guides = the_one(&dump, Role::Pane, "Guide Curves");
+    assert!(
+        guides.y0 > options.y1,
+        "guide curves group sits below the options group",
+    );
     let scope = the_one(&dump, Role::Pane, "Feature Scope");
     assert!(
-        scope.y0 > profile_path.y1,
-        "feature scope sits below the profile and path group",
+        scope.y0 > guides.y1,
+        "feature scope sits below the guide curves group",
     );
     assert!(
         dump.matching(Role::Tree, "Feature Tree").is_empty(),