diff --git a/src/frontend/src/components/floatComponent/index.tsx b/src/frontend/src/components/floatComponent/index.tsx
index a3d29b798..40d6fc3fe 100644
--- a/src/frontend/src/components/floatComponent/index.tsx
+++ b/src/frontend/src/components/floatComponent/index.tsx
@@ -36,9 +36,7 @@ export default function FloatComponent({
         max={max}
         value={value ?? ""}
         disabled={disabled}
-        className={
-          (editNode ? "input-edit-node" : "")
-        }
+        className={editNode ? "input-edit-node" : ""}
         placeholder={
           editNode ? "Number 0 to 1" : "Type a number from zero to one"
         }
diff --git a/src/frontend/src/components/inputListComponent/index.tsx b/src/frontend/src/components/inputListComponent/index.tsx
index 8fde7cf4c..c3651d95e 100644
--- a/src/frontend/src/components/inputListComponent/index.tsx
+++ b/src/frontend/src/components/inputListComponent/index.tsx
@@ -28,20 +28,15 @@ export default function InputListComponent({
   }, [disabled, onChange]);
 
   return (
-    <div className="flex flex-col gap-3"
-    >
+    <div className="flex flex-col gap-3">
       {inputList.map((i, idx) => {
         return (
           <div key={idx} className="flex w-full gap-3">
             <Input
-            disabled={disabled}
+              disabled={disabled}
               type="text"
               value={i}
-              className={
-                editNode
-                  ? "input-edit-node"
-                  : ""
-              }
+              className={editNode ? "input-edit-node" : ""}
               placeholder="Type something..."
               onChange={(e) => {
                 setInputList((old) => {
diff --git a/src/frontend/src/components/intComponent/index.tsx b/src/frontend/src/components/intComponent/index.tsx
index 8a4da22b6..c43055b47 100644
--- a/src/frontend/src/components/intComponent/index.tsx
+++ b/src/frontend/src/components/intComponent/index.tsx
@@ -18,8 +18,7 @@ export default function IntComponent({
   }, [disabled, onChange]);
 
   return (
-    <div className="w-full"
-    >
+    <div className="w-full">
       <Input
         onKeyDown={(event) => {
           if (
@@ -48,11 +47,7 @@ export default function IntComponent({
           }
         }}
         value={value ?? ""}
-        className={
-          editNode
-            ? "input-edit-node"
-            : ""
-        }
+        className={editNode ? "input-edit-node" : ""}
         disabled={disabled}
         placeholder={editNode ? "Integer number" : "Type an integer number"}
         onChange={(e) => {
diff --git a/src/frontend/src/components/textAreaComponent/index.tsx b/src/frontend/src/components/textAreaComponent/index.tsx
index e3cbb672f..cd598f01e 100644
--- a/src/frontend/src/components/textAreaComponent/index.tsx
+++ b/src/frontend/src/components/textAreaComponent/index.tsx
@@ -19,41 +19,37 @@ export default function TextAreaComponent({
   }, [disabled]);
 
   return (
-      <div className="flex w-full items-center">
-        <Input
+    <div className="flex w-full items-center">
+      <Input
+        value={value}
+        disabled={disabled}
+        className={editNode ? "input-edit-node" : ""}
+        placeholder={"Type something..."}
+        onChange={(e) => {
+          onChange(e.target.value);
+        }}
+      />
+      <div>
+        <GenericModal
+          type={TypeModal.TEXT}
+          buttonText="Finishing Editing"
+          modalTitle="Edit Text"
           value={value}
-          disabled={disabled}
-          className={
-            (editNode
-              ? "input-edit-node"
-              : "")
-          }
-          placeholder={"Type something..."}
-          onChange={(e) => {
-            onChange(e.target.value);
+          setValue={(t: string) => {
+            onChange(t);
           }}
-        />
-        <div>
-          <GenericModal
-            type={TypeModal.TEXT}
-            buttonText="Finishing Editing"
-            modalTitle="Edit Text"
-            value={value}
-            setValue={(t: string) => {
-              onChange(t);
-            }}
-          >
-            {!editNode && (
-              <IconComponent
-                name="ExternalLink"
-                className={
-                  "icons-parameters-comp" +
-                  (disabled ? " text-ring" : " hover:text-accent-foreground")
-                }
-              />
-            )}
-          </GenericModal>
-        </div>
+        >
+          {!editNode && (
+            <IconComponent
+              name="ExternalLink"
+              className={
+                "icons-parameters-comp" +
+                (disabled ? " text-ring" : " hover:text-accent-foreground")
+              }
+            />
+          )}
+        </GenericModal>
       </div>
+    </div>
   );
 }
diff --git a/src/frontend/src/components/ui/input.tsx b/src/frontend/src/components/ui/input.tsx
index 33b7f8813..c025f8de3 100644
--- a/src/frontend/src/components/ui/input.tsx
+++ b/src/frontend/src/components/ui/input.tsx
@@ -9,10 +9,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
     return (
       <input
         type={type}
-        className={cn(
-          "input-primary nopan nodrag noundo nocopy",
-          className
-        )}
+        className={cn("nopan nodrag noundo nocopy input-primary", className)}
         ref={ref}
         {...props}
       />
diff --git a/src/frontend/src/components/ui/textarea.tsx b/src/frontend/src/components/ui/textarea.tsx
index 2dcafa1f9..cfad1cf72 100644
--- a/src/frontend/src/components/ui/textarea.tsx
+++ b/src/frontend/src/components/ui/textarea.tsx
@@ -8,10 +8,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
   ({ className, ...props }, ref) => {
     return (
       <textarea
-        className={cn(
-          "textarea-primary nopan nodrag noundo nocopy",
-          className
-        )}
+        className={cn("nopan nodrag noundo nocopy textarea-primary", className)}
         ref={ref}
         {...props}
       />
diff --git a/src/frontend/src/modals/formModal/chatInput/index.tsx b/src/frontend/src/modals/formModal/chatInput/index.tsx
index e03078a10..30dfdcd6d 100644
--- a/src/frontend/src/modals/formModal/chatInput/index.tsx
+++ b/src/frontend/src/modals/formModal/chatInput/index.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import IconComponent from "../../../components/genericIconComponent";
-import { classNames } from "../../../utils/utils";
 import { Textarea } from "../../../components/ui/textarea";
+import { classNames } from "../../../utils/utils";
 
 export default function ChatInput({
   lockChat,
@@ -26,7 +26,7 @@ export default function ChatInput({
 
   return (
     <div className="relative">
-      <Textarea 
+      <Textarea
         onKeyDown={(event) => {
           if (event.key === "Enter" && !lockChat && !event.shiftKey) {
             sendMessage();
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index 6d08cabd1..3111f74a2 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -1,6 +1,7 @@
 import { useContext, useState } from "react";
 import ShadTooltip from "../../../../components/ShadTooltipComponent";
 import IconComponent from "../../../../components/genericIconComponent";
+import { Input } from "../../../../components/ui/input";
 import { Separator } from "../../../../components/ui/separator";
 import { alertContext } from "../../../../contexts/alertContext";
 import { TabsContext } from "../../../../contexts/tabsContext";
@@ -15,7 +16,6 @@ import {
 } from "../../../../utils/styleUtils";
 import { classNames } from "../../../../utils/utils";
 import DisclosureComponent from "../DisclosureComponent";
-import { Input } from "../../../../components/ui/input";
 
 export default function ExtraSidebar() {
   const { data } = useContext(typesContext);