diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 69d511e2b..b825201ac 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -2,6 +2,25 @@
  
 https://agr-jira.atlassian.net/wiki/spaces/ATEAM/overview
 
+## v0.29.0
+* New features
+   * Allele detail page: Visually emphasize field names/sections and visually demphasize 'Add' buttons (SCRUM-3343)	
+   * Report Failed Loads table in Data Loads page UI (SCRUM-3440)	
+   * Notify developers via Slack of failed curation system loads (SCRUM-3470)	
+   * Provide "Saving in progress" indicator and inactivate interaction with page on allele detail pages (SCRUM-3536)	
+   * Move "Add" buttons in Allele detail page to right of field names (in-line)(SCRUM-3551)	
+   * Reduce empty space in disease annotations table to create a more compact representation (SCRUM-3564)	
+   * Enable downloading of all exception messages for a given data load (SCRUM-2639)	
+
+* Fixes and maintenance
+   * Upgrade python version used in agr_db_backups (SCRUM-3094)	
+   * FB constructs failing to load (SCRUM-3613)	
+   * Fix failing Construct Association loads (SCRUM-3620)	
+   * SGD Allele load failing with uninterpretable exception messages (SCRUM-3630)	
+   * Attempting to display FB constructs with secondary IDs in Constructs table (on alpha) throws error (SCRUM-3631)	
+   * RGD Allele load entries failing incorrectly (SCRUM-3633)
+   * Create Json View to Limit data from Disease Annotations (SCRUM-3588)	
+
 ## v0.28.0-rc2 
 * Updates quarkus to version 3
 * Fixes and maintenance 
diff --git a/src/main/cliapp/src/containers/diseaseAnnotationsPage/NewAnnotationForm.js b/src/main/cliapp/src/containers/diseaseAnnotationsPage/NewAnnotationForm.js
index 7a58d1d7b..2493dd0c6 100644
--- a/src/main/cliapp/src/containers/diseaseAnnotationsPage/NewAnnotationForm.js
+++ b/src/main/cliapp/src/containers/diseaseAnnotationsPage/NewAnnotationForm.js
@@ -3,7 +3,7 @@ import { Dialog } from "primereact/dialog";
 import { Button } from "primereact/button";
 import { Dropdown } from "primereact/dropdown";
 import { Toast } from "primereact/toast";
-// import { MultiSelect } from 'primereact/multiselect';
+ import { MultiSelect } from 'primereact/multiselect';
 import { useMutation, useQueryClient } from "react-query";
 import { FormErrorMessageComponent } from "../../components/Error/FormErrorMessageComponent";
 import { classNames } from "primereact/utils";
@@ -31,7 +31,8 @@ import { EvidenceCodesAdditionalFieldData } from "../../components/FieldData/Evi
 import { WithAdditionalFieldData } from "../../components/FieldData/WithAdditionalFieldData";
 import { GeneticModifiersAdditionalFieldData } from "../../components/FieldData/GeneticModifiersAdditionalFieldData";
 import ErrorBoundary from "../../components/Error/ErrorBoundary";
