diff --git a/schemas/base-metadata.schema.ts b/schemas/base-metadata.schema.ts
index 726ac1df2..7fea3bd08 100644
--- a/schemas/base-metadata.schema.ts
+++ b/schemas/base-metadata.schema.ts
@@ -41,6 +41,12 @@ export const preprocessMetadataSchema = (schema: any = baseMetadataSchema, globa
 
     copy.additionalProperties = false
 
+
+
+    copy.required = Object.keys(copy.properties) // Require all properties at the top level
+
+    copy.order = [ "NWBFile", "Subject" ]
+
     // Add unit to weight
     const subjectProps = copy.properties.Subject.properties
     subjectProps.weight.unit = 'kg'
@@ -88,6 +94,8 @@ export const preprocessMetadataSchema = (schema: any = baseMetadataSchema, globa
 
     if (ophys) {
 
+        ophys.required = Object.keys(ophys.properties)
+
         const getProp = (name: string) => ophys.properties[name]
 
         if (getProp("TwoPhotonSeries")) {
@@ -143,8 +151,17 @@ export const preprocessMetadataSchema = (schema: any = baseMetadataSchema, globa
 
     // Remove non-global properties
     if (global) {
+
         Object.entries(copy.properties).forEach(([globalProp, schema]) => {
-            instanceSpecificFields[globalProp]?.forEach((prop) =>  delete schema.properties[prop]);
+
+            const requiredSet = new Set(schema.required)
+
+            instanceSpecificFields[globalProp]?.forEach((prop) =>  {
+                delete schema.properties[prop]
+                requiredSet.delete(prop)
+            });
+
+            schema.required = Array.from(requiredSet)
         });
     }
 
diff --git a/src/renderer/src/stories/Accordion.js b/src/renderer/src/stories/Accordion.js
index d4711e82d..b0bae8602 100644
--- a/src/renderer/src/stories/Accordion.js
+++ b/src/renderer/src/stories/Accordion.js
@@ -11,8 +11,6 @@ import {
 
 import { Chevron } from "./Chevron";
 
-// import 'fa-icons';
-
 const faSize = "1em";
 const faColor = "#000000";
 
@@ -25,13 +23,11 @@ export class Accordion extends LitElement {
 
             :host {
                 display: block;
-                overflow: hidden;
             }
 
             .header {
                 display: flex;
-                align-items: end;
-                padding: 20px 0px;
+                align-items: center;
                 white-space: nowrap;
             }
 
@@ -47,14 +43,6 @@ export class Accordion extends LitElement {
                 margin-right: 10px;
             }
 
-            .header > *:nth-child(2) {
-                padding-bottom: 2px;
-            }
-
-            nwb-chevron {
-                margin: 10px;
-            }
-
             .guided--nav-bar-section {
                 display: flex;
                 flex-direction: column;
@@ -64,45 +52,39 @@ export class Accordion extends LitElement {
                 height: 100%;
             }
 
-            .guided--nav-bar-section > * {
-                padding: 0px 10px;
-            }
-
             .content {
                 width: 100%;
             }
 
             .guided--nav-bar-dropdown {
                 position: relative;
-                min-height: 40px;
                 width: 100%;
                 display: flex;
                 align-items: center;
                 justify-content: space-between;
                 flex-wrap: nowrap;
                 user-select: none;
-                background-color: rgb(240, 240, 240);
-                border-bottom: 1px solid gray;
+                background-color: rgb(235, 235, 235);
             }
 
-            .guided--nav-bar-dropdown.active {
-                border-bottom: none;
+            .guided--nav-bar-section > * {
+                padding: 3px 15px 3px 10px;
             }
 
-            .guided--nav-bar-section:last-child > .guided--nav-bar-dropdown {
+            .guided--nav-bar-dropdown.active {
                 border-bottom: none;
             }
 
             .guided--nav-bar-dropdown.error {
-                border-bottom: 5px solid hsl(${errorHue}, 100%, 70%) !important;
+                border-bottom: 3px solid hsl(${errorHue}, 100%, 70%) !important;
             }
 
             .guided--nav-bar-dropdown.warning {
-                border-bottom: 5px solid hsl(${warningHue}, 100%, 70%) !important;
+                border-bottom: 3px solid hsl(${warningHue}, 100%, 70%) !important;
             }
 
             .guided--nav-bar-dropdown.valid {
-                border-bottom: 5px solid hsl(${successHue}, 100%, 70%) !important;
+                border-bottom: 3px solid hsl(${successHue}, 100%, 70%) !important;
             }
 
             .guided--nav-bar-dropdown {
@@ -120,21 +102,9 @@ export class Accordion extends LitElement {
                 right: 50px;
             }
 
-            .guided--nav-bar-dropdown.error::after {
-                content: "${errorSymbol}";
-            }
-
-            .guided--nav-bar-dropdown.warning::after {
-                content: "${warningSymbol}";
-            }
-
-            .guided--nav-bar-dropdown.valid::after {
-                content: "${successSymbol}";
-            }
-
             .guided--nav-bar-dropdown.toggleable:hover {
                 cursor: pointer;
-                background-color: lightgray;
+                background-color: gainsboro;
             }
 
             .guided--nav-bar-section-page {
@@ -268,7 +238,7 @@ export class Accordion extends LitElement {
                     ? html`<div
                           id="section"
                           class="content hidden ${this.disabled ? "disabled" : ""}"
-                          style="padding: ${this.contentPadding ?? "25px"}"
+                          style="padding: ${this.contentPadding ?? "15px"}"
                       >
                           ${this.content}
                       </div>`
diff --git a/src/renderer/src/stories/BasicTable.js b/src/renderer/src/stories/BasicTable.js
index e880cd146..c56e8329e 100644
--- a/src/renderer/src/stories/BasicTable.js
+++ b/src/renderer/src/stories/BasicTable.js
@@ -243,7 +243,7 @@ export class BasicTable extends LitElement {
         else if (value !== "" && thisTypeOf !== type)
             result = [{ message: `${col} is expected to be of type ${ogType}, not ${thisTypeOf}`, type: "error" }];
         // Otherwise validate using the specified onChange function
-        else result = this.validateOnChange([col], parent, value, this.#itemProps[col]);
+        else result = this.validateOnChange(col, parent, value, this.#itemProps[col]);
 
         // Will run synchronously if not a promise result
         return promises.resolve(result, () => {
diff --git a/src/renderer/src/stories/Button.js b/src/renderer/src/stories/Button.js
index 066316f26..850dc32dd 100644
--- a/src/renderer/src/stories/Button.js
+++ b/src/renderer/src/stories/Button.js
@@ -52,6 +52,11 @@ export class Button extends LitElement {
                 background-color: transparent;
                 box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset;
             }
+            .storybook-button--extra-small {
+                font-size: 10px;
+                padding: 7px 12px;
+            }
+
             .storybook-button--small {
                 font-size: 12px;
                 padding: 10px 16px;
diff --git a/src/renderer/src/stories/Chevron.js b/src/renderer/src/stories/Chevron.js
index caf62e199..9aa31c933 100644
--- a/src/renderer/src/stories/Chevron.js
+++ b/src/renderer/src/stories/Chevron.js
@@ -13,7 +13,7 @@ export class Chevron extends LitElement {
 
             div::before {
                 border-style: solid;
-                border-width: 0.25em 0.25em 0 0;
+                border-width: 0.2em 0.2em 0 0;
                 content: "";
                 display: inline-block;
                 height: 0.45em;
diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js
index abee5c817..36060fd91 100644
--- a/src/renderer/src/stories/JSONSchemaForm.js
+++ b/src/renderer/src/stories/JSONSchemaForm.js
@@ -27,6 +27,7 @@ const provideNaNMessage = `<br/><small>Type <b>NaN</b> to represent an unknown v
 
 import { Validator } from "jsonschema";
 import { successHue, warningHue, errorHue } from "./globals";
+import { Button } from "./Button";
 
 var validator = new Validator();
 
@@ -302,7 +303,10 @@ export class JSONSchemaForm extends LitElement {
         const path = [...localPath];
         const name = path.pop();
 
-        const reducer = (acc, key) => (key in acc ? acc[key] : (acc[key] = {})); // NOTE: Create nested objects if required to set a new path
+        const reducer = (acc, key) => {
+            const value = acc[key];
+            return value && typeof value === "object" ? value : (acc[key] = {});
+        }; // NOTE: Create nested objects if required to set a new path
 
         const resultParent = path.reduce(reducer, this.results);
         const resolvedParent = path.reduce(reducer, this.resolved);
@@ -386,6 +390,10 @@ export class JSONSchemaForm extends LitElement {
                 const resolvedValue = e.path.reduce((acc, token) => acc[token], resolved);
 
                 // ------------ Exclude Certain Errors ------------
+
+                // Ignore required errors if value is empty
+                if (e.name === "required" && !this.validateEmptyValues && !(e.property in e.instance)) return;
+
                 // Non-Strict Rule
                 if (schema.strict === false && e.message.includes("is not one of enum values")) return;
 
@@ -428,7 +436,7 @@ export class JSONSchemaForm extends LitElement {
         if (resolvedErrors.length) {
             const len = resolvedErrors.length;
             if (len === 1) this.throw(resolvedErrors[0].message);
-            else this.throw(`${len} JSON Schema errors on this form.`);
+            else this.throw(`${len} JSON Schema errors detected.`);
         }
 
         const allErrors = Array.from(flaggedInputs)
@@ -1060,24 +1068,11 @@ export class JSONSchemaForm extends LitElement {
 
             const localPath = [...path, name];
 
-            const enableToggle = document.createElement("input");
-            const enableToggleContainer = document.createElement("div");
-            Object.assign(enableToggleContainer.style, {
-                position: "relative",
-            });
-            enableToggleContainer.append(enableToggle);
-
             // Check properties that will be rendered before creating the accordion
             const base = [...this.base, ...localPath];
 
             const explicitlyRequired = schema.required?.includes(name) ?? false;
 
-            Object.assign(enableToggle, {
-                type: "checkbox",
-                checked: true,
-                style: "margin-right: 10px; pointer-events:all;",
-            });
-
             const headerName = header(info.title ?? name);
 
             const renderableInside = this.#getRenderable(info, required[name], ignore, localPath, true);
@@ -1097,8 +1092,6 @@ export class JSONSchemaForm extends LitElement {
 
             const isDisabled = !!__disabledResolved[name];
 
-            enableToggle.checked = !isDisabled;
-
             const nestedResults = __disabled[name] ?? results[name] ?? this.results[name]; // One or the other will exist—depending on global or local disabling
 
             if (renderableInside.length) {
@@ -1151,13 +1144,43 @@ export class JSONSchemaForm extends LitElement {
 
             const oldStates = this.#accordions[headerName];
 
+            const disableText = "Skip";
+            const enableText = "Enable";
+
+            const disabledPath = [...path, "__disabled"];
+            const interactedPath = [...disabledPath, "__interacted"];
+
+            const enableToggle = new Button({
+                label: isDisabled ? enableText : disableText,
+                size: "extra-small",
+                onClick: (ev) => {
+                    ev.stopPropagation();
+
+                    const willEnable = enableToggle.label === enableText;
+
+                    // Reset parameters on interaction
+                    isGlobalEffect = false;
+
+                    enableToggle.label = willEnable ? disableText : enableText;
+
+                    willEnable ? enable() : disable();
+                    this.updateData([...interactedPath, name], true, true);
+
+                    this.onUpdate(localPath, this.results[name]);
+                },
+            });
+
+            // const enableToggle = document.createElement("input");
+            const enableToggleContainer = document.createElement("div");
+            Object.assign(enableToggleContainer.style, { position: "relative" });
+            enableToggleContainer.append(enableToggle);
+            Object.assign(enableToggle.style, { marginRight: "10px", pointerEvents: "all" });
+
             const accordion = (this.#accordions[headerName] = new Accordion({
                 name: headerName,
                 toggleable: hasMany,
                 subtitle: html`<div style="display:flex; align-items: center;">
-                    ${explicitlyRequired ? "" : enableToggleContainer}${renderableInside.length
-                        ? `${hasPatternProperties ? "Dynamic" : renderableInside.length} fields`
-                        : ""}
+                    ${explicitlyRequired ? "" : enableToggleContainer}
                 </div>`,
                 content: this.#nestedForms[name],
 
@@ -1169,68 +1192,41 @@ export class JSONSchemaForm extends LitElement {
 
             accordion.id = name; // assign name to accordion id
 
-            // Set enable / disable behavior
-            const addDisabled = (name, parentObject) => {
-                if (!parentObject.__disabled) parentObject.__disabled = {};
-
-                // Do not overwrite cache of disabled values (with globals, for instance)
-                if (parentObject.__disabled[name]) {
-                    if (isGlobalEffect) return;
-                }
-
-                parentObject.__disabled[name] = parentObject[name] ?? (parentObject[name] = {}); // Track disabled values (or at least something)
-            };
-
             const disable = () => {
                 accordion.disabled = true;
-                addDisabled(name, this.resolved);
-                addDisabled(name, this.results);
-                this.resolved[name] = this.results[name] = undefined; // Remove entry from results
 
-                this.checkStatus();
-            };
+                const target = this.results;
+                const value = target[name] ?? {};
 
-            const enable = () => {
-                accordion.disabled = false;
+                let update = true;
+                if (target.__disabled?.[name] && isGlobalEffect) update = false;
 
-                const { __disabled = {} } = this.results;
-                const { __disabled: resolvedDisabled = {} } = this.resolved;
+                // Disabled path is set to actual value
+                if (update) this.updateData([...disabledPath, name], value);
 
-                if (__disabled[name]) this.updateData(localPath, __disabled[name]); // Propagate restored disabled values
-                __disabled[name] = undefined; // Clear disabled value
-                resolvedDisabled[name] = undefined; // Clear disabled value
+                // Actual data is set to undefined
+                this.updateData(localPath, undefined);
 
                 this.checkStatus();
             };
 
-            enableToggle.addEventListener("click", (clickEvent) => {
-                clickEvent.stopPropagation();
-                const { checked } = clickEvent.target;
-
-                // Reset parameters on interaction
-                isGlobalEffect = false;
-                Object.assign(enableToggle.style, {
-                    accentColor: "unset",
-                });
+            const enable = () => {
+                accordion.disabled = false;
 
                 const { __disabled = {} } = this.results;
-                const { __disabled: resolvedDisabled = {} } = this.resolved;
 
-                if (!__disabled.__interacted) __disabled.__interacted = {};
-                if (!resolvedDisabled.__interacted) resolvedDisabled.__interacted = {};
+                // Actual value is restored to the cached value
+                if (__disabled[name]) this.updateData(localPath, __disabled[name]);
 
-                __disabled.__interacted[name] = resolvedDisabled.__interacted[name] = true; // Track that the user has interacted with the form
+                // Cached value is cleared
+                this.updateData([...disabledPath, name], undefined);
 
-                checked ? enable() : disable();
-
-                this.onUpdate(localPath, this.results[name]);
-            });
+                this.checkStatus();
+            };
 
             if (isGlobalEffect) {
                 isDisabled ? disable() : enable();
-                Object.assign(enableToggle.style, {
-                    accentColor: "gray",
-                });
+                Object.assign(enableToggle.style, { accentColor: "gray" });
             }
 
             return accordion;
diff --git a/src/renderer/src/stories/JSONSchemaInput.js b/src/renderer/src/stories/JSONSchemaInput.js
index 1d0941e7d..3c61f412b 100644
--- a/src/renderer/src/stories/JSONSchemaInput.js
+++ b/src/renderer/src/stories/JSONSchemaInput.js
@@ -989,17 +989,31 @@ export class JSONSchemaInput extends LitElement {
                 return search;
             }
 
+            const enumItems = [...schema.enum];
+
+            const noSelection = "No Selection";
+            if (!this.required) enumItems.unshift(noSelection);
+
+            const selectedItem = enumItems.find((item) => this.value === item);
+
             return html`
                 <select
                     class="guided--input schema-input"
-                    @input=${(ev) => this.#updateData(fullPath, schema.enum[ev.target.value])}
+                    @input=${(ev) => {
+                        const index = ev.target.value;
+                        const value = enumItems[index];
+                        this.#updateData(fullPath, value === noSelection ? undefined : value);
+                    }}
                     @change=${(ev) => validateOnChange && this.#triggerValidation(name, path)}
                     @keydown=${this.#moveToNextInput}
                 >
                     <option disabled selected value>${schema.placeholder ?? "Select an option"}</option>
-                    ${schema.enum.map(
+                    ${enumItems.map(
                         (item, i) =>
-                            html`<option value=${i} ?selected=${this.value === item}>
+                            html`<option
+                                value=${i}
+                                ?selected=${selectedItem === item || (selectedItem === -1 && item === noSelection)}
+                            >
                                 ${schema.enumLabels?.[item] ?? item}
                             </option>`
                     )}
diff --git a/src/renderer/src/stories/SimpleTable.js b/src/renderer/src/stories/SimpleTable.js
index 621c36863..412483722 100644
--- a/src/renderer/src/stories/SimpleTable.js
+++ b/src/renderer/src/stories/SimpleTable.js
@@ -104,6 +104,7 @@ export class SimpleTable extends LitElement {
             .table-container {
                 overflow: auto;
                 max-height: 400px;
+                border: 1px solid gray;
             }
 
             table {
@@ -119,7 +120,7 @@ export class SimpleTable extends LitElement {
             }
 
             th {
-                border: 1px solid silver;
+                border-right: 1px solid gray;
                 color: #222;
                 font-weight: 400;
                 text-align: center;
@@ -141,11 +142,17 @@ export class SimpleTable extends LitElement {
             }
 
             td {
-                border: 1px solid gainsboro;
+                border: 1px solid gray;
+                border-left: none;
+                border-bottom: none;
                 background: white;
                 user-select: none;
             }
 
+            table *:last-child {
+                border-right: none;
+            }
+
             .relative .info {
                 margin: 0px 5px;
                 font-size: 80%;
@@ -496,7 +503,7 @@ export class SimpleTable extends LitElement {
                     Object.keys(cols).map((k) => (cols[k] = ""));
                     if (this.validateOnChange)
                         Object.keys(cols).map((k) => {
-                            const res = this.validateOnChange([k], { ...cols }, cols[k]);
+                            const res = this.validateOnChange(k, { ...cols }, cols[k]);
                             if (typeof res === "function") res();
                         });
 
diff --git a/src/renderer/src/stories/Table.js b/src/renderer/src/stories/Table.js
index be6d98ee4..ec956b466 100644
--- a/src/renderer/src/stories/Table.js
+++ b/src/renderer/src/stories/Table.js
@@ -295,7 +295,7 @@ export class Table extends LitElement {
                 try {
                     const valid = this.validateOnChange
                         ? await this.validateOnChange(
-                              [k],
+                              k,
                               { ...this.data[rowHeaders[row]] }, // Validate on a copy of the parent
                               value,
                               info
diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js
index f6affa1ff..dbec3445f 100644
--- a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js
+++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js
@@ -26,7 +26,6 @@ import { Button } from "../../../Button.js";
 import globalIcon from "../../../assets/global.svg?raw";
 
 const imagingPlaneKey = "imaging_plane";
-
 const propsToIgnore = {
     Ophys: {
         // NOTE: Get this to work
@@ -36,6 +35,9 @@ const propsToIgnore = {
             conversion: true,
             offset: true,
             unit: true,
+            control: true,
+            comments: true,
+            control_description: true,
         },
         ImagingPlane: {
             [imagingPlaneKey]: true,
@@ -61,6 +63,8 @@ const propsToIgnore = {
     },
     NWBFile: {
         session_id: true,
+        source_script: true,
+        source_script_file_name: true,
     },
 };
 
@@ -80,6 +84,7 @@ export class GuidedMetadataPage extends ManagedPage {
     }
 
     beforeSave = () => {
+        console.log(this.localState.results, this.info.globalState.results);
         merge(this.localState.results, this.info.globalState.results);
     };
 
@@ -117,10 +122,13 @@ export class GuidedMetadataPage extends ManagedPage {
     connectedCallback() {
         super.connectedCallback();
 
+        // Provide HARDCODED global schema for metadata properties (not automatically abstracting across sessions)...
+        const schema = preprocessMetadataSchema(undefined, true);
+
         const modal = (this.#globalModal = createGlobalFormModal.call(this, {
             header: "Global Metadata",
             propsToRemove: propsToIgnore,
-            schema: preprocessMetadataSchema(undefined, true), // Provide HARDCODED global schema for metadata properties (not automatically abstracting across sessions)...
+            schema,
             hasInstances: true,
             mergeFunction: function (globalResolved, globals) {
                 merge(globalResolved, globals);
@@ -154,8 +162,6 @@ export class GuidedMetadataPage extends ManagedPage {
         // Ignore specific metadata in the form by removing their schema value
         const schema = globalState.schema.metadata[subject][session];
         delete schema.description;
-        delete schema.properties.NWBFile.properties.source_script;
-        delete schema.properties.NWBFile.properties.source_script_file_name;
 
         // Only include a select group of Ecephys metadata here
         if ("Ecephys" in schema.properties) {
@@ -498,10 +504,10 @@ export class GuidedMetadataPage extends ManagedPage {
                         this.beforeSave = () => {
                             const { subject, session } = getInfoFromId(id);
 
-                            merge(
-                                this.localState.results[subject][session],
-                                this.info.globalState.results[subject][session]
-                            );
+                            const local = this.localState.results[subject][session];
+                            const global = this.info.globalState.results[subject][session];
+
+                            merge(local, global);
 
                             this.notify(`Session ${id} metadata saved!`);
                         };
diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js
index 826074c92..fee0343cf 100644
--- a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js
+++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js
@@ -186,6 +186,10 @@ export class GuidedSourceDataPage extends ManagedPage {
 
     connectedCallback() {
         super.connectedCallback();
+
+        const schema = structuredClone(this.info.globalState.schema.source_data);
+        delete schema.description;
+
         const modal = (this.#globalModal = createGlobalFormModal.call(this, {
             header: "Global Source Data",
             propsToRemove: {
@@ -197,7 +201,7 @@ export class GuidedSourceDataPage extends ManagedPage {
                 },
             },
             key: "SourceData",
-            schema: this.info.globalState.schema.source_data,
+            schema,
             hasInstances: true,
         }));
         document.body.append(modal);
diff --git a/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js b/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js
index 6890f697e..9a9da4b7c 100644
--- a/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js
+++ b/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js
@@ -81,13 +81,17 @@ export class GuidedSubjectsPage extends Page {
 
     connectedCallback() {
         super.connectedCallback();
+
+        const schema = preprocessMetadataSchema(undefined, true).properties.Subject;
+
         const modal = (this.#globalModal = createGlobalFormModal.call(this, {
             header: "Global Subject Metadata",
             key: "Subject",
-            schema: preprocessMetadataSchema(undefined, true).properties.Subject,
+            validateEmptyValues: false,
+            schema,
             formProps: {
-                validateOnChange: (key, parent, path) => {
-                    return validateOnChange(key, parent, ["Subject", ...path]);
+                validateOnChange: (localPath, parent, path) => {
+                    return validateOnChange(localPath, parent, ["Subject", ...path]);
                 },
             },
         }));
@@ -132,8 +136,8 @@ export class GuidedSubjectsPage extends Page {
             onUpdate: () => {
                 this.unsavedUpdates = "conversions";
             },
-            validateOnChange: (key, parent, v) => {
-                if (key.slice(-1)[0] === "sessions") {
+            validateOnChange: (localPath, parent, v) => {
+                if (localPath.slice(-1)[0] === "sessions") {
                     if (v?.length) return true;
                     else {
                         return [
@@ -145,7 +149,7 @@ export class GuidedSubjectsPage extends Page {
                     }
                 } else {
                     delete parent.sessions; // Delete sessions from parent copy
-                    return validateOnChange(key, parent, ["Subject"], v);
+                    return validateOnChange(localPath, parent, ["Subject"], v);
                 }
             },
         });
diff --git a/src/renderer/src/validation/index.js b/src/renderer/src/validation/index.js
index ade5898fd..524795f83 100644
--- a/src/renderer/src/validation/index.js
+++ b/src/renderer/src/validation/index.js
@@ -13,7 +13,6 @@ export async function validateOnChange(name, parent, path, value) {
     let functions = [];
 
     const fullPath = [...path, name];
-
     const toIterate = fullPath; //fullPathNoRows // fullPath
 
     const copy = { ...parent }; // Validate on a copy of the parent
@@ -38,7 +37,6 @@ export async function validateOnChange(name, parent, path, value) {
                 // Otherwise set the last wildcard
                 else {
                     lastWildcard = typeof acc["*"] === "string" ? acc["*"].replace(`{*}`, `${name}`) : acc["*"];
-
                     overridden = false; // Re-enable if a new one is specified below
                 }
             } else if (lastWildcard && typeof lastWildcard === "object") {
@@ -52,7 +50,7 @@ export async function validateOnChange(name, parent, path, value) {
 
         if (overridden && functions !== true) lastWildcard = false; // Disable if not promised to exist
 
-        if (typeof lastWildcard === "function") functions = [lastWildcard];
+        if (typeof lastWildcard === "function" || typeof lastWildcard === "string") functions = [lastWildcard];
     }
 
     if (!functions || (Array.isArray(functions) && functions.length === 0)) return; // No validation for this field
diff --git a/src/renderer/src/validation/validation.json b/src/renderer/src/validation/validation.json
index af88a8690..96569524f 100644
--- a/src/renderer/src/validation/validation.json
+++ b/src/renderer/src/validation/validation.json
@@ -42,6 +42,7 @@
     "Behavior": false,
 
     "Subject": {
+        "sessions": false,
         "description": false,
         "genotype": false,
         "strain": false,
diff --git a/src/renderer/src/validation/validation.ts b/src/renderer/src/validation/validation.ts
index 62426ffdd..262cafd6b 100644
--- a/src/renderer/src/validation/validation.ts
+++ b/src/renderer/src/validation/validation.ts
@@ -79,7 +79,8 @@ schema.Ecephys.Electrodes = {
         // Label columns as invalid if not registered on the ElectrodeColumns table
         // NOTE: If not present in the schema, these are not being rendered...
         ['*']: function (this: JSONSchemaForm, name, parent, path) {
-            if (!this.results.Ecephys.ElectrodeColumns.find((row: any) => row.name === name)) return [
+            const electrodeColumns = this.results.ElectrodeColumns
+            if (electrodeColumns && !electrodeColumns.find((row: any) => row.name === name)) return [
                 {
                     message: 'Not a valid column',
                     type: 'error'