Here’s my take. I moved things so that “Units” would be adjacent to both the “Z Move Dist.” and “XY Move Dist.” buttons. I tried to use color to delineate XY functions (purple), Z functions (lavender), XYZ function “Units” (kinda between purple and lavender) and not specifically tied to XY or Z “Setup” (grey)