-// import { ConfirmButton } from "../../components/ConfirmButton";
+import { ConfirmButton } from "../../components/ConfirmButton";
+import { getModFormFields } from "../../service/TableStateService";
 
 export const NewAnnotationForm = ({
 									newAnnotationState,
@@ -50,7 +51,7 @@ export const NewAnnotationForm = ({
 	const assertedAlleleRef = useRef(null);
 	const evidenceCodesRef = useRef(null);
 	const experimentsRef = useRef(null);
-	// const [selectedFields, setSelectedFields] = useState([]);
+
 	const {
 		newAnnotation,
 		errorMessages,
@@ -73,7 +74,9 @@ export const NewAnnotationForm = ({
 	const geneticModifierRelationTerms = useControlledVocabularyService('disease_genetic_modifier_relation');
 	const [uiErrorMessages, setUiErrorMessages] = useState({});
 	const areUiErrors = useRef(false);
-
+	const optionalFields = ["Asserted Genes", "Asserted Allele", "Negated", "With", "Related Notes", "Experimental Conditions", "Experiments", "Genetic Sex",
+							"Disease Qualifiers", "SGD Strain Background", "Annotation Type", "Genetic Modifier Relation", "Genetic Modifiers","Internal"];
+	const [selectedFields, setSelectedFields] = useState(optionalFields);
 	const mutation = useMutation(newAnnotation => {
 		if (!diseaseAnnotationService) {
 			diseaseAnnotationService = new DiseaseAnnotationService();
@@ -81,7 +84,6 @@ export const NewAnnotationForm = ({
 		return diseaseAnnotationService.createDiseaseAnnotation(newAnnotation);
 	});
 
-
 	const hideDialog = () => {
 		newAnnotationDispatch({ type: "RESET" });
 		newAnnotationDispatch({ type: "SET_IS_ENABLED", value: false });
@@ -94,15 +96,15 @@ export const NewAnnotationForm = ({
 		event.preventDefault();
 		newAnnotationDispatch({type: "SUBMIT"});
 		const isRelatedNotesErrors = await validateTable(
-			"note", 
-			"relatedNotesErrorMessages", 
-			newAnnotation.relatedNotes, 
+			"note",
+			"relatedNotesErrorMessages",
+			newAnnotation.relatedNotes,
 			newAnnotationDispatch
 		);
 		const isExConErrors = await validateTable(
-			"condition-relation", 
-			"exConErrorMessages", 
-			newAnnotation.conditionRelations, 
+			"condition-relation",
+			"exConErrorMessages",
+			newAnnotation.conditionRelations,
 			newAnnotationDispatch
 		);
 
@@ -134,7 +136,7 @@ export const NewAnnotationForm = ({
 			},
 			onError: (error) => {
 
-				let message; 
+				let message;
 				if(error?.response?.data?.errorMessages?.uniqueId){
 					message = "Page Error: New annotation is a duplicate of an existing annotation";
 				} else if(error?.response?.data?.errorMessage){
@@ -143,14 +145,13 @@ export const NewAnnotationForm = ({
 					//toast will still display even if 500 error and no errorMessages
 					message = `${error.response.status} ${error.response.statusText}`
 				}
-					
 
 				toast_error.current.show({severity: 'error', summary: 'Page error: ', detail: message });
 
 				newAnnotationDispatch(
 					{
-						type: "UPDATE_ERROR_MESSAGES", 
-						errorType: "errorMessages", 
+						type: "UPDATE_ERROR_MESSAGES",
+						errorType: "errorMessages",
 						errorMessages: error.response?.data?.errorMessages || {}
 					}
 				);
@@ -174,6 +175,10 @@ export const NewAnnotationForm = ({
 		handleSubmit(event, false);
 	}
 
+	const handleShowAllFields = () => {
+		setSelectedFields(optionalFields);
+	}
+
 	const onSingleReferenceChange = (event) => {
 		setUiErrorMessages({});
 		newAnnotationDispatch({
@@ -398,35 +403,39 @@ export const NewAnnotationForm = ({
 		autocompleteSearch(searchService, endpoint, filterName, filter, setFiltered);
 	}
 
-	// const defaultFields = (["Subject", "Asserted Genes", "Asserted Allele", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code", "With", "Related Notes",
-	// 	"Experimental Conditions", "Experiments", "Genetic Sex", "Disease Qualifiers", "SGD Strain Background", "Annotation Type", "Genetic Modifier Relation",
-	// 	"Genetic Modifiers", "Internal"]);
+	const setToModDefault = () => {
+		const modFormFields = getModFormFields("DiseaseAnnotations");
+		setSelectedFields(modFormFields);
+	}
 
 	const dialogHeader = (
 	<>
 		<Splitter style={{border:'none', height:'5%'}} gutterSize="0">
 			<SplitterPanel size={25} style={{textAlign: 'left'}}>
-				<h4>Add Annotation</h4>
+				<h4>Add Disease Annotation</h4>
 			</SplitterPanel>
-			{/*<SplitterPanel size={10} style={{textAlign: 'right', padding: '5px'}}>
+			<SplitterPanel size={10} style={{textAlign: 'right', padding: '5px'}}>
 				<MultiSelect
 					aria-label='columnToggle'
-					options={defaultFields}
+					options={optionalFields}
 					value={selectedFields}
-					display="chip"
+					filter
+					resetFilterOnHide
 					onChange={(e) => setSelectedFields(e.value)}
-					style={{ width: '20em', textAlign: 'center' }}
+					className='w-20rem text-center'
+					maxSelectedLabels={4}
 				/>
-			</SplitterPanel>*/}
-			{/*<SplitterPanel size={20} style={{textAlign: 'right', padding: '5px'}}>
-				<Button label="Show all fields"/>
-			</SplitterPanel>*/}
-			{/*<SplitterPanel size={20} style={{textAlign: 'right', padding: '5px'}}>
+			</SplitterPanel>
+			<SplitterPanel size={10} style={{textAlign: 'right', padding: '5px'}}>
+				<Button label="Show all fields" onClick={handleShowAllFields}/>
+			</SplitterPanel>
+			<SplitterPanel size={10} style={{textAlign: 'right', padding: '5px'}}>
 				<ConfirmButton
-					buttonText="Set MOD Defaults"
+					buttonText="Set to MOD Defaults"
 					messageText= {`Are you sure? This will reset to MOD default settings.`}
+					acceptHandler={setToModDefault}
 				/>
-			</SplitterPanel>*/}
+			</SplitterPanel>
 		</Splitter>
 	</>
 	);
@@ -439,12 +448,12 @@ export const NewAnnotationForm = ({
 		<div>
 			<Toast ref={toast_error} position="top-left"/>
 			<Toast ref={toast_success} position="top-right"/>
-			<Dialog visible={newAnnotationDialog} header={dialogHeader} modal className="p-fluid w-9" footer={dialogFooter} onHide={hideDialog} maximizable>
+			<Dialog visible={newAnnotationDialog} header={dialogHeader} position={"top"} modal className="p-fluid w-9" footer={dialogFooter} onHide={hideDialog} maximizable>
 				<ErrorBoundary>
 				<form>
 					<div className="grid">
 						<div className={labelColumnSize}>
-					 		<label htmlFor="subject"><font color={'red'}>*</font>Subject</label>
+							<label htmlFor="subject"><font color={'red'}>*</font>Subject</label>
 						</div>
 						<div className={widgetColumnSize}>
 							<AutocompleteFormEditor
@@ -466,56 +475,64 @@ export const NewAnnotationForm = ({
 						</div>
 					</div>
 
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="assertedGenes">Asserted Genes</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<AutocompleteFormMultiEditor
-								customRef={assertedGenesRef}
-								search={assertedGenesSearch}
-								name="assertedGenes"
-								label="Asserted Genes"
-								fieldName='assertedGenes'
-								disabled = {!isAssertedGeneEnabled}
-								initialValue={newAnnotation.assertedGenes}
-								onValueChangeHandler={onArrayFieldChange}
-								valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
-									<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
-								classNames={classNames({'p-invalid': submitted && errorMessages.assertedGenes})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"assertedGenes"}/>
-							<AssertedGenesAdditionalFieldData fieldData={newAnnotation.assertedGenes}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="assertedAllele">Asserted Allele</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<AutocompleteFormEditor
-								customRef={assertedAlleleRef}
-								search={assertedAlleleSearch}
-								name="assertedAllele"
-								label="Asserted Allele"
-								fieldName='assertedAllele'
-								disabled = {!isAssertedAlleleEnabled}
-								initialValue={newAnnotation.assertedAllele}
-								onValueChangeHandler={onSingleReferenceChange}
-								valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
-									<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
-								classNames={classNames({'p-invalid': submitted && errorMessages.assertedAllele})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"assertedAllele"}/>
-							<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"assertedAllele"}/>
-							<AssertedAlleleAdditionalFieldData fieldData={newAnnotation.assertedAllele}/>
-						</div>
-					</div>
+					{selectedFields.includes("Asserted Genes") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="assertedGenes">Asserted Genes</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<AutocompleteFormMultiEditor
+										customRef={assertedGenesRef}
+										search={assertedGenesSearch}
+										name="assertedGenes"
+										label="Asserted Genes"
+										fieldName='assertedGenes'
+										disabled = {!isAssertedGeneEnabled}
+										initialValue={newAnnotation.assertedGenes}
+										onValueChangeHandler={onArrayFieldChange}
+										valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
+											<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
+										classNames={classNames({'p-invalid': submitted && errorMessages.assertedGenes})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"assertedGenes"}/>
+									<AssertedGenesAdditionalFieldData fieldData={newAnnotation.assertedGenes}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Asserted Allele") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="assertedAllele">Asserted Allele</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<AutocompleteFormEditor
+										customRef={assertedAlleleRef}
+										search={assertedAlleleSearch}
+										name="assertedAllele"
+										label="Asserted Allele"
+										fieldName='assertedAllele'
+										disabled = {!isAssertedAlleleEnabled}
+										initialValue={newAnnotation.assertedAllele}
+										onValueChangeHandler={onSingleReferenceChange}
+										valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
+											<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
+										classNames={classNames({'p-invalid': submitted && errorMessages.assertedAllele})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"assertedAllele"}/>
+									<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"assertedAllele"}/>
+									<AssertedAlleleAdditionalFieldData fieldData={newAnnotation.assertedAllele}/>
+								</div>
+							</div>
+						</>
+					)}
 
 					<div className="grid">
 						<div className={labelColumnSize}>
@@ -536,25 +553,29 @@ export const NewAnnotationForm = ({
 						</div>
 					</div>
 
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="negated">Negated</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<Dropdown
-								name="negated"
-								value={newAnnotation.negated}
-								options={negatedTerms}
-								optionLabel='text'
-								optionValue='name'
-								onChange={onDropdownFieldChange}
-								className={classNames({'p-invalid': submitted && errorMessages.negated})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"negated"}/>
-						</div>
-					</div>
+					{selectedFields.includes("Negated") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="negated">Negated</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<Dropdown
+										name="negated"
+										value={newAnnotation.negated}
+										options={negatedTerms}
+										optionLabel='text'
+										optionValue='name'
+										onChange={onDropdownFieldChange}
+										className={classNames({'p-invalid': submitted && errorMessages.negated})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"negated"}/>
+								</div>
+							</div>
+						</>
+					)}
 
 					<div className="grid">
 						<div className={labelColumnSize}>
@@ -624,229 +645,274 @@ export const NewAnnotationForm = ({
 						</div>
 					</div>
 
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="with">With</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<AutocompleteFormMultiEditor
-								customRef={withRef}
-								search={withSearch}
-								name="with"
-								label="With"
-								fieldName='with'
-								initialValue={newAnnotation.with}
-								onValueChangeHandler={onArrayFieldChange}
-								valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
-									<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
-								classNames={classNames({'p-invalid': submitted && errorMessages.with})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"with"}/>
-							<WithAdditionalFieldData fieldData={newAnnotation.with}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label>Related Notes</label>
-						</div>
-						<div className={classNames('col-9', {'border-2 border-red-300': submitted && errorMessages.relatedNotes && Object.keys(relatedNotesErrorMessages).length === 0})}>
-							<RelatedNotesForm
-								dispatch={newAnnotationDispatch}
-								relatedNotes={newAnnotation.relatedNotes}
-								showRelatedNotes={showRelatedNotes}
-								errorMessages={relatedNotesErrorMessages}
-								editingRows={relatedNotesEditingRows}
-							/>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"relatedNotes"}/>
-							<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"relatedNotes"}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label>Experimental Conditions</label>
-						</div>
-						<div className={classNames('col-9')} >
-							<ConditionRelationsForm
-								dispatch={newAnnotationDispatch}
-								conditionRelations={newAnnotation.conditionRelations}
-								showConditionRelations={showConditionRelations}
-								errorMessages={exConErrorMessages}
-								searchService={searchService}
-								buttonIsDisabled={isConditionRelationButtonEnabled()}
-								editingRows={conditionRelationsEditingRows}
-							/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="experiments">Experiments</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<ConditionRelationHandleFormDropdown
-								name="experiments"
-								customRef={experimentsRef}
-								editorChange={onDropdownExperimentsFieldChange}
-								referenceCurie={newAnnotation.singleReference?.curie}
-								value={newAnnotation.conditionRelations?.[0]?.handle}
-								showClear={true}
-								placeholderText={newAnnotation.conditionRelations?.[0]?.handle}
-								isEnabled={isExperimentEnabled()}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"conditionRelations[0]?.handle"}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="geneticSex">Genetic Sex</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<ControlledVocabularyFormDropdown
-								name="geneticSex"
-								options={geneticSexTerms}
-								editorChange={onDropdownFieldChange}
-								value={newAnnotation.geneticSex}
-								showClear={true}
-								className={classNames({'p-invalid': submitted && errorMessages.geneticSex})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"geneticSex"} />
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="diseaseQualifiers">Disease Qualifiers</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<ControlledVocabularyFormMultiSelectDropdown
-								name="diseaseQualifiers"
-								options={diseaseQualifiersTerms}
-								editorChange={onControlledVocabChange}
-								value={newAnnotation.diseaseQualifiers}
-								className={classNames({'p-invalid': submitted && errorMessages.diseaseQualifiers})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseQualifiers"} />
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="sgdStrainBackground">SGD Strain Background</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<AutocompleteFormEditor
-								initialValue={newAnnotation.sgdStrainBackground}
-								search={sgdStrainBackgroundSearch}
-								searchService={searchService}
-								fieldName='sgdStrainBackground'
-								name="sgdStrainBackground"
-								label="SGD Strain Background"
-								valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
-									<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
-								onValueChangeHandler={onSingleReferenceChange}
-								classNames={classNames({'p-invalid': submitted && errorMessages.sgdStrainBackground})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"sgdStrainBackground"}/>
-							<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"sgdStrainBackground"}/>
-							<SGDStrainBackgroundAdditionalFieldData fieldData={newAnnotation.sgdStrainBackground}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="annotationType">Annotation Type</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<ControlledVocabularyFormDropdown
-								name="annotationType"
-								field="annotationType"
-								options={annotationTypeTerms}
-								editorChange={onDropdownFieldChange}
-								showClear={true}
-								value={newAnnotation.annotationType}
-								className={classNames({'p-invalid': submitted && errorMessages.annotationType})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"annotationType"} />
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="diseaseGeneticModifierRelation">Genetic Modifier Relation</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<ControlledVocabularyFormDropdown
-								name="diseaseGeneticModifierRelation"
-								field="diseaseGeneticModifierRelation"
-								options={geneticModifierRelationTerms}
-								editorChange={onDropdownFieldChange}
-								showClear={true}
-								value={newAnnotation.diseaseGeneticModifierRelation}
-								className={classNames({'p-invalid': submitted && errorMessages.diseaseGeneticModifierRelation})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseGeneticModifierRelation"}/>
-							<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"diseaseGeneticModifierRelation"}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="diseaseGeneticModifier">Genetic Modifiers</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<AutocompleteFormMultiEditor
-								search={geneticModifiersSearch}
-								initialValue={newAnnotation.diseaseGeneticModifiers}
-								fieldName='diseaseGeneticModifiers'
-								name="diseaseGeneticModifiers"
-								valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
-									<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
-								onValueChangeHandler={onArrayFieldChange}
-								classNames={classNames({'p-invalid': submitted && errorMessages.diseaseGeneticModifiers})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseGeneticModifiers"}/>
-							<GeneticModifiersAdditionalFieldData fieldData={newAnnotation.diseaseGeneticModifiers}/>
-						</div>
-					</div>
-
-					<div className="grid">
-						<div className={labelColumnSize}>
-							<label htmlFor="internal"><font color={'red'}>*</font>Internal</label>
-						</div>
-						<div className={widgetColumnSize}>
-							<Dropdown
-								name="internal"
-								value={newAnnotation.internal}
-								options={booleanTerms}
-								optionLabel='text'
-								optionValue='name'
-								onChange={onDropdownFieldChange}
-								className={classNames({'p-invalid': submitted && errorMessages.internal})}
-							/>
-						</div>
-						<div className={fieldDetailsColumnSize}>
-							<FormErrorMessageComponent errorMessages={errorMessages} errorField={"internal"}/>
-						</div>
-					</div>
+					{selectedFields.includes("With") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="with">With</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<AutocompleteFormMultiEditor
+										customRef={withRef}
+										search={withSearch}
+										name="with"
+										label="With"
+										fieldName='with'
+										initialValue={newAnnotation.with}
+										onValueChangeHandler={onArrayFieldChange}
+										valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
+											<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
+										classNames={classNames({'p-invalid': submitted && errorMessages.with})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"with"}/>
+									<WithAdditionalFieldData fieldData={newAnnotation.with}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Related Notes") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label>Related Notes</label>
+								</div>
+								<div className={classNames('col-9', {'border-2 border-red-300': submitted && errorMessages.relatedNotes && Object.keys(relatedNotesErrorMessages).length === 0})}>
+									<RelatedNotesForm
+										dispatch={newAnnotationDispatch}
+										relatedNotes={newAnnotation.relatedNotes}
+										showRelatedNotes={showRelatedNotes}
+										errorMessages={relatedNotesErrorMessages}
+										editingRows={relatedNotesEditingRows}
+									/>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"relatedNotes"}/>
+									<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"relatedNotes"}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Experimental Conditions") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label>Experimental Conditions</label>
+								</div>
+								<div className={classNames('col-9')} >
+									<ConditionRelationsForm
+										dispatch={newAnnotationDispatch}
+										conditionRelations={newAnnotation.conditionRelations}
+										showConditionRelations={showConditionRelations}
+										errorMessages={exConErrorMessages}
+										searchService={searchService}
+										buttonIsDisabled={isConditionRelationButtonEnabled()}
+										editingRows={conditionRelationsEditingRows}
+									/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Experiments") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="experiments">Experiments</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<ConditionRelationHandleFormDropdown
+										name="experiments"
+										customRef={experimentsRef}
+										editorChange={onDropdownExperimentsFieldChange}
+										referenceCurie={newAnnotation.singleReference?.curie}
+										value={newAnnotation.conditionRelations?.[0]?.handle}
+										showClear={true}
+										placeholderText={newAnnotation.conditionRelations?.[0]?.handle}
+										isEnabled={isExperimentEnabled()}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"conditionRelations[0]?.handle"}/>
+								</div>
+							</div>
+						</>
+					)}
+
+
+					{selectedFields.includes("Genetic Sex") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="geneticSex">Genetic Sex</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<ControlledVocabularyFormDropdown
+										name="geneticSex"
+										options={geneticSexTerms}
+										editorChange={onDropdownFieldChange}
+										value={newAnnotation.geneticSex}
+										showClear={true}
+										className={classNames({'p-invalid': submitted && errorMessages.geneticSex})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"geneticSex"} />
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Disease Qualifiers") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="diseaseQualifiers">Disease Qualifiers</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<ControlledVocabularyFormMultiSelectDropdown
+										name="diseaseQualifiers"
+										options={diseaseQualifiersTerms}
+										editorChange={onControlledVocabChange}
+										value={newAnnotation.diseaseQualifiers}
+										className={classNames({'p-invalid': submitted && errorMessages.diseaseQualifiers})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseQualifiers"} />
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("SGD Strain Background") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="sgdStrainBackground">SGD Strain Background</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<AutocompleteFormEditor
+										initialValue={newAnnotation.sgdStrainBackground}
+										search={sgdStrainBackgroundSearch}
+										searchService={searchService}
+										fieldName='sgdStrainBackground'
+										name="sgdStrainBackground"
+										label="SGD Strain Background"
+										valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
+											<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
+										onValueChangeHandler={onSingleReferenceChange}
+										classNames={classNames({'p-invalid': submitted && errorMessages.sgdStrainBackground})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"sgdStrainBackground"}/>
+									<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"sgdStrainBackground"}/>
+									<SGDStrainBackgroundAdditionalFieldData fieldData={newAnnotation.sgdStrainBackground}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Annotation Type") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="annotationType">Annotation Type</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<ControlledVocabularyFormDropdown
+										name="annotationType"
+										field="annotationType"
+										options={annotationTypeTerms}
+										editorChange={onDropdownFieldChange}
+										showClear={true}
+										value={newAnnotation.annotationType}
+										className={classNames({'p-invalid': submitted && errorMessages.annotationType})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"annotationType"} />
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Genetic Modifier Relation") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="diseaseGeneticModifierRelation">Genetic Modifier Relation</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<ControlledVocabularyFormDropdown
+										name="diseaseGeneticModifierRelation"
+										field="diseaseGeneticModifierRelation"
+										options={geneticModifierRelationTerms}
+										editorChange={onDropdownFieldChange}
+										showClear={true}
+										value={newAnnotation.diseaseGeneticModifierRelation}
+										className={classNames({'p-invalid': submitted && errorMessages.diseaseGeneticModifierRelation})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseGeneticModifierRelation"}/>
+									<FormErrorMessageComponent errorMessages={uiErrorMessages} errorField={"diseaseGeneticModifierRelation"}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Genetic Modifiers") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="diseaseGeneticModifier">Genetic Modifiers</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<AutocompleteFormMultiEditor
+										search={geneticModifiersSearch}
+										initialValue={newAnnotation.diseaseGeneticModifiers}
+										fieldName='diseaseGeneticModifiers'
+										name="diseaseGeneticModifiers"
+										valueDisplay={(item, setAutocompleteHoverItem, op, query) =>
+											<SubjectAutocompleteTemplate item={item} setAutocompleteHoverItem={setAutocompleteHoverItem} op={op} query={query}/>}
+										onValueChangeHandler={onArrayFieldChange}
+										classNames={classNames({'p-invalid': submitted && errorMessages.diseaseGeneticModifiers})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"diseaseGeneticModifiers"}/>
+									<GeneticModifiersAdditionalFieldData fieldData={newAnnotation.diseaseGeneticModifiers}/>
+								</div>
+							</div>
+						</>
+					)}
+
+					{selectedFields.includes("Internal") && (
+						<>
+							<div className="grid">
+								<div className={labelColumnSize}>
+									<label htmlFor="internal"><font color={'red'}>*</font>Internal</label>
+								</div>
+								<div className={widgetColumnSize}>
+									<Dropdown
+										name="internal"
+										value={newAnnotation.internal}
+										options={booleanTerms}
+										optionLabel='text'
+										optionValue='name'
+										onChange={onDropdownFieldChange}
+										className={classNames({'p-invalid': submitted && errorMessages.internal})}
+									/>
+								</div>
+								<div className={fieldDetailsColumnSize}>
+									<FormErrorMessageComponent errorMessages={errorMessages} errorField={"internal"}/>
+								</div>
+							</div>
+						</>
+					)}
 				</form>
 				</ErrorBoundary>
 			</Dialog>
diff --git a/src/main/cliapp/src/service/TableStateService.js b/src/main/cliapp/src/service/TableStateService.js
index 9a8606100..ea757589c 100644
--- a/src/main/cliapp/src/service/TableStateService.js
+++ b/src/main/cliapp/src/service/TableStateService.js
@@ -12,6 +12,11 @@ const modTableSettings = {
 				"Secondary Data Provider", "Updated By", "Date Updated", "Created By",
 				"Date Created", "Internal", "Obsolete",
 			],
+			selectedFormFields: [
+				"Subject", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code",
+			"Related Notes", "Experimental Conditions", "Disease Qualifiers",
+			"Asserted Genes", "Asserted Allele"
+			],
 			filters:{
 				dataProviderFilter: {
 					"dataProvider.sourceOrganization.abbreviation": { queryString: "RGD", tokenOperator: "AND" },
@@ -35,6 +40,9 @@ const modTableSettings = {
 				"Annotation Type", "Data Provider", "Updated By", "Date Updated",
 				"Created By", "Date Created", "Internal", "Obsolete"
 			],
+			selectedFormFields: [
+				"Subject", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code", "With", "SGD Strain Background", "Annotation Type"
+			],
 			filters: {
 				dataProviderFilter: {
 					"dataProvider.sourceOrganization.abbreviation": { queryString: "SGD", tokenOperator: "AND" },
@@ -69,6 +77,10 @@ const modTableSettings = {
 					"Genetic Modifiers","Data Provider", "Updated By", "Date Updated", "Created By",
 					"Date Created", "Internal", "Obsolete",
 			],
+			selectedFormFields: [
+					"Subject", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code",
+					"Related Notes", "Experimental Conditions", "Genetic Sex", "Genetic Modifier Relation", "Genetic Modifiers", "Asserted Genes"
+			],
 			tableSettingsKeyName: "DiseaseAnnotationsTableSettings"
 		}
 	},
@@ -84,6 +96,10 @@ const modTableSettings = {
 					"Genetic Modifier Relation", "Genetic Modifiers", "Related Notes", "Data Provider",
 					"Updated By", "Date Updated", "Created By", "Date Created"
 			],
+			selectedFormFields: [
+				"Subject", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code",
+				"Related Notes", "Genetic Modifier Relation", "Genetic Modifiers"
+			],
 			filters: {
 				obsoleteFilter: {
 					obsolete: { queryString: "false", tokenOperator: "OR" }
@@ -110,6 +126,10 @@ const modTableSettings = {
 					"Data Provider", "Updated By", "Date Updated", "Created By",
 					"Date Created", "Obsolete"
 			],
+			selectedFormFields: [
+				"Subject", "Disease Relation", "Disease", "Reference", "Evidence Code",
+				"Experiments"
+			],
 			filters: {
 					dataProviderFilter: {
 							"dataProvider.sourceOrganization.abbreviation": { queryString: "ZFIN", tokenOperator: "AND" },
@@ -121,6 +141,13 @@ const modTableSettings = {
 			tableSettingsKeyName: "DiseaseAnnotationsTableSettings"
 		}
 	},
+	XBStaff:	{
+		DiseaseAnnotations: {
+			selectedFormFields: [
+				"Experimental Conditions"
+			]
+		}
+	},
 	MGIStaff:	{
 		DiseaseAnnotations: {
 			page: 0,
@@ -133,6 +160,10 @@ const modTableSettings = {
 					"Related Notes", "Inferred Gene", "Inferred Allele", "Data Provider",
 					"Updated By", "Date Updated", "Created By", "Date Created",
 			],
+			selectedFormFields: [
+				"Subject", "Disease Relation", "Negated", "Disease", "Reference", "Evidence Code",
+				"Related Notes"
+			],		
 			filters: {
 					dataProviderFilter: {
 							"dataProvider.sourceOrganization.abbreviation": { queryString: "MGI", tokenOperator: "AND" },
@@ -159,6 +190,10 @@ const modTableSettings = {
 				"Genetic Modifier Relation" , "Genetic Modifiers" , "Inferred Gene", "Asserted Genes", "Inferred Allele", "Asserted Allele", "Data Provider",
 				"Secondary Data Provider", "Updated By", "Date Updated", "Created By", "Date Created", "Internal", "Obsolete"
 			],
+			selectedFormFields: [
+				"Asserted Genes", "Asserted Allele", "Negated", "With", "Related Notes", "Experimental Conditions", "Experiments", "Genetic Sex",
+				"Disease Qualifiers", "SGD Strain Background", "Annotation Type", "Genetic Modifier Relation", "Genetic Modifiers","Internal"
+			],
 			filters: {},
 			tableKeyName: "DiseaseAnnotations",
 			tableSettingsKeyName: "DiseaseAnnotationsTableSettings"
@@ -175,6 +210,13 @@ export function getModTableState(table, widthsObject, defaultColumnNames) {
 	return modTableState;
 };
 
+export function getModFormFields(table) {
+	const oktaToken = JSON.parse(localStorage.getItem('okta-token-storage'));
+	const mod = oktaToken?.accessToken?.claims?.Groups?.filter(group => group.includes("Staff"));
+	const modFormFields = modTableSettings[mod][table]['selectedFormFields'];
+	return modFormFields;
+};
+
 export function getDefaultTableState(table, defaultColumnNames, defaultVisibleColumns, widthsObject){
 	return {
 			page: 0,
diff --git a/src/main/java/org/alliancegenome/curation_api/interfaces/SystemControllerInterface.java b/src/main/java/org/alliancegenome/curation_api/interfaces/SystemControllerInterface.java
index 79ac02fc6..537d86709 100644
--- a/src/main/java/org/alliancegenome/curation_api/interfaces/SystemControllerInterface.java
+++ b/src/main/java/org/alliancegenome/curation_api/interfaces/SystemControllerInterface.java
@@ -22,9 +22,13 @@ public interface SystemControllerInterface {
 
 	@GET
 	@Path("/reindexeverything")
-	public void reindexEverything(@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects, @DefaultValue("10000") @QueryParam("idFetchSize") Integer idFetchSize,
-		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo, @DefaultValue("4") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
-		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout, @DefaultValue("1") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
+	public void reindexEverything(
+		@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects,
+		@DefaultValue("0") @QueryParam("idFetchSize") Integer idFetchSize,
+		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo,
+		@DefaultValue("8") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
+		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout,
+		@DefaultValue("4") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
 
 	@GET
 	@Path("/sitesummary")
diff --git a/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseCurieCrudInterface.java b/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseCurieCrudInterface.java
index 275dbf55e..a17238cd5 100644
--- a/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseCurieCrudInterface.java
+++ b/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseCurieCrudInterface.java
@@ -69,8 +69,12 @@ public interface BaseCurieCrudInterface<E extends BaseEntity> {
 	@GET
 	@Path("/reindex")
 	@Tag(name = "Reindex Endpoints")
-	public void reindex(@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects, @DefaultValue("10000") @QueryParam("idFetchSize") Integer idFetchSize,
-		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo, @DefaultValue("4") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
-		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout, @DefaultValue("1") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
+	public void reindex(
+		@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects,
+		@DefaultValue("0") @QueryParam("idFetchSize") Integer idFetchSize,
+		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo,
+		@DefaultValue("4") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
+		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout,
+		@DefaultValue("1") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
 
 }
diff --git a/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseIdCrudInterface.java b/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseIdCrudInterface.java
index 34b6d0f3c..c2a4bb46b 100644
--- a/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseIdCrudInterface.java
+++ b/src/main/java/org/alliancegenome/curation_api/interfaces/base/BaseIdCrudInterface.java
@@ -75,8 +75,12 @@ public interface BaseIdCrudInterface<E extends BaseEntity> {
 	@GET
 	@Path("/reindex")
 	@Tag(name = "Reindex Endpoints")
-	public void reindex(@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects, @DefaultValue("10000") @QueryParam("idFetchSize") Integer idFetchSize,
-		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo, @DefaultValue("4") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
-		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout, @DefaultValue("1") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
+	public void reindex(
+		@DefaultValue("1000") @QueryParam("batchSizeToLoadObjects") Integer batchSizeToLoadObjects,
+		@DefaultValue("0") @QueryParam("idFetchSize") Integer idFetchSize,
+		@DefaultValue("0") @QueryParam("limitIndexedObjectsTo") Integer limitIndexedObjectsTo,
+		@DefaultValue("4") @QueryParam("threadsToLoadObjects") Integer threadsToLoadObjects,
+		@DefaultValue("14400") @QueryParam("transactionTimeout") Integer transactionTimeout,
+		@DefaultValue("1") @QueryParam("typesToIndexInParallel") Integer typesToIndexInParallel);
 
 }