diff --git a/scripts/xyz/xyz_grid_classes.py b/scripts/xyz/xyz_grid_classes.py
index 0836adbbf..43dc9b2a3 100644
--- a/scripts/xyz/xyz_grid_classes.py
+++ b/scripts/xyz/xyz_grid_classes.py
@@ -201,8 +201,6 @@ axis_options = [
     AxisOption("[Param] Height", int, apply_field("height")),
     AxisOption("[Param] Seed", int, apply_seed),
     AxisOption("[Param] Steps", int, apply_field("steps")),
-    AxisOption("[Param] Guidance scale", float, apply_field("cfg_scale")),
-    AxisOption("[Param] Guidance end", float, apply_field("cfg_end")),
     AxisOption("[Param] Variation seed", int, apply_field("subseed")),
     AxisOption("[Param] Variation strength", float, apply_field("subseed_strength")),
     AxisOption("[Param] Clip skip", float, apply_clip_skip),
@@ -224,13 +222,15 @@ axis_options = [
     AxisOption("[Sampler] Shift", float, apply_setting("schedulers_shift")),
     AxisOption("[Sampler] eta delta", float, apply_setting("eta_noise_seed_delta")),
     AxisOption("[Sampler] eta multiplier", float, apply_setting("scheduler_eta")),
-    AxisOption("[Guidance] Guidance name", str, apply_guidance, choices=lambda: ['Default', 'CFG', 'Auto', 'Zero', 'PAG', 'APG', 'SLG', 'SEG', 'TCFG', 'FDG']),
+    AxisOption("[Guidance] scale", float, apply_field("cfg_scale")),
+    AxisOption("[Guidance] end", float, apply_field("cfg_end")),
+    AxisOption("[Guidance] image scale", float, apply_field("image_cfg_scale")),
+    AxisOption("[Guidance] rescale", float, apply_field("diffusers_guidance_rescale")),
+    AxisOption("[Guidance] modular name", str, apply_guidance, choices=lambda: ['Default', 'CFG', 'Auto', 'Zero', 'PAG', 'APG', 'SLG', 'SEG', 'TCFG', 'FDG']),
     AxisOption("[Refine] Upscaler", str, apply_field("hr_upscaler"), cost=0.3, choices=lambda: [x.name for x in shared.sd_upscalers]),
     AxisOption("[Refine] Sampler", str, apply_hr_sampler_name, fmt=format_value_add_label, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),
     AxisOption("[Refine] Denoising strength", float, apply_field("denoising_strength")),
     AxisOption("[Refine] Hires steps", int, apply_field("hr_second_pass_steps")),
-    AxisOption("[Refine] Guidance scale", float, apply_field("image_cfg_scale")),
-    AxisOption("[Refine] Guidance rescale", float, apply_field("diffusers_guidance_rescale")),
     AxisOption("[Refine] Refiner start", float, apply_field("refiner_start")),
     AxisOption("[Refine] Refiner steps", float, apply_field("refiner_steps")),
     AxisOption("[Postprocess] Upscaler", str, apply_upscaler, cost=0.4, choices=lambda: [x.name for x in shared.sd_upscalers]),