diff --git a/addon/components/order-config-manager/activity-flow.js b/addon/components/order-config-manager/activity-flow.js
index 814a0fb79..3ed847ca8 100644
--- a/addon/components/order-config-manager/activity-flow.js
+++ b/addon/components/order-config-manager/activity-flow.js
@@ -455,6 +455,10 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
      * and creates links from the parent to each child. It then calls itself to add any children of the current child activities.
      * Finally, it repositions all child activities to maintain visual consistency.
      *
+     * A flow is a graph, not a tree: an activity may be reachable from several parents, and a
+     * configured lifecycle can loop back (e.g. active -> extended -> active). An activity that is
+     * already on the graph only gets a link from this parent; it is never placed or walked twice.
+     *
      * @param {Object} parentActivity - The parent activity to which child activities will be added.
      * @param {Array} [childActivities=[]] - An array of child activity objects to be added. Defaults to an empty array.
      */
@@ -463,6 +467,11 @@ export default class OrderConfigManagerActivityFlowComponent extends Component {
             return;
         }
         childActivities.forEach((childActivityObject) => {
+            if (childActivityObject.get('node')) {
+                this.addLinkToGraph(parentActivity, childActivityObject);
+                return;
+            }
+
             const childPositionals = this.getActivityPositioning(childActivityObject, parentActivity);
             const childActivity = this.createActivityNode(childActivityObject, childPositionals);
             childActivity.set('parentId', parentActivity.get('id'));
diff --git a/addon/components/order-config-manager/lifecycle.hbs b/addon/components/order-config-manager/lifecycle.hbs
index 13ecd9175..c5998f089 100644
--- a/addon/components/order-config-manager/lifecycle.hbs
+++ b/addon/components/order-config-manager/lifecycle.hbs
@@ -122,6 +122,20 @@
         {{else}}
             <p class="text-sm text-gray-600 dark:text-gray-300">{{t "order-config-manager.lifecycle.default-lifecycle"}}</p>
         {{/if}}
+
+        {{#if this.canEdit}}
+            <div class="flex justify-end pt-4">
+                <Button
+                    @type="primary"
+                    @icon="save"
+                    @text={{t "common.save-changes"}}
+                    @onClick={{perform this.save}}
+                    @isLoading={{this.save.isRunning}}
+                    @disabled={{not this.canSave}}
+                    @permission="fleet-ops update order-config"
+                />
+            </div>
+        {{/if}}
     </ContentPanel>
 
     {{#if this.saved}}
@@ -157,19 +171,4 @@
         </ContentPanel>
     {{/if}}
 
-    {{#if this.canEdit}}
-        <ContentPanel @title={{t "order-config-manager.details.controls"}} @open={{true}}>
-            <div class="flex flex-row items-center py-2 space-x-4">
-                <Button
-                    @type="primary"
-                    @icon="save"
-                    @text={{t "common.save-changes"}}
-                    @onClick={{perform this.save}}
-                    @isLoading={{this.save.isRunning}}
-                    @disabled={{not this.canSave}}
-                    @permission="fleet-ops update order-config"
-                />
-            </div>
-        </ContentPanel>
-    {{/if}}
 </div>
\ No newline at end of file