diff --git a/api-editor/gui/src/features/annotations/batchforms/ConfirmAnnotations.tsx b/api-editor/gui/src/features/annotations/batchforms/ConfirmAnnotations.tsx
index 6ed63feea..f536ee39a 100644
--- a/api-editor/gui/src/features/annotations/batchforms/ConfirmAnnotations.tsx
+++ b/api-editor/gui/src/features/annotations/batchforms/ConfirmAnnotations.tsx
@@ -33,7 +33,13 @@ export const ConfirmAnnotations: React.FC<ConfirmAnnotationsProps> = function ({
     const useCancelRef = useRef(null);
 
     return (
-        <AlertDialog isOpen={true} leastDestructiveRef={useCancelRef} onClose={handleCancel} scrollBehavior={'inside'}>
+        <AlertDialog
+            isOpen={true}
+            leastDestructiveRef={useCancelRef}
+            onClose={handleCancel}
+            scrollBehavior="inside"
+            size="4xl"
+        >
             <AlertDialogOverlay>
                 <AlertDialogContent>
                     <AlertDialogHeader>
diff --git a/api-editor/gui/src/features/annotations/batchforms/DestinationBatchForm.tsx b/api-editor/gui/src/features/annotations/batchforms/DestinationBatchForm.tsx
index 58274176c..82715d8e6 100644
--- a/api-editor/gui/src/features/annotations/batchforms/DestinationBatchForm.tsx
+++ b/api-editor/gui/src/features/annotations/batchforms/DestinationBatchForm.tsx
@@ -1,4 +1,4 @@
-import { FormControl, FormErrorIcon, FormErrorMessage, FormLabel, Input } from '@chakra-ui/react';
+import { FormControl, FormErrorIcon, FormErrorMessage, FormLabel, Input, Text as ChakraText } from '@chakra-ui/react';
 import React, { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useAppDispatch } from '../../../app/hooks';
@@ -75,7 +75,7 @@ export const DestinationBatchForm: React.FC<DestinationBatchFormProps> = functio
                     </FormErrorMessage>
                 </FormControl>
 
-                <FormLabel>This will annotate classes and global functions.</FormLabel>
+                <ChakraText>This will annotate classes and global functions.</ChakraText>
             </AnnotationBatchForm>
             {confirmWindowVisible && (
                 <ConfirmAnnotations
diff --git a/api-editor/gui/src/features/annotations/batchforms/OldNewBatchForm.tsx b/api-editor/gui/src/features/annotations/batchforms/OldNewBatchForm.tsx
index b92eb9fe2..f697f6412 100644
--- a/api-editor/gui/src/features/annotations/batchforms/OldNewBatchForm.tsx
+++ b/api-editor/gui/src/features/annotations/batchforms/OldNewBatchForm.tsx
@@ -1,26 +1,11 @@
-import {
-    AlertDialog,
-    AlertDialogBody,
-    AlertDialogContent,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogOverlay,
-    Button,
-    FormControl,
-    FormErrorIcon,
-    FormErrorMessage,
-    FormLabel,
-    Heading,
-    Input,
-    ListItem,
-    UnorderedList,
-} from '@chakra-ui/react';
-import React, { useRef, useState } from 'react';
+import { FormControl, FormErrorIcon, FormErrorMessage, FormLabel, Input, Text as ChakraText } from '@chakra-ui/react';
+import React, { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useAppDispatch } from '../../../app/hooks';
 import { PythonDeclaration } from '../../packageData/model/PythonDeclaration';
 import { AnnotationBatchForm } from './AnnotationBatchForm';
 import { hideAnnotationForm } from '../../ui/uiSlice';
+import { ConfirmAnnotations } from './ConfirmAnnotations';
 
 interface OldNewBatchFormProps {
     targets: PythonDeclaration[];
@@ -51,8 +36,10 @@ export const OldNewBatchForm: React.FC<OldNewBatchFormProps> = function ({
         },
     });
 
-    let [confirmWindowVisible, setConfirmWindowVisible] = useState(false);
-    let [data, setData] = useState<OldNewBatchFormState>({ oldString: '', newString: '' });
+    const [confirmWindowVisible, setConfirmWindowVisible] = useState(false);
+    const [data, setData] = useState<OldNewBatchFormState>({ oldString: '', newString: '' });
+
+    const filteredTargets = targets.filter((t) => t.name !== t.name.replace(data.oldString, data.newString));
 
     // Event handlers ----------------------------------------------------------
 
@@ -71,6 +58,7 @@ export const OldNewBatchForm: React.FC<OldNewBatchFormProps> = function ({
     const handleCancel = () => {
         dispatch(hideAnnotationForm());
     };
+
     // Rendering -------------------------------------------------------------------------------------------------------
 
     return (
@@ -94,22 +82,17 @@ export const OldNewBatchForm: React.FC<OldNewBatchFormProps> = function ({
 
                 <FormControl isInvalid={Boolean(errors.newString)}>
                     <FormLabel>Replacement String:</FormLabel>
-                    <Input
-                        {...register('newString', {
-                            required: 'This is required.',
-                        })}
-                    />
+                    <Input {...register('newString')} />
                     <FormErrorMessage>
                         <FormErrorIcon /> {errors.newString?.message}
                     </FormErrorMessage>
                 </FormControl>
 
-                <FormLabel>This will annotate classes, functions, and parameters.</FormLabel>
+                <ChakraText>This will annotate classes, functions, and parameters.</ChakraText>
             </AnnotationBatchForm>
             {confirmWindowVisible && (
                 <ConfirmAnnotations
-                    targets={targets}
-                    data={data}
+                    targets={filteredTargets}
                     handleSave={() => handleSave(data)}
                     setConfirmVisible={setConfirmWindowVisible}
                 />
@@ -117,61 +100,3 @@ export const OldNewBatchForm: React.FC<OldNewBatchFormProps> = function ({
         </>
     );
 };
-
-interface ConfirmAnnotationsProps {
-    targets: PythonDeclaration[];
-    data: OldNewBatchFormState;
-    handleSave: () => void;
-    setConfirmVisible: (visible: boolean) => void;
-}
-
-const ConfirmAnnotations: React.FC<ConfirmAnnotationsProps> = function ({
-    targets,
-    data,
-    handleSave,
-    setConfirmVisible,
-}) {
-    const handleCancel = () => {
-        setConfirmVisible(false);
-        hideAnnotationForm();
-    };
-
-    const useCancelRef = useRef(null);
-
-    const filteredTargets = targets.filter((t) => t.name !== t.name.replace(data.oldString, data.newString));
-
-    return (
-        <AlertDialog
-            isOpen={true}
-            leastDestructiveRef={useCancelRef}
-            onClose={handleCancel}
-            size={'xl'}
-            scrollBehavior={'inside'}
-        >
-            <AlertDialogOverlay>
-                <AlertDialogContent>
-                    <AlertDialogHeader>
-                        <Heading>This will annotate these {filteredTargets.length} items</Heading>
-                    </AlertDialogHeader>
-
-                    <AlertDialogBody>
-                        <UnorderedList>
-                            {filteredTargets.map((target) => (
-                                <ListItem key={target.id}>{target.id}</ListItem>
-                            ))}
-                        </UnorderedList>
-                    </AlertDialogBody>
-
-                    <AlertDialogFooter>
-                        <Button ref={useCancelRef} onClick={handleCancel}>
-                            Cancel
-                        </Button>
-                        <Button colorScheme="green" onClick={handleSave} ml={3}>
-                            Confirm
-                        </Button>
-                    </AlertDialogFooter>
-                </AlertDialogContent>
-            </AlertDialogOverlay>
-        </AlertDialog>
-    );
-};
diff --git a/api-editor/gui/src/features/annotations/batchforms/TypeValueBatchForm.tsx b/api-editor/gui/src/features/annotations/batchforms/TypeValueBatchForm.tsx
index 233eefe94..ab42c8511 100644
--- a/api-editor/gui/src/features/annotations/batchforms/TypeValueBatchForm.tsx
+++ b/api-editor/gui/src/features/annotations/batchforms/TypeValueBatchForm.tsx
@@ -13,6 +13,7 @@ import {
     RadioGroup,
     Select,
     Stack,
+    Text as ChakraText,
 } from '@chakra-ui/react';
 import React, { useState } from 'react';
 import { useForm } from 'react-hook-form';
@@ -152,7 +153,7 @@ export const TypeValueBatchForm: React.FC<TypeValueBatchFormProps> = function ({
                     </FormControl>
                 )}
 
-                <FormLabel>This will annotate parameters.</FormLabel>
+                <ChakraText>This will annotate parameters.</ChakraText>
             </AnnotationBatchForm>
             {confirmWindowVisible && (
                 <ConfirmAnnotations