diff --git a/client/package.json b/client/package.json
index b2a751ff3d94..de12b9f71852 100644
--- a/client/package.json
+++ b/client/package.json
@@ -66,6 +66,7 @@
     "elkjs": "^0.8.2",
     "file-saver": "^2.0.5",
     "flush-promises": "^1.0.2",
+    "font-awesome-6": "npm:@fortawesome/free-solid-svg-icons@6",
     "glob": "^10.3.10",
     "handsontable": "^4.0.0",
     "hsluv": "^1.0.1",
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 1e9ab944ad2e..654d8e77594e 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -18464,6 +18464,8 @@ export interface components {
          *     }
          */
         WorkflowJobMetric: {
+            /** Job Id */
+            job_id: string;
             /**
              * Name
              * @description The name of the metric variable.
diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue
index 5371d14f84fe..aee942c40ee9 100644
--- a/client/src/components/ActivityBar/ActivityBar.vue
+++ b/client/src/components/ActivityBar/ActivityBar.vue
@@ -189,6 +189,10 @@ function setActiveSideBar(key: string) {
     activityStore.toggledSideBar = key;
 }
 
+const canDrag = computed(() => {
+    return isActiveSideBar("settings");
+});
+
 defineExpose({
     isActiveSideBar,
     setActiveSideBar,
@@ -209,6 +213,7 @@ defineExpose({
                 <draggable
                     :list="activities"
                     :class="{ 'activity-popper-disabled': isDragging }"
+                    :disabled="!canDrag"
                     :force-fallback="true"
                     chosen-class="activity-chosen-class"
                     :delay="DRAG_DELAY"
@@ -216,7 +221,10 @@ defineExpose({
                     ghost-class="activity-chosen-class"
                     @start="isDragging = true"
                     @end="isDragging = false">
-                    <div v-for="(activity, activityIndex) in activities" :key="activityIndex">
+                    <div
+                        v-for="(activity, activityIndex) in activities"
+                        :key="activityIndex"
+                        :class="{ 'can-drag': canDrag }">
                         <div v-if="activity.visible && (activity.anonymous || !isAnonymous)">
                             <UploadItem
                                 v-if="activity.id === 'upload'"
@@ -380,4 +388,11 @@ defineExpose({
     overflow-y: auto;
     overflow-x: hidden;
 }
+
+.can-drag {
+    border-radius: 12px;
+    border: 1px;
+    outline: dashed darkgray;
+    outline-offset: -3px;
+}
 </style>
diff --git a/client/src/components/Collections/CollectionCreatorModal.vue b/client/src/components/Collections/CollectionCreatorModal.vue
index 334f6586e0da..8db25d243c6d 100644
--- a/client/src/components/Collections/CollectionCreatorModal.vue
+++ b/client/src/components/Collections/CollectionCreatorModal.vue
@@ -113,22 +113,25 @@ watch(
     }
 );
 
+const extensionInTitle = computed<string>(() => {
+    const extensions = props.extensions;
+    if (!extensions || extensions.length == 0 || extensions.indexOf("data") >= 0) {
+        return "";
+    } else {
+        return orList(extensions);
+    }
+});
+
 const modalTitle = computed(() => {
     if (props.collectionType === "list") {
-        return localize(
-            `Create a collection from a list of ${fromSelection.value ? "selected" : ""} ${
-                props.extensions?.length ? orList(props.extensions) : ""
-            } datasets`
-        );
+        return localize(`Create a list of ${fromSelection.value ? "selected" : ""} ${extensionInTitle.value} datasets`);
     } else if (props.collectionType === "list:paired") {
         return localize(
-            `Create a collection of ${fromSelection.value ? "selected" : ""} ${
-                props.extensions?.length ? orList(props.extensions) : ""
-            } dataset pairs`
+            `Create a list of ${fromSelection.value ? "selected" : ""} ${extensionInTitle.value} paired datasets`
         );
     } else if (props.collectionType === "paired") {
         return localize(
-            `Create a ${props.extensions?.length ? orList(props.extensions) : ""} dataset pair collection ${
+            `Create a ${extensionInTitle.value} paired dataset collection ${
                 fromSelection.value ? "from selected items" : ""
             }`
         );
diff --git a/client/src/components/Collections/ListCollectionCreator.vue b/client/src/components/Collections/ListCollectionCreator.vue
index 841a206a3635..ca9e25aec416 100644
--- a/client/src/components/Collections/ListCollectionCreator.vue
+++ b/client/src/components/Collections/ListCollectionCreator.vue
@@ -412,28 +412,38 @@ function renameElement(element: any, name: string) {
                 :history-id="props.historyId"
                 :hide-source-items="hideSourceItems"
                 :extensions="extensions"
+                collection-type="list"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @on-update-datatype-toggle="changeDatatypeFilter"
                 @onUpdateHideSourceItems="onUpdateHideSourceItems"
                 @clicked-create="clickedCreate">
                 <template v-slot:help-content>
-                    <!-- TODO: Update help content for case where `fromSelection` is false -->
                     <p>
                         {{
                             localize(
                                 [
-                                    "Collections of datasets are permanent, ordered lists of datasets that can be passed to tools ",
+                                    "This interface allows you to build a new Galaxy list of datasets. ",
+                                    "A list is a type of Galaxy dataset collection that is a permanent, ordered list of datasets that can be passed to tools ",
                                     "and workflows in order to have analyses done on each member of the entire group. This interface allows ",
-                                    "you to create a collection and re-order the final collection.",
+                                    "you to create and re-order a list of datasets. The datasets in a Galaxy collection have an identifier that is preserved accross ",
+                                    "tool executions and serves as a form of sample tracking - setting the name in this form will pick the identifier for that element ",
+                                    "of the list but will not change the dataset's actual name in Galaxy.",
                                 ].join("")
                             )
                         }}
                     </p>
 
                     <ul>
+                        <li v-if="!fromSelection">
+                            Move datsets from the "Unselected" column to the "Selected" column below to compose the list
+                            in the intended order and with the intended datasets.
+                        </li>
+                        <li v-if="!fromSelection">
+                            The filter textbox can be used to rapidly find the datasets of interest by name.
+                        </li>
                         <li>
-                            {{ localize("Rename elements in the list by clicking on") }}
+                            {{ localize("Change the identifier of elements in the list by clicking on") }}
                             <i data-target=".collection-element .name">
                                 {{ localize("the existing name") }}
                             </i>
@@ -442,13 +452,16 @@ function renameElement(element: any, name: string) {
 
                         <li>
                             {{ localize("Discard elements from the final created list by clicking on the ") }}
-                            <i data-target=".collection-element .discard">
-                                {{ localize("Discard") }}
+                            <i v-if="fromSelection" data-target=".collection-element .discard">
+                                {{ localize("Remove") }}
+                            </i>
+                            <i v-else data-target=".collection-element .discard">
+                                {{ localize("discard") }}
                             </i>
                             {{ localize("button.") }}
                         </li>
 
-                        <li>
+                        <li v-if="fromSelection">
                             {{
                                 localize(
                                     "Reorder the list by clicking and dragging elements. Select multiple elements by clicking on"
@@ -468,7 +481,7 @@ function renameElement(element: any, name: string) {
                             {{ localize("link.") }}
                         </li>
 
-                        <li>
+                        <li v-if="fromSelection">
                             {{ localize("Click ") }}
                             <i data-target=".reset">
                                 <FontAwesomeIcon :icon="faUndo" />
@@ -476,7 +489,7 @@ function renameElement(element: any, name: string) {
                             {{ localize("to begin again as if you had just opened the interface.") }}
                         </li>
 
-                        <li>
+                        <li v-if="fromSelection">
                             {{ localize("Click ") }}
                             <i data-target=".sort-items">
                                 <FontAwesomeIcon :icon="faSortAlphaDown" />
diff --git a/client/src/components/Collections/PairCollectionCreator.vue b/client/src/components/Collections/PairCollectionCreator.vue
index 38ee98f530c9..1d3e5922f315 100644
--- a/client/src/components/Collections/PairCollectionCreator.vue
+++ b/client/src/components/Collections/PairCollectionCreator.vue
@@ -374,6 +374,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                 :suggested-name="initialSuggestedName"
                 :extensions="props.extensions"
                 :extensions-toggle="removeExtensions"
+                collection-type="paired"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @onUpdateHideSourceItems="onUpdateHideSourceItems"
@@ -423,7 +424,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                         <i data-target=".collection-name"> {{ localize("name") }}</i>
                         {{ localize("and click ") }}
                         <i data-target=".create-collection">
-                            {{ localize("Create list") }}
+                            {{ localize("Create dataset pair") }}
                         </i>
                         {{ localize(".") }}
                     </p>
diff --git a/client/src/components/Collections/PairedListCollectionCreator.vue b/client/src/components/Collections/PairedListCollectionCreator.vue
index ba46d2139934..620252f7c281 100644
--- a/client/src/components/Collections/PairedListCollectionCreator.vue
+++ b/client/src/components/Collections/PairedListCollectionCreator.vue
@@ -93,6 +93,14 @@ const hasFilter = computed(() => forwardFilter.value || reverseFilter.value);
 const strategy = ref(autoPairLCS);
 const duplicatePairNames = ref<string[]>([]);
 
+const canClearFilters = computed(() => {
+    return forwardFilter.value || reverseFilter.value;
+});
+
+const canAutoPair = computed(() => {
+    return forwardFilter.value && reverseFilter.value && pairableElements.value.length > 0;
+});
+
 const forwardElements = computed<HDASummary[]>(() => {
     return filterElements(workingElements.value, forwardFilter.value);
 });
@@ -117,7 +125,11 @@ const autoPairButton = computed(() => {
     let variant;
     let icon;
     let text;
-    if (!firstAutoPairDone.value && pairableElements.value.length > 0) {
+    if (!canAutoPair.value) {
+        variant = "secondary";
+        icon = faLink;
+        text = localize("Specify simple filters to divide datasets into forward and reverse reads for pairing.");
+    } else if (!firstAutoPairDone.value && pairableElements.value.length > 0) {
         variant = "primary";
         icon = faExclamationCircle;
         text = localize("Click to auto-pair datasets based on the current filters");
@@ -235,8 +247,11 @@ function initialFiltersSet() {
             illumina++;
         }
     });
-
-    if (illumina > dot12s && illumina > Rs) {
+    // if we cannot filter don't set an initial filter and hide all the data
+    if (illumina == 0 && dot12s == 0 && Rs == 0) {
+        forwardFilter.value = "";
+        reverseFilter.value = "";
+    } else if (illumina > dot12s && illumina > Rs) {
         changeFilters("illumina");
     } else if (dot12s > illumina && dot12s > Rs) {
         changeFilters("dot12s");
@@ -864,6 +879,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                 render-extensions-toggle
                 :extensions-toggle="removeExtensions"
                 :extensions="extensions"
+                collection-type="list:paired"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @onUpdateHideSourceItems="hideSourceItems = $event"
@@ -875,9 +891,10 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                         {{
                             localize(
                                 [
-                                    "Collections of paired datasets are ordered lists of dataset pairs (often forward and reverse reads). ",
-                                    "These collections can be passed to tools and workflows in order to have analyses done on each member of ",
-                                    "the entire group. This interface allows you to create a collection, choose which datasets are paired, ",
+                                    "This interface allows you to build a new Galaxy list of pairs. List of pairs are an ordered list of ",
+                                    "individual dataset paired together in their own paired collection (often forward and reverse reads). ",
+                                    "These lists can be passed to tools and workflows in order to have analyses done on each member of ",
+                                    "the entire group. This interface allows you to create such a list of paired datasets, choose which datasets are paired, ",
                                     "and re-order the final collection.",
                                 ].join("")
                             )
@@ -994,7 +1011,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                         </i>
                         {{ localize("and click ") }}
                         <i data-target=".create-collection">
-                            {{ localize("Create list") }}
+                            {{ localize("Create list or pairs") }}
                         </i>
                         {{ localize(". (Note: you do not have to pair all unpaired datasets to finish.)") }}
                     </p>
@@ -1133,6 +1150,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                                         <BButtonGroup vertical>
                                             <BButton
                                                 class="clear-filters-link"
+                                                :disabled="!canClearFilters"
                                                 size="sm"
                                                 :variant="hasFilter ? 'danger' : 'secondary'"
                                                 @click="clickClearFilters">
@@ -1141,6 +1159,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                                             </BButton>
                                             <BButton
                                                 class="autopair-link"
+                                                :disabled="!canAutoPair"
                                                 size="sm"
                                                 :title="autoPairButton.text"
                                                 :variant="autoPairButton.variant"
@@ -1309,6 +1328,8 @@ $fa-font-path: "../../../node_modules/@fortawesome/fontawesome-free/webfonts/";
 @import "~@fortawesome/fontawesome-free/scss/solid";
 @import "~@fortawesome/fontawesome-free/scss/fontawesome";
 @import "~@fortawesome/fontawesome-free/scss/brands";
+@import "~bootstrap/scss/_functions.scss";
+@import "theme/blue.scss";
 .paired-column {
     text-align: center;
     // mess with these two to make center more/scss priority
@@ -1355,7 +1376,7 @@ li.dataset.paired {
             white-space: nowrap;
             overflow: hidden;
             border: 2px solid grey;
-            background: #aff1af;
+            background: $state-success-bg;
             text-align: center;
             span {
                 display: inline-block;
diff --git a/client/src/components/Collections/common/CollectionCreator.vue b/client/src/components/Collections/common/CollectionCreator.vue
index 7e2401d0bd7b..c60e80099fd2 100644
--- a/client/src/components/Collections/common/CollectionCreator.vue
+++ b/client/src/components/Collections/common/CollectionCreator.vue
@@ -39,6 +39,7 @@ interface Props {
     extensions?: string[];
     extensionsToggle?: boolean;
     noItems?: boolean;
+    collectionType?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -102,6 +103,19 @@ const defaultExtension = computed(() => {
     }
 });
 
+const shortWhatIsBeingCreated = computed<string>(() => {
+    // plain language for what is being created
+    if (props.collectionType === "list") {
+        return "list";
+    } else if (props.collectionType === "list:paired") {
+        return "list of pairs";
+    } else if (props.collectionType == "paired") {
+        return "dataset pair";
+    } else {
+        return "collection";
+    }
+});
+
 function addUploadedFiles(value: HDASummary[]) {
     // TODO: We really need to wait for each of these items to get `state = 'ok'`
     //       before we can add them to the collection.
@@ -222,7 +236,7 @@ watch(
                                     id="collection-name"
                                     v-model="collectionName"
                                     class="collection-name"
-                                    :placeholder="localize('Enter a name for your new collection')"
+                                    :placeholder="localize('Enter a name for your new ' + shortWhatIsBeingCreated)"
                                     size="sm"
                                     required
                                     :state="!collectionName ? false : null" />
@@ -240,7 +254,7 @@ watch(
                             variant="primary"
                             :disabled="!validInput"
                             @click="emit('clicked-create', collectionName)">
-                            {{ localize("Create collection") }}
+                            {{ localize("Create " + shortWhatIsBeingCreated) }}
                         </BButton>
                     </div>
                 </div>
diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
index de820ccef641..0695af21369b 100644
--- a/client/src/components/Form/Elements/FormData/FormData.vue
+++ b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -607,10 +607,20 @@ watch(
 const formatsVisible = ref(false);
 const formatsButtonId = useUid("form-data-formats-");
 
+function collectionTypeToText(collectionType: string): string {
+    if (collectionType == "list:paired") {
+        return "list of pairs";
+    } else {
+        return collectionType;
+    }
+}
+
 const warningListAmount = 4;
 const noOptionsWarningMessage = computed(() => {
     const itemType = props.type === "data" ? "datasets" : "dataset collections";
-    const collectionTypeLabel = props.collectionTypes?.length ? `${orList(props.collectionTypes)} ` : "";
+    const collectionTypeLabel = props.collectionTypes?.length
+        ? `${orList(props.collectionTypes.map(collectionTypeToText))} `
+        : "";
     if (!props.extensions || props.extensions.length === 0 || props.extensions.includes("data")) {
         return `No ${collectionTypeLabel}${itemType} available`;
     } else if (props.extensions.length <= warningListAmount) {
diff --git a/client/src/components/Help/HelpText.vue b/client/src/components/Help/HelpText.vue
index f5f6a7006295..bfd54ed79b61 100644
--- a/client/src/components/Help/HelpText.vue
+++ b/client/src/components/Help/HelpText.vue
@@ -4,9 +4,12 @@ import HelpPopover from "./HelpPopover.vue";
 interface Props {
     uri: string;
     text: string;
+    forTitle?: boolean;
 }
 
-defineProps<Props>();
+withDefaults(defineProps<Props>(), {
+    forTitle: false,
+});
 </script>
 
 <template>
@@ -18,7 +21,7 @@ defineProps<Props>();
                 }
             "
             :term="uri" />
-        <span ref="helpTarget" class="help-text">{{ text }}</span>
+        <span ref="helpTarget" class="help-text" :class="{ 'title-help-text': forTitle }">{{ text }}</span>
     </span>
 </template>
 
@@ -28,4 +31,7 @@ defineProps<Props>();
     text-decoration-line: underline;
     text-decoration-style: dashed;
 }
+.title-help-text {
+    text-decoration-thickness: 1px;
+}
 </style>
diff --git a/client/src/components/Help/terms.yml b/client/src/components/Help/terms.yml
index fce6204d6198..c361ddf91e60 100644
--- a/client/src/components/Help/terms.yml
+++ b/client/src/components/Help/terms.yml
@@ -72,8 +72,23 @@ galaxy:
         each individual file above. If there is only one extension, Galaxy will attempt to set that as the
         extension for each file.
 
-
   jobs:
+    metrics:
+      cores: |
+        This is how many [cores](https://en.wikipedia.org/wiki/Central_processing_unit) (or distinct central processing units (CPUs)) are
+        allocated to run the job for the tool. This value is generally configured for the tool by the Galaxy administrator. This value
+        does not guarantee how many cores the job actually used - the job may have used more and less based on how Galaxy is configured
+        and how the tool is programmed.
+
+      walltime: |
+        This is estimate of the length of time the job ran created by recording the start and stop of the job in the job script
+        created for the tool execution and subtracting these values. 
+
+      allocated_core_time: |
+        This is the number of cores Galaxy believes is allocated for the job times the estimated walltime for the job. This can be thought
+        of as scaling the runtime/walltime metric by the number of cores allocated - when purchasing compute time per core hour or consuming
+        compute time from a compute center's allocation - this is likely to be a more interesting and useful number than the walltime.
+
     states:
       # upload, waiting, failed, paused, deleting, deleted, stop, stopped, skipped.
       ok: |
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
index 28f55ff9385e..5463baab1b59 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -145,6 +145,7 @@
             :filter-text="filterText"
             :selected-items="collectionSelection"
             :show-modal.sync="collectionModalShow"
+            hide-modal-on-create
             default-hide-source-items
             @created-collection="createdCollection" />
     </section>
diff --git a/client/src/components/Panels/ActivityPanel.vue b/client/src/components/Panels/ActivityPanel.vue
index 20fb01d0d4ca..d97512c24cc5 100644
--- a/client/src/components/Panels/ActivityPanel.vue
+++ b/client/src/components/Panels/ActivityPanel.vue
@@ -79,17 +79,6 @@ const hasGoToAll = computed(() => props.goToAllTitle && props.href);
         flex-grow: 1;
         overflow-y: auto;
         position: relative;
-        button:first-child {
-            background: none;
-            border: none;
-            text-align: left;
-            transition: none;
-            width: 100%;
-            border-color: transparent;
-        }
-        button:first-child:hover {
-            background: $gray-200;
-        }
     }
 
     .activity-panel-footer {
diff --git a/client/src/components/Panels/InputPanel.vue b/client/src/components/Panels/InputPanel.vue
new file mode 100644
index 000000000000..2150d969050a
--- /dev/null
+++ b/client/src/components/Panels/InputPanel.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+
+import type { WorkflowInput } from "../Workflow/Editor/modules/inputs";
+
+import ActivityPanel from "./ActivityPanel.vue";
+
+const props = defineProps<{
+    inputs: WorkflowInput[];
+}>();
+
+const emit = defineEmits<{
+    (e: "insertModule", id: string, name: string, state: WorkflowInput["stateOverwrites"]): void;
+}>();
+</script>
+
+<template>
+    <ActivityPanel title="Inputs">
+        <div class="input-list">
+            <button
+                v-for="(input, index) in props.inputs"
+                :key="index"
+                :data-id="input.id ?? input.moduleId"
+                class="workflow-input-button"
+                @click="emit('insertModule', input.moduleId, input.title, input.stateOverwrites)">
+                <FontAwesomeIcon class="input-icon" fixed-width :icon="input.icon" />
+                <span class="input-title"> {{ input.title }} </span>
+                <span class="input-description"> {{ input.description }} </span>
+            </button>
+        </div>
+    </ActivityPanel>
+</template>
+
+<style lang="scss" scoped>
+@import "theme/blue.scss";
+
+.input-list {
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.workflow-input-button {
+    border-radius: 0.5rem;
+    border: 1px solid $gray-300;
+    background: transparent;
+
+    display: grid;
+    grid-template-columns: auto 1fr;
+    grid-template-areas:
+        "i t"
+        "d d";
+
+    text-align: left;
+    gap: 0.25rem;
+    align-items: center;
+
+    &:hover,
+    &:focus {
+        background-color: $gray-100;
+        border-color: $brand-primary;
+    }
+
+    &:active {
+        background-color: $gray-200;
+        border-color: $brand-primary;
+    }
+
+    .input-icon {
+        grid-area: i;
+    }
+
+    .input-title {
+        grid-area: t;
+        font-weight: bold;
+    }
+
+    .input-description {
+        grid-area: d;
+    }
+}
+</style>
diff --git a/client/src/components/Panels/ToolBox.vue b/client/src/components/Panels/ToolBox.vue
index cca2127c4741..d34f8ee6f501 100644
--- a/client/src/components/Panels/ToolBox.vue
+++ b/client/src/components/Panels/ToolBox.vue
@@ -33,7 +33,6 @@ const props = defineProps({
     panelView: { type: String, required: true },
     showAdvanced: { type: Boolean, default: false, required: true },
     panelQuery: { type: String, required: true },
-    editorWorkflows: { type: Array, default: null },
     dataManagers: { type: Array, default: null },
     moduleSections: { type: Array as PropType<Record<string, any>>, default: null },
     useSearchWorker: { type: Boolean, default: true },
diff --git a/client/src/components/Panels/ToolPanel.vue b/client/src/components/Panels/ToolPanel.vue
index fb75fb39295d..80e196135ba4 100644
--- a/client/src/components/Panels/ToolPanel.vue
+++ b/client/src/components/Panels/ToolPanel.vue
@@ -17,7 +17,6 @@ import Heading from "@/components/Common/Heading.vue";
 
 const props = defineProps({
     workflow: { type: Boolean, default: false },
-    editorWorkflows: { type: Array, default: null },
     dataManagers: { type: Array, default: null },
     moduleSections: { type: Array, default: null },
     useSearchWorker: { type: Boolean, default: true },
@@ -199,7 +198,6 @@ watch(
             :panel-query.sync="query"
             :panel-view="currentPanelView"
             :show-advanced.sync="showAdvanced"
-            :editor-workflows="editorWorkflows"
             :data-managers="dataManagers"
             :module-sections="moduleSections"
             :use-search-worker="useSearchWorker"
diff --git a/client/src/components/Workflow/Editor/Forms/FormDefault.test.js b/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
index 2a09dc0d7963..7fb84f507636 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
@@ -24,6 +24,7 @@ describe("FormDefault", () => {
                     contentId: "id",
                     annotation: "annotation",
                     label: "label",
+                    name: "name",
                     type: "subworkflow",
                     configForm: {
                         inputs: [],
@@ -42,7 +43,7 @@ describe("FormDefault", () => {
 
     it("check initial value and value change", async () => {
         const title = wrapper.find(".portlet-title-text").text();
-        expect(title).toBe("label");
+        expect(title).toBe("name");
         const inputCount = wrapper.findAll("input").length;
         expect(inputCount).toBe(4);
         const outputLabelCount = wrapper.findAll("#__label__output-name").length;
diff --git a/client/src/components/Workflow/Editor/Forms/FormDefault.vue b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
index 8ac56fd941da..3a0f82c0a9d6 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDefault.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
@@ -97,9 +97,6 @@ const { stepId, contentId, annotation, label, name, type, configForm } = useStep
 const { stepStore } = useWorkflowStores();
 const uniqueErrorLabel = useUniqueLabelError(stepStore, label.value);
 const stepTitle = computed(() => {
-    if (label.value) {
-        return label.value;
-    }
     if (isSubworkflow.value) {
         return name.value;
     } else {
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 9506a25386af..c3f91749e32e 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -47,11 +47,14 @@
                     workflow
                     :module-sections="moduleSections"
                     :data-managers="dataManagers"
-                    :editor-workflows="workflows"
                     @onInsertTool="onInsertTool"
                     @onInsertModule="onInsertModule"
                     @onInsertWorkflow="onInsertWorkflow"
                     @onInsertWorkflowSteps="onInsertWorkflowSteps" />
+                <InputPanel
+                    v-if="isActiveSideBar('workflow-editor-inputs')"
+                    :inputs="inputs"
+                    @insertModule="onInsertModule" />
                 <WorkflowLint
                     v-else-if="isActiveSideBar('workflow-best-practices')"
                     :untyped-parameters="parameters"
@@ -60,7 +63,11 @@
                     :license="license"
                     :steps="steps"
                     :datatypes-mapper="datatypesMapper"
-                    @onAttributes="showAttributes"
+                    @onAttributes="
+                        (e) => {
+                            showAttributes(e);
+                        }
+                    "
                     @onHighlight="onHighlight"
                     @onUnhighlight="onUnhighlight"
                     @onRefactor="onAttemptRefactor"
@@ -75,6 +82,7 @@
                     v-else-if="isActiveSideBar('workflow-editor-attributes')"
                     :id="id"
                     :tags="tags"
+                    :highlight="highlightAttribute"
                     :parameters="parameters"
                     :annotation="annotation"
                     :name="name"
@@ -207,6 +215,7 @@ import { InsertStepAction, useStepActions } from "./Actions/stepActions";
 import { CopyIntoWorkflowAction, SetValueActionHandler } from "./Actions/workflowActions";
 import { defaultPosition } from "./composables/useDefaultStepPosition";
 import { useActivityLogic, useSpecialWorkflowActivities, workflowEditorActivities } from "./modules/activities";
+import { getWorkflowInputs } from "./modules/inputs";
 import { fromSimple } from "./modules/model";
 import { getModule, getVersions, loadWorkflow, saveWorkflow } from "./modules/services";
 import { getStateUpgradeMessages } from "./modules/utilities";
@@ -222,6 +231,7 @@ import WorkflowAttributes from "./WorkflowAttributes.vue";
 import WorkflowGraph from "./WorkflowGraph.vue";
 import ActivityBar from "@/components/ActivityBar/ActivityBar.vue";
 import MarkdownEditor from "@/components/Markdown/MarkdownEditor.vue";
+import InputPanel from "@/components/Panels/InputPanel.vue";
 import ToolPanel from "@/components/Panels/ToolPanel.vue";
 import WorkflowPanel from "@/components/Panels/WorkflowPanel.vue";
 import UndoRedoStack from "@/components/UndoRedo/UndoRedoStack.vue";
@@ -244,6 +254,7 @@ export default {
         UndoRedoStack,
         WorkflowPanel,
         NodeInspector,
+        InputPanel,
     },
     props: {
         workflowId: {
@@ -266,10 +277,6 @@ export default {
             type: Array,
             required: true,
         },
-        workflows: {
-            type: Array,
-            required: true,
-        },
     },
     setup(props, { emit }) {
         const { datatypes, datatypesMapper, datatypesMapperLoading } = useDatatypesMapper();
@@ -297,10 +304,13 @@ export default {
             parameters.value = getUntypedWorkflowParameters(steps.value);
         }
 
-        function showAttributes() {
+        function showAttributes(args) {
             ensureParametersSet();
             stateStore.activeNodeId = null;
             activityBar.value?.setActiveSideBar("workflow-editor-attributes");
+            if (args.highlight) {
+                this.highlightAttribute = args.highlight;
+            }
         }
 
         const name = ref("Unnamed Workflow");
@@ -466,6 +476,7 @@ export default {
         );
 
         const { confirm } = useConfirmDialog();
+        const inputs = getWorkflowInputs();
 
         return {
             id,
@@ -510,6 +521,7 @@ export default {
             isNewTempWorkflow,
             saveWorkflowTitle,
             confirm,
+            inputs,
         };
     },
     data() {
@@ -522,6 +534,7 @@ export default {
             refactorActions: [],
             scrollToId: null,
             highlightId: null,
+            highlightAttribute: null,
             messageTitle: null,
             messageBody: null,
             messageIsError: false,
@@ -663,8 +676,8 @@ export default {
         onInsertTool(tool_id, tool_name) {
             this._insertStep(tool_id, tool_name, "tool");
         },
-        onInsertModule(module_id, module_name) {
-            this._insertStep(module_name, module_name, module_id);
+        async onInsertModule(module_id, module_name, state) {
+            this._insertStep(module_name, module_name, module_id, state);
         },
         onInsertWorkflow(workflow_id, workflow_name) {
             this._insertStep(workflow_id, workflow_name, "subworkflow");
@@ -913,7 +926,7 @@ export default {
                 this._loadCurrent(this.id, version);
             }
         },
-        _insertStep(contentId, name, type) {
+        async _insertStep(contentId, name, type, state) {
             const action = new InsertStepAction(this.stepStore, this.stateStore, {
                 contentId,
                 name,
@@ -924,22 +937,24 @@ export default {
             this.undoRedoStore.applyAction(action);
             const stepData = action.getNewStepData();
 
-            getModule({ name, type, content_id: contentId }, stepData.id, this.stateStore.setLoadingState).then(
-                (response) => {
-                    const updatedStep = {
-                        ...stepData,
-                        tool_state: response.tool_state,
-                        inputs: response.inputs,
-                        outputs: response.outputs,
-                        config_form: response.config_form,
-                    };
+            const response = await getModule(
+                { name, type, content_id: contentId, tool_state: state },
+                stepData.id,
+                this.stateStore.setLoadingState
+            );
 
-                    this.stepStore.updateStep(updatedStep);
-                    action.updateStepData = updatedStep;
+            const updatedStep = {
+                ...stepData,
+                tool_state: response.tool_state,
+                inputs: response.inputs,
+                outputs: response.outputs,
+                config_form: response.config_form,
+            };
 
-                    this.stateStore.activeNodeId = stepData.id;
-                }
-            );
+            this.stepStore.updateStep(updatedStep);
+            action.updateStepData = updatedStep;
+
+            this.stateStore.activeNodeId = stepData.id;
         },
         async _loadEditorData(data) {
             if (data.name !== undefined) {
diff --git a/client/src/components/Workflow/Editor/Lint.vue b/client/src/components/Workflow/Editor/Lint.vue
index 3cb265c9d90c..88d3781ccca4 100644
--- a/client/src/components/Workflow/Editor/Lint.vue
+++ b/client/src/components/Workflow/Editor/Lint.vue
@@ -7,26 +7,21 @@
             :okay="checkAnnotation"
             success-message="This workflow is annotated. Ideally, this helps the executors of the workflow
                     understand the purpose and usage of the workflow."
-            warning-message="This workflow is not annotated. Providing an annotation helps workflow executors
-                    understand the purpose and usage of the workflow."
+            :warning-message="bestPracticeWarningAnnotation"
             attribute-link="Annotate your Workflow."
-            @onClick="onAttributes" />
+            @onClick="onAttributes('annotation')" />
         <LintSection
             :okay="checkCreator"
             success-message="This workflow defines creator information."
-            warning-message="This workflow does not specify creator(s). This is important metadata for workflows
-                    that will be published and/or shared to help workflow executors know how to cite the
-                    workflow authors."
+            :warning-message="bestPracticeWarningCreator"
             attribute-link="Provide Creator Details."
-            @onClick="onAttributes" />
+            @onClick="onAttributes('creator')" />
         <LintSection
             :okay="checkLicense"
             success-message="This workflow defines a license."
-            warning-message="This workflow does not specify a license. This is important metadata for workflows
-                    that will be published and/or shared to help workflow executors understand how it
-                    may be used."
+            :warning-message="bestPracticeWarningLicense"
             attribute-link="Specify a License."
-            @onClick="onAttributes" />
+            @onClick="onAttributes('license')" />
         <LintSection
             success-message="Workflow parameters are using formal input parameters."
             warning-message="This workflow uses legacy workflow parameters. They should be replaced with
@@ -79,6 +74,9 @@ import { DatatypesMapperModel } from "@/components/Datatypes/model";
 import { useWorkflowStores } from "@/composables/workflowStores";
 
 import {
+    bestPracticeWarningAnnotation,
+    bestPracticeWarningCreator,
+    bestPracticeWarningLicense,
     fixAllIssues,
     fixDisconnectedInput,
     fixUnlabeledOutputs,
@@ -135,6 +133,13 @@ export default {
         const { hasActiveOutputs } = storeToRefs(stepStore);
         return { stores, connectionStore, stepStore, hasActiveOutputs, stateStore };
     },
+    data() {
+        return {
+            bestPracticeWarningAnnotation: bestPracticeWarningAnnotation,
+            bestPracticeWarningCreator: bestPracticeWarningCreator,
+            bestPracticeWarningLicense: bestPracticeWarningLicense,
+        };
+    },
     computed: {
         showRefactor() {
             // we could be even more precise here and check the inputs and such, because
@@ -177,8 +182,9 @@ export default {
         },
     },
     methods: {
-        onAttributes() {
-            this.$emit("onAttributes");
+        onAttributes(highlight) {
+            const args = { highlight: highlight };
+            this.$emit("onAttributes", args);
         },
         onFixUntypedParameter(item) {
             if (
diff --git a/client/src/components/Workflow/Editor/WorkflowAttributes.vue b/client/src/components/Workflow/Editor/WorkflowAttributes.vue
index dfcccc86ded2..3f258d462062 100644
--- a/client/src/components/Workflow/Editor/WorkflowAttributes.vue
+++ b/client/src/components/Workflow/Editor/WorkflowAttributes.vue
@@ -28,7 +28,10 @@
                 </b-list-group-item>
             </b-list-group>
         </div>
-        <div id="workflow-annotation-area" class="mt-2">
+        <div
+            id="workflow-annotation-area"
+            class="mt-2"
+            :class="{ 'bg-secondary': showAnnotationHightlight, 'highlight-attribute': showAnnotationHightlight }">
             <b>Annotation</b>
             <meta itemprop="description" :content="annotationCurrent" />
             <b-textarea
@@ -36,14 +39,50 @@
                 v-model="annotationCurrent"
                 @keyup="$emit('update:annotationCurrent', annotationCurrent)" />
             <div class="form-text text-muted">These notes will be visible when this workflow is viewed.</div>
+            <b-popover
+                custom-class="best-practice-popover"
+                target="workflow-annotation"
+                boundary="window"
+                placement="right"
+                :show.sync="showAnnotationHightlight"
+                triggers="manual"
+                title="Best Practice"
+                :content="bestPracticeWarningAnnotation">
+            </b-popover>
         </div>
-        <div id="workflow-license-area" class="mt-2">
+        <div
+            id="workflow-license-area"
+            class="mt-2"
+            :class="{ 'bg-secondary': showLicenseHightlight, 'highlight-attribute': showLicenseHightlight }">
             <b>License</b>
-            <LicenseSelector :input-license="license" @onLicense="onLicense" />
+            <LicenseSelector id="license-selector" :input-license="license" @onLicense="onLicense" />
+            <b-popover
+                custom-class="best-practice-popover"
+                target="license-selector"
+                boundary="window"
+                placement="right"
+                :show.sync="showLicenseHightlight"
+                triggers="manual"
+                title="Best Practice"
+                :content="bestPracticeWarningLicense">
+            </b-popover>
         </div>
-        <div id="workflow-creator-area" class="mt-2">
+        <div
+            id="workflow-creator-area"
+            class="mt-2"
+            :class="{ 'bg-secondary': showCreatorHightlight, 'highlight-attribute': showCreatorHightlight }">
             <b>Creator</b>
-            <CreatorEditor :creators="creatorAsList" @onCreators="onCreator" />
+            <CreatorEditor id="creator-editor" :creators="creatorAsList" @onCreators="onCreator" />
+            <b-popover
+                custom-class="best-practice-popover"
+                target="creator-editor"
+                boundary="window"
+                placement="right"
+                :show.sync="showCreatorHightlight"
+                triggers="manual"
+                title="Best Practice"
+                :content="bestPracticeWarningCreator">
+            </b-popover>
         </div>
         <div class="mt-2">
             <b>Tags</b>
@@ -60,6 +99,11 @@ import { format, parseISO } from "date-fns";
 
 import { Services } from "@/components/Workflow/services";
 
+import {
+    bestPracticeWarningAnnotation,
+    bestPracticeWarningCreator,
+    bestPracticeWarningLicense,
+} from "./modules/linting";
 import { UntypedParameters } from "./modules/parameters";
 
 import LicenseSelector from "@/components/License/LicenseSelector.vue";
@@ -67,6 +111,8 @@ import ActivityPanel from "@/components/Panels/ActivityPanel.vue";
 import CreatorEditor from "@/components/SchemaOrg/CreatorEditor.vue";
 import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue";
 
+const bestPracticeHighlightTime = 10000;
+
 export default {
     name: "WorkflowAttributes",
     components: {
@@ -84,6 +130,10 @@ export default {
             type: String,
             default: null,
         },
+        highlight: {
+            type: String,
+            default: null,
+        },
         tags: {
             type: Array,
             required: true,
@@ -115,11 +165,17 @@ export default {
     },
     data() {
         return {
+            bestPracticeWarningAnnotation: bestPracticeWarningAnnotation,
+            bestPracticeWarningCreator: bestPracticeWarningCreator,
+            bestPracticeWarningLicense: bestPracticeWarningLicense,
             message: null,
             messageVariant: null,
             versionCurrent: this.version,
             annotationCurrent: this.annotation,
             nameCurrent: this.name,
+            showAnnotationHightlight: false,
+            showLicenseHightlight: false,
+            showCreatorHightlight: false,
         };
     },
     computed: {
@@ -179,6 +235,36 @@ export default {
         name() {
             this.nameCurrent = this.name;
         },
+        highlight: {
+            immediate: true,
+            handler(newHighlight, oldHighlight) {
+                if (newHighlight == oldHighlight) {
+                    return;
+                }
+                if (newHighlight == "annotation") {
+                    this.showAnnotationHightlight = true;
+                    this.showCreatorHightlight = false;
+                    this.showLicenseHightlight = false;
+                    setTimeout(() => {
+                        this.showAnnotationHightlight = false;
+                    }, bestPracticeHighlightTime);
+                } else if (newHighlight == "creator") {
+                    this.showAnnotationHightlight = false;
+                    this.showCreatorHightlight = true;
+                    this.showLicenseHightlight = false;
+                    setTimeout(() => {
+                        this.showCreatorHightlight = false;
+                    }, bestPracticeHighlightTime);
+                } else if (newHighlight == "license") {
+                    this.showAnnotationHightlight = false;
+                    this.showCreatorHightlight = false;
+                    this.showLicenseHightlight = true;
+                    setTimeout(() => {
+                        this.showLicenseHightlight = false;
+                    }, bestPracticeHighlightTime);
+                }
+            },
+        },
     },
     created() {
         this.services = new Services();
@@ -211,3 +297,14 @@ export default {
     },
 };
 </script>
+
+<style>
+.highlight-attribute {
+    border: 1px outset;
+    padding: 10px;
+}
+
+.best-practice-popover {
+    max-width: 250px !important;
+}
+</style>
diff --git a/client/src/components/Workflow/Editor/modules/activities.ts b/client/src/components/Workflow/Editor/modules/activities.ts
index aed37909dea2..5a5534a4af0e 100644
--- a/client/src/components/Workflow/Editor/modules/activities.ts
+++ b/client/src/components/Workflow/Editor/modules/activities.ts
@@ -13,6 +13,7 @@ import {
     faWrench,
 } from "@fortawesome/free-solid-svg-icons";
 import { watchImmediate } from "@vueuse/core";
+import { faDiagramNext } from "font-awesome-6";
 import { computed, type Ref } from "vue";
 
 import { type Activity, useActivityStore } from "@/stores/activityStore";
@@ -27,6 +28,15 @@ export const workflowEditorActivities = [
         icon: faPencilAlt,
         visible: true,
     },
+    {
+        title: "Inputs",
+        id: "workflow-editor-inputs",
+        tooltip: "Add input steps to your workflow",
+        description: "Add input steps to your workflow.",
+        icon: faDiagramNext,
+        panel: true,
+        visible: true,
+    },
     {
         title: "Tools",
         id: "workflow-editor-tools",
diff --git a/client/src/components/Workflow/Editor/modules/inputs.ts b/client/src/components/Workflow/Editor/modules/inputs.ts
new file mode 100644
index 000000000000..c152058d4360
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/inputs.ts
@@ -0,0 +1,90 @@
+import { faFile, faFolder } from "@fortawesome/free-regular-svg-icons";
+import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
+import { type IconDefinition } from "font-awesome-6";
+
+export interface WorkflowInput {
+    id?: string; // unique ID. defaults to module ID
+    moduleId: string;
+    title: string;
+    description: string;
+    stateOverwrites?: {
+        parameter_type?: "text" | "integer" | "boolean" | "color" | "float" | "directory_uri";
+    };
+    icon: IconDefinition;
+}
+
+export function getWorkflowInputs(): WorkflowInput[] {
+    return [
+        {
+            moduleId: "data_input",
+            title: "Input Dataset",
+            description: "Single dataset input",
+            icon: faFile,
+        },
+        {
+            moduleId: "data_collection_input",
+            title: "Input Dataset Collection",
+            description: "Input for a collection of datasets",
+            icon: faFolder,
+        },
+        {
+            moduleId: "parameter_input",
+            title: "Text Input",
+            description: "Text parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "text",
+            },
+        },
+        {
+            id: "parameter_input_integer",
+            moduleId: "parameter_input",
+            title: "Integer Input",
+            description: "Whole number parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "integer",
+            },
+        },
+        {
+            id: "parameter_input_float",
+            moduleId: "parameter_input",
+            title: "Float Input",
+            description: "Imprecise decimal number parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "float",
+            },
+        },
+        {
+            id: "parameter_input_boolean",
+            moduleId: "parameter_input",
+            title: "Boolean Input",
+            description: "True / False parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "boolean",
+            },
+        },
+        {
+            id: "parameter_input_color",
+            moduleId: "parameter_input",
+            title: "Color Input",
+            description: "Color parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "color",
+            },
+        },
+        {
+            id: "parameter_input_directory_uri",
+            moduleId: "parameter_input",
+            title: "Directory Input",
+            description: "Directory parameter used for workflow logic",
+            icon: faPencilAlt,
+            stateOverwrites: {
+                parameter_type: "directory_uri",
+            },
+        },
+    ];
+}
diff --git a/client/src/components/Workflow/Editor/modules/linting.ts b/client/src/components/Workflow/Editor/modules/linting.ts
index 21d02cafff88..75a7c142ab43 100644
--- a/client/src/components/Workflow/Editor/modules/linting.ts
+++ b/client/src/components/Workflow/Editor/modules/linting.ts
@@ -15,6 +15,13 @@ interface LintState {
     autofix?: boolean;
 }
 
+export const bestPracticeWarningAnnotation =
+    "This workflow is not annotated. Providing an annotation helps workflow executors understand the purpose and usage of the workflow.";
+export const bestPracticeWarningCreator =
+    "This workflow does not specify creator(s). This is important metadata for workflows that will be published and/or shared to help workflow executors know how to cite the workflow authors.";
+export const bestPracticeWarningLicense =
+    "This workflow does not specify a license. This is important metadata for workflows that will be published and/or shared to help workflow executors understand how it may be used.";
+
 export function getDisconnectedInputs(
     steps: Steps = {},
     datatypesMapper: DatatypesMapperModel,
diff --git a/client/src/components/WorkflowInvocationState/VegaWrapper.vue b/client/src/components/WorkflowInvocationState/VegaWrapper.vue
index e5f4a8f49ba8..ec4ce67b8586 100644
--- a/client/src/components/WorkflowInvocationState/VegaWrapper.vue
+++ b/client/src/components/WorkflowInvocationState/VegaWrapper.vue
@@ -1,17 +1,24 @@
 <template>
-    <div ref="chartContainer" class="chart"></div>
+    <div ref="chartContainer" class="chart" :style="style"></div>
 </template>
 
 <script setup lang="ts">
 import { useResizeObserver } from "@vueuse/core";
 import embed, { type VisualizationSpec } from "vega-embed";
-import { onBeforeUnmount, onMounted, ref, watch } from "vue";
+import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue";
 
 export interface VisSpec {
     spec: VisualizationSpec;
+    width: string;
 }
 
-const props = defineProps<VisSpec>();
+const props = withDefaults(defineProps<VisSpec>(), {
+    width: "100%",
+});
+
+const style = computed(() => {
+    return { width: props.width };
+});
 
 const chartContainer = ref<HTMLDivElement | null>(null);
 let vegaView: any;
@@ -30,7 +37,9 @@ onMounted(embedChart);
 
 watch(props, embedChart, { immediate: true, deep: true });
 useResizeObserver(chartContainer, () => {
-    embedChart();
+    if (vegaView) {
+        vegaView.resize();
+    }
 });
 
 // Cleanup the chart when the component is unmounted
@@ -43,7 +52,5 @@ onBeforeUnmount(() => {
 
 <style scoped>
 .chart {
-    width: 100%;
-    height: 100%;
 }
 </style>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationMetrics.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationMetrics.vue
index 91782651b709..cb32e4f11288 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationMetrics.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationMetrics.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts">
+import { BButtonGroup, BCol, BContainer, BRow } from "bootstrap-vue";
 import type { VisualizationSpec } from "vega-embed";
 import { computed, ref, watch } from "vue";
 import { type ComputedRef } from "vue";
 
 import { type components, GalaxyApi } from "@/api";
+import { getAppRoot } from "@/onload/loadConfig";
 import { errorMessageAsString } from "@/utils/simple-error";
 
+import HelpText from "@/components/Help/HelpText.vue";
+
 const VegaWrapper = () => import("./VegaWrapper.vue");
 
 const props = defineProps({
@@ -16,6 +20,7 @@ const props = defineProps({
 });
 
 const groupBy = ref<"tool_id" | "step_id">("tool_id");
+const timing = ref<"seconds" | "minutes" | "hours">("seconds");
 const jobMetrics = ref<components["schemas"]["WorkflowJobMetric"][]>();
 const fetchError = ref<string>();
 
@@ -54,17 +59,81 @@ function itemToX(item: components["schemas"]["WorkflowJobMetric"]) {
 interface boxplotData {
     x_title: string;
     y_title: string;
+    helpTerm?: string;
     values?: { x: string; y: Number }[];
 }
 
+interface piechartData {
+    category_title: string;
+    y_title: string;
+    helpTerm?: string;
+    values?: { category: string; y: Number }[];
+}
+
+interface JobInfo {
+    toolId: string;
+    stepIndex: number;
+    stepLabel: string | null;
+}
+
+interface DerivedMetric {
+    name: string;
+    job_id: string;
+    raw_value: string;
+    tool_id: string;
+    step_index: number;
+    step_label: string | null;
+}
+
+type AnyMetric = components["schemas"]["WorkflowJobMetric"] & DerivedMetric;
+
+function computeAllocatedCoreTime(
+    jobMetrics: components["schemas"]["WorkflowJobMetric"][] | undefined
+): DerivedMetric[] {
+    const walltimePerJob: Record<string, number> = {};
+    const coresPerJob: Record<string, number> = {};
+    const jobInfo: Record<string, JobInfo> = {};
+    jobMetrics?.forEach((jobMetric) => {
+        if (jobMetric.name == "runtime_seconds") {
+            walltimePerJob[jobMetric.job_id] = parseFloat(jobMetric.raw_value);
+            jobInfo[jobMetric.job_id] = {
+                toolId: jobMetric.tool_id,
+                stepIndex: jobMetric.step_index,
+                stepLabel: jobMetric.step_label,
+            };
+        } else if (jobMetric.name == "galaxy_slots") {
+            coresPerJob[jobMetric.job_id] = parseFloat(jobMetric.raw_value);
+        }
+    });
+    const thisMetric: DerivedMetric[] = [];
+    Object.keys(walltimePerJob).map((jobId) => {
+        const walltime: number | undefined = walltimePerJob[jobId];
+        const cores: number | undefined = coresPerJob[jobId];
+        const thisJobInfo = jobInfo[jobId];
+        if (cores && thisJobInfo && walltime) {
+            const metric: DerivedMetric = {
+                name: "allocated_core_time",
+                job_id: jobId,
+                raw_value: (cores * walltime).toString(),
+                tool_id: thisJobInfo.toolId as string,
+                step_index: thisJobInfo.stepIndex,
+                step_label: thisJobInfo.stepLabel,
+            };
+            thisMetric.push(metric);
+        }
+    });
+    return thisMetric;
+}
+
 function metricToSpecData(
-    jobMetrics: components["schemas"]["WorkflowJobMetric"][] | undefined,
+    jobMetrics: AnyMetric[] | undefined,
     metricName: string,
     yTitle: string,
+    helpTerm?: string,
     transform?: (param: number) => number
-) {
-    const wallclock = jobMetrics?.filter((jobMetric) => jobMetric.name == metricName);
-    const values = wallclock?.map((item) => {
+): boxplotData {
+    const thisMetric = jobMetrics?.filter((jobMetric) => jobMetric.name == metricName);
+    const values = thisMetric?.map((item) => {
         let y = parseFloat(item.raw_value);
         if (transform !== undefined) {
             y = transform(y);
@@ -72,21 +141,109 @@ function metricToSpecData(
         return {
             y,
             x: itemToX(item),
+            job_id: item.job_id,
+            tooltip: "click to view job",
         };
     });
     return {
         x_title: attributeToLabel[groupBy.value],
         y_title: yTitle,
+        helpTerm,
         values,
     };
 }
 
+function metricToAggregateData(
+    jobMetrics: AnyMetric[] | undefined,
+    metricName: string,
+    yTitle: string,
+    helpTerm?: string,
+    transform?: (param: number) => number
+): piechartData {
+    const thisMetric = jobMetrics?.filter((jobMetric) => jobMetric.name == metricName);
+    const aggregateByX: Record<string, number> = {};
+    thisMetric?.forEach((item) => {
+        let y = parseFloat(item.raw_value);
+        if (transform !== undefined) {
+            y = transform(y);
+        }
+        const x = itemToX(item);
+        if (!(x in aggregateByX)) {
+            aggregateByX[x] = 0;
+        }
+        if (x in aggregateByX) {
+            aggregateByX[x] += y;
+        }
+    });
+    const values = Object.keys(aggregateByX).map((key) => {
+        const value = aggregateByX[key];
+        return {
+            category: key,
+            y: value || 0,
+        };
+    });
+    return {
+        category_title: attributeToLabel[groupBy.value],
+        y_title: yTitle,
+        helpTerm,
+        values,
+    };
+}
+
+function transformTime(time: number): number {
+    if (timing.value == "minutes") {
+        return time / 60;
+    } else if (timing.value == "hours") {
+        return time / 3600;
+    } else {
+        return time;
+    }
+}
+
+const allocatedCoreTime: ComputedRef<DerivedMetric[]> = computed(() => {
+    return computeAllocatedCoreTime(jobMetrics.value);
+});
+
 const wallclock: ComputedRef<boxplotData> = computed(() => {
-    return metricToSpecData(jobMetrics.value, "runtime_seconds", "Runtime (in Seconds)");
+    const title = `Runtime (in ${timingInTitles.value})`;
+    return metricToSpecData(jobMetrics.value, "runtime_seconds", title, "galaxy.jobs.metrics.walltime", transformTime);
+});
+
+const wallclockAggregate: ComputedRef<piechartData> = computed(() => {
+    const title = `Runtime (in ${timingInTitles.value})`;
+    return metricToAggregateData(
+        jobMetrics.value,
+        "runtime_seconds",
+        title,
+        "galaxy.jobs.metrics.walltime",
+        transformTime
+    );
+});
+
+const allocatedCoreTimeSpec: ComputedRef<boxplotData> = computed(() => {
+    const title = `Allocated Core Time (in ${timingInTitles.value})`;
+    return metricToSpecData(
+        allocatedCoreTime.value as AnyMetric[],
+        "allocated_core_time",
+        title,
+        "galaxy.jobs.metrics.allocated_core_time",
+        transformTime
+    );
+});
+
+const allocatedCoreTimeAggregate: ComputedRef<piechartData> = computed(() => {
+    const title = `Allocated Core Time (in ${timingInTitles.value})`;
+    return metricToAggregateData(
+        allocatedCoreTime.value as AnyMetric[],
+        "allocated_core_time",
+        title,
+        "galaxy.jobs.metrics.allocated_core_time",
+        transformTime
+    );
 });
 
 const coresAllocated: ComputedRef<boxplotData> = computed(() => {
-    return metricToSpecData(jobMetrics.value, "galaxy_slots", "Cores Allocated");
+    return metricToSpecData(jobMetrics.value, "galaxy_slots", "Cores Allocated", "galaxy.jobs.metrics.cores");
 });
 
 const memoryAllocated: ComputedRef<boxplotData> = computed(() => {
@@ -94,9 +251,59 @@ const memoryAllocated: ComputedRef<boxplotData> = computed(() => {
 });
 
 const peakMemory: ComputedRef<boxplotData> = computed(() => {
-    return metricToSpecData(jobMetrics.value, "memory.peak", "Max memory usage recorded (in MB)", (v) => v / 1024 ** 2);
+    return metricToSpecData(
+        jobMetrics.value,
+        "memory.peak",
+        "Max memory usage recorded (in MB)",
+        undefined,
+        (v) => v / 1024 ** 2
+    );
 });
 
+function itemToPieChartSpec(item: piechartData) {
+    const spec: VisualizationSpec = {
+        $schema: "https://vega.github.io/schema/vega-lite/v5.json",
+        description: "Aggregate data.",
+        data: {
+            values: item.values!,
+        },
+        mark: { type: "arc", tooltip: true },
+        encoding: {
+            theta: { field: "y", type: "quantitative" },
+            color: {
+                field: "category",
+                type: "nominal",
+                legend: {
+                    type: "symbol",
+                    title: "", // should be item.category_title but it doesn't align right so just hide it
+                    direction: "vertical",
+                    titleAlign: "right",
+                    padding: 10,
+                    // rowPadding: 3,
+                    labelOffset: 40,
+                    // symbolOffset: 50,
+                    labelLimit: 120,
+                    // labelAlign: 'center',
+                    columnPadding: 5,
+                    // clipHeight: 20,
+                    titleOrient: "top",
+                },
+            },
+            tooltip: [
+                { field: "category", type: "nominal", title: item.category_title },
+                { field: "y", type: "quantitative", title: item.y_title },
+            ],
+        },
+        autosize: {
+            type: "fit",
+            resize: true,
+        },
+        width: 400,
+        height: 250,
+    };
+    return spec;
+}
+
 function itemToSpec(item: boxplotData) {
     const spec: VisualizationSpec = {
         $schema: "https://vega.github.io/schema/vega-lite/v5.json",
@@ -109,14 +316,31 @@ function itemToSpec(item: boxplotData) {
                 calculate: "random() - 0.5",
                 as: "random_jitter",
             },
+            {
+                calculate: "'" + getAppRoot() + "jobs/' + datum.job_id + '/view'",
+                as: "url",
+            },
         ],
+        encoding: {
+            y: {
+                field: "y",
+                type: "quantitative",
+                scale: { zero: false },
+                title: item.y_title,
+            },
+            x: {
+                field: "x",
+                type: "nominal",
+                title: item.x_title,
+                axis: {
+                    labelAngle: -45,
+                    labelAlign: "right",
+                },
+            },
+        },
         layer: [
             {
                 mark: { type: "boxplot", opacity: 0.5 },
-                encoding: {
-                    x: { field: "x", type: "nominal" },
-                    y: { field: "y", type: "quantitative" },
-                },
                 width: "container",
             },
             {
@@ -125,54 +349,90 @@ function itemToSpec(item: boxplotData) {
                     opacity: 0.7,
                 },
                 encoding: {
-                    x: {
-                        field: "x",
-                        type: "nominal",
-                        title: item.x_title,
-                        axis: {
-                            labelAngle: -45,
-                            labelAlign: "right",
-                        },
-                    },
                     xOffset: { field: "random_jitter", type: "quantitative", scale: { domain: [-2, 2] } },
-                    y: {
-                        field: "y",
-                        type: "quantitative",
-                        scale: { zero: false },
-                        title: item.y_title,
-                    },
+                    tooltip: { field: "tooltip", type: "nominal" },
+                    href: { field: "url", type: "nominal" },
+                    color: { field: "x", type: "nominal", legend: null },
                 },
                 width: "container",
+                height: 350,
             },
         ],
     };
     return spec;
 }
 
-const specs = computed(() => {
-    const items = [wallclock.value, coresAllocated.value, memoryAllocated.value, peakMemory.value].filter(
-        (item) => item.values?.length
-    );
-    const specs = Object.fromEntries(items.map((item) => [item.y_title, itemToSpec(item)]));
-    return specs;
+const metrics = computed(() => {
+    const items = [
+        wallclock.value,
+        allocatedCoreTimeSpec.value,
+        coresAllocated.value,
+        memoryAllocated.value,
+        peakMemory.value,
+    ].filter((item) => item.values?.length);
+
+    return Object.fromEntries(items.map((item) => [item.y_title, { spec: itemToSpec(item), item: item }]));
+});
+
+function getTimingInTitle(timing: string): string {
+    return timing.charAt(0).toUpperCase() + timing.slice(1);
+}
+
+const timingInTitles = computed(() => {
+    return getTimingInTitle(timing.value);
 });
 </script>
 
 <template>
     <div>
-        <b-tabs lazy>
-            <b-tab title="Summary by Tool" @click="groupBy = 'tool_id'">
-                <div v-for="(spec, key) in specs" :key="key">
-                    <h2 class="h-l truncate text-center">{{ key }}</h2>
-                    <VegaWrapper :spec="spec" />
-                </div>
-            </b-tab>
-            <b-tab title="Summary by Workflow Step" @click="groupBy = 'step_id'">
-                <div v-for="(spec, key) in specs" :key="key">
-                    <h2 class="h-l truncate text-center">{{ key }}</h2>
+        <BContainer>
+            <BRow align-h="end" class="mb-2">
+                <BButtonGroup>
+                    <b-dropdown right :text="'Timing: ' + timingInTitles">
+                        <b-dropdown-item @click="timing = 'seconds'">{{ getTimingInTitle("seconds") }}</b-dropdown-item>
+                        <b-dropdown-item @click="timing = 'minutes'">{{ getTimingInTitle("minutes") }}</b-dropdown-item>
+                        <b-dropdown-item @click="timing = 'hours'">{{ getTimingInTitle("hours") }}</b-dropdown-item>
+                    </b-dropdown>
+                    <b-dropdown right text="Group By: Tool">
+                        <b-dropdown-item @click="groupBy = 'tool_id'">Tool</b-dropdown-item>
+                        <b-dropdown-item @click="groupBy = 'step_id'">Workflow Step</b-dropdown-item>
+                    </b-dropdown>
+                </BButtonGroup>
+            </BRow>
+            <BRow>
+                <BCol v-if="wallclockAggregate && wallclockAggregate.values">
+                    <h2 class="h-l truncate text-center">
+                        Aggregate
+                        <HelpText :for-title="true" uri="galaxy.jobs.metrics.walltime" text="Runtime Time" /> (in
+                        {{ timingInTitles }})
+                    </h2>
+                    <VegaWrapper :spec="itemToPieChartSpec(wallclockAggregate)" />
+                </BCol>
+                <BCol v-if="allocatedCoreTimeAggregate && allocatedCoreTimeAggregate.values">
+                    <h2 class="h-l truncate text-center">
+                        Aggregate
+                        <HelpText
+                            :for-title="true"
+                            uri="galaxy.jobs.metrics.allocated_core_time"
+                            text="Allocated Core Time" />
+                        (in {{ timingInTitles }})
+                    </h2>
+                    <VegaWrapper :spec="itemToPieChartSpec(allocatedCoreTimeAggregate)" />
+                </BCol>
+            </BRow>
+            <BRow v-for="({ spec, item }, key) in metrics" :key="key">
+                <BCol>
+                    <h2 class="h-l truncate text-center">
+                        <span v-if="item.helpTerm">
+                            <HelpText :for-title="true" :uri="item.helpTerm" :text="key" />
+                        </span>
+                        <span v-else>
+                            {{ key }}
+                        </span>
+                    </h2>
                     <VegaWrapper :spec="spec" />
-                </div>
-            </b-tab>
-        </b-tabs>
+                </BCol>
+            </BRow>
+        </BContainer>
     </div>
 </template>
diff --git a/client/src/entry/analysis/modules/WorkflowEditor.vue b/client/src/entry/analysis/modules/WorkflowEditor.vue
index fb8ed6eea9d5..67634f4a3842 100644
--- a/client/src/entry/analysis/modules/WorkflowEditor.vue
+++ b/client/src/entry/analysis/modules/WorkflowEditor.vue
@@ -7,7 +7,6 @@
         :initial-version="editorConfig.initialVersion"
         :module-sections="editorConfig.moduleSections"
         :workflow-tags="editorConfig.tags"
-        :workflows="editorConfig.workflows"
         @update:confirmation="$emit('update:confirmation', $event)" />
 </template>
 <script>
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 0612bdf75aff..a20d2d82ecac 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -750,6 +750,11 @@ workflow_editor:
       freehand_comment: ".freehand-workflow-comment"
       freehand_path: ".freehand-workflow-comment path"
       delete: "button[title='Delete comment']"
+  inputs:
+    selectors:
+      activity_button: "#activity-workflow-editor-inputs"
+      activity_panel: ".activity-panel[data-description='Inputs']"
+      input: ".workflow-input-button[data-id='${id}']"
   selectors:
     node_inspector: '.tool-inspector'
     node_inspector_close: ".tool-inspector [title='close']"
diff --git a/client/yarn.lock b/client/yarn.lock
index 63fb0ca4c55e..cd6c4bf5f55a 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1456,6 +1456,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
   integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==
 
+"@fortawesome/fontawesome-common-types@6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.1.tgz#6201640f39fdcf8e41cd9d1a92b2da3a96817fa4"
+  integrity sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==
+
 "@fortawesome/fontawesome-common-types@^0.2.36":
   version "0.2.36"
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz"
@@ -6335,6 +6340,13 @@ follow-redirects@^1.0.0, follow-redirects@^1.15.6:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
+"font-awesome-6@npm:@fortawesome/free-solid-svg-icons@6":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.1.tgz#c1f9a6c25562a12c283e87e284f9d82a5b0dbcc0"
+  integrity sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.7.1"
+
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
index 1ef47ff34f46..48c04b3e656f 100644
--- a/lib/galaxy/managers/jobs.py
+++ b/lib/galaxy/managers/jobs.py
@@ -788,7 +788,7 @@ def invocation_job_source_iter(sa_session, invocation_id):
 
 def get_job_metrics_for_invocation(sa_session: galaxy_scoped_session, invocation_id: int):
     single_job_stmnt = (
-        select(WorkflowStep.order_index, Job.tool_id, WorkflowStep.label, JobMetricNumeric)
+        select(WorkflowStep.order_index, Job.id, Job.tool_id, WorkflowStep.label, JobMetricNumeric)
         .join(Job, JobMetricNumeric.job_id == Job.id)
         .join(
             WorkflowInvocationStep,
@@ -799,7 +799,7 @@ def get_job_metrics_for_invocation(sa_session: galaxy_scoped_session, invocation
         .join(WorkflowStep, WorkflowStep.id == WorkflowInvocationStep.workflow_step_id)
     )
     collection_job_stmnt = (
-        select(WorkflowStep.order_index, Job.tool_id, WorkflowStep.label, JobMetricNumeric)
+        select(WorkflowStep.order_index, Job.id, Job.tool_id, WorkflowStep.label, JobMetricNumeric)
         .join(Job, JobMetricNumeric.job_id == Job.id)
         .join(ImplicitCollectionJobsJobAssociation, Job.id == ImplicitCollectionJobsJobAssociation.job_id)
         .join(
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index 3febee546896..fe8d280f7515 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -2165,6 +2165,7 @@ class JobMetric(Model):
 
 class WorkflowJobMetric(JobMetric):
     tool_id: str
+    job_id: str
     step_index: int
     step_label: Optional[str]
 
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 350ff5b62c1e..94ca2a64f341 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -914,8 +914,7 @@ def upload_paired_list(self, test_paths, name="test", ext=None, genome=None, hid
         if not hide_source_items:
             self.collection_builder_hide_originals()
 
-        self.collection_builder_clear_filters()
-        # TODO: generalize and loop these clicks so we don't need the assert
+        self.ensure_collection_builder_filters_cleared()
         assert len(test_paths) == 2
         self.collection_builder_click_paired_item("forward", 0)
         self.collection_builder_click_paired_item("reverse", 1)
@@ -1209,12 +1208,11 @@ def workflow_editor_add_input(self, item_name="data_input"):
         # Make sure we're on the workflow editor and not clicking the main tool panel.
         editor.canvas_body.wait_for_visible()
 
-        self.open_toolbox()
-        editor.tool_menu_section_link(section_name="inputs").wait_for_and_click()
-        editor.tool_menu_item_link(item_name=item_name).wait_for_and_click()
+        if editor.inputs.activity_panel.is_absent:
+            editor.inputs.activity_button.wait_for_and_click()
 
-    def workflow_editor_add_parameter_input(self):
-        self.workflow_editor_add_input(item_name="parameter_input")
+        editor.inputs.input(id=item_name).wait_for_and_click()
+        self.sleep_for(self.wait_types.UX_RENDER)
 
     def workflow_editor_set_license(self, license: str) -> None:
         license_selector = self.components.workflow_editor.license_selector
@@ -2053,8 +2051,15 @@ def collection_builder_hide_originals(self):
     def collection_builder_create(self):
         self.wait_for_and_click_selector("button.create-collection")
 
+    def ensure_collection_builder_filters_cleared(self):
+        clear_filters = self.components.collection_builders.clear_filters
+        element = clear_filters.wait_for_present()
+        if "disabled" not in element.get_attribute("class").split(" "):
+            self.collection_builder_clear_filters()
+
     def collection_builder_clear_filters(self):
-        self.wait_for_and_click_selector("button.clear-filters-link")
+        clear_filters = self.components.collection_builders.clear_filters
+        clear_filters.wait_for_and_click()
 
     def collection_builder_click_paired_item(self, forward_or_reverse, item):
         assert forward_or_reverse in ["forward", "reverse"]
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 9348e25a977b..b52d495d40e6 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -531,12 +531,12 @@ def build_module(self, trans: GalaxyWebTransaction, payload=None):
         inputs = payload.get("inputs", {})
         trans.workflow_building_mode = workflow_building_modes.ENABLED
         module = module_factory.from_dict(trans, payload, from_tool_form=True)
-        if "tool_state" not in payload:
-            module_state: Dict[str, Any] = {}
-            errors: ParameterValidationErrorsT = {}
-            populate_state(trans, module.get_inputs(), inputs, module_state, errors=errors, check=True)
-            module.recover_state(module_state, from_tool_form=True)
-            module.check_and_update_state()
+
+        module_state: Dict[str, Any] = {}
+        errors: ParameterValidationErrorsT = {}
+        populate_state(trans, module.get_inputs(), inputs, module_state, errors=errors, check=True)
+        module.recover_state(module_state, from_tool_form=True)
+        module.check_and_update_state()
         step_dict = {
             "name": module.get_name(),
             "tool_state": module_state,
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index 186a95b56116..6a2ea65b4877 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -1,13 +1,6 @@
 import logging
 
 from markupsafe import escape
-from sqlalchemy import (
-    and_,
-    desc,
-    false,
-    func,
-    select,
-)
 
 from galaxy import (
     model,
@@ -168,35 +161,6 @@ def editor(self, trans, id=None, workflow_id=None, version=None, **kwargs):
             else:
                 new_workflow = True
 
-        # The following query loads all user-owned workflows,
-        # So that they can be copied or inserted in the workflow editor.
-        assert trans.user  # help out type checker, require_login means we will have a user
-        workflow_stmnt = (
-            select(
-                model.StoredWorkflow.id,
-                model.StoredWorkflow.latest_workflow_id,
-                model.StoredWorkflow.name,
-                func.coalesce(func.count(model.WorkflowStep.id), 0).label("step_count"),
-            )
-            .join(
-                model.WorkflowStep,
-                model.StoredWorkflow.latest_workflow_id == model.WorkflowStep.workflow_id,
-                isouter=True,
-            )
-            .where(
-                and_(
-                    model.StoredWorkflow.user_id == trans.user.id,
-                    model.StoredWorkflow.deleted == false(),
-                    model.StoredWorkflow.hidden == false(),
-                )
-            )
-            .group_by(
-                model.StoredWorkflow.id,
-            )
-            .order_by(desc(model.StoredWorkflow.update_time))
-        )
-        workflow_results = trans.sa_session.execute(workflow_stmnt).all()
-
         # create workflow module models
         module_sections = []
         for module_section in load_module_sections(trans).values():
@@ -239,23 +203,10 @@ def editor(self, trans, id=None, workflow_id=None, version=None, **kwargs):
             # identify item tags
             item_tags = stored.make_tag_string_list()
 
-        # create workflow models
-        workflows = [
-            {
-                "id": trans.security.encode_id(stored_workflow_id),
-                "latest_id": trans.security.encode_id(latest_workflow_id),
-                "step_count": step_count,
-                "name": workflow_name,
-            }
-            for stored_workflow_id, latest_workflow_id, workflow_name, step_count in workflow_results
-            if not stored or stored_workflow_id != stored.id
-        ]
-
         # build workflow editor model
         editor_config = {
             "moduleSections": module_sections,
             "dataManagers": data_managers,
-            "workflows": workflows,
         }
 
         # for existing workflow add its data to the model
diff --git a/lib/galaxy/webapps/galaxy/services/invocations.py b/lib/galaxy/webapps/galaxy/services/invocations.py
index 4db9a0d5f1a0..9b7ef61cc1ce 100644
--- a/lib/galaxy/webapps/galaxy/services/invocations.py
+++ b/lib/galaxy/webapps/galaxy/services/invocations.py
@@ -167,19 +167,22 @@ def show_invocation_step(self, trans, step_id) -> InvocationStep:
     def show_invocation_metrics(self, trans: ProvidesHistoryContext, invocation_id: int):
         extended_job_metrics = get_job_metrics_for_invocation(trans.sa_session, invocation_id)
         job_metrics = []
+        job_ids = []
         tool_ids = []
         step_indexes = []
         step_labels = []
         for row in extended_job_metrics:
             step_indexes.append(row[0])
-            tool_ids.append(row[1])
-            step_labels.append(row[2])
-            job_metrics.append(row[3])
+            job_ids.append(row[1])
+            tool_ids.append(row[2])
+            step_labels.append(row[3])
+            job_metrics.append(row[4])
         metrics_dict_list = summarize_metrics(trans, job_metrics)
-        for tool_id, step_index, step_label, metrics_dict in zip(
-            tool_ids, step_indexes, step_labels, metrics_dict_list
+        for tool_id, job_id, step_index, step_label, metrics_dict in zip(
+            tool_ids, job_ids, step_indexes, step_labels, metrics_dict_list
         ):
             metrics_dict["tool_id"] = tool_id
+            metrics_dict["job_id"] = trans.security.encode_id(job_id)
             metrics_dict["step_index"] = step_index
             metrics_dict["step_label"] = step_label
         return metrics_dict_list
diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py
index f5c2da9b6dda..835b9ae2a710 100644
--- a/lib/galaxy/workflow/modules.py
+++ b/lib/galaxy/workflow/modules.py
@@ -2567,23 +2567,6 @@ def load_module_sections(trans):
     is configured with.
     """
     module_sections = {}
-    module_sections["inputs"] = {
-        "name": "inputs",
-        "title": "Inputs",
-        "modules": [
-            {"name": "data_input", "title": "Input Dataset", "description": "Input dataset"},
-            {
-                "name": "data_collection_input",
-                "title": "Input Dataset Collection",
-                "description": "Input dataset collection",
-            },
-            {
-                "name": "parameter_input",
-                "title": "Parameter Input",
-                "description": "Simple inputs used for workflow logic",
-            },
-        ],
-    }
 
     if trans.app.config.enable_beta_workflow_modules:
         module_sections["experimental"] = {
diff --git a/lib/galaxy_test/selenium/test_collection_builders.py b/lib/galaxy_test/selenium/test_collection_builders.py
index 24b47a825cf3..2c57e632e8b5 100644
--- a/lib/galaxy_test/selenium/test_collection_builders.py
+++ b/lib/galaxy_test/selenium/test_collection_builders.py
@@ -39,7 +39,6 @@ def test_build_paired_list_simple(self):
         self.perform_upload(self.get_filename("2.tabular"))
         self._wait_for_and_select([1, 2])
         self._collection_dropdown("build list of pairs")
-        self.collection_builder_clear_filters()
         self.collection_builder_click_paired_item("forward", 0)
         self.collection_builder_click_paired_item("reverse", 1)
         self.collection_builder_set_name("my awesome paired list")
@@ -61,7 +60,7 @@ def test_build_paired_list_show_original(self):
         self._wait_for_and_select([1, 2])
         self._collection_dropdown("build list of pairs")
         collection_builders = self.components.collection_builders
-        collection_builders.clear_filters.wait_for_and_click()
+        self.ensure_collection_builder_filters_cleared()
         forward_column = collection_builders.forward_datasets.wait_for_visible()
         first_datset_forward = forward_column.find_elements(self.by.CSS_SELECTOR, "li")[0]
         first_datset_forward.click()
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 229b76634b36..5e1f37e2a984 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -102,7 +102,7 @@ def test_parameter_regex_validation(self):
 
         parameter_name = "text_param"
         name = self.create_and_wait_for_new_workflow_in_editor()
-        self.workflow_editor_add_parameter_input()
+        self.workflow_editor_add_input("parameter_input")
         editor.label_input.wait_for_and_send_keys(parameter_name)
         # this really should be parameterized with the repeat name
         self.components.tool_form.repeat_insert.wait_for_and_click()
@@ -131,7 +131,7 @@ def test_int_parameter_minimum_validation(self):
 
         parameter_name = "int_param"
         name = self.create_and_wait_for_new_workflow_in_editor()
-        self.workflow_editor_add_parameter_input()
+        self.workflow_editor_add_input("parameter_input")
         editor.label_input.wait_for_and_send_keys(parameter_name)
         select_field = self.components.tool_form.parameter_select(parameter="parameter_definition|parameter_type")
         self.select_set_value(select_field, "integer")
@@ -157,10 +157,8 @@ def test_float_parameter_maximum_validation(self):
 
         parameter_name = "float_param"
         name = self.create_and_wait_for_new_workflow_in_editor()
-        self.workflow_editor_add_parameter_input()
+        self.workflow_editor_add_input("parameter_input_float")
         editor.label_input.wait_for_and_send_keys(parameter_name)
-        select_field = self.components.tool_form.parameter_select(parameter="parameter_definition|parameter_type")
-        self.select_set_value(select_field, "float")
         self.components.tool_form.parameter_input(parameter="parameter_definition|max").wait_for_and_send_keys("3.14")
         self.save_after_node_form_changes()