diff --git a/pom.xml b/pom.xml
index 999432742..caefddac9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/pipeline-graph-view-plugin</gitHubRepo>
     <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-    <jenkins.baseline>2.504</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.516</jenkins.baseline>
+    <jenkins.version>2.532</jenkins.version>
     <node.version>24.2.0</node.version>
     <npm.version>11.3.0</npm.version>
     <spotless.check.skip>false</spotless.check.skip>
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx
index 7568289bf..9dd7f2e40 100644
--- a/src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx
+++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx
@@ -52,6 +52,12 @@ export default function PipelineConsole() {
         container={document.getElementById("console-pipeline-overflow-root")}
       >
         <Dropdown
+          className={
+            rootElement?.closest(".app-build-content")
+              ? "jenkins-details__button"
+              : ""
+          }
+          icon={SETTINGS}
           items={[
             showSplitView ? (
               <StagesCustomization key="visibility-select" />
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss b/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss
index d57735ec4..d71f54ca1 100644
--- a/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss
+++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/components/stages.scss
@@ -1,12 +1,7 @@
 .pgv-stages-graph {
-  --card-background: color-mix(
-    in srgb,
-    var(--text-color-secondary) 4%,
-    var(--background)
-  );
   position: relative;
   background: var(--card-background);
-  border: var(--jenkins-border);
+  border: var(--card-border-width) solid var(--card-border-color);
   border-radius: var(--form-input-border-radius);
   overflow: hidden;
   height: 100%;
diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss b/src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss
index 09f98dcc0..134d3f219 100644
--- a/src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss
+++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss
@@ -11,6 +11,7 @@ $pgv-item-padding-inline: 0.7rem;
     content: "";
     position: absolute;
     inset: 0;
+    background: var(--input-color);
     border-radius: var(--form-input-border-radius);
     // TODO - var fallback can removed after baseline is moved >= 2.496
     border: var(
diff --git a/src/main/frontend/pipeline-graph-view/app.tsx b/src/main/frontend/pipeline-graph-view/app.tsx
index 87491a8c1..e3b2c0ea4 100644
--- a/src/main/frontend/pipeline-graph-view/app.tsx
+++ b/src/main/frontend/pipeline-graph-view/app.tsx
@@ -16,14 +16,12 @@ export default function App() {
   });
 
   return (
-    <div>
-      <UserPreferencesProvider>
-        <Stages
-          stages={run.stages}
-          stageViewPosition={StageViewPosition.TOP}
-          onRunPage
-        />
-      </UserPreferencesProvider>
-    </div>
+    <UserPreferencesProvider>
+      <Stages
+        stages={run.stages}
+        stageViewPosition={StageViewPosition.TOP}
+        onRunPage
+      />
+    </UserPreferencesProvider>
   );
 }
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/Card.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/Card.java
deleted file mode 100644
index 06efcb937..000000000
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/Card.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards;
-
-public abstract class Card {
-    public abstract String getTitle();
-}
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsCard.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsCard.java
deleted file mode 100644
index 516c4ad55..000000000
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsCard.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards;
-
-import java.util.List;
-
-public class RunDetailsCard extends Card {
-
-    private final List<RunDetailsItem> items;
-
-    public RunDetailsCard(List<RunDetailsItem> items) {
-        this.items = items;
-    }
-
-    public List<RunDetailsItem> getItems() {
-        return items;
-    }
-
-    @Override
-    public String getTitle() {
-        return "Details";
-    }
-}
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem.java
index d9cfe97a2..d63539760 100644
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem.java
+++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem.java
@@ -7,10 +7,6 @@
 
 public sealed interface RunDetailsItem {
 
-    RunDetailsItem SEPARATOR = new Separator();
-
-    record Separator() implements RunDetailsItem {}
-
     final class RunDetail implements RunDetailsItem {
         private final @NonNull Icon icon;
         private final @NonNull ItemContent content;
@@ -45,12 +41,6 @@ public String icon() {
     sealed interface Icon {
         String value();
 
-        record SimpleIcon(@NonNull String value) implements Icon {
-            public SimpleIcon {
-                requireNonNull(value);
-            }
-        }
-
         record Ionicon(@NonNull String value) implements Icon {
             public Ionicon(@NonNull String value) {
                 requireNonNull(value);
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/TimingRunDetailsItems.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/TimingRunDetailsItems.java
deleted file mode 100644
index 862204750..000000000
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/TimingRunDetailsItems.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards.items;
-
-import hudson.Util;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.Ionicon;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import jenkins.metrics.impl.TimeInQueueAction;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-
-public class TimingRunDetailsItems {
-
-    public static List<RunDetailsItem> get(WorkflowRun run) {
-        List<RunDetailsItem> runDetailsItems = new ArrayList<>();
-
-        long startedTime = Math.abs(run.getTime().getTime() - new Date().getTime());
-        RunDetailsItem startedItem = new RunDetailsItem.RunDetail(
-                new Ionicon("time-outline"), ItemContent.of(Messages.startedAgo(Util.getTimeSpanString(startedTime))));
-        runDetailsItems.add(startedItem);
-
-        TimeInQueueAction timeInQueueAction = run.getAction(TimeInQueueAction.class);
-
-        if (timeInQueueAction != null) {
-            RunDetailsItem queuedItem = new RunDetailsItem.RunDetail(
-                    new Ionicon("hourglass-outline"),
-                    ItemContent.of(
-                            Messages.queued(Util.getTimeSpanString(timeInQueueAction.getQueuingDurationMillis()))));
-
-            runDetailsItems.add(queuedItem);
-        }
-
-        RunDetailsItem timerItem = new RunDetailsItem.RunDetail(
-                new Ionicon("timer-outline"), ItemContent.of(Messages.took(run.getDurationString())));
-
-        runDetailsItems.add(timerItem);
-
-        return runDetailsItems;
-    }
-}
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItem.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItem.java
deleted file mode 100644
index 3904adaa2..000000000
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards.items;
-
-import hudson.model.Cause;
-import hudson.model.CauseAction;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import io.jenkins.plugins.pipelinegraphview.PipelineGraphDisplayURLProvider;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.Ionicon;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-
-public class UpstreamCauseRunDetailsItem {
-
-    public static Optional<RunDetailsItem> get(WorkflowRun run) {
-        CauseAction causeAction = run.getAction(CauseAction.class);
-        if (causeAction == null) {
-            return Optional.empty();
-        }
-        List<Cause> causes = causeAction.getCauses();
-        return causes.stream()
-                .filter(cause -> cause instanceof Cause.UpstreamCause)
-                .map(upstreamCause -> (Cause.UpstreamCause) upstreamCause)
-                .map(Cause.UpstreamCause::getUpstreamRun)
-                .filter(Objects::nonNull)
-                .map(upstreamRun -> ItemContent.of(
-                        new PipelineGraphDisplayURLProvider().getRunURL(upstreamRun),
-                        Messages.cause_upstream(upstreamRun.getDisplayName())))
-                .<RunDetailsItem>map(
-                        content -> new RunDetailsItem.RunDetail(new Ionicon("play-circle-outline"), content))
-                .findAny();
-    }
-}
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItem.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItem.java
deleted file mode 100644
index 0bd9d513d..000000000
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards.items;
-
-import hudson.model.Cause;
-import hudson.model.CauseAction;
-import hudson.model.User;
-import hudson.tasks.UserAvatarResolver;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.SimpleIcon;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-
-public class UserIdCauseRunDetailsItem {
-
-    public static Optional<RunDetailsItem> get(WorkflowRun run) {
-        CauseAction causeAction = run.getAction(CauseAction.class);
-        if (causeAction == null) {
-            return Optional.empty();
-        }
-        List<Cause> causes = causeAction.getCauses();
-        return causes.stream()
-                .filter(cause -> cause instanceof Cause.UserIdCause)
-                .map(userIdCause -> (Cause.UserIdCause) userIdCause)
-                .map(userIdCause -> User.get(userIdCause.getUserId(), false, new HashMap<>()))
-                .filter(Objects::nonNull)
-                .<RunDetailsItem>map(user -> new RunDetailsItem.RunDetail(
-                        new SimpleIcon(UserAvatarResolver.resolve(user, "48x48")),
-                        ItemContent.of(Messages.cause_user(user.getDisplayName()))))
-                .findAny();
-    }
-}
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java
index 0ed25545d..2c0de9ed8 100644
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java
+++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java
@@ -4,7 +4,6 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Plugin;
 import hudson.console.AnnotatedLargeText;
-import hudson.model.Action;
 import hudson.model.BallColor;
 import hudson.model.Item;
 import hudson.model.ParametersDefinitionProperty;
@@ -14,15 +13,11 @@
 import hudson.util.HttpResponses;
 import io.jenkins.plugins.pipelinegraphview.Messages;
 import io.jenkins.plugins.pipelinegraphview.PipelineGraphViewConfiguration;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsCard;
 import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
 import io.jenkins.plugins.pipelinegraphview.cards.items.ArtifactRunDetailsItem;
 import io.jenkins.plugins.pipelinegraphview.cards.items.ChangesRunDetailsItem;
 import io.jenkins.plugins.pipelinegraphview.cards.items.SCMRunDetailsItems;
 import io.jenkins.plugins.pipelinegraphview.cards.items.TestResultRunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.cards.items.TimingRunDetailsItems;
-import io.jenkins.plugins.pipelinegraphview.cards.items.UpstreamCauseRunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.cards.items.UserIdCauseRunDetailsItem;
 import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraph;
 import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraphApi;
 import io.jenkins.plugins.pipelinegraphview.utils.PipelineNodeUtil;
@@ -35,9 +30,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import jenkins.model.Jenkins;
+import jenkins.model.Tab;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
-import org.jenkins.ui.icon.IconSpec;
 import org.jenkinsci.plugins.pipeline.modeldefinition.actions.RestartDeclarativePipelineAction;
 import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction;
 import org.jenkinsci.plugins.workflow.flow.FlowExecution;
@@ -53,7 +48,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PipelineConsoleViewAction implements Action, IconSpec {
+public class PipelineConsoleViewAction extends Tab {
     public static final long LOG_THRESHOLD = 150 * 1024; // 150KB
     public static final String URL_NAME = "pipeline-overview";
     public static final int CACHE_AGE = (int) TimeUnit.DAYS.toSeconds(1);
@@ -71,6 +66,7 @@ public class PipelineConsoleViewAction implements Action, IconSpec {
     private final PipelineStepApi stepApi;
 
     public PipelineConsoleViewAction(WorkflowRun target) {
+        super(target);
         this.run = target;
         this.graphApi = new PipelineGraphApi(this.run);
         this.stepApi = new PipelineStepApi(this.run);
@@ -78,7 +74,7 @@ public PipelineConsoleViewAction(WorkflowRun target) {
 
     @Override
     public String getDisplayName() {
-        return "Pipeline Overview";
+        return "Stages";
     }
 
     @Override
@@ -318,24 +314,12 @@ private static long parseIntWithDefault(String s, long defaultValue) {
     }
 
     @SuppressWarnings("unused")
-    public RunDetailsCard getRunDetailsCard() {
-
+    public List<RunDetailsItem> getRunDetailsItems() {
         List<RunDetailsItem> runDetailsItems = new ArrayList<>(SCMRunDetailsItems.get(run));
-
-        if (!runDetailsItems.isEmpty()) {
-            runDetailsItems.add(RunDetailsItem.SEPARATOR);
-        }
-
-        UpstreamCauseRunDetailsItem.get(run).ifPresent(runDetailsItems::add);
-        UserIdCauseRunDetailsItem.get(run).ifPresent(runDetailsItems::add);
-
-        runDetailsItems.addAll(TimingRunDetailsItems.get(run));
-
         ChangesRunDetailsItem.get(run).ifPresent(runDetailsItems::add);
         TestResultRunDetailsItem.get(run).ifPresent(runDetailsItems::add);
         ArtifactRunDetailsItem.get(run).ifPresent(runDetailsItems::add);
-
-        return new RunDetailsCard(runDetailsItems);
+        return runDetailsItems;
     }
 
     public boolean isShowGraphOnBuildPage() {
@@ -516,13 +500,8 @@ public BallColor getIconColor() {
         return run.getIconColor();
     }
 
-    @Override
-    public String getIconClassName() {
-        return "symbol-git-network-outline plugin-ionicons-api";
-    }
-
     @Override
     public String getIconFileName() {
-        return null;
+        return "symbol-git-network-outline plugin-ionicons-api";
     }
 }
diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java
index 7ba96e4ba..58c358a14 100644
--- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java
+++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewActionFactory.java
@@ -8,7 +8,7 @@
 import jenkins.model.TransientActionFactory;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 
-@Extension
+@Extension(ordinal = Integer.MAX_VALUE - 1)
 public class PipelineConsoleViewActionFactory extends TransientActionFactory<WorkflowRun> {
 
     @Override
diff --git a/src/main/resources/components/taglib b/src/main/resources/components/taglib
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/resources/components/temporary-wrapper.jelly b/src/main/resources/components/temporary-wrapper.jelly
new file mode 100644
index 000000000..0427ceb2f
--- /dev/null
+++ b/src/main/resources/components/temporary-wrapper.jelly
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core"
+         xmlns:l="/lib/layout"
+         xmlns:d="jelly:define"
+         xmlns:st="jelly:stapler"
+         xmlns:t="/lib/hudson"
+         xmlns:dd="/lib/layout/dropdowns">
+    <l:userExperimentalFlag var="newBuildPage" flagClassName="jenkins.model.experimentalflags.NewBuildPageUserExperimentalFlag" />
+
+    <j:choose>
+        <j:when test="${newBuildPage}">
+            <l:run-subpage>
+                <d:invokeBody />
+            </l:run-subpage>
+        </j:when>
+        <j:otherwise>
+            <l:layout title="${it.buildDisplayName} - ${it.fullProjectDisplayName}">
+                <l:main-panel>
+                    <link rel="stylesheet" href="${resURL}/plugin/pipeline-graph-view/js/style.css" type="text/css" />
+
+                    <j:set var="controls">
+                        <j:if test="${it.buildInProgress}">
+                            <l:hasPermission permission="${it.cancelPermission}">
+                                <j:set var="proxyId" value="${h.generateId()}" />
+                                <st:bind value="${it}" var="cancelAction${proxyId}"/>
+                                <button id="pgv-cancel" data-confirm="${%Confirm(it.buildFullDisplayName)}"
+                                        data-success-message="${%Build cancelled}"
+                                        data-proxy-name="cancelAction${proxyId}"
+                                        class="jenkins-button jenkins-!-error-color">
+                                    <l:icon src="symbol-stop-circle-outline plugin-ionicons-api"/>
+                                    ${%Cancel}
+                                </button>
+                            </l:hasPermission>
+                        </j:if>
+                        <j:if test="${it.buildable}">
+                            <l:hasPermission permission="${it.permission}">
+                                <j:set var="proxyId" value="${h.generateId()}" />
+                                <st:bind value="${it}" var="rerunAction${proxyId}"/>
+                                <div class="jenkins-split-button">
+                                    <button id="pgv-rerun"
+                                            data-proxy-name="rerunAction${proxyId}"
+                                            class="jenkins-button jenkins-!-build-color">
+                                        <div class="jenkins-dropdown__item__icon">
+                                            <l:icon src="symbol-refresh-outline plugin-ionicons-api"/>
+                                        </div>
+                                        ${%Rerun}
+                                    </button>
+                                    <l:overflowButton id="pgv-rerun-overflow" tooltip="${null}"
+                                                      icon="symbol-chevron-down"
+                                                      clazz="jenkins-button jenkins-!-build-color">
+                                        <dd:custom>
+                                            <a id="pgv-replay" href="../replay" class="jenkins-dropdown__item pgv-dropdown-item">
+                                                <div class="jenkins-dropdown__item__icon">
+                                                    <l:icon src="symbol-arrow-redo-outline plugin-ionicons-api"/>
+                                                </div>
+                                                <span>${%Replay}</span>
+                                                <div class="pgv-dropdown-item__description">
+                                                    ${%Edit Pipeline and replay}
+                                                </div>
+                                            </a>
+                                        </dd:custom>
+                                        <j:if test="${it.restartFromStageAvailable}">
+                                            <dd:custom>
+                                                <a id="pgv-restart" href="../restart" class="jenkins-dropdown__item pgv-dropdown-item">
+                                                    <div class="jenkins-dropdown__item__icon">
+                                                        <l:icon src="symbol-refresh-outline plugin-ionicons-api"/>
+                                                    </div>
+                                                    <span>${%Restart from Stage}</span>
+                                                    <div class="pgv-dropdown-item__description">
+                                                        ${%Restart Pipeline from a specific Stage}
+                                                    </div>
+                                                </a>
+                                            </dd:custom>
+                                        </j:if>
+                                        <j:if test="${it.rebuildAvailable}">
+                                            <dd:custom>
+                                                <a id="pgv-rebuild" href="../rebuild/parameterized" class="jenkins-dropdown__item pgv-dropdown-item">
+                                                    <div class="jenkins-dropdown__item__icon">
+                                                        <l:icon src="symbol-play-outline plugin-ionicons-api"/>
+                                                    </div>
+                                                    <span>${%Rebuild}</span>
+                                                    <div class="pgv-dropdown-item__description">
+                                                        ${%Edit parameters and rebuild}
+                                                    </div>
+                                                </a>
+                                            </dd:custom>
+                                        </j:if>
+                                    </l:overflowButton>
+                                </div>
+                            </l:hasPermission>
+                        </j:if>
+                        <div id="console-pipeline-overflow-root"/>
+                    </j:set>
+
+                    <t:buildCaption controls="${controls}">
+                        <j:if test="${it.previousBuildNumber!=null}">
+                            <a href="../../${it.previousBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Previous Build}">
+                                <l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" />
+                            </a>
+                        </j:if>
+                        ${it.buildDisplayName}
+                        <j:if test="${it.nextBuildNumber!=null}">
+                            <a href="../../${it.nextBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
+                                <l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
+                            </a>
+                        </j:if>
+                    </t:buildCaption>
+
+                    <j:set var="action" value="${it}" />
+
+                    <div class="pgv-details">
+                        <l:details-bar it="${it.run}">
+                            <j:forEach var="detail" items="${action.runDetailsItems}" indexVar="index">
+                                <j:if test="${index == 0}">
+                                    <div class="jenkins-details__separator">•</div>
+                                </j:if>
+                                <a class="jenkins-details__item" href="${detail.content().href()}" tooltip="${detail.tooltip()}">
+                                    <div class="jenkins-details__item__icon">
+                                        <l:icon src="${detail.icon()}" />
+                                    </div>
+                                    ${detail.content().text()}
+                                </a>
+                            </j:forEach>
+                        </l:details-bar>
+                    </div>
+
+                    <j:if test="${!empty(it.run.description)}">
+                        <div class="pgv-description">
+                            <l:icon src="symbol-information-circle-outline plugin-ionicons-api" />
+                            <div>
+                                <j:out value="${app.markupFormatter.translate(it.run.description)}"/>
+                            </div>
+                        </div>
+                    </j:if>
+
+                    <j:set var="configPermission" value="${h.hasPermission(it, it.configurePermission)}" />
+                    <template data-module="permissions"
+                              data-permission-configure="${configPermission}"
+                    />
+
+                    <div id="console-pipeline-root" data-current-run-path="${rootURL + '/' + it.buildUrl}"
+                         data-previous-run-path="${it.previousBuildUrl != null ? rootURL + '/' + it.previousBuildUrl : null}"
+                         data-user-locale="${request2.getLocale().toLanguageTag()}"/>
+                    <script src="${rootURL}/plugin/pipeline-graph-view/js/build.js" type="module"/>
+                    <script src="${rootURL}/plugin/pipeline-graph-view/js/bundles/pipeline-console-view-bundle.js" type="module"/>
+                </l:main-panel>
+            </l:layout>
+        </j:otherwise>
+    </j:choose>
+</j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly
deleted file mode 100644
index 7418f9805..000000000
--- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/LinkContent/description.jelly
+++ /dev/null
@@ -1,4 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-    <a href="${it.href()}">${it.text()}</a>
-</j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/PlainContent/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/PlainContent/description.jelly
deleted file mode 100644
index 8ebae064f..000000000
--- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/ItemContent/PlainContent/description.jelly
+++ /dev/null
@@ -1,4 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-    ${it.text()}
-</j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly
deleted file mode 100644
index 776af9187..000000000
--- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly
+++ /dev/null
@@ -1,9 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-    <div>
-        <l:icon src="${it.icon()}" class="jenkins-avatar" />
-        <span tooltip="${it.tooltip()}">
-            <st:include page="description.jelly" it="${it.content()}" />
-        </span>
-    </div>
-</j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/Separator/description.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/Separator/description.jelly
deleted file mode 100644
index a25eb2344..000000000
--- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/Separator/description.jelly
+++ /dev/null
@@ -1,2 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core"/>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/action.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/action.jelly
new file mode 100644
index 000000000..c41dac986
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/action.jelly
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
+    <l:userExperimentalFlag var="newBuildPage" flagClassName="jenkins.model.experimentalflags.NewBuildPageUserExperimentalFlag" />
+
+    <j:if test="${!newBuildPage}">
+        <l:task icon="${action.iconFileName}" title="Pipeline Overview" href="${action.urlName}" />
+    </j:if>
+</j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly
index fafdc298a..2dd9c1ec5 100644
--- a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly
@@ -1,124 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:dd="/lib/layout/dropdowns">
-    <l:layout title="${it.buildDisplayName} - ${it.fullProjectDisplayName}">
-        <l:main-panel>
-            <link rel="stylesheet" href="${resURL}/plugin/pipeline-graph-view/js/style.css" type="text/css" />
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:pgv="/components">
+    <pgv:temporary-wrapper>
+        <link rel="stylesheet" href="${resURL}/plugin/pipeline-graph-view/js/style.css" type="text/css" />
 
-            <j:set var="controls">
-                <j:if test="${it.buildInProgress}">
-                    <l:hasPermission permission="${it.cancelPermission}">
-                        <j:set var="proxyId" value="${h.generateId()}" />
-                        <st:bind value="${it}" var="cancelAction${proxyId}"/>
-                        <button id="pgv-cancel" data-confirm="${%Confirm(it.buildFullDisplayName)}"
-                                data-success-message="${%Build cancelled}"
-                                data-proxy-name="cancelAction${proxyId}"
-                                class="jenkins-button jenkins-!-error-color">
-                            <l:icon src="symbol-stop-circle-outline plugin-ionicons-api"/>
-                            ${%Cancel}
-                        </button>
-                    </l:hasPermission>
-                </j:if>
-                <j:if test="${it.buildable}">
-                    <l:hasPermission permission="${it.permission}">
-                        <j:set var="proxyId" value="${h.generateId()}" />
-                        <st:bind value="${it}" var="rerunAction${proxyId}"/>
-                        <div class="jenkins-split-button">
-                            <button id="pgv-rerun"
-                                    data-proxy-name="rerunAction${proxyId}"
-                                    class="jenkins-button jenkins-!-build-color">
-                                <div class="jenkins-dropdown__item__icon">
-                                    <l:icon src="symbol-refresh-outline plugin-ionicons-api"/>
-                                </div>
-                                ${%Rerun}
-                            </button>
-                            <l:overflowButton id="pgv-rerun-overflow" tooltip="${null}"
-                                icon="symbol-chevron-down"
-                                clazz="jenkins-button jenkins-!-build-color">
-                                <dd:custom>
-                                    <a id="pgv-replay" href="../replay" class="jenkins-dropdown__item pgv-dropdown-item">
-                                        <div class="jenkins-dropdown__item__icon">
-                                            <l:icon src="symbol-arrow-redo-outline plugin-ionicons-api"/>
-                                        </div>
-                                        <span>${%Replay}</span>
-                                        <div class="pgv-dropdown-item__description">
-                                            ${%Edit Pipeline and replay}
-                                        </div>
-                                    </a>
-                                </dd:custom>
-                                <j:if test="${it.restartFromStageAvailable}">
-                                    <dd:custom>
-                                        <a id="pgv-restart" href="../restart" class="jenkins-dropdown__item pgv-dropdown-item">
-                                            <div class="jenkins-dropdown__item__icon">
-                                                <l:icon src="symbol-refresh-outline plugin-ionicons-api"/>
-                                            </div>
-                                            <span>${%Restart from Stage}</span>
-                                            <div class="pgv-dropdown-item__description">
-                                                ${%Restart Pipeline from a specific Stage}
-                                            </div>
-                                        </a>
-                                    </dd:custom>
-                                </j:if>
-                                <j:if test="${it.rebuildAvailable}">
-                                    <dd:custom>
-                                        <a id="pgv-rebuild" href="../rebuild/parameterized" class="jenkins-dropdown__item pgv-dropdown-item">
-                                            <div class="jenkins-dropdown__item__icon">
-                                                <l:icon src="symbol-play-outline plugin-ionicons-api"/>
-                                            </div>
-                                            <span>${%Rebuild}</span>
-                                            <div class="pgv-dropdown-item__description">
-                                                ${%Edit parameters and rebuild}
-                                            </div>
-                                        </a>
-                                    </dd:custom>
-                                </j:if>
-                            </l:overflowButton>
-                        </div>
-                    </l:hasPermission>
-                </j:if>
-                <div id="console-pipeline-overflow-root"/>
-            </j:set>
+        <l:app-bar title="Stages">
+            <l:details-bar it="${it.run}">
+                <div id="console-pipeline-overflow-root" />
+            </l:details-bar>
+        </l:app-bar>
 
-            <t:buildCaption controls="${controls}">
-                <j:if test="${it.previousBuildNumber!=null}">
-                    <a href="../../${it.previousBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Previous Build}">
-                        <l:icon class="symbol-chevron-back-outline plugin-ionicons-api icon-md" />
-                    </a>
-                </j:if>
-                ${it.buildDisplayName}
-                <j:if test="${it.nextBuildNumber!=null}">
-                    <a href="../../${it.nextBuildNumber}/pipeline-overview" class="jenkins-button jenkins-button--tertiary app-details__prev_next" tooltip="${%Next Build}">
-                        <l:icon class="symbol-chevron-forward-outline plugin-ionicons-api icon-md" />
-                    </a>
-                </j:if>
-            </t:buildCaption>
-
-            <div class="pgv-details">
-                <j:forEach var="card" items="${it.runDetailsCard.items}">
-                    <st:include page="description.jelly" it="${card}" />
-                </j:forEach>
-            </div>
-
-            <j:if test="${!empty(it.run.description)}">
-                <div class="pgv-description">
-                    <l:icon src="symbol-information-circle-outline plugin-ionicons-api" />
-                    <div>
-                        <j:out value="${app.markupFormatter.translate(it.run.description)}"/>
-                    </div>
+        <j:if test="${!empty(it.run.description)}">
+            <div class="pgv-description">
+                <l:icon src="symbol-information-circle-outline plugin-ionicons-api" />
+                <div>
+                    <j:out value="${app.markupFormatter.translate(it.run.description)}"/>
                 </div>
-            </j:if>
+            </div>
+        </j:if>
 
-            <j:set var="configPermission" value="${h.hasPermission(it, it.configurePermission)}" />
-            <template data-module="permissions"
-                      data-permission-configure="${configPermission}"
-            />
+        <j:set var="configPermission" value="${h.hasPermission(it, it.configurePermission)}" />
+        <template data-module="permissions"
+                  data-permission-configure="${configPermission}"
+        />
 
-            <div id="console-pipeline-root" data-current-run-path="${rootURL + '/' + it.buildUrl}"
-                           data-previous-run-path="${it.previousBuildUrl != null ? rootURL + '/' + it.previousBuildUrl : null}"
-                           data-user-locale="${request2.getLocale().toLanguageTag()}"/>
-            <script src="${rootURL}/plugin/pipeline-graph-view/js/build.js" type="module"/>
-            <script src="${rootURL}/plugin/pipeline-graph-view/js/bundles/pipeline-console-view-bundle.js" type="module"/>
-        </l:main-panel>
-    </l:layout>
+        <div id="console-pipeline-root" data-current-run-path="${rootURL + '/' + it.buildUrl}"
+                       data-previous-run-path="${it.previousBuildUrl != null ? rootURL + '/' + it.previousBuildUrl : null}"
+                       data-user-locale="${request2.getLocale().toLanguageTag()}"/>
+        <script src="${rootURL}/plugin/pipeline-graph-view/js/build.js" type="module"/>
+        <script src="${rootURL}/plugin/pipeline-graph-view/js/bundles/pipeline-console-view-bundle.js" type="module"/>
+    </pgv:temporary-wrapper>
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/widget.jelly b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/widget.jelly
new file mode 100644
index 000000000..9295a9db5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/widget.jelly
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core">
+    <div id="graph"
+         data-current-run-path="${rootURL + '/' + it.url}"
+         data-previous-run-path="${it.previousBuild != null ? rootURL + '/' + it.previousBuild.url : null}" />
+    <script src="${rootURL}/plugin/pipeline-graph-view/js/bundles/pipeline-graph-view-bundle.js" type="module"/>
+</j:jelly>
diff --git a/src/main/webapp/js/style.css b/src/main/webapp/js/style.css
index 2710de1de..ffbe4415f 100644
--- a/src/main/webapp/js/style.css
+++ b/src/main/webapp/js/style.css
@@ -23,37 +23,9 @@ h1 {
 }
 
 .pgv-details {
-  display: flex;
-  align-items: center;
-  gap: 1rem 1.5rem;
   margin-left: 0.25rem;
-  margin-bottom: 0.875rem;
-  margin-top: -0.25rem;
-  flex-wrap: wrap;
-
-  @media (width <= 800px) {
-    margin-block: 0.75rem 1rem;
-  }
-
-  & > div {
-    display: flex;
-    align-items: center;
-    gap: 1ch;
-    font-size: var(--font-size-sm);
-    color: var(--text-color-secondary);
-    font-weight: var(--font-bold-weight);
-    text-box: trim-both;
-
-    a {
-      color: inherit;
-    }
-
-    svg,
-    img {
-      width: 1.125rem;
-      height: 1.125rem;
-    }
-  }
+  margin-bottom: 0.5rem;
+  margin-top: -0.5rem;
 }
 
 .pgv-description {
@@ -61,7 +33,7 @@ h1 {
   grid-template-columns: auto 1fr;
   gap: 1ch;
   align-items: start;
-  margin: 0 0 1rem 0.25rem;
+  margin: -0.5rem 0 1rem 0;
 
   & > svg {
     width: 1.125rem;
@@ -75,6 +47,10 @@ h1 {
   }
 }
 
+.pgv-details + .pgv-description {
+  margin: 0 0 1rem 0.25rem;
+}
+
 .pgv-dropdown-item {
   display: grid;
   grid-template-columns: auto 1fr;
diff --git a/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItemTest.java b/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItemTest.java
deleted file mode 100644
index a7c622ad1..000000000
--- a/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UpstreamCauseRunDetailsItemTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards.items;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import hudson.model.Cause;
-import hudson.model.CauseAction;
-import hudson.model.Result;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.utils.TestUtils;
-import java.util.Optional;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
-
-@WithJenkins
-class UpstreamCauseRunDetailsItemTest {
-
-    private static WorkflowRun run;
-    private static String baseUrl;
-
-    @BeforeAll
-    static void beforeAll(JenkinsRule j) throws Exception {
-        run = TestUtils.createAndRunJob(j, "simple", "singleStagePipeline.jenkinsfile", Result.SUCCESS);
-        baseUrl = j.getURL().toString();
-    }
-
-    @BeforeEach
-    void setUp() {
-        run.removeActions(CauseAction.class);
-    }
-
-    @Test
-    void get_noActionsOfType() {
-        Optional<RunDetailsItem> detailsItem = UpstreamCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isEmpty());
-    }
-
-    @Test
-    void get_noUpstreamCause() {
-        run.addAction(new CauseAction(new Cause.UserIdCause("User Id")));
-
-        Optional<RunDetailsItem> detailsItem = UpstreamCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isEmpty());
-    }
-
-    @Test
-    void get() {
-        run.addAction(new CauseAction(new Cause.UpstreamCause(run)));
-
-        Optional<RunDetailsItem> detailsItem = UpstreamCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isPresent());
-
-        RunDetailsItem.RunDetail userDetails = (RunDetailsItem.RunDetail) detailsItem.get();
-
-        assertEquals(
-                new RunDetailsItem.ItemContent.LinkContent(
-                        baseUrl + run.getUrl() + "pipeline-overview", Messages.cause_upstream("#1")),
-                userDetails.content());
-        assertEquals("symbol-play-circle-outline plugin-ionicons-api", userDetails.icon());
-    }
-}
diff --git a/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItemTest.java b/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItemTest.java
deleted file mode 100644
index 891ebc695..000000000
--- a/src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItemTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.jenkins.plugins.pipelinegraphview.cards.items;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import hudson.model.Cause;
-import hudson.model.CauseAction;
-import hudson.model.Result;
-import hudson.model.User;
-import io.jenkins.plugins.pipelinegraphview.Messages;
-import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
-import io.jenkins.plugins.pipelinegraphview.utils.TestUtils;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Optional;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
-
-@WithJenkins
-class UserIdCauseRunDetailsItemTest {
-
-    private static WorkflowRun run;
-
-    @BeforeAll
-    static void beforeAll(JenkinsRule j) throws Exception {
-        run = TestUtils.createAndRunJob(j, "simple", "singleStagePipeline.jenkinsfile", Result.SUCCESS);
-    }
-
-    @BeforeEach
-    void setUp() {
-        run.removeActions(CauseAction.class);
-        User.getAll().forEach(user -> {
-            try {
-                user.delete();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
-    @Test
-    void get_noActionsOfType() {
-        Optional<RunDetailsItem> detailsItem = UserIdCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isEmpty());
-    }
-
-    @Test
-    void get_noUserIdCause() {
-        run.addAction(new CauseAction(new Cause.UpstreamCause(run)));
-
-        Optional<RunDetailsItem> detailsItem = UserIdCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isEmpty());
-    }
-
-    @Test
-    void get_userNotFound() {
-        run.addAction(new CauseAction(new Cause.UserIdCause("User Id")));
-
-        Optional<RunDetailsItem> detailsItem = UserIdCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isEmpty());
-    }
-
-    @Test
-    void get() {
-        run.addAction(new CauseAction(new Cause.UserIdCause("User Id")));
-        User.get("User Id", true, new HashMap<>());
-
-        Optional<RunDetailsItem> detailsItem = UserIdCauseRunDetailsItem.get(run);
-
-        assertTrue(detailsItem.isPresent());
-
-        RunDetailsItem.RunDetail userDetails = (RunDetailsItem.RunDetail) detailsItem.get();
-
-        assertEquals(
-                new RunDetailsItem.ItemContent.PlainContent(Messages.cause_user("User Id")), userDetails.content());
-        assertEquals("symbol-person-circle", userDetails.icon());
-    }
-}