diff --git a/src/frontend/src/components/codeAreaComponent/index.tsx b/src/frontend/src/components/codeAreaComponent/index.tsx
index 756296970..2086b467c 100644
--- a/src/frontend/src/components/codeAreaComponent/index.tsx
+++ b/src/frontend/src/components/codeAreaComponent/index.tsx
@@ -19,9 +19,24 @@ export default function CodeAreaComponent({
 		}
 	}, [disabled, onChange]);
 	return (
-		<div className={disabled ? "pointer-events-none cursor-not-allowed w-full" : "w-full"}>
+		<div
+			className={
+				disabled ? "pointer-events-none cursor-not-allowed w-full" : "w-full"
+			}
+		>
 			<div className="w-full flex items-center gap-3">
 				<span
+					onClick={() => {
+						openPopUp(
+							<CodeAreaModal
+								value={myValue}
+								setValue={(t: string) => {
+									setMyValue(t);
+									onChange(t);
+								}}
+							/>
+						);
+					}}
 					className={
 						"truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" +
 						(disabled ? " bg-gray-200" : "")
diff --git a/src/frontend/src/components/inputFileComponent/index.tsx b/src/frontend/src/components/inputFileComponent/index.tsx
index 36d13e918..cb915bce5 100644
--- a/src/frontend/src/components/inputFileComponent/index.tsx
+++ b/src/frontend/src/components/inputFileComponent/index.tsx
@@ -69,6 +69,7 @@ export default function InputFileComponent({
 		>
 			<div className="w-full flex items-center gap-3">
 				<span
+				onClick={handleButtonClick}
 					className={
 						"truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" +
 						(disabled ? " bg-gray-200" : "")
diff --git a/src/frontend/src/components/promptComponent/index.tsx b/src/frontend/src/components/promptComponent/index.tsx
index 6ad51f87b..71ad501c9 100644
--- a/src/frontend/src/components/promptComponent/index.tsx
+++ b/src/frontend/src/components/promptComponent/index.tsx
@@ -6,30 +6,61 @@ import TextAreaModal from "../../modals/textAreaModal";
 import { TextAreaComponentType } from "../../types/components";
 import PromptAreaModal from "../../modals/promptModal";
 
-export default function PromptAreaComponent({ value, onChange, disabled }:TextAreaComponentType) {
-  const [myValue, setMyValue] = useState(value);
-  const { openPopUp } = useContext(PopUpContext);
-  useEffect(() => {
-    if (disabled) {
-      setMyValue("");
-      onChange("");
-    }
-  }, [disabled, onChange]);
-  return (
-    <div className={disabled ? "pointer-events-none cursor-not-allowed w-full" : " w-full"}>
-      <div className="w-full flex items-center gap-3">
-        <span
-          className={
-            "truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" +
-            (disabled ? " bg-gray-200" : "")
-          }
-        >
-            {myValue !== "" ? myValue : 'Text empty'}
-        </span>
-        <button onClick={()=>{openPopUp(<PromptAreaModal value={myValue} setValue={(t:string) => {setMyValue(t); onChange(t);}}/>)}}>
-            <ArrowTopRightOnSquareIcon className="w-6 h-6 hover:text-blue-600" />
-        </button>
-      </div>
-    </div>
-  );
+export default function PromptAreaComponent({
+	value,
+	onChange,
+	disabled,
+}: TextAreaComponentType) {
+	const [myValue, setMyValue] = useState(value);
+	const { openPopUp } = useContext(PopUpContext);
+	useEffect(() => {
+		if (disabled) {
+			setMyValue("");
+			onChange("");
+		}
+	}, [disabled, onChange]);
+	return (
+		<div
+			className={
+				disabled ? "pointer-events-none cursor-not-allowed w-full" : " w-full"
+			}
+		>
+			<div className="w-full flex items-center gap-3">
+				<span
+					onClick={() => {
+						openPopUp(
+							<PromptAreaModal
+								value={myValue}
+								setValue={(t: string) => {
+									setMyValue(t);
+									onChange(t);
+								}}
+							/>
+						);
+					}}
+					className={
+						"truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" +
+						(disabled ? " bg-gray-200" : "")
+					}
+				>
+					{myValue !== "" ? myValue : "Text empty"}
+				</span>
+				<button
+					onClick={() => {
+						openPopUp(
+							<PromptAreaModal
+								value={myValue}
+								setValue={(t: string) => {
+									setMyValue(t);
+									onChange(t);
+								}}
+							/>
+						);
+					}}
+				>
+					<ArrowTopRightOnSquareIcon className="w-6 h-6 hover:text-blue-600" />
+				</button>
+			</div>
+		</div>
+	);
 }
diff --git a/src/frontend/src/components/textAreaComponent/index.tsx b/src/frontend/src/components/textAreaComponent/index.tsx
index 9efdfacbc..153de4ffa 100644
--- a/src/frontend/src/components/textAreaComponent/index.tsx
+++ b/src/frontend/src/components/textAreaComponent/index.tsx
@@ -16,7 +16,7 @@ export default function TextAreaComponent({ value, onChange, disabled }:TextArea
   return (
     <div className={disabled ? "pointer-events-none cursor-not-allowed" : ""}>
       <div className="w-full flex items-center gap-3">
-        <span
+        <span onClick={()=>{openPopUp(<TextAreaModal value={myValue} setValue={(t:string) => {setMyValue(t); onChange(t);}}/>)}}
           className={
             "truncate block w-full text-gray-500 px-3 py-2 rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" +
             (disabled ? " bg-gray-200" : "")
diff --git a/src/frontend/src/modals/NodeModal/index.tsx b/src/frontend/src/modals/NodeModal/index.tsx
index aad1a32fd..16c615524 100644
--- a/src/frontend/src/modals/NodeModal/index.tsx
+++ b/src/frontend/src/modals/NodeModal/index.tsx
@@ -87,34 +87,37 @@ export default function NodeModal({ data }: { data: NodeDataType }) {
 										<div className="flex h-full w-full">
 											<div className="overflow-hidden px-4 sm:p-4  w-full rounded-lg bg-white dark:bg-gray-800 shadow">
 												<div className="flex flex-col h-full gap-5">
-													{Object.keys(data.node.template)
-														.filter((t) => t.charAt(0) !== "_")
-														.map((t: string, idx) => {
-															return (
-																<ModalField
-																	data={data}
-																	title={
-																		data.node.template[t].display_name
-																			? data.node.template[t].display_name
-																			: data.node.template[t].name
-																			? snakeToNormalCase(
-																					data.node.template[t].name
-																			  )
-																			: snakeToNormalCase(t)
-																	}
-																	required={data.node.template[t].required}
-																	id={
-																		data.node.template[t].type +
-																		"|" +
-																		t +
-																		"|" +
-																		data.id
-																	}
-																	name={t}
-																	type={data.node.template[t].type}
-																/>
-															);
-														})}
+													{
+														//&& data.node.template[t].advanced
+														Object.keys(data.node.template)
+															.filter((t) => t.charAt(0) !== "_")
+															.map((t: string, idx) => {
+																return (
+																	<ModalField
+																		data={data}
+																		title={
+																			data.node.template[t].display_name
+																				? data.node.template[t].display_name
+																				: data.node.template[t].name
+																				? snakeToNormalCase(
+																						data.node.template[t].name
+																				  )
+																				: snakeToNormalCase(t)
+																		}
+																		required={data.node.template[t].required}
+																		id={
+																			data.node.template[t].type +
+																			"|" +
+																			t +
+																			"|" +
+																			data.id
+																		}
+																		name={t}
+																		type={data.node.template[t].type}
+																	/>
+																);
+															})
+													}
 												</div>
 											</div>
 										</div>