diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index bccd357bb4..d83fb8e684 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "6.71.0",
+  "version": "6.71.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "6.71.0",
+      "version": "6.71.1",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index b02aa74fff..a87b81e8c8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.71.0",
+  "version": "6.71.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index ed1fce005f..dd8888c065 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,12 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+###  version 6.71.1
+*Released*: 20 November 2025
+- Sample Amount/Units polish
+  - Disallow negative sample amounts: Update `getValidatedEditableGridValue` to check for negative amount values
+  - Added `AmountUnitInput` to show amount/units input side-by-side on bulk add/edit
+
 ###  version 6.71.0
 *Released*: 20 November 2025
 - Line chart trendline options for provided parameters to CalculateCurveFit API
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index d2dee15827..da22ed2dd6 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -471,6 +471,7 @@ import {
     DOMAIN_FIELD_REQUIRED,
     DOMAIN_FIELD_TYPE,
     DOMAIN_RANGE_VALIDATOR,
+    NON_NEGATIVE_NUMBER_CONCEPT_URI,
     RANGE_URIS,
     SAMPLE_TYPE_CONCEPT_URI,
     STORAGE_UNIQUE_ID_CONCEPT_URI,
@@ -1535,6 +1536,7 @@ export {
     NavigationBar,
     NO_UPDATES_MESSAGE,
     NoLinkRenderer,
+    NON_NEGATIVE_NUMBER_CONCEPT_URI,
     NOT_ANY_FILTER_TYPE,
     NOT_IN_EXP_DESCENDANTS_OF_FILTER_TYPE,
     Notifications,
diff --git a/packages/components/src/internal/components/domainproperties/DomainForm.tsx b/packages/components/src/internal/components/domainproperties/DomainForm.tsx
index 794fad3cd9..182c5756c7 100644
--- a/packages/components/src/internal/components/domainproperties/DomainForm.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainForm.tsx
@@ -146,28 +146,28 @@ const DomainFormToolbar: FC<DomainFormToolbarProps> = memo(props => {
             <div className="col-xs-4">
                 {!domainFormDisplayOptions?.hideAddFieldsButton && (
                     <AddEntityButton
-                        entity="Field"
-                        containerClass="container--toolbar-button"
                         buttonClass="domain-toolbar-add-btn"
+                        containerClass="container--toolbar-button"
+                        entity="Field"
                         onClick={onAddField}
                     />
                 )}
                 {!domainFormDisplayOptions?.hideAddFieldsButton && (
                     <ActionButton
-                        containerClass="container--toolbar-button"
                         buttonClass="domain-toolbar-delete-btn"
-                        onClick={onBulkDeleteClick}
+                        containerClass="container--toolbar-button"
                         disabled={visibleSelection.size === 0}
+                        onClick={onBulkDeleteClick}
                     >
                         <i className="fa fa-trash domain-toolbar-export-btn-icon" /> Delete
                     </ActionButton>
                 )}
                 {shouldShowImportExport && (
                     <ActionButton
-                        containerClass="container--toolbar-button"
                         buttonClass="domain-toolbar-export-btn"
-                        onClick={onExportFields}
+                        containerClass="container--toolbar-button"
                         disabled={disableExport}
+                        onClick={onExportFields}
                     >
                         <i className="fa fa-download domain-toolbar-export-btn-icon" /> Export
                     </ActionButton>
@@ -177,26 +177,26 @@ const DomainFormToolbar: FC<DomainFormToolbarProps> = memo(props => {
                 <div className="pull-right domain-field-toolbar-right-aligned">
                     {!valueIsEmpty(search) && (
                         <span className="domain-search-text">
-                            Showing {fields.filter(f => f.visible).size} of {fields.size} {' '}
-                            field{fields.size > 1 ? 's' : ''}.
+                            Showing {fields.filter(f => f.visible).size} of {fields.size} field
+                            {fields.size > 1 ? 's' : ''}.
                         </span>
                     )}
                     <input
-                        id={'domain-search-name-' + domainIndex}
                         className="form-control domain-search-input"
-                        type="text"
-                        placeholder="Search Fields"
+                        id={'domain-search-name-' + domainIndex}
                         onChange={onSearchChange}
+                        placeholder="Search Fields"
+                        type="text"
                     />
 
                     <div className="domain-toolbar-toggle-summary">
                         <span>Mode: </span>
                         <ToggleButtons
+                            active={summaryViewMode ? 'Summary' : 'Detail'}
                             className=""
                             first="Summary"
-                            second="Detail"
-                            active={summaryViewMode ? 'Summary' : 'Detail'}
                             onClick={onToggleSummaryView}
+                            second="Detail"
                         />
                     </div>
                 </div>
@@ -217,6 +217,8 @@ export interface DomainFormProps extends PropsWithChildren {
     domainFormDisplayOptions?: IDomainFormDisplayOptions;
     domainIndex?: number;
     fieldsAdditionalRenderer?: () => ReactNode;
+    // Map of grouped system fields, that should be enabled/disabled together
+    groupedSystemFields?: Record<string, string[]>;
     headerPrefix?: string; // used as a string to remove from the heading when using the domain.name
     headerTitle?: string;
     helpNoun?: string;
@@ -602,10 +604,10 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
         if (deletableSelectedFieldsCount === 0) {
             return (
                 <Modal
-                    title="Cannot Delete Required Fields"
-                    onCancel={this.onConfirmBulkCancel}
                     cancelText="Close"
                     confirmClass="btn-danger"
+                    onCancel={this.onConfirmBulkCancel}
+                    title="Cannot Delete Required Fields"
                 >
                     <div>
                         <p> None of the selected fields can be deleted. </p>
@@ -621,11 +623,11 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
 
         return (
             <Modal
-                title="Confirm Delete Selected Fields"
-                onConfirm={this.onBulkDeleteConfirm}
-                onCancel={this.onConfirmBulkCancel}
                 confirmClass="btn-danger"
                 confirmText="Yes, Delete Fields"
+                onCancel={this.onConfirmBulkCancel}
+                onConfirm={this.onBulkDeleteConfirm}
+                title="Confirm Delete Selected Fields"
             >
                 <div>
                     <p>{howManyDeleted} will be deleted.</p>
@@ -703,8 +705,12 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
     };
 
     onSystemFieldEnable = (field: string, enable: boolean): void => {
-        const { domain } = this.props;
-        this.onDomainChange(handleSystemFieldUpdates(domain, field, enable));
+        const { domain, groupedSystemFields } = this.props;
+        let updatedDomain = handleSystemFieldUpdates(domain, field, enable);
+        groupedSystemFields?.[field.toLowerCase()]?.forEach(groupedField => {
+            updatedDomain = handleSystemFieldUpdates(updatedDomain, groupedField, enable);
+        });
+        this.onDomainChange(updatedDomain);
     };
 
     onFieldsChange = (changes: List<IFieldChange>, index: number, expand: boolean, skipDirtyCheck = false): void => {
@@ -923,9 +929,9 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                 <div className="row domain-add-field-row">
                     <div className="col-xs-12">
                         <AddEntityButton
-                            entity="Field"
                             buttonClass="domain-form-add-btn"
                             containerClass="pull-right"
+                            entity="Field"
                             onClick={this.onAddField}
                         />
                     </div>
@@ -957,11 +963,11 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
         const fieldName = field && field.name && field.name.trim().length > 0 ? <b>{field.name}</b> : 'this field';
         return (
             <Modal
-                title="Confirm Remove Field"
-                onConfirm={() => this.onDeleteConfirm(confirmDeleteRowIndex)}
-                onCancel={this.onConfirmCancel}
                 confirmClass="btn-danger"
                 confirmText="Yes, Remove Field"
+                onCancel={this.onConfirmCancel}
+                onConfirm={() => this.onDeleteConfirm(confirmDeleteRowIndex)}
+                title="Confirm Remove Field"
             >
                 <div>
                     Are you sure you want to remove {fieldName}?{' '}
@@ -1090,11 +1096,11 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                 <>
                     <FileAttachmentForm
                         acceptedFormats={acceptedFormats.join(', ')}
-                        showAcceptedFormats
                         allowDirectories={false}
                         allowMultiple={false}
-                        label={label}
+                        fileSpecificCallback={Map({ '.json': this.importFieldsFromJson })}
                         index={index}
+                        label={label}
                         onFileRemoval={this.onFileRemoval}
                         previewGridProps={
                             shouldShowInferFromFile && {
@@ -1104,7 +1110,7 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                                 domainKindName: domain.domainKindName,
                             }
                         }
-                        fileSpecificCallback={Map({ '.json': this.importFieldsFromJson })}
+                        showAcceptedFormats
                     />
                     {shouldShowInferFromFile && this.state.filePreviewMsg && (
                         <Alert bsStyle="info">{this.state.filePreviewMsg}</Alert>
@@ -1199,7 +1205,7 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
             visibleFieldsCount !== 0 && visibleSelection.size === visibleFieldsCount ? 'Clear All' : 'Clear';
 
         return (
-            <DragDropContext onDragEnd={this.onDragEnd} onBeforeDragStart={this.onBeforeDragStart}>
+            <DragDropContext onBeforeDragStart={this.onBeforeDragStart} onDragEnd={this.onDragEnd}>
                 <div className="domain-field-row domain-row-border-default domain-floating-hdr">
                     <Alert bsStyle="info">{reservedFieldsMsg}</Alert>
                     <div className="row">
@@ -1219,10 +1225,10 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                         <div className="domain-row-handle" />
                         <div className="domain-row-action-section">
                             <CheckboxLK
+                                checked={selectAll}
                                 className="domain-field-check-icon"
-                                name="domain-select-all-checkbox"
                                 id="domain-select-all-checkbox"
-                                checked={selectAll}
+                                name="domain-select-all-checkbox"
                                 onChange={this.toggleSelectAll}
                             />
                         </div>
@@ -1257,39 +1263,39 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
 
                                         return (
                                             <DomainRow
-                                                ref={ref => {
-                                                    this.refsArray[i] = ref;
-                                                }}
+                                                allowUniqueConstraintProperties={domain.allowUniqueConstraintProperties}
+                                                appPropertiesOnly={appPropertiesOnly}
+                                                availableTypes={availableTypes}
+                                                defaultDefaultValueType={domain.defaultDefaultValueType}
+                                                defaultValueOptions={domain.defaultValueOptions}
+                                                domainContainerPath={domain.container}
+                                                domainFormDisplayOptions={domainFormDisplayOptions}
                                                 domainId={domain.domainId}
-                                                helpNoun={helpNoun}
-                                                key={key}
+                                                domainIndex={domainIndex}
+                                                dragging={dragId === i}
+                                                expanded={expandedRowIndex === i}
                                                 field={field}
+                                                fieldDetailsInfo={fieldDetails.detailsInfo}
                                                 fieldError={this.getFieldError(domain, i)}
                                                 getDomainFields={this.getDomainFields}
-                                                fieldDetailsInfo={fieldDetails.detailsInfo}
-                                                domainIndex={domainIndex}
+                                                helpNoun={helpNoun}
                                                 index={i}
-                                                expanded={expandedRowIndex === i}
-                                                onChange={this.onFieldsChange}
-                                                onExpand={this.onFieldExpandToggle}
-                                                onDelete={this.onDeleteField}
-                                                maxPhiLevel={maxPhiLevel}
-                                                dragging={dragId === i}
-                                                availableTypes={availableTypes}
-                                                allowUniqueConstraintProperties={domain.allowUniqueConstraintProperties}
-                                                showDefaultValueSettings={domain.showDefaultValueSettings}
-                                                defaultDefaultValueType={domain.defaultDefaultValueType}
-                                                defaultValueOptions={domain.defaultValueOptions}
-                                                appPropertiesOnly={appPropertiesOnly}
                                                 isDragDisabled={
                                                     !valueIsEmpty(search) ||
                                                     domainFormDisplayOptions.isDragDisabled ||
                                                     field.isCalculatedField()
                                                 }
-                                                domainFormDisplayOptions={domainFormDisplayOptions}
-                                                domainContainerPath={domain.container}
-                                                schemaName={schemaName ?? domain.schemaName}
+                                                key={key}
+                                                maxPhiLevel={maxPhiLevel}
+                                                onChange={this.onFieldsChange}
+                                                onDelete={this.onDeleteField}
+                                                onExpand={this.onFieldExpandToggle}
                                                 queryName={queryName ?? domain.queryName}
+                                                ref={ref => {
+                                                    this.refsArray[i] = ref;
+                                                }}
+                                                schemaName={schemaName ?? domain.schemaName}
+                                                showDefaultValueSettings={domain.showDefaultValueSettings}
                                             />
                                         );
                                     })
@@ -1356,17 +1362,17 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                 <div className={getDomainPanelClass(collapsed, controlledCollapse, isApp_)}>
                     {showHeader && (
                         <CollapsiblePanelHeader
-                            id={getDomainPanelHeaderId(domain)}
-                            title={getDomainHeaderName(domain.name, headerTitle, headerPrefix)}
                             collapsed={!(this.isPanelExpanded() && controlledCollapse)}
                             collapsible={collapsible}
                             controlledCollapse={controlledCollapse}
                             headerDetails={headerDetails}
-                            todoIconHelpMsg={todoIconHelpMsg}
+                            iconHelpMsg={hasException ? domain.domainException.exception : undefined}
+                            id={getDomainPanelHeaderId(domain)}
+                            isValid={!hasException}
                             panelStatus={panelStatus}
+                            title={getDomainHeaderName(domain.name, headerTitle, headerPrefix)}
+                            todoIconHelpMsg={todoIconHelpMsg}
                             togglePanel={this.togglePanel}
-                            isValid={!hasException}
-                            iconHelpMsg={hasException ? domain.domainException.exception : undefined}
                         >
                             {children}
                         </CollapsiblePanelHeader>
@@ -1379,8 +1385,8 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                                 <>
                                     {systemFields && (
                                         <SystemFields
-                                            fields={systemFields}
                                             disabledSystemFields={domain.disabledSystemFields}
+                                            fields={systemFields}
                                             onSystemFieldEnable={this.onSystemFieldEnable}
                                         />
                                     )}
@@ -1407,7 +1413,7 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                                         <div className={`col-xs-${helpTopic ? 9 : 12}`} />
                                         {helpTopic && (
                                             <div className="col-xs-3">
-                                                <HelpLink topic={helpTopic} className="domain-field-float-right">
+                                                <HelpLink className="domain-field-float-right" topic={helpTopic}>
                                                     Learn more about this tool
                                                 </HelpLink>
                                             </div>
@@ -1454,10 +1460,10 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
 
                             {filePreviewData && !domainFormDisplayOptions?.hideImportData && (
                                 <ImportDataFilePreview
-                                    noun={helpNoun}
+                                    file={file}
                                     filePreviewData={filePreviewData}
+                                    noun={helpNoun}
                                     setFileImportData={setFileImportData}
-                                    file={file}
                                 />
                             )}
                         </div>
@@ -1465,8 +1471,8 @@ export class DomainFormImpl extends React.PureComponent<DomainFormProps, State>
                 </div>
                 {hasException && domain.domainException.severity === SEVERITY_LEVEL_ERROR && (
                     <div
-                        onClick={this.togglePanel}
                         className={getDomainAlertClasses(collapsed, controlledCollapse, isApp_)}
+                        onClick={this.togglePanel}
                     >
                         <Alert bsStyle="danger">{domain.domainException.exception}</Alert>
                     </div>
diff --git a/packages/components/src/internal/components/domainproperties/constants.ts b/packages/components/src/internal/components/domainproperties/constants.ts
index a914003a0a..7525f0dce1 100644
--- a/packages/components/src/internal/components/domainproperties/constants.ts
+++ b/packages/components/src/internal/components/domainproperties/constants.ts
@@ -158,6 +158,7 @@ export const MODIFIED_TIMESTAMP_CONCEPT_URI = 'http://www.labkey.org/types#modif
 export const SMILES_CONCEPT_URI = 'http://www.labkey.org/exp/xml#smiles';
 export const AUTO_INT_CONCEPT_URI = 'http://www.labkey.org/types#autoInt';
 export const CALCULATED_CONCEPT_URI = 'http://www.labkey.org/exp/xml#calculated';
+export const NON_NEGATIVE_NUMBER_CONCEPT_URI = 'http://www.labkey.org/types#nonNegativeNumber';
 
 export const UNLIMITED_TEXT_LENGTH = 2147483647; // Integer.MAX_VALUE
 export const MAX_TEXT_LENGTH = 4000;
diff --git a/packages/components/src/internal/components/domainproperties/samples/SampleTypeDesigner.tsx b/packages/components/src/internal/components/domainproperties/samples/SampleTypeDesigner.tsx
index 81a6077c80..15c7885e52 100644
--- a/packages/components/src/internal/components/domainproperties/samples/SampleTypeDesigner.tsx
+++ b/packages/components/src/internal/components/domainproperties/samples/SampleTypeDesigner.tsx
@@ -29,7 +29,7 @@ import { ComponentsAPIWrapper, getDefaultAPIWrapper } from '../../../APIWrapper'
 
 import { GENID_SYNTAX_STRING } from '../NameExpressionGenIdBanner';
 
-import { IImportAlias, IParentAlias, IParentOption, FolderConfigurableDataType } from '../../entities/models';
+import { FolderConfigurableDataType, IImportAlias, IParentAlias, IParentOption } from '../../entities/models';
 import { SCHEMAS } from '../../../schemas';
 import {
     getHelpLink,
@@ -115,10 +115,10 @@ interface Props {
     onCancel: () => void;
     onChange?: (model: SampleTypeModel) => void;
     onComplete: (response: DomainDesign) => void;
+    sampleAliasCaption?: string;
     sampleTypeCaption?: string;
     saveBtnText?: string;
     showAliquotOptions?: boolean;
-    sampleAliasCaption?: string;
     showLinkToStudy?: boolean;
     showParentLabelPrefix?: boolean;
     useSeparateDataClassesAliasMenu?: boolean;
@@ -138,7 +138,7 @@ interface State {
     uniqueIdsConfirmed: boolean;
 }
 // Exported for testing
-export class SampleTypeDesignerImpl extends React.PureComponent<Props & InjectedBaseDomainDesignerProps, State> {
+export class SampleTypeDesignerImpl extends React.PureComponent<InjectedBaseDomainDesignerProps & Props, State> {
     static defaultProps = {
         api: getDefaultAPIWrapper(),
         defaultSampleFieldConfig: DEFAULT_SAMPLE_FIELD_CONFIG,
@@ -156,7 +156,7 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
         validateNameExpressions: true,
     };
 
-    constructor(props: Props & InjectedBaseDomainDesignerProps) {
+    constructor(props: InjectedBaseDomainDesignerProps & Props) {
         super(props);
 
         let domainDetails = this.props.initModel || DomainDetails.create();
@@ -550,7 +550,7 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
         if (isCommunityDistribution() || !model.isNew() || model.domain?.fields?.isEmpty()) {
             return null;
         }
-        return <UniqueIdBanner model={this.state.model} isFieldsPanel={true} onAddField={config.onAddField} />;
+        return <UniqueIdBanner isFieldsPanel={true} model={this.state.model} onAddField={config.onAddField} />;
     };
 
     getNumNewUniqueIdFields(): number {
@@ -558,7 +558,7 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
         return model.domain.fields.filter(field => field.isNew() && field.isUniqueIdField()).count();
     }
 
-    getDomainDetails = (): { [key: string]: any } => {
+    getDomainDetails = (): Record<string, any> => {
         const { model } = this.state;
 
         const {
@@ -683,56 +683,31 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
 
         return (
             <BaseDomainDesigner
-                name={model.name}
-                exception={model.exception}
                 domains={List.of(model.domain)}
+                exception={model.exception}
                 hasValidProperties={model.hasValidProperties()}
-                visitedPanels={visitedPanels}
-                submitting={submitting}
+                name={model.name}
                 onCancel={onCancel}
                 onFinish={this.onFinish}
                 saveBtnText={saveBtnText}
                 showUserComment={isUpdate && appPropertiesOnly}
+                submitting={submitting}
+                visitedPanels={visitedPanels}
             >
                 <SampleTypePropertiesPanel
+                    aliquotNamePatternProps={aliquotNamePatternProps}
                     api={api}
-                    nounSingular={nounSingular}
-                    nounPlural={nounPlural}
-                    nameExpressionInfoUrl={nameExpressionInfoUrl}
-                    nameExpressionPlaceholder={nameExpressionPlaceholder}
+                    appPropertiesOnly={appPropertiesOnly}
+                    controlledCollapse
+                    dataClassAliasCaption={dataClassAliasCaption}
+                    dataClassParentageLabel={dataClassParentageLabel}
+                    dataClassTypeCaption={dataClassTypeCaption}
                     headerText={headerText}
                     helpTopic={helpTopic}
-                    model={model}
-                    parentOptions={parentOptions}
                     includeDataClasses={includeDataClasses}
-                    useSeparateDataClassesAliasMenu={useSeparateDataClassesAliasMenu}
-                    sampleAliasCaption={sampleAliasCaption}
-                    sampleTypeCaption={sampleTypeCaption}
-                    dataClassAliasCaption={dataClassAliasCaption}
-                    dataClassTypeCaption={dataClassTypeCaption}
-                    dataClassParentageLabel={dataClassParentageLabel}
-                    onParentAliasChange={this.parentAliasChange}
-                    onAddParentAlias={this.addParentAlias}
-                    onRemoveParentAlias={this.removeParentAlias}
-                    updateDupeParentAliases={this.updateDupes}
-                    updateModel={this.onFieldChange}
-                    controlledCollapse
                     initCollapsed={currentPanelIndex !== PROPERTIES_PANEL_INDEX}
-                    panelStatus={
-                        model.isNew()
-                            ? getDomainPanelStatus(PROPERTIES_PANEL_INDEX, currentPanelIndex, visitedPanels, firstState)
-                            : 'COMPLETE'
-                    }
-                    validate={validatePanel === PROPERTIES_PANEL_INDEX}
-                    onToggle={this.propertiesToggle}
-                    appPropertiesOnly={appPropertiesOnly}
-                    showLinkToStudy={_showLinkToStudy}
                     metricUnitProps={metricUnitProps}
-                    onAddUniqueIdField={this.onAddUniqueIdField}
-                    aliquotNamePatternProps={aliquotNamePatternProps}
-                    namePreviewsLoading={namePreviewsLoading}
-                    namePreviews={namePreviews}
-                    onNameFieldHover={this.onNameFieldHover}
+                    model={model}
                     nameExpressionGenIdProps={
                         isUpdate && options && hasGenIdInExpression
                             ? {
@@ -745,26 +720,38 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
                               }
                             : undefined
                     }
-                />
-                <DomainForm
-                    api={api.domain}
-                    key={model.domain.domainId || 0}
-                    appDomainHeaderRenderer={this.uniqueIdBannerRenderer}
-                    domainIndex={0}
-                    domain={model.domain}
-                    headerTitle="Fields"
-                    helpTopic={null} // null so that we don't show the "learn more about this tool" link for this domains
-                    controlledCollapse
-                    initCollapsed={currentPanelIndex !== DOMAIN_PANEL_INDEX}
-                    validate={validatePanel === DOMAIN_PANEL_INDEX}
+                    nameExpressionInfoUrl={nameExpressionInfoUrl}
+                    nameExpressionPlaceholder={nameExpressionPlaceholder}
+                    namePreviews={namePreviews}
+                    namePreviewsLoading={namePreviewsLoading}
+                    nounPlural={nounPlural}
+                    nounSingular={nounSingular}
+                    onAddParentAlias={this.addParentAlias}
+                    onAddUniqueIdField={this.onAddUniqueIdField}
+                    onNameFieldHover={this.onNameFieldHover}
+                    onParentAliasChange={this.parentAliasChange}
+                    onRemoveParentAlias={this.removeParentAlias}
+                    onToggle={this.propertiesToggle}
                     panelStatus={
                         model.isNew()
-                            ? getDomainPanelStatus(1, currentPanelIndex, visitedPanels, firstState)
+                            ? getDomainPanelStatus(PROPERTIES_PANEL_INDEX, currentPanelIndex, visitedPanels, firstState)
                             : 'COMPLETE'
                     }
-                    onChange={this.domainChangeHandler}
-                    onToggle={this.formToggle}
+                    parentOptions={parentOptions}
+                    sampleAliasCaption={sampleAliasCaption}
+                    sampleTypeCaption={sampleTypeCaption}
+                    showLinkToStudy={_showLinkToStudy}
+                    updateDupeParentAliases={this.updateDupes}
+                    updateModel={this.onFieldChange}
+                    useSeparateDataClassesAliasMenu={useSeparateDataClassesAliasMenu}
+                    validate={validatePanel === PROPERTIES_PANEL_INDEX}
+                />
+                <DomainForm
+                    api={api.domain}
+                    appDomainHeaderRenderer={this.uniqueIdBannerRenderer}
                     appPropertiesOnly={appPropertiesOnly}
+                    controlledCollapse
+                    domain={model.domain}
                     domainFormDisplayOptions={{
                         ...domainFormDisplayOptions,
                         hideStudyPropertyTypes: !_showLinkToStudy,
@@ -791,47 +778,61 @@ export class SampleTypeDesignerImpl extends React.PureComponent<Props & Injected
                                 "Updating a 'Samples Only' field to be 'Samples and Aliquots' will blank out the field values for all aliquots. This action cannot be undone. ",
                         },
                     }}
+                    domainIndex={0}
+                    groupedSystemFields={{ storedamount: ['units'], units: ['storedamount'] }}
+                    headerTitle="Fields"
+                    helpTopic={null} // null so that we don't show the "learn more about this tool" link for this domains
+                    initCollapsed={currentPanelIndex !== DOMAIN_PANEL_INDEX}
+                    key={model.domain.domainId || 0}
                     newFieldConfig={{
                         derivationDataScope: DERIVATION_DATA_SCOPES.PARENT_ONLY,
                     }}
+                    onChange={this.domainChangeHandler}
+                    onToggle={this.formToggle}
+                    panelStatus={
+                        model.isNew()
+                            ? getDomainPanelStatus(1, currentPanelIndex, visitedPanels, firstState)
+                            : 'COMPLETE'
+                    }
                     systemFields={options?.get('systemFields')}
+                    validate={validatePanel === DOMAIN_PANEL_INDEX}
                 />
                 {appPropertiesOnly && allowFolderExclusion && (
                     // appPropertiesOnly check will prevent this panel from showing in LKS and in LKB media types
                     <DataTypeFoldersPanel
                         controlledCollapse
-                        dataTypeRowId={model?.rowId}
                         dataTypeName={model?.name}
+                        dataTypeRowId={model?.rowId}
                         entityDataType={SampleTypeDataType}
-                        relatedFolderConfigurableDataType="DashboardSampleType"
-                        relatedDataTypeLabel="Include in Dashboard Insights graphs"
                         initCollapsed={currentPanelIndex !== FOLDERS_PANEL_INDEX}
                         onToggle={this.foldersToggle}
                         onUpdateExcludedFolders={this.onUpdateExcludedFolders}
+                        relatedDataTypeLabel="Include in Dashboard Insights graphs"
+                        relatedFolderConfigurableDataType="DashboardSampleType"
                     />
                 )}
                 {error && <div className="domain-form-panel">{error && <Alert bsStyle="danger">{error}</Alert>}</div>}
                 {showUniqueIdConfirmation && (
                     <Modal
+                        confirmText="Continue"
+                        onCancel={this.onUniqueIdCancel}
+                        onConfirm={this.onUniqueIdConfirm}
                         title={
                             'Updating ' +
                             SampleTypeDataType.typeNounSingular +
                             ' with Unique ID field' +
                             (numNewUniqueIdFields !== 1 ? 's' : '')
                         }
-                        onCancel={this.onUniqueIdCancel}
-                        onConfirm={this.onUniqueIdConfirm}
-                        confirmText="Continue"
                     >
                         {confirmModalMessage}
                     </Modal>
                 )}
                 <NameExpressionValidationModal
-                    onHide={this.onNameExpressionWarningCancel}
                     onConfirm={this.onNameExpressionWarningConfirm}
-                    warnings={nameExpressionWarnings}
+                    onHide={this.onNameExpressionWarningCancel}
                     previews={namePreviews}
                     show={!!nameExpressionWarnings && !model.exception}
+                    warnings={nameExpressionWarnings}
                 />
             </BaseDomainDesigner>
         );
diff --git a/packages/components/src/internal/components/editable/Cell.tsx b/packages/components/src/internal/components/editable/Cell.tsx
index 95839e694c..3f3e2f0c15 100644
--- a/packages/components/src/internal/components/editable/Cell.tsx
+++ b/packages/components/src/internal/components/editable/Cell.tsx
@@ -44,6 +44,7 @@ import {
 } from './utils';
 import { LookupCell } from './LookupCell';
 import { DateInputCell } from './DateInputCell';
+import { NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../domainproperties/constants';
 
 // CSS Order: top, right, bottom, left
 export type BorderMask = [boolean, boolean, boolean, boolean];
@@ -532,6 +533,8 @@ export class Cell extends React.PureComponent<CellProps, undefined> {
                 .filter(vd => vd && vd.display !== undefined)
                 .reduce((v, vd, i) => v + (i > 0 ? ', ' : '') + vd.display, '');
 
+            const showMenu = (showLookup || !!col.inputRenderer) && (NON_NEGATIVE_NUMBER_CONCEPT_URI !== col?.conceptURI /*storedamount has inputRenderer but shouldn't show menu*/);
+
             return (
                 <>
                     <DisplayCell
@@ -551,7 +554,7 @@ export class Cell extends React.PureComponent<CellProps, undefined> {
                         placeholder={placeholder}
                         selected={selected}
                         selection={selection}
-                        showMenu={showLookup || !!col.inputRenderer}
+                        showMenu={showMenu}
                         targetRef={this.displayEl}
                     />
                     {renderDragHandle && !this.isReadOnly && (
diff --git a/packages/components/src/internal/components/editable/utils.test.ts b/packages/components/src/internal/components/editable/utils.test.ts
index c10dfcb870..8895584578 100644
--- a/packages/components/src/internal/components/editable/utils.test.ts
+++ b/packages/components/src/internal/components/editable/utils.test.ts
@@ -3,7 +3,7 @@ import { List, Map } from 'immutable';
 import { QueryInfo } from '../../../public/QueryInfo';
 import { QueryColumn, QueryLookup } from '../../../public/QueryColumn';
 
-import { DATE_RANGE_URI } from '../domainproperties/constants';
+import { DATE_RANGE_URI, NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../domainproperties/constants';
 
 import sampleSetQueryInfoJSON from '../../../test/data/sampleSetAllFieldTypes-getQueryDetails.json';
 
@@ -273,6 +273,42 @@ describe('getValidatedEditableGridValue', () => {
         });
     });
 
+    test('amount column', () => {
+        const amountCol = new QueryColumn({
+            jsonType: 'float',
+            conceptURI: NON_NEGATIVE_NUMBER_CONCEPT_URI,
+            caption: 'Amount',
+        });
+
+        const validValues = [null, undefined, '', ' ', 0, 1.1e3, '100', '0.0', 1.11, '1.11', 123.456e2];
+        validValues.forEach(value => {
+            expect(getValidatedEditableGridValue(value, amountCol)).toStrictEqual({
+                message: undefined,
+                value: Utils.isString(value) ? value.trim() : value,
+            });
+        });
+
+        const invalidValues = ['Bogus', true, NaN];
+        invalidValues.forEach(value => {
+            expect(getValidatedEditableGridValue(value, amountCol)).toStrictEqual({
+                message: {
+                    message: 'Invalid decimal',
+                },
+                value,
+            });
+        });
+
+        const invalidNegative = ['-1', '-1.1', -1, -1.1, -1.1e3, -123.456e2];
+        invalidNegative.forEach(value => {
+            expect(getValidatedEditableGridValue(value, amountCol)).toStrictEqual({
+                message: {
+                    message: 'Amount must be non-negative',
+                },
+                value,
+            });
+        });
+    });
+
     test('boolean column', () => {
         const boolCol = new QueryColumn({ jsonType: 'boolean' });
 
diff --git a/packages/components/src/internal/components/editable/utils.ts b/packages/components/src/internal/components/editable/utils.ts
index 957ebed635..b5c1ee6f13 100644
--- a/packages/components/src/internal/components/editable/utils.ts
+++ b/packages/components/src/internal/components/editable/utils.ts
@@ -20,6 +20,7 @@ import { incrementClientSideMetricCount } from '../../actions';
 
 import { CellMessage } from './models';
 import { CellActions, MODIFICATION_TYPES } from './constants';
+import { NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../domainproperties/constants';
 
 interface ValidatedValue {
     message: CellMessage;
@@ -63,6 +64,8 @@ export const getValidatedEditableGridValue = (origValue: any, col: QueryColumn):
             message = 'Invalid integer';
         } else if (jsonType === 'float' && !isFloat(value)) {
             message = 'Invalid decimal';
+        } else if (NON_NEGATIVE_NUMBER_CONCEPT_URI === col?.conceptURI && Number(value) < 0) {
+            message = col.caption + ' must be non-negative';
         } else if (jsonType === 'string' && scale) {
             if (value.toString().trim().length > scale)
                 message = value.toString().trim().length + '/' + scale + ' characters';
diff --git a/packages/components/src/internal/components/forms/QueryFormInputs.tsx b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
index 7ae2f034b7..152f44a6bb 100644
--- a/packages/components/src/internal/components/forms/QueryFormInputs.tsx
+++ b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
@@ -194,7 +194,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
         // QueryFormInputs to be a rendering factory for the columns that are in the set.
         if (columns) {
             return columns.valueArray
-                .filter(col => filter(col))
+                .filter(col => filter(col) && !col.removeFromFormInput)
                 .map(col => {
                     const { fieldKey, name, required } = col;
                     const shouldDisableField = initiallyDisableFields || disabledFields.contains(name.toLowerCase());
@@ -223,8 +223,10 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                     if (ColumnInputRenderer) {
                         return (
                             <ColumnInputRenderer
+                                allColumns={columns}
                                 allowFieldDisable={allowFieldDisable}
                                 col={col}
+                                containerFilter={containerFilter}
                                 data={fieldValues}
                                 formsy
                                 initiallyDisabled={shouldDisableField}
@@ -232,6 +234,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                 onAdditionalFormDataChange={onAdditionalFormDataChange}
                                 onSelectChange={this.onSelectChange}
                                 onToggleDisable={this.onToggleDisable}
+                                queryFilters={queryFilters}
                                 renderLabelField={this.renderLabelField}
                                 showAsteriskSymbol={showAsteriskSymbol}
                                 showLabel
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index cf3e08ad87..1902527e2b 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -40,7 +40,7 @@ import { UserDetailsRenderer } from '../../../renderers/UserDetailsRenderer';
 import { ExpirationDateColumnRenderer } from '../../../renderers/ExpirationDateColumnRenderer';
 import { getContainerFilterForLookups } from '../../../query/api';
 import { FolderColumnRenderer } from '../../../renderers/FolderColumnRenderer';
-import { FILELINK_RANGE_URI } from '../../domainproperties/constants';
+import { FILELINK_RANGE_URI, NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../../domainproperties/constants';
 import { LOOKUP_DEFAULT_SIZE } from '../../../constants';
 
 export type Renderer = (data: any, row?: any) => ReactNode;
@@ -294,7 +294,10 @@ export function resolveDetailEditRenderer(
         }
         let value = resolveDetailFieldValue(data);
 
-        const ColumnInputRenderer = resolveInputRenderer(col);
+        const ColumnInputRenderer =
+            col.conceptURI === NON_NEGATIVE_NUMBER_CONCEPT_URI
+                ? null /* Use standard forminput for media amount/unit */
+                : resolveInputRenderer(col);
         if (ColumnInputRenderer) {
             return (
                 <ColumnInputRenderer
diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
new file mode 100644
index 0000000000..bede93660a
--- /dev/null
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.test.tsx
@@ -0,0 +1,139 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { AmountUnitInput } from './AmountUnitInput';
+import { ExtendedMap } from '../../../../public/ExtendedMap';
+import { QueryColumn } from '../../../../public/QueryColumn';
+import { Formsy } from '../formsy/index';
+
+describe('AmountUnitInput', () => {
+    const amountCol = { name: 'StoredAmount', caption: 'amount', fieldKey: 'amountKey' };
+    const unitCol = {
+        name: 'Units',
+        caption: 'unit',
+        fieldKey: 'unitKey',
+        lookup: {
+            hasQueryFilters: jest.fn(),
+            displayColumn: new QueryColumn({ caption: 'test' }),
+        },
+    };
+    const data = { StoredAmount: 12.5, Units: 'mg' };
+    const allColumns = new ExtendedMap<string, QueryColumn>({
+        [amountCol.fieldKey]: amountCol,
+        [unitCol.fieldKey]: unitCol,
+    });
+
+    const CAN_DISABLE: any = {
+        allowFieldDisable: true,
+        onSelectChange: jest.fn(),
+        onToggleDisable: jest.fn(),
+        initiallyDisabled: false,
+        containerFilter: undefined,
+        containerPath: undefined,
+        allColumns,
+        data,
+        queryFilters: {},
+    };
+
+    const DISABLED: any = {
+        ...CAN_DISABLE,
+        initiallyDisabled: true,
+    };
+
+    const NOT_DISABLABLE: any = {
+        ...CAN_DISABLE,
+        allowFieldDisable: false,
+    };
+
+    test('returns null when required columns are missing', () => {
+        // Missing unit column
+
+        const someColumns = new ExtendedMap<string, QueryColumn>({ [amountCol.fieldKey]: amountCol });
+        const { container } = render(
+            <Formsy className="inner-test">
+                <AmountUnitInput
+                    allColumns={someColumns}
+                    allowFieldDisable={false}
+                    containerFilter={undefined}
+                    containerPath={undefined}
+                    data={{}}
+                    initiallyDisabled={false}
+                    onSelectChange={jest.fn()}
+                    onToggleDisable={jest.fn()}
+                    queryFilters={{}}
+                />
+            </Formsy>
+        );
+
+        // Component should render nothing when unit or amount column can't be found
+        expect(container.querySelector('.inner-test')).toBeEmptyDOMElement();
+    });
+
+    test('with amount and unit column, can disable', () => {
+        const { container } = render(
+            <Formsy>
+                <AmountUnitInput {...CAN_DISABLE} />
+            </Formsy>
+        );
+        expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
+        expect(document.querySelectorAll('label')).toHaveLength(2);
+        expect(document.querySelectorAll('label')[0].textContent).toBe('Amount and Units ');
+        expect(document.querySelectorAll('label')[1].textContent).toBe('');
+        expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(1);
+        expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
+        const inputs = document.querySelectorAll('input');
+        expect(inputs).toHaveLength(4);
+        expect(inputs[0].getAttribute('value')).toBe('true');
+        expect(inputs[0].getAttribute('type')).toBe('hidden');
+        expect(inputs[0].getAttribute('name')).toBe('StoredAmount::enabled');
+        expect(inputs[1].getAttribute('value')).toBe('12.5');
+        expect(inputs[1].getAttribute('name')).toBe('amountKey');
+        expect(inputs[2].getAttribute('role')).toBe('combobox');
+        expect(inputs[3].getAttribute('name')).toBe('Units::enabled');
+        expect(inputs[3].getAttribute('value')).toBe('true');
+        expect(inputs[3].getAttribute('type')).toBe('hidden');
+    });
+
+    test('with amount and unit column, can disable and disabled', () => {
+        const { container } = render(
+            <Formsy>
+                <AmountUnitInput {...DISABLED} />
+            </Formsy>
+        );
+        expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
+        expect(document.querySelectorAll('label')).toHaveLength(2);
+        expect(document.querySelectorAll('label')[0].textContent).toBe('Amount and Units ');
+        expect(document.querySelectorAll('label')[1].textContent).toBe('');
+        expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
+        expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(1);
+        const inputs = document.querySelectorAll('input');
+        expect(inputs).toHaveLength(4);
+        expect(inputs[0].getAttribute('value')).toBe('false');
+        expect(inputs[0].getAttribute('type')).toBe('hidden');
+        expect(inputs[0].getAttribute('name')).toBe('StoredAmount::enabled');
+        expect(inputs[1].getAttribute('value')).toBe('12.5');
+        expect(inputs[1].getAttribute('name')).toBe('amountKey');
+        expect(inputs[2].getAttribute('role')).toBe('combobox');
+        expect(inputs[3].getAttribute('name')).toBe('Units::enabled');
+        expect(inputs[3].getAttribute('value')).toBe('false');
+        expect(inputs[3].getAttribute('type')).toBe('hidden');
+    });
+
+    test('with amount and unit column, cannot disable', () => {
+        const { container } = render(
+            <Formsy>
+                <AmountUnitInput {...NOT_DISABLABLE} />
+            </Formsy>
+        );
+        expect(document.querySelectorAll('.form-group.row')).toHaveLength(1);
+        expect(document.querySelectorAll('label')).toHaveLength(2);
+        expect(document.querySelectorAll('label')[0].textContent).toBe('Amount and Units ');
+        expect(document.querySelectorAll('label')[1].textContent).toBe('');
+        expect(document.querySelectorAll('.fa-toggle-on')).toHaveLength(0);
+        expect(document.querySelectorAll('.fa-toggle-off')).toHaveLength(0);
+        const inputs = document.querySelectorAll('input');
+        expect(inputs).toHaveLength(2);
+        expect(inputs[0].getAttribute('value')).toBe('12.5');
+        expect(inputs[0].getAttribute('name')).toBe('amountKey');
+        expect(inputs[1].getAttribute('role')).toBe('combobox');
+    });
+});
diff --git a/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
new file mode 100644
index 0000000000..06797ffe05
--- /dev/null
+++ b/packages/components/src/internal/components/forms/input/AmountUnitInput.tsx
@@ -0,0 +1,102 @@
+import React, { FC, memo, useCallback, useMemo, useState } from 'react';
+import { List } from 'immutable';
+
+import { TextInput } from './TextInput';
+import { QuerySelect } from '../QuerySelect';
+import { getContainerFilterForLookups } from '../../../query/api';
+import { FieldLabel } from '../FieldLabel';
+import { InputRendererProps } from './types';
+import { caseInsensitive, generateId } from '../../../util/utils';
+import { FormsyInput } from './FormsyReactComponents';
+import { Operation } from '../../../../public/QueryColumn';
+import { STORED_AMOUNT_FIELDS } from '../../samples/constants';
+
+export const AmountUnitInput: FC<InputRendererProps> = memo(props => {
+    const {
+        allowFieldDisable,
+        onSelectChange,
+        onToggleDisable,
+        initiallyDisabled,
+        containerFilter,
+        containerPath,
+        allColumns,
+        data,
+        queryFilters,
+    } = props;
+    const [disabled, setDisabled] = useState<boolean>(initiallyDisabled && allowFieldDisable);
+
+    const amountCol = allColumns.find(col => col.name.toLowerCase() === STORED_AMOUNT_FIELDS.AMOUNT.toLowerCase());
+    const unitCol = allColumns.find(col => col.name.toLowerCase() === STORED_AMOUNT_FIELDS.UNITS.toLowerCase());
+    const amountValue = caseInsensitive(data, amountCol?.name);
+    const unitValue = caseInsensitive(data, unitCol?.name);
+    const queryFilter = unitCol?.lookup.hasQueryFilters(Operation.insert)
+        ? List(unitCol?.lookup.getQueryFilters(Operation.insert))
+        : queryFilters?.[unitCol?.fieldKey];
+
+    const id = useMemo(() => generateId('amount-unit-input-'), []);
+
+    const onToggleChange = useCallback(() => {
+        setDisabled(prevDisabled => {
+            const newDisabled = !prevDisabled;
+            onToggleDisable?.(newDisabled);
+            return newDisabled;
+        });
+    }, [setDisabled]);
+
+    if (!amountCol || !unitCol) {
+        return null;
+    }
+
+    return (
+        <div className="form-group row">
+            <FieldLabel
+                fieldName={amountCol.name}
+                id={id}
+                isDisabled={disabled}
+                labelOverlayProps={{
+                    inputId: amountCol.name,
+                    description: 'The amount and units of this sample currently on hand.',
+                    label: 'Amount and Units',
+                    isFormsy: false,
+                }}
+                showLabel
+                showToggle={allowFieldDisable}
+                toggleProps={{
+                    onClick: onToggleChange,
+                }}
+            />
+            <TextInput
+                disableInput={disabled}
+                elementWrapperClassName=""
+                queryColumn={amountCol}
+                rowClassName={'col-sm-5 col-xs-6'}
+                showLabel={false}
+                value={amountValue ? String(amountValue) : amountValue}
+            />
+            <QuerySelect
+                containerClass={'col-sm-4 col-xs-6'}
+                containerFilter={unitCol.lookup.containerFilter ?? containerFilter ?? getContainerFilterForLookups()}
+                containerPath={unitCol.lookup.containerPath ?? containerPath}
+                description={unitCol.description}
+                disableInput={disabled}
+                displayColumn={unitCol.lookup.displayColumn}
+                formsy
+                id={id}
+                inputClass={''}
+                name={unitCol.fieldKey}
+                onQSChange={onSelectChange}
+                placeholder="Select or type to search..."
+                queryFilters={queryFilter}
+                schemaQuery={unitCol.lookup.schemaQuery}
+                showLabel={false}
+                value={unitValue}
+                valueColumn={unitCol.lookup.keyColumn}
+            />
+            {allowFieldDisable && (
+                <FormsyInput name={unitCol.name + '::enabled'} type="hidden" value={disabled ? 'false' : 'true'} />
+            )}
+        </div>
+    );
+});
+
+AmountUnitInput.displayName = 'AmountUnitInput';
diff --git a/packages/components/src/internal/components/forms/input/InputRenderFactory.ts b/packages/components/src/internal/components/forms/input/InputRenderFactory.ts
index fd69a13e4e..68945769b6 100644
--- a/packages/components/src/internal/components/forms/input/InputRenderFactory.ts
+++ b/packages/components/src/internal/components/forms/input/InputRenderFactory.ts
@@ -6,6 +6,7 @@ import { InputRendererProps } from './types';
 import { AliasGridInput, AliasInput } from './AliasInput';
 import { AppendUnitsInput } from './AppendUnitsInput';
 import { SampleStatusInputRenderer } from './SampleStatusInput';
+import { AmountUnitInput } from './AmountUnitInput';
 
 export type InputRendererComponent = ComponentType<InputRendererProps>;
 export type InputRendererFactory = (col: QueryColumn, isGridInput?: boolean) => InputRendererComponent;
@@ -48,4 +49,5 @@ export function registerInputRenderers(): void {
     registerInputRenderer('ExperimentAlias', AliasGridInput, InputRenderContext.Grid);
     registerInputRenderer('ExperimentAlias', AliasInput, InputRenderContext.Form);
     registerInputRenderer('SampleStatusInput', SampleStatusInputRenderer);
+    registerInputRenderer('AmountUnitInput', AmountUnitInput, InputRenderContext.Form);
 }
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 9e1ef55381..5003879301 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -145,7 +145,7 @@ export type SelectInputChange = (
 // Copied from @types/react-select/src/Select.d.ts
 export type FilterOption = ((option: SelectInputOption, rawInput: string) => boolean) | null;
 
-function initOptionFromPrimitive(value: string | number, props: SelectInputProps): SelectInputOption {
+function initOptionFromPrimitive(value: number | string, props: SelectInputProps): SelectInputOption {
     const { labelKey = 'label', options, valueKey = 'value' } = props;
     const result = options?.find(o => o[valueKey] === value);
     if (result) return result;
@@ -205,8 +205,8 @@ export interface SelectInputProps {
     autoValue?: boolean;
     backspaceRemovesValue?: boolean;
     cacheOptions?: boolean;
-    clearCacheOnChange?: boolean;
     clearable?: boolean;
+    clearCacheOnChange?: boolean;
     closeMenuOnSelect?: boolean;
     containerClass?: string;
     customStyles?: Record<string, any>;
@@ -216,6 +216,7 @@ export interface SelectInputProps {
     delimiter?: string;
     description?: string;
     disabled?: boolean;
+    disableInput?: boolean;
     filterOption?: FilterOption;
     formatCreateLabel?: (inputValue: string) => ReactNode;
     formatGroupLabel?: (data: any) => ReactNode;
@@ -269,7 +270,7 @@ export interface SelectInputProps {
     warning?: ReactNode;
 }
 
-type SelectInputImplProps = SelectInputProps & FormsyInjectedProps<any>;
+type SelectInputImplProps = FormsyInjectedProps<any> & SelectInputProps;
 
 interface State {
     // This state property is used in conjunction with the prop "clearCacheOnChange" which when true
@@ -537,8 +538,9 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
 
                 return (
                     <FieldLabel
-                        id={this.getId()}
                         fieldName={name}
+                        id={this.getId()}
+                        isDisabled={isDisabled}
                         labelOverlayProps={{
                             inputId: name,
                             description: description_,
@@ -551,7 +553,6 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         }}
                         showLabel={showLabel}
                         showToggle={allowDisable}
-                        isDisabled={isDisabled}
                         toggleProps={{
                             onClick: toggleDisabledTooltip ? undefined : this.onToggleChange,
                             toolTip: toggleDisabledTooltip,
@@ -686,7 +687,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
             id: this.getId(),
             inputId,
             isClearable: clearable,
-            isDisabled: disabled || this.state.isDisabled,
+            isDisabled: disabled || this.state.isDisabled || this.props.disableInput,
             isLoading,
             isMulti: multiple,
             isValidNewOption,
diff --git a/packages/components/src/internal/components/forms/input/TextInput.tsx b/packages/components/src/internal/components/forms/input/TextInput.tsx
index 8d081a7c8f..a0e136a032 100644
--- a/packages/components/src/internal/components/forms/input/TextInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextInput.tsx
@@ -27,6 +27,7 @@ import { InternalSpacesWarning } from '../InternalSpacesWarning';
 
 export interface TextInputProps extends DisableableInputProps, Omit<FormsyInputProps, 'onChange'> {
     addLabelAsterisk?: boolean;
+    disableInput?: boolean;
     includeSpacesWarning?: boolean;
     isUpdate?: boolean;
     onChange?: (value: any) => void;
@@ -91,12 +92,12 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
 
         return (
             <FieldLabel
+                column={queryColumn}
+                isDisabled={isDisabled}
                 label={label}
-                showLabel={showLabel}
                 labelOverlayProps={{ isFormsy: true, addLabelAsterisk }}
+                showLabel={showLabel}
                 showToggle={allowDisable}
-                column={queryColumn}
-                isDisabled={isDisabled}
                 toggleProps={{
                     onClick: this.toggleDisabled,
                 }}
@@ -126,7 +127,6 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
             ...inputProps
         } = rest;
 
-
         let help: string;
         // Issue 52367: Don't show the message if we have a name that can be edited
         if (queryColumn.nameExpression && !isUpdate) {
@@ -142,7 +142,7 @@ export class TextInput extends DisableableInput<TextInputProps, TextInputState>
                     required={queryColumn.required}
                     {...inputProps}
                     componentRef={this.textInput}
-                    disabled={this.state.isDisabled}
+                    disabled={this.state.isDisabled || this.props.disableInput}
                     help={help}
                     label={this.renderLabel()}
                     labelClassName={showLabel ? labelClassName : 'hide-label'}
diff --git a/packages/components/src/internal/components/forms/input/types.ts b/packages/components/src/internal/components/forms/input/types.ts
index 7a3abedf33..abfe2a7200 100644
--- a/packages/components/src/internal/components/forms/input/types.ts
+++ b/packages/components/src/internal/components/forms/input/types.ts
@@ -1,12 +1,15 @@
 import { ReactNode } from 'react';
+import { List } from 'immutable';
 
-import { Query } from '@labkey/api';
+import { Filter, Query } from '@labkey/api';
 
 import { QueryColumn } from '../../../../public/QueryColumn';
 
 import { SelectInputChange, SelectInputProps } from './SelectInput';
+import { ExtendedMap } from '../../../../public/ExtendedMap';
 
 export interface InputRendererProps {
+    allColumns?: ExtendedMap<string, QueryColumn>;
     allowFieldDisable?: boolean;
     col: QueryColumn;
     containerFilter?: Query.ContainerFilter;
@@ -19,6 +22,7 @@ export interface InputRendererProps {
     onAdditionalFormDataChange?: (name: string, value: any) => void;
     onSelectChange?: SelectInputChange;
     onToggleDisable?: (disabled: boolean) => void;
+    queryFilters?: Record<string, List<Filter.IFilter>>;
     renderLabelField?: (col: QueryColumn) => ReactNode;
     selectInputProps?: Omit<SelectInputProps, 'onChange'>;
     showAsteriskSymbol?: boolean;
diff --git a/packages/components/src/internal/query/api.ts b/packages/components/src/internal/query/api.ts
index 47a8768d0a..45a210c4e3 100644
--- a/packages/components/src/internal/query/api.ts
+++ b/packages/components/src/internal/query/api.ts
@@ -373,6 +373,10 @@ function applyViewColumns(
 
 export class Renderers {
     static _check(columnMetadata, rawColumn, field, metadata) {
+        const columnValue = columnMetadata[field];
+        if (columnValue)
+            return columnValue;
+
         if (columnMetadata.conceptURI || rawColumn.conceptURI) {
             const concept = metadata.getIn([
                 'concepts',
diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts
index 1370b73d47..fc77622bef 100644
--- a/packages/components/src/public/QueryColumn.ts
+++ b/packages/components/src/public/QueryColumn.ts
@@ -190,6 +190,7 @@ export class QueryColumn implements IQueryColumn {
     declare inputRenderer: string;
     declare sorts: '+' | '-';
     declare removeFromViews: boolean; // strips this column from all ViewInfo definitions
+    declare removeFromFormInput: boolean; // strips this column from QueryFormInputs
     declare units: string;
     declare derivationDataScope: string;