diff --git a/src/backend/base/langflow/api/v1/endpoints.py b/src/backend/base/langflow/api/v1/endpoints.py
index 38dc6c297..fa93f799d 100644
--- a/src/backend/base/langflow/api/v1/endpoints.py
+++ b/src/backend/base/langflow/api/v1/endpoints.py
@@ -6,7 +6,16 @@ from typing import TYPE_CHECKING, Annotated
 from uuid import UUID
 
 import sqlalchemy as sa
-from fastapi import APIRouter, BackgroundTasks, Body, Depends, HTTPException, Request, UploadFile, status
+from fastapi import (
+    APIRouter,
+    BackgroundTasks,
+    Body,
+    Depends,
+    HTTPException,
+    Request,
+    UploadFile,
+    status,
+)
 from loguru import logger
 from sqlmodel import select
 
@@ -17,7 +26,6 @@ from langflow.api.v1.schemas import (
     CustomComponentResponse,
     InputValueRequest,
     RunResponse,
-    SidebarCategoriesResponse,
     SimplifiedAPIRequest,
     TaskStatusResponse,
     UpdateCustomComponentRequest,
@@ -37,7 +45,9 @@ from langflow.services.auth.utils import api_key_security, get_current_active_us
 from langflow.services.cache.utils import save_uploaded_file
 from langflow.services.database.models.flow import Flow
 from langflow.services.database.models.flow.model import FlowRead
-from langflow.services.database.models.flow.utils import get_all_webhook_components_in_flow
+from langflow.services.database.models.flow.utils import (
+    get_all_webhook_components_in_flow,
+)
 from langflow.services.database.models.user.model import User, UserRead
 from langflow.services.deps import (
     get_session_service,
@@ -47,7 +57,6 @@ from langflow.services.deps import (
 )
 from langflow.services.settings.feature_flags import FEATURE_FLAGS
 from langflow.services.telemetry.schema import RunPayload
-from langflow.utils.constants import SIDEBAR_CATEGORIES
 from langflow.utils.version import get_version_info
 
 if TYPE_CHECKING:
@@ -110,7 +119,11 @@ async def simple_run_flow(
         graph_data = process_tweaks(graph_data, input_request.tweaks or {}, stream=stream)
         graph = Graph.from_payload(graph_data, flow_id=flow_id_str, user_id=str(user_id), flow_name=flow.name)
         inputs = [
-            InputValueRequest(components=[], input_value=input_request.input_value, type=input_request.input_type)
+            InputValueRequest(
+                components=[],
+                input_value=input_request.input_value,
+                type=input_request.input_type,
+            )
         ]
         if input_request.output_component:
             outputs = [input_request.output_component]
@@ -248,7 +261,10 @@ async def simplified_run_flow(
         background_tasks.add_task(
             telemetry_service.log_package_run,
             RunPayload(
-                run_is_webhook=False, run_seconds=int(end_time - start_time), run_success=True, run_error_message=""
+                run_is_webhook=False,
+                run_seconds=int(end_time - start_time),
+                run_success=True,
+                run_error_message="",
             ),
         )
 
@@ -360,7 +376,11 @@ async def webhook_run_flow(
     return {"message": "Task started in the background", "status": "in progress"}
 
 
-@router.post("/run/advanced/{flow_id}", response_model=RunResponse, response_model_exclude_none=True)
+@router.post(
+    "/run/advanced/{flow_id}",
+    response_model=RunResponse,
+    response_model_exclude_none=True,
+)
 async def experimental_run_flow(
     *,
     session: DbSession,
@@ -631,11 +651,9 @@ async def get_config():
 
         settings_service: SettingsService = get_settings_service()
 
-        return {"feature_flags": FEATURE_FLAGS, **settings_service.settings.model_dump()}
+        return {
+            "feature_flags": FEATURE_FLAGS,
+            **settings_service.settings.model_dump(),
+        }
     except Exception as exc:
         raise HTTPException(status_code=500, detail=str(exc)) from exc
-
-
-@router.get("/sidebar_categories")
-async def get_sidebar_categories() -> SidebarCategoriesResponse:
-    return SidebarCategoriesResponse(categories=SIDEBAR_CATEGORIES)
diff --git a/src/backend/base/langflow/api/v1/schemas.py b/src/backend/base/langflow/api/v1/schemas.py
index 78e9dc585..9d9b21018 100644
--- a/src/backend/base/langflow/api/v1/schemas.py
+++ b/src/backend/base/langflow/api/v1/schemas.py
@@ -4,7 +4,14 @@ from pathlib import Path
 from typing import Any
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator, model_serializer
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    field_serializer,
+    field_validator,
+    model_serializer,
+)
 
 from langflow.graph.schema import RunOutputs
 from langflow.graph.utils import serialize_field
@@ -316,7 +323,11 @@ class InputValueRequest(BaseModel):
                 },
                 {"components": ["Component Name"], "input_value": "input_value"},
                 {"input_value": "input_value"},
-                {"components": ["Component Name"], "input_value": "input_value", "session": "session_id"},
+                {
+                    "components": ["Component Name"],
+                    "input_value": "input_value",
+                    "session": "session_id",
+                },
                 {"input_value": "input_value", "session": "session_id"},
                 {"type": "chat", "input_value": "input_value"},
                 {"type": "json", "input_value": '{"key": "value"}'},
@@ -357,14 +368,3 @@ class ConfigResponse(BaseModel):
     auto_saving_interval: int
     health_check_max_retries: int
     max_file_size_upload: int
-
-
-class SidebarCategory(BaseModel):
-    display_name: str
-    name: str
-    icon: str
-    beta: bool = False
-
-
-class SidebarCategoriesResponse(BaseModel):
-    categories: list[SidebarCategory]
diff --git a/src/backend/base/langflow/base/constants.py b/src/backend/base/langflow/base/constants.py
index bb4886fe0..07de77c65 100644
--- a/src/backend/base/langflow/base/constants.py
+++ b/src/backend/base/langflow/base/constants.py
@@ -10,7 +10,15 @@ import orjson
 
 STREAM_INFO_TEXT = "Stream the response from the model. Streaming works only in Chat."
 
-NODE_FORMAT_ATTRIBUTES = ["beta", "icon", "display_name", "output_types", "edited", "metadata"]
+NODE_FORMAT_ATTRIBUTES = [
+    "beta",
+    "legacy",
+    "icon",
+    "display_name",
+    "output_types",
+    "edited",
+    "metadata",
+]
 
 
 FIELD_FORMAT_ATTRIBUTES = [
diff --git a/src/backend/base/langflow/components/__init__.py b/src/backend/base/langflow/components/__init__.py
index fbe764f24..22b771454 100644
--- a/src/backend/base/langflow/components/__init__.py
+++ b/src/backend/base/langflow/components/__init__.py
@@ -1,6 +1,7 @@
 from . import (
     agents,
     chains,
+    custom_component,
     documentloaders,
     embeddings,
     helpers,
@@ -26,6 +27,7 @@ __all__ = [
     "helpers",
     "inputs",
     "link_extractors",
+    "custom_component",
     "memories",
     "models",
     "output_parsers",
diff --git a/src/backend/base/langflow/components/agents/json.py b/src/backend/base/langflow/components/agents/json.py
index 52bd2c681..05732c830 100644
--- a/src/backend/base/langflow/components/agents/json.py
+++ b/src/backend/base/langflow/components/agents/json.py
@@ -14,11 +14,22 @@ class JsonAgentComponent(LCAgentComponent):
     display_name = "JsonAgent"
     description = "Construct a json agent from an LLM and tools."
     name = "JsonAgent"
+    legacy: bool = True
 
     inputs = [
         *LCAgentComponent._base_inputs,
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
-        FileInput(name="path", display_name="File Path", file_types=["json", "yaml", "yml"], required=True),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
+        ),
+        FileInput(
+            name="path",
+            display_name="File Path",
+            file_types=["json", "yaml", "yml"],
+            required=True,
+        ),
     ]
 
     def build_agent(self) -> AgentExecutor:
diff --git a/src/backend/base/langflow/components/agents/vector_store.py b/src/backend/base/langflow/components/agents/vector_store.py
index 86f38b313..8d161fb51 100644
--- a/src/backend/base/langflow/components/agents/vector_store.py
+++ b/src/backend/base/langflow/components/agents/vector_store.py
@@ -9,11 +9,22 @@ class VectorStoreAgentComponent(LCAgentComponent):
     display_name = "VectorStoreAgent"
     description = "Construct an agent from a Vector Store."
     name = "VectorStoreAgent"
+    legacy: bool = True
 
     inputs = [
         *LCAgentComponent._base_inputs,
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
-        HandleInput(name="vectorstore", display_name="Vector Store", input_types=["VectorStoreInfo"], required=True),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
+        ),
+        HandleInput(
+            name="vectorstore",
+            display_name="Vector Store",
+            input_types=["VectorStoreInfo"],
+            required=True,
+        ),
     ]
 
     def build_agent(self) -> AgentExecutor:
diff --git a/src/backend/base/langflow/components/agents/vector_store_router.py b/src/backend/base/langflow/components/agents/vector_store_router.py
index efea4e08e..6c44c2d5c 100644
--- a/src/backend/base/langflow/components/agents/vector_store_router.py
+++ b/src/backend/base/langflow/components/agents/vector_store_router.py
@@ -9,10 +9,16 @@ class VectorStoreRouterAgentComponent(LCAgentComponent):
     display_name = "VectorStoreRouterAgent"
     description = "Construct an agent from a Vector Store Router."
     name = "VectorStoreRouterAgent"
+    legacy: bool = True
 
     inputs = [
         *LCAgentComponent._base_inputs,
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
+        ),
         HandleInput(
             name="vectorstores",
             display_name="Vector Stores",
diff --git a/src/backend/base/langflow/components/chains/conversation.py b/src/backend/base/langflow/components/chains/conversation.py
index f1bb74ef9..b6d59fcd0 100644
--- a/src/backend/base/langflow/components/chains/conversation.py
+++ b/src/backend/base/langflow/components/chains/conversation.py
@@ -9,12 +9,21 @@ class ConversationChainComponent(LCChainComponent):
     display_name = "ConversationChain"
     description = "Chain to have a conversation and load context from memory."
     name = "ConversationChain"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
-            name="input_value", display_name="Input", info="The input value to pass to the chain.", required=True
+            name="input_value",
+            display_name="Input",
+            info="The input value to pass to the chain.",
+            required=True,
+        ),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
         ),
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
         HandleInput(
             name="memory",
             display_name="Memory",
@@ -28,7 +37,10 @@ class ConversationChainComponent(LCChainComponent):
         else:
             chain = ConversationChain(llm=self.llm, memory=self.memory)
 
-        result = chain.invoke({"input": self.input_value}, config={"callbacks": self.get_langchain_callbacks()})
+        result = chain.invoke(
+            {"input": self.input_value},
+            config={"callbacks": self.get_langchain_callbacks()},
+        )
         if isinstance(result, dict):
             result = result.get(chain.output_key, "")
 
diff --git a/src/backend/base/langflow/components/chains/llm_checker.py b/src/backend/base/langflow/components/chains/llm_checker.py
index 68796afae..9f8294dde 100644
--- a/src/backend/base/langflow/components/chains/llm_checker.py
+++ b/src/backend/base/langflow/components/chains/llm_checker.py
@@ -10,18 +10,28 @@ class LLMCheckerChainComponent(LCChainComponent):
     description = "Chain for question-answering with self-verification."
     documentation = "https://python.langchain.com/docs/modules/chains/additional/llm_checker"
     name = "LLMCheckerChain"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
-            name="input_value", display_name="Input", info="The input value to pass to the chain.", required=True
+            name="input_value",
+            display_name="Input",
+            info="The input value to pass to the chain.",
+            required=True,
+        ),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
         ),
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
     ]
 
     def invoke_chain(self) -> Message:
         chain = LLMCheckerChain.from_llm(llm=self.llm)
         response = chain.invoke(
-            {chain.input_key: self.input_value}, config={"callbacks": self.get_langchain_callbacks()}
+            {chain.input_key: self.input_value},
+            config={"callbacks": self.get_langchain_callbacks()},
         )
         result = response.get(chain.output_key, "")
         result = str(result)
diff --git a/src/backend/base/langflow/components/chains/llm_math.py b/src/backend/base/langflow/components/chains/llm_math.py
index b95d67845..940d75e96 100644
--- a/src/backend/base/langflow/components/chains/llm_math.py
+++ b/src/backend/base/langflow/components/chains/llm_math.py
@@ -11,12 +11,21 @@ class LLMMathChainComponent(LCChainComponent):
     description = "Chain that interprets a prompt and executes python code to do math."
     documentation = "https://python.langchain.com/docs/modules/chains/additional/llm_math"
     name = "LLMMathChain"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
-            name="input_value", display_name="Input", info="The input value to pass to the chain.", required=True
+            name="input_value",
+            display_name="Input",
+            info="The input value to pass to the chain.",
+            required=True,
+        ),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
         ),
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
     ]
 
     outputs = [Output(display_name="Text", name="text", method="invoke_chain")]
@@ -24,7 +33,8 @@ class LLMMathChainComponent(LCChainComponent):
     def invoke_chain(self) -> Message:
         chain = LLMMathChain.from_llm(llm=self.llm)
         response = chain.invoke(
-            {chain.input_key: self.input_value}, config={"callbacks": self.get_langchain_callbacks()}
+            {chain.input_key: self.input_value},
+            config={"callbacks": self.get_langchain_callbacks()},
         )
         result = response.get(chain.output_key, "")
         result = str(result)
diff --git a/src/backend/base/langflow/components/chains/retrieval_qa.py b/src/backend/base/langflow/components/chains/retrieval_qa.py
index cb70589ea..d3d55db1f 100644
--- a/src/backend/base/langflow/components/chains/retrieval_qa.py
+++ b/src/backend/base/langflow/components/chains/retrieval_qa.py
@@ -9,10 +9,14 @@ class RetrievalQAComponent(LCChainComponent):
     display_name = "Retrieval QA"
     description = "Chain for question-answering querying sources from a retriever."
     name = "RetrievalQA"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
-            name="input_value", display_name="Input", info="The input value to pass to the chain.", required=True
+            name="input_value",
+            display_name="Input",
+            info="The input value to pass to the chain.",
+            required=True,
         ),
         DropdownInput(
             name="chain_type",
@@ -22,8 +26,18 @@ class RetrievalQAComponent(LCChainComponent):
             value="Stuff",
             advanced=True,
         ),
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
-        HandleInput(name="retriever", display_name="Retriever", input_types=["Retriever"], required=True),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
+        ),
+        HandleInput(
+            name="retriever",
+            display_name="Retriever",
+            input_types=["Retriever"],
+            required=True,
+        ),
         HandleInput(
             name="memory",
             display_name="Memory",
@@ -52,7 +66,10 @@ class RetrievalQAComponent(LCChainComponent):
             return_source_documents=True,
         )
 
-        result = runnable.invoke({"query": self.input_value}, config={"callbacks": self.get_langchain_callbacks()})
+        result = runnable.invoke(
+            {"query": self.input_value},
+            config={"callbacks": self.get_langchain_callbacks()},
+        )
 
         source_docs = self.to_data(result.get("source_documents", keys=[]))
         result_str = str(result.get("result", ""))
diff --git a/src/backend/base/langflow/components/chains/sql_generator.py b/src/backend/base/langflow/components/chains/sql_generator.py
index d2c412e23..a516a8c3d 100644
--- a/src/backend/base/langflow/components/chains/sql_generator.py
+++ b/src/backend/base/langflow/components/chains/sql_generator.py
@@ -16,17 +16,38 @@ class SQLGeneratorComponent(LCChainComponent):
     display_name = "Natural Language to SQL"
     description = "Generate SQL from natural language."
     name = "SQLGenerator"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
-            name="input_value", display_name="Input", info="The input value to pass to the chain.", required=True
+            name="input_value",
+            display_name="Input",
+            info="The input value to pass to the chain.",
+            required=True,
+        ),
+        HandleInput(
+            name="llm",
+            display_name="Language Model",
+            input_types=["LanguageModel"],
+            required=True,
+        ),
+        HandleInput(
+            name="db",
+            display_name="SQLDatabase",
+            input_types=["SQLDatabase"],
+            required=True,
         ),
-        HandleInput(name="llm", display_name="Language Model", input_types=["LanguageModel"], required=True),
-        HandleInput(name="db", display_name="SQLDatabase", input_types=["SQLDatabase"], required=True),
         IntInput(
-            name="top_k", display_name="Top K", info="The number of results per select statement to return.", value=5
+            name="top_k",
+            display_name="Top K",
+            info="The number of results per select statement to return.",
+            value=5,
+        ),
+        MultilineInput(
+            name="prompt",
+            display_name="Prompt",
+            info="The prompt must contain `{question}`.",
         ),
-        MultilineInput(name="prompt", display_name="Prompt", info="The prompt must contain `{question}`."),
     ]
 
     outputs = [Output(display_name="Text", name="text", method="invoke_chain")]
@@ -48,7 +69,8 @@ class SQLGeneratorComponent(LCChainComponent):
             sql_query_chain = create_sql_query_chain(llm=self.llm, db=self.db, prompt=prompt_template, k=self.top_k)
         query_writer: Runnable = sql_query_chain | {"query": lambda x: x.replace("SQLQuery:", "").strip()}
         response = query_writer.invoke(
-            {"question": self.input_value}, config={"callbacks": self.get_langchain_callbacks()}
+            {"question": self.input_value},
+            config={"callbacks": self.get_langchain_callbacks()},
         )
         query = response.get("query")
         self.status = query
diff --git a/src/backend/base/langflow/components/custom_component/__init__.py b/src/backend/base/langflow/components/custom_component/__init__.py
new file mode 100644
index 000000000..fa37797fe
--- /dev/null
+++ b/src/backend/base/langflow/components/custom_component/__init__.py
@@ -0,0 +1,5 @@
+from .custom_component import CustomComponent
+
+__all__ = [
+    "CustomComponent",
+]
diff --git a/src/backend/base/langflow/components/helpers/custom_component.py b/src/backend/base/langflow/components/custom_component/custom_component.py
similarity index 100%
rename from src/backend/base/langflow/components/helpers/custom_component.py
rename to src/backend/base/langflow/components/custom_component/custom_component.py
diff --git a/src/backend/base/langflow/components/helpers/__init__.py b/src/backend/base/langflow/components/helpers/__init__.py
index c30861d2b..b78c7fdee 100644
--- a/src/backend/base/langflow/components/helpers/__init__.py
+++ b/src/backend/base/langflow/components/helpers/__init__.py
@@ -2,7 +2,6 @@ from .combine_text import CombineTextComponent
 from .create_list import CreateListComponent
 from .csv_to_data import CSVToDataComponent
 from .current_date import CurrentDateComponent
-from .custom_component import CustomComponent
 from .data_conditional_router import DataConditionalRouterComponent
 from .extract_key import ExtractDataKeyComponent
 from .filter_data import FilterDataComponent
@@ -25,7 +24,6 @@ __all__ = [
     "CombineTextComponent",
     "CreateListComponent",
     "CurrentDateComponent",
-    "CustomComponent",
     "DataConditionalRouterComponent",
     "DataFilterComponent",
     "ExtractDataKeyComponent",
diff --git a/src/backend/base/langflow/components/langchain_utilities/json_document_builder.py b/src/backend/base/langflow/components/langchain_utilities/json_document_builder.py
index b6303c952..402a65182 100644
--- a/src/backend/base/langflow/components/langchain_utilities/json_document_builder.py
+++ b/src/backend/base/langflow/components/langchain_utilities/json_document_builder.py
@@ -21,6 +21,7 @@ class JSONDocumentBuilder(CustomComponent):
     display_name: str = "JSON Document Builder"
     description: str = "Build a Document containing a JSON object using a key and another Document page content."
     name = "JSONDocumentBuilder"
+    legacy: bool = True
 
     output_types: list[str] = ["Document"]
     documentation: str = "https://docs.langflow.org/components/utilities#json-document-builder"
diff --git a/src/backend/base/langflow/components/retrievers/amazon_kendra.py b/src/backend/base/langflow/components/retrievers/amazon_kendra.py
index 43fefeec2..21c12c003 100644
--- a/src/backend/base/langflow/components/retrievers/amazon_kendra.py
+++ b/src/backend/base/langflow/components/retrievers/amazon_kendra.py
@@ -11,6 +11,7 @@ class AmazonKendraRetrieverComponent(CustomComponent):
     description: str = "Retriever that uses the Amazon Kendra API."
     name = "AmazonKendra"
     icon = "Amazon"
+    legacy: bool = True
 
     def build_config(self):
         return {
diff --git a/src/backend/base/langflow/components/retrievers/cohere_rerank.py b/src/backend/base/langflow/components/retrievers/cohere_rerank.py
index 3a4882a8a..177899954 100644
--- a/src/backend/base/langflow/components/retrievers/cohere_rerank.py
+++ b/src/backend/base/langflow/components/retrievers/cohere_rerank.py
@@ -3,7 +3,10 @@ from typing import cast
 from langchain.retrievers import ContextualCompressionRetriever
 from langchain_cohere import CohereRerank
 
-from langflow.base.vectorstores.model import LCVectorStoreComponent, check_cached_vector_store
+from langflow.base.vectorstores.model import (
+    LCVectorStoreComponent,
+    check_cached_vector_store,
+)
 from langflow.field_typing import Retriever, VectorStore
 from langflow.io import (
     DropdownInput,
@@ -22,6 +25,7 @@ class CohereRerankComponent(LCVectorStoreComponent):
     description = "Rerank documents using the Cohere API and a retriever."
     name = "CohereRerank"
     icon = "Cohere"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
diff --git a/src/backend/base/langflow/components/retrievers/metal.py b/src/backend/base/langflow/components/retrievers/metal.py
index 083031560..f7dba35eb 100644
--- a/src/backend/base/langflow/components/retrievers/metal.py
+++ b/src/backend/base/langflow/components/retrievers/metal.py
@@ -11,6 +11,7 @@ class MetalRetrieverComponent(CustomComponent):
     display_name: str = "Metal Retriever"
     description: str = "Retriever that uses the Metal API."
     name = "MetalRetriever"
+    legacy: bool = True
 
     def build_config(self):
         return {
diff --git a/src/backend/base/langflow/components/retrievers/multi_query.py b/src/backend/base/langflow/components/retrievers/multi_query.py
index 5baa50025..6d381affc 100644
--- a/src/backend/base/langflow/components/retrievers/multi_query.py
+++ b/src/backend/base/langflow/components/retrievers/multi_query.py
@@ -9,6 +9,7 @@ class MultiQueryRetrieverComponent(CustomComponent):
     description = "Initialize from llm using default template."
     documentation = "https://python.langchain.com/docs/modules/data_connection/retrievers/how_to/MultiQueryRetriever"
     name = "MultiQueryRetriever"
+    legacy: bool = True
 
     def build_config(self):
         return {
diff --git a/src/backend/base/langflow/components/retrievers/nvidia_rerank.py b/src/backend/base/langflow/components/retrievers/nvidia_rerank.py
index d0a68f6a2..1092e0343 100644
--- a/src/backend/base/langflow/components/retrievers/nvidia_rerank.py
+++ b/src/backend/base/langflow/components/retrievers/nvidia_rerank.py
@@ -2,9 +2,18 @@ from typing import Any, cast
 
 from langchain.retrievers import ContextualCompressionRetriever
 
-from langflow.base.vectorstores.model import LCVectorStoreComponent, check_cached_vector_store
+from langflow.base.vectorstores.model import (
+    LCVectorStoreComponent,
+    check_cached_vector_store,
+)
 from langflow.field_typing import Retriever, VectorStore
-from langflow.io import DropdownInput, HandleInput, MultilineInput, SecretStrInput, StrInput
+from langflow.io import (
+    DropdownInput,
+    HandleInput,
+    MultilineInput,
+    SecretStrInput,
+    StrInput,
+)
 from langflow.schema import Data
 from langflow.schema.dotdict import dotdict
 from langflow.template.field.base import Output
@@ -14,6 +23,7 @@ class NvidiaRerankComponent(LCVectorStoreComponent):
     display_name = "NVIDIA Rerank"
     description = "Rerank documents using the NVIDIA API and a retriever."
     icon = "NVIDIA"
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
@@ -28,7 +38,10 @@ class NvidiaRerankComponent(LCVectorStoreComponent):
             info="The base URL of the NVIDIA API. Defaults to https://integrate.api.nvidia.com/v1.",
         ),
         DropdownInput(
-            name="model", display_name="Model", options=["nv-rerank-qa-mistral-4b:1"], value="nv-rerank-qa-mistral-4b:1"
+            name="model",
+            display_name="Model",
+            options=["nv-rerank-qa-mistral-4b:1"],
+            value="nv-rerank-qa-mistral-4b:1",
         ),
         SecretStrInput(name="api_key", display_name="API Key"),
         HandleInput(name="retriever", display_name="Retriever", input_types=["Retriever"]),
diff --git a/src/backend/base/langflow/components/retrievers/self_query.py b/src/backend/base/langflow/components/retrievers/self_query.py
index e732e3c35..86aaeb71f 100644
--- a/src/backend/base/langflow/components/retrievers/self_query.py
+++ b/src/backend/base/langflow/components/retrievers/self_query.py
@@ -13,6 +13,7 @@ class SelfQueryRetrieverComponent(Component):
     description = "Retriever that uses a vector store and an LLM to generate the vector store queries."
     name = "SelfQueryRetriever"
     icon = "LangChain"
+    legacy: bool = True
 
     inputs = [
         HandleInput(
@@ -48,7 +49,11 @@ class SelfQueryRetrieverComponent(Component):
     ]
 
     outputs = [
-        Output(display_name="Retrieved Documents", name="documents", method="retrieve_documents"),
+        Output(
+            display_name="Retrieved Documents",
+            name="documents",
+            method="retrieve_documents",
+        ),
     ]
 
     def retrieve_documents(self) -> list[Data]:
diff --git a/src/backend/base/langflow/components/retrievers/vector_store.py b/src/backend/base/langflow/components/retrievers/vector_store.py
index b4ef2c846..6243725e5 100644
--- a/src/backend/base/langflow/components/retrievers/vector_store.py
+++ b/src/backend/base/langflow/components/retrievers/vector_store.py
@@ -8,6 +8,7 @@ class VectoStoreRetrieverComponent(CustomComponent):
     display_name = "VectorStore Retriever"
     description = "A vector store retriever"
     name = "VectorStoreRetriever"
+    legacy: bool = True
 
     def build_config(self):
         return {
diff --git a/src/backend/base/langflow/components/toolkits/vector_store_info.py b/src/backend/base/langflow/components/toolkits/vector_store_info.py
index 3b7d752f6..5961756b0 100644
--- a/src/backend/base/langflow/components/toolkits/vector_store_info.py
+++ b/src/backend/base/langflow/components/toolkits/vector_store_info.py
@@ -9,6 +9,7 @@ class VectorStoreInfoComponent(Component):
     display_name = "VectorStoreInfo"
     description = "Information about a VectorStore"
     name = "VectorStoreInfo"
+    legacy: bool = True
 
     inputs = [
         MessageTextInput(
@@ -41,5 +42,7 @@ class VectorStoreInfoComponent(Component):
             "description": self.vectorstore_description,
         }
         return VectorStoreInfo(
-            vectorstore=self.input_vectorstore, description=self.vectorstore_description, name=self.vectorstore_name
+            vectorstore=self.input_vectorstore,
+            description=self.vectorstore_description,
+            name=self.vectorstore_name,
         )
diff --git a/src/backend/base/langflow/components/tools/python_code_structured_tool.py b/src/backend/base/langflow/components/tools/python_code_structured_tool.py
index f3028731d..8d715c91a 100644
--- a/src/backend/base/langflow/components/tools/python_code_structured_tool.py
+++ b/src/backend/base/langflow/components/tools/python_code_structured_tool.py
@@ -10,7 +10,14 @@ from pydantic.v1.fields import Undefined
 from typing_extensions import override
 
 from langflow.base.langchain_utilities.model import LCToolComponent
-from langflow.inputs.inputs import BoolInput, DropdownInput, FieldTypes, HandleInput, MessageTextInput, MultilineInput
+from langflow.inputs.inputs import (
+    BoolInput,
+    DropdownInput,
+    FieldTypes,
+    HandleInput,
+    MessageTextInput,
+    MultilineInput,
+)
 from langflow.io import Output
 from langflow.schema import Data
 from langflow.schema.dotdict import dotdict
@@ -36,6 +43,7 @@ class PythonCodeStructuredTool(LCToolComponent):
     name = "PythonCodeStructuredTool"
     icon = "🐍"
     field_order = ["name", "description", "tool_code", "return_direct", "tool_function"]
+    legacy: bool = True
 
     inputs = [
         MultilineInput(
@@ -47,7 +55,12 @@ class PythonCodeStructuredTool(LCToolComponent):
             real_time_refresh=True,
             refresh_button=True,
         ),
-        MessageTextInput(name="tool_name", display_name="Tool Name", info="Enter the name of the tool.", required=True),
+        MessageTextInput(
+            name="tool_name",
+            display_name="Tool Name",
+            info="Enter the name of the tool.",
+            required=True,
+        ),
         MessageTextInput(
             name="tool_description",
             display_name="Description",
@@ -192,7 +205,10 @@ class PythonCodeStructuredTool(LCToolComponent):
                 schema_annotation = Any
             schema_fields[field_name] = (
                 schema_annotation,
-                Field(default=func_arg.get("default", Undefined), description=field_description),
+                Field(
+                    default=func_arg.get("default", Undefined),
+                    description=field_description,
+                ),
             )
 
         if "temp_annotation_type" in _globals:
@@ -214,7 +230,9 @@ class PythonCodeStructuredTool(LCToolComponent):
         """This function is called after the code validation is done."""
         frontend_node = super().post_code_processing(new_frontend_node, current_frontend_node)
         frontend_node["template"] = self.update_build_config(
-            frontend_node["template"], frontend_node["template"]["tool_code"]["value"], "tool_code"
+            frontend_node["template"],
+            frontend_node["template"]["tool_code"]["value"],
+            "tool_code",
         )
         frontend_node = super().post_code_processing(new_frontend_node, current_frontend_node)
         for key in frontend_node["template"]:
diff --git a/src/backend/base/langflow/components/tools/searxng.py b/src/backend/base/langflow/components/tools/searxng.py
index 3227b56e0..9d379c494 100644
--- a/src/backend/base/langflow/components/tools/searxng.py
+++ b/src/backend/base/langflow/components/tools/searxng.py
@@ -19,6 +19,7 @@ class SearXNGToolComponent(LCToolComponent):
     display_name = "SearXNG Search Tool"
     description = "A component that searches for tools using SearXNG."
     name = "SearXNGTool"
+    legacy: bool = True
 
     inputs = [
         MessageTextInput(
@@ -127,7 +128,10 @@ class SearXNGToolComponent(LCToolComponent):
 
         schema_fields = {
             "query": (str, Field(..., description="The query to search for.")),
-            "categories": (list[str], Field(default=[], description="The categories to search in.")),
+            "categories": (
+                list[str],
+                Field(default=[], description="The categories to search in."),
+            ),
         }
 
         searx_search_schema = create_model("SearxSearchSchema", **schema_fields)
diff --git a/src/backend/base/langflow/custom/attributes.py b/src/backend/base/langflow/custom/attributes.py
index 0070d13c9..fadede40f 100644
--- a/src/backend/base/langflow/custom/attributes.py
+++ b/src/backend/base/langflow/custom/attributes.py
@@ -61,6 +61,7 @@ ATTR_FUNC_MAPPING: dict[str, Callable] = {
     "display_name": getattr_return_str,
     "description": getattr_return_str,
     "beta": getattr_return_bool,
+    "legacy": getattr_return_bool,
     "documentation": getattr_return_str,
     "icon": validate_icon,
     "frozen": getattr_return_bool,
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json b/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json
index 19cc0cd2d..82153f047 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json	
@@ -158,6 +158,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "lf_version": "1.0.16",
             "metadata": {},
             "output_types": [],
@@ -380,6 +381,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "lf_version": "1.0.16",
             "metadata": {},
             "output_types": [],
@@ -589,6 +591,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "lf_version": "1.0.16",
             "metadata": {},
             "output_types": [],
@@ -1203,6 +1206,7 @@
             ],
             "frozen": false,
             "icon": "calculator",
+            "legacy": false,
             "lf_version": "1.0.16",
             "metadata": {},
             "official": false,
@@ -1322,6 +1326,7 @@
               "code"
             ],
             "frozen": false,
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Basic Prompting (Hello, World).json b/src/backend/base/langflow/initial_setup/starter_projects/Basic Prompting (Hello, World).json
index b91e1b0c5..6ebd89572 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Basic Prompting (Hello, World).json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Basic Prompting (Hello, World).json	
@@ -108,6 +108,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -324,6 +325,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -445,6 +447,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -647,6 +650,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Blog Writer.json b/src/backend/base/langflow/initial_setup/starter_projects/Blog Writer.json
index 39f15075b..99b83df6a 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Blog Writer.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Blog Writer.json	
@@ -156,6 +156,7 @@
             ],
             "frozen": false,
             "icon": "layout-template",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -288,6 +289,7 @@
             ],
             "frozen": false,
             "icon": "braces",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -425,6 +427,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -667,6 +670,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -869,6 +873,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Complex Agent.json b/src/backend/base/langflow/initial_setup/starter_projects/Complex Agent.json
index 607126fa7..5d69c3dcd 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Complex Agent.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Complex Agent.json	
@@ -629,6 +629,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -876,6 +877,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1202,6 +1204,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1388,6 +1391,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1528,6 +1532,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1783,6 +1788,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2043,6 +2049,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2373,6 +2380,7 @@
             "is_composition": null,
             "is_input": null,
             "is_output": null,
+            "legacy": false,
             "metadata": {},
             "name": "",
             "output_types": [],
@@ -2488,6 +2496,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2814,6 +2823,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -3264,6 +3274,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -3738,6 +3749,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -4070,6 +4082,7 @@
             "is_composition": null,
             "is_input": null,
             "is_output": null,
+            "legacy": false,
             "metadata": {},
             "name": "",
             "output_types": [],
@@ -4237,6 +4250,7 @@
               "search_params"
             ],
             "frozen": false,
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Document QA.json b/src/backend/base/langflow/initial_setup/starter_projects/Document QA.json
index 9080d2f92..63bba535a 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Document QA.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Document QA.json	
@@ -161,6 +161,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -306,6 +307,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -523,6 +525,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -725,6 +728,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1048,6 +1052,7 @@
             ],
             "frozen": false,
             "icon": "braces",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1181,6 +1186,7 @@
             ],
             "frozen": false,
             "icon": "file-text",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Hierarchical Agent.json b/src/backend/base/langflow/initial_setup/starter_projects/Hierarchical Agent.json
index 6e6f30ea6..5f39b1160 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Hierarchical Agent.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Hierarchical Agent.json	
@@ -326,6 +326,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -576,6 +577,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -906,6 +908,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1097,6 +1100,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1242,6 +1246,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1501,6 +1506,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1763,6 +1769,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2097,6 +2104,7 @@
             "is_composition": null,
             "is_input": null,
             "is_output": null,
+            "legacy": false,
             "metadata": {},
             "name": "",
             "output_types": [],
@@ -2216,6 +2224,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2436,6 +2445,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2687,6 +2697,7 @@
               "search_params"
             ],
             "frozen": false,
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Memory Chatbot.json b/src/backend/base/langflow/initial_setup/starter_projects/Memory Chatbot.json
index feea5b9a5..1cc4c6d8b 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Memory Chatbot.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Memory Chatbot.json	
@@ -135,6 +135,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -280,6 +281,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -504,6 +506,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -830,6 +833,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1023,6 +1027,7 @@
             ],
             "frozen": false,
             "icon": "message-square-more",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Sequential Agent.json b/src/backend/base/langflow/initial_setup/starter_projects/Sequential Agent.json
index 0973b30f6..c7ba32ab2 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Sequential Agent.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Sequential Agent.json	
@@ -389,6 +389,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -588,6 +589,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -915,6 +917,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -1199,6 +1202,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -1320,6 +1324,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -1441,6 +1446,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -1569,6 +1575,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -1920,6 +1927,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -2271,6 +2279,7 @@
             ],
             "frozen": false,
             "icon": "CrewAI",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Travel Planning Agents.json b/src/backend/base/langflow/initial_setup/starter_projects/Travel Planning Agents.json
index 19cbd20ad..2482d8138 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Travel Planning Agents.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Travel Planning Agents.json	
@@ -398,6 +398,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -620,6 +621,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "output_types": [],
@@ -829,6 +831,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1442,6 +1445,7 @@
               "search_params"
             ],
             "frozen": false,
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "official": false,
@@ -2319,6 +2323,7 @@
             ],
             "frozen": false,
             "icon": "calculator",
+            "legacy": false,
             "lf_version": "1.0.15",
             "metadata": {},
             "official": false,
diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Vector Store RAG.json b/src/backend/base/langflow/initial_setup/starter_projects/Vector Store RAG.json
index be00e8bec..012104864 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Vector Store RAG.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Vector Store RAG.json	
@@ -291,6 +291,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -524,6 +525,7 @@
             ],
             "frozen": false,
             "icon": "AstraDB",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1020,6 +1022,7 @@
             ],
             "frozen": false,
             "icon": "braces",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1157,6 +1160,7 @@
             ],
             "frozen": false,
             "icon": "prompts",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1302,6 +1306,7 @@
             ],
             "frozen": false,
             "icon": "MessagesSquare",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1494,6 +1499,7 @@
             ],
             "frozen": false,
             "icon": "scissors-line-dashed",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1639,6 +1645,7 @@
             ],
             "frozen": false,
             "icon": "file-text",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -1788,6 +1795,7 @@
             ],
             "frozen": false,
             "icon": "AstraDB",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2302,6 +2310,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -2778,6 +2787,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -3246,6 +3256,7 @@
             ],
             "frozen": false,
             "icon": "OpenAI",
+            "legacy": false,
             "metadata": {},
             "output_types": [],
             "outputs": [
diff --git a/src/backend/base/langflow/template/frontend_node/base.py b/src/backend/base/langflow/template/frontend_node/base.py
index bf80442e0..4df292120 100644
--- a/src/backend/base/langflow/template/frontend_node/base.py
+++ b/src/backend/base/langflow/template/frontend_node/base.py
@@ -49,6 +49,8 @@ class FrontendNode(BaseModel):
     """Order of the fields in the frontend node."""
     beta: bool = False
     """Whether the frontend node is in beta."""
+    legacy: bool = False
+    """Whether the frontend node is legacy."""
     error: str | None = None
     """Error message for the frontend node."""
     edited: bool = False
@@ -81,7 +83,10 @@ class FrontendNode(BaseModel):
         if "output_types" in result and not result.get("outputs"):
             for base_class in result["output_types"]:
                 output = Output(
-                    display_name=base_class, name=base_class.lower(), types=[base_class], selected=base_class
+                    display_name=base_class,
+                    name=base_class.lower(),
+                    types=[base_class],
+                    selected=base_class,
                 )
                 result["outputs"].append(output.model_dump())
 
diff --git a/src/backend/base/langflow/template/frontend_node/custom_components.py b/src/backend/base/langflow/template/frontend_node/custom_components.py
index 4f733c15e..b9a820070 100644
--- a/src/backend/base/langflow/template/frontend_node/custom_components.py
+++ b/src/backend/base/langflow/template/frontend_node/custom_components.py
@@ -47,6 +47,7 @@ class CustomComponentFrontendNode(FrontendNode):
     name: str = "CustomComponent"
     display_name: str | None = "CustomComponent"
     beta: bool = False
+    legacy: bool = False
     template: Template = Template(
         type_name="CustomComponent",
         fields=[
@@ -72,6 +73,7 @@ class ComponentFrontendNode(FrontendNode):
     name: str = "Component"
     display_name: str | None = "Component"
     beta: bool = False
+    legacy: bool = False
     template: Template = Template(
         type_name="Component",
         fields=[
diff --git a/src/backend/base/langflow/utils/constants.py b/src/backend/base/langflow/utils/constants.py
index 45d3d7e70..1b720652a 100644
--- a/src/backend/base/langflow/utils/constants.py
+++ b/src/backend/base/langflow/utils/constants.py
@@ -52,7 +52,18 @@ def python_function(text: str) -> str:
 
 
 PYTHON_BASIC_TYPES = [str, bool, int, float, tuple, list, dict, set]
-DIRECT_TYPES = ["str", "bool", "dict", "int", "float", "Any", "prompt", "code", "NestedDict", "table"]
+DIRECT_TYPES = [
+    "str",
+    "bool",
+    "dict",
+    "int",
+    "float",
+    "Any",
+    "prompt",
+    "code",
+    "NestedDict",
+    "table",
+]
 
 
 LOADERS_INFO: list[dict[str, Any]] = [
@@ -175,29 +186,3 @@ MESSAGE_SENDER_NAME_AI = "AI"
 MESSAGE_SENDER_NAME_USER = "User"
 
 MAX_TEXT_LENGTH = 99999
-
-
-SIDEBAR_CATEGORIES = [
-    {"display_name": "Saved", "name": "saved_components", "icon": "GradientSave"},
-    {"display_name": "Inputs", "name": "inputs", "icon": "Download"},
-    {"display_name": "Outputs", "name": "outputs", "icon": "Upload"},
-    {"display_name": "Prompts", "name": "prompts", "icon": "TerminalSquare"},
-    {"display_name": "Data", "name": "data", "icon": "Database"},
-    {"display_name": "Models", "name": "models", "icon": "BrainCircuit"},
-    {"display_name": "Helpers", "name": "helpers", "icon": "Wand2"},
-    {"display_name": "Vector Stores", "name": "vectorstores", "icon": "Layers"},
-    {"display_name": "Embeddings", "name": "embeddings", "icon": "Binary"},
-    {"display_name": "Agents", "name": "agents", "icon": "Bot"},
-    {"display_name": "Astra Assistants", "name": "astra_assistants", "icon": "Sparkles"},
-    {"display_name": "Chains", "name": "chains", "icon": "Link"},
-    {"display_name": "Loaders", "name": "documentloaders", "icon": "Paperclip"},
-    {"display_name": "Utilities", "name": "langchain_utilities", "icon": "PocketKnife"},
-    {"display_name": "Link Extractors", "name": "link_extractors", "icon": "Link2"},
-    {"display_name": "Memories", "name": "memories", "icon": "Cpu"},
-    {"display_name": "Output Parsers", "name": "output_parsers", "icon": "Compass"},
-    {"display_name": "Prototypes", "name": "prototypes", "icon": "FlaskConical"},
-    {"display_name": "Retrievers", "name": "retrievers", "icon": "FileSearch"},
-    {"display_name": "Text Splitters", "name": "textsplitters", "icon": "Scissors"},
-    {"display_name": "Toolkits", "name": "toolkits", "icon": "Package2"},
-    {"display_name": "Tools", "name": "tools", "icon": "Hammer"},
-]
diff --git a/src/backend/tests/unit/api/v1/test_endpoints.py b/src/backend/tests/unit/api/v1/test_endpoints.py
index 15d96e9aa..908b4edaf 100644
--- a/src/backend/tests/unit/api/v1/test_endpoints.py
+++ b/src/backend/tests/unit/api/v1/test_endpoints.py
@@ -23,14 +23,3 @@ async def test_get_config(client: AsyncClient):
     assert "auto_saving" in result, "The dictionary must contain a key called 'auto_saving'"
     assert "health_check_max_retries" in result, "The dictionary must contain a 'health_check_max_retries' key"
     assert "max_file_size_upload" in result, "The dictionary must contain a key called 'max_file_size_upload'"
-
-
-async def test_get_sidebar_components(client: AsyncClient):
-    response = await client.get("api/v1/sidebar_categories")
-    result = response.json()
-
-    assert response.status_code == status.HTTP_200_OK
-    assert isinstance(result, dict), "The result must be a dictionary"
-    assert "categories" in result, "The dictionary must contain a key called 'categories'"
-    assert len(result["categories"]) > 0, "The categories list must not be empty"
-    assert isinstance(result["categories"], list), "The categories must be a list"
diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
index 7aaf8a3ca..046cf7d98 100644
--- a/src/frontend/package-lock.json
+++ b/src/frontend/package-lock.json
@@ -14,7 +14,8 @@
         "@million/lint": "^1.0.0-rc.26",
         "@radix-ui/react-accordion": "^1.1.2",
         "@radix-ui/react-checkbox": "^1.0.4",
-        "@radix-ui/react-dialog": "^1.1.1",
+        "@radix-ui/react-collapsible": "^1.1.1",
+        "@radix-ui/react-dialog": "^1.1.2",
         "@radix-ui/react-dropdown-menu": "^2.0.6",
         "@radix-ui/react-form": "^0.0.3",
         "@radix-ui/react-icons": "^1.3.0",
diff --git a/src/frontend/package.json b/src/frontend/package.json
index 7c072f75d..34df5f5c7 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -9,7 +9,8 @@
     "@million/lint": "^1.0.0-rc.26",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.1.1",
+    "@radix-ui/react-collapsible": "^1.1.1",
+    "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-form": "^0.0.3",
     "@radix-ui/react-icons": "^1.3.0",
diff --git a/src/frontend/src/components/appHeaderComponent/components/GithubStarButton/index.tsx b/src/frontend/src/components/appHeaderComponent/components/GithubStarButton/index.tsx
index cc13c466f..fd8a0a655 100644
--- a/src/frontend/src/components/appHeaderComponent/components/GithubStarButton/index.tsx
+++ b/src/frontend/src/components/appHeaderComponent/components/GithubStarButton/index.tsx
@@ -9,7 +9,7 @@ export const GithubStarComponent = () => {
       <FaGithub className="h-4 w-4 text-black dark:text-[white]" />
       <div className="hidden text-black dark:text-[white] lg:block">Star</div>
       <div className="header-github-display text-black dark:text-[white]">
-        {stars.toLocaleString() ?? 0}
+        {stars?.toLocaleString() ?? 0}
       </div>
     </div>
   );
diff --git a/src/frontend/src/components/ui/badge.tsx b/src/frontend/src/components/ui/badge.tsx
index 6eea7971a..ad3a2638f 100644
--- a/src/frontend/src/components/ui/badge.tsx
+++ b/src/frontend/src/components/ui/badge.tsx
@@ -15,13 +15,15 @@ const badgeVariants = cva(
         destructive:
           "bg-destructive hover:bg-destructive/80 border-transparent text-destructive-foreground",
         outline: "text-primary/80 border-ring/60",
+        secondaryStatic: "bg-input text-muted-foreground",
+        pinkStatic: "bg-accent-pink text-accent-pink-foreground",
       },
       size: {
         sm: "h-4 text-xs",
         md: "h-5 text-sm",
         lg: "h-6 text-base",
-        sq: "h-6 text-sm font-normal rounded-md",
-        xq: "h-5 text-xs font-normal rounded-md",
+        sq: "h-6 px-1.5 text-sm font-medium rounded-md",
+        xq: "h-5 px-1 text-xs font-medium rounded-md",
       },
     },
     defaultVariants: {
diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx
index 140c7b0e3..027d9bf15 100644
--- a/src/frontend/src/components/ui/button.tsx
+++ b/src/frontend/src/components/ui/button.tsx
@@ -18,8 +18,10 @@ const buttonVariants = cva(
           "border bg-background text-secondary-foreground hover:bg-muted dark:hover:bg-muted hover:shadow-sm",
         secondary:
           "border border-muted bg-muted text-secondary-foreground hover:bg-secondary-foreground/5",
-        ghost: "hover:bg-accent hover:text-accent-foreground",
-        menu: "hover:bg-muted hover:text-accent-foreground focus-visible:!ring-offset-0",
+        ghost: "text-foreground hover:bg-accent hover:text-accent-foreground",
+        ghostActive:
+          "bg-muted text-foreground hover:bg-accent hover:text-accent-foreground",
+        menu: "hover:bg-muted hover:text-accent-foreground focus:!ring-0 focus-visible:!ring-0",
         "menu-active":
           "font-semibold hover:bg-muted hover:text-accent-foreground focus-visible:!ring-offset-0",
         link: "underline-offset-4 hover:underline text-primary",
@@ -29,7 +31,9 @@ const buttonVariants = cva(
         sm: "h-9 px-3 rounded-md",
         xs: "py-0.5 px-3 rounded-md",
         lg: "h-11 px-8 rounded-md",
-        icon: "py-1 px-1 rounded-md",
+        iconMd: "p-1.5 rounded-md",
+        icon: "p-1 rounded-md",
+        iconSm: "p-0.5 rounded-md",
         "node-toolbar": "py-[6px] px-[6px] rounded-md",
       },
     },
diff --git a/src/frontend/src/components/ui/collapsible.tsx b/src/frontend/src/components/ui/collapsible.tsx
new file mode 100644
index 000000000..1fe76f5d1
--- /dev/null
+++ b/src/frontend/src/components/ui/collapsible.tsx
@@ -0,0 +1,11 @@
+"use client";
+
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
+
+const Collapsible = CollapsiblePrimitive.Root;
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
+
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
+
+export { Collapsible, CollapsibleContent, CollapsibleTrigger };
diff --git a/src/frontend/src/components/ui/disclosure.tsx b/src/frontend/src/components/ui/disclosure.tsx
new file mode 100644
index 000000000..77ca775c4
--- /dev/null
+++ b/src/frontend/src/components/ui/disclosure.tsx
@@ -0,0 +1,191 @@
+"use client";
+import {
+  AnimatePresence,
+  motion,
+  MotionConfig,
+  Transition,
+  Variant,
+  Variants,
+} from "framer-motion";
+import * as React from "react";
+import { createContext, useContext, useEffect, useId, useState } from "react";
+import { cn } from "../../utils/utils";
+
+type DisclosureContextType = {
+  open: boolean;
+  toggle: () => void;
+  variants?: { expanded: Variant; collapsed: Variant };
+};
+
+const DisclosureContext = createContext<DisclosureContextType | undefined>(
+  undefined,
+);
+
+type DisclosureProviderProps = {
+  children: React.ReactNode;
+  open: boolean;
+  onOpenChange?: (open: boolean) => void;
+  variants?: { expanded: Variant; collapsed: Variant };
+};
+
+function DisclosureProvider({
+  children,
+  open: openProp,
+  onOpenChange,
+  variants,
+}: DisclosureProviderProps) {
+  const [internalOpenValue, setInternalOpenValue] = useState<boolean>(openProp);
+
+  useEffect(() => {
+    setInternalOpenValue(openProp);
+  }, [openProp]);
+
+  const toggle = () => {
+    const newOpen = !internalOpenValue;
+    setInternalOpenValue(newOpen);
+    if (onOpenChange) {
+      onOpenChange(newOpen);
+    }
+  };
+
+  return (
+    <DisclosureContext.Provider
+      value={{
+        open: internalOpenValue,
+        toggle,
+        variants,
+      }}
+    >
+      {children}
+    </DisclosureContext.Provider>
+  );
+}
+
+function useDisclosure() {
+  const context = useContext(DisclosureContext);
+  if (!context) {
+    throw new Error("useDisclosure must be used within a DisclosureProvider");
+  }
+  return context;
+}
+
+type DisclosureProps = {
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+  children: React.ReactNode;
+  className?: string;
+  variants?: { expanded: Variant; collapsed: Variant };
+  transition?: Transition;
+};
+
+export function Disclosure({
+  open: openProp = false,
+  onOpenChange,
+  children,
+  className,
+  transition,
+  variants,
+}: DisclosureProps) {
+  return (
+    <MotionConfig transition={transition}>
+      <div className={className}>
+        <DisclosureProvider
+          open={openProp}
+          onOpenChange={onOpenChange}
+          variants={variants}
+        >
+          {React.Children.toArray(children)[0]}
+          {React.Children.toArray(children)[1]}
+        </DisclosureProvider>
+      </div>
+    </MotionConfig>
+  );
+}
+
+export function DisclosureTrigger({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
+  const { toggle, open } = useDisclosure();
+
+  return (
+    <>
+      {React.Children.map(children, (child) => {
+        return React.isValidElement(child)
+          ? React.cloneElement(child, {
+              onClick: toggle,
+              role: "button",
+              "aria-expanded": open,
+              tabIndex: 0,
+              onKeyDown: (e: { key: string; preventDefault: () => void }) => {
+                if (e.key === "Enter" || e.key === " ") {
+                  e.preventDefault();
+                  toggle();
+                }
+              },
+              className: cn(
+                className,
+                (child as React.ReactElement).props.className,
+              ),
+              ...(child as React.ReactElement).props,
+            })
+          : child;
+      })}
+    </>
+  );
+}
+
+export function DisclosureContent({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
+  const { open, variants } = useDisclosure();
+  const uniqueId = useId();
+
+  const BASE_VARIANTS: Variants = {
+    expanded: {
+      height: "auto",
+      opacity: 1,
+    },
+    collapsed: {
+      height: 0,
+      opacity: 0,
+    },
+  };
+
+  const combinedVariants = {
+    expanded: { ...BASE_VARIANTS.expanded, ...variants?.expanded },
+    collapsed: { ...BASE_VARIANTS.collapsed, ...variants?.collapsed },
+  };
+
+  return (
+    <div className={cn("overflow-hidden", className)}>
+      <AnimatePresence initial={false}>
+        {open && (
+          <motion.div
+            id={uniqueId}
+            initial="collapsed"
+            animate="expanded"
+            exit="collapsed"
+            variants={combinedVariants}
+          >
+            {children}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+}
+
+export default {
+  Disclosure,
+  DisclosureProvider,
+  DisclosureTrigger,
+  DisclosureContent,
+};
diff --git a/src/frontend/src/components/ui/sheet.tsx b/src/frontend/src/components/ui/sheet.tsx
index e48bc1d99..adac8151e 100644
--- a/src/frontend/src/components/ui/sheet.tsx
+++ b/src/frontend/src/components/ui/sheet.tsx
@@ -65,7 +65,7 @@ const SheetContent = React.forwardRef<
       {...props}
     >
       {children}
-      <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+      <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
         <X className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </SheetPrimitive.Close>
diff --git a/src/frontend/src/components/ui/sidebar.tsx b/src/frontend/src/components/ui/sidebar.tsx
index 4941106ea..328ff9629 100644
--- a/src/frontend/src/components/ui/sidebar.tsx
+++ b/src/frontend/src/components/ui/sidebar.tsx
@@ -5,10 +5,12 @@ import { VariantProps, cva } from "class-variance-authority";
 import { PanelLeft } from "lucide-react";
 import * as React from "react";
 
+import { useIsMobile } from "../../hooks/use-mobile";
 import { cn } from "../../utils/utils";
 import { Button } from "./button";
 import { Input } from "./input";
 import { Separator } from "./separator";
+import { Sheet, SheetContent } from "./sheet";
 import { Skeleton } from "./skeleton";
 import {
   Tooltip,
@@ -20,13 +22,17 @@ import {
 const SIDEBAR_COOKIE_NAME = "sidebar:state";
 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
 const SIDEBAR_WIDTH = "19rem";
-const SIDEBAR_WIDTH_ICON = "4rem";
+const SIDEBAR_WIDTH_MOBILE = "18rem";
+const SIDEBAR_WIDTH_ICON = "3rem";
 const SIDEBAR_KEYBOARD_SHORTCUT = "b";
 
 type SidebarContext = {
   state: "expanded" | "collapsed";
   open: boolean;
   setOpen: (open: boolean) => void;
+  openMobile: boolean;
+  setOpenMobile: (open: boolean) => void;
+  isMobile: boolean;
   toggleSidebar: () => void;
 };
 
@@ -47,7 +53,6 @@ const SidebarProvider = React.forwardRef<
     defaultOpen?: boolean;
     open?: boolean;
     onOpenChange?: (open: boolean) => void;
-    width?: string;
   }
 >(
   (
@@ -58,11 +63,13 @@ const SidebarProvider = React.forwardRef<
       className,
       style,
       children,
-      width = SIDEBAR_WIDTH,
       ...props
     },
     ref,
   ) => {
+    const isMobile = useIsMobile();
+    const [openMobile, setOpenMobile] = React.useState(false);
+
     // This is the internal state of the sidebar.
     // We use openProp and setOpenProp for control from outside the component.
     const [_open, _setOpen] = React.useState(defaultOpen);
@@ -85,8 +92,10 @@ const SidebarProvider = React.forwardRef<
 
     // Helper to toggle the sidebar.
     const toggleSidebar = React.useCallback(() => {
-      return setOpen((open) => !open);
-    }, [setOpen]);
+      return isMobile
+        ? setOpenMobile((open) => !open)
+        : setOpen((open) => !open);
+    }, [isMobile, setOpen, setOpenMobile]);
 
     // Adds a keyboard shortcut to toggle the sidebar.
     React.useEffect(() => {
@@ -113,9 +122,20 @@ const SidebarProvider = React.forwardRef<
         state,
         open,
         setOpen,
+        isMobile,
+        openMobile,
+        setOpenMobile,
         toggleSidebar,
       }),
-      [state, open, setOpen, toggleSidebar],
+      [
+        state,
+        open,
+        setOpen,
+        isMobile,
+        openMobile,
+        setOpenMobile,
+        toggleSidebar,
+      ],
     );
 
     return (
@@ -124,7 +144,7 @@ const SidebarProvider = React.forwardRef<
           <div
             style={
               {
-                "--sidebar-width": width,
+                "--sidebar-width": SIDEBAR_WIDTH,
                 "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
                 ...style,
               } as React.CSSProperties
@@ -164,33 +184,47 @@ const Sidebar = React.forwardRef<
     },
     ref,
   ) => {
-    const { state } = useSidebar();
+    const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
 
     if (collapsible === "none") {
       return (
         <div
           className={cn(
-            "group flex h-full w-[--sidebar-width] flex-col bg-background text-foreground",
+            "flex h-full w-[--sidebar-width] flex-col bg-background text-foreground",
             className,
           )}
-          data-side={side}
           ref={ref}
           {...props}
         >
-          <div
-            data-sidebar="sidebar"
-            className="flex h-full w-full flex-col group-data-[side=left]:border-r group-data-[side=right]:border-l"
-          >
-            {children}
-          </div>
+          {children}
         </div>
       );
     }
 
+    if (isMobile) {
+      return (
+        <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+          <SheetContent
+            data-sidebar="sidebar"
+            data-mobile="true"
+            className="w-[--sidebar-width] bg-background p-0 text-foreground [&>button]:hidden"
+            style={
+              {
+                "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
+              } as React.CSSProperties
+            }
+            side={side}
+          >
+            <div className="flex h-full w-full flex-col">{children}</div>
+          </SheetContent>
+        </Sheet>
+      );
+    }
+
     return (
       <div
         ref={ref}
-        className="group peer relative block h-full flex-col"
+        className="group peer relative flex h-full flex-col md:block"
         data-state={state}
         data-collapsible={state === "collapsed" ? collapsible : ""}
         data-variant={variant}
@@ -205,16 +239,11 @@ const Sidebar = React.forwardRef<
             variant === "floating" || variant === "inset"
               ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
               : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
-            // Keep icon width on mobile when collapsed
-            "max-sm:w-[--sidebar-width-icon]",
           )}
         />
         <div
           className={cn(
-            "absolute inset-y-0 z-50 flex h-full transition-[left,right,width] duration-200 ease-linear",
-            // Adjust width based on state and device
-            "w-[--sidebar-width]",
-            "max-sm:group-data-[state=collapsed]:w-[--sidebar-width-icon]",
+            "absolute inset-y-0 z-10 hidden h-full w-[--sidebar-width] transition-[left,right,width] duration-200 ease-linear md:flex",
             side === "left"
               ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
               : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
@@ -222,20 +251,13 @@ const Sidebar = React.forwardRef<
             variant === "floating" || variant === "inset"
               ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
               : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
-            // Position absolute relative to parent container on mobile
-            "max-sm:absolute max-sm:h-[100%] max-sm:group-data-[state=expanded]:bg-background/80",
             className,
           )}
           {...props}
         >
           <div
             data-sidebar="sidebar"
-            className={cn(
-              "flex h-full w-full flex-col bg-background",
-              "group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-border group-data-[variant=floating]:shadow",
-              // Add shadow on mobile
-              "max-sm:shadow-lg",
-            )}
+            className="flex h-full w-full flex-col bg-background group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-border group-data-[variant=floating]:shadow"
           >
             {children}
           </div>
@@ -258,7 +280,7 @@ const SidebarTrigger = React.forwardRef<
       data-sidebar="trigger"
       variant="ghost"
       size="icon"
-      className={cn("h-8 w-8", className)}
+      className={cn("h-7 w-7", className)}
       onClick={(event) => {
         onClick?.(event);
         toggleSidebar();
@@ -310,7 +332,7 @@ const SidebarInset = React.forwardRef<
       ref={ref}
       className={cn(
         "relative flex min-h-svh flex-1 flex-col bg-background",
-        "peer-data-[variant=inset]:m-2 peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 peer-data-[variant=inset]:ml-0 peer-data-[variant=inset]:rounded-xl peer-data-[variant=inset]:shadow",
+        "peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
         className,
       )}
       {...props}
@@ -328,7 +350,7 @@ const SidebarInput = React.forwardRef<
       ref={ref}
       data-sidebar="input"
       className={cn(
-        "h-8 w-full bg-background shadow-none focus-visible:ring-1 focus-visible:ring-ring",
+        "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-ring",
         className,
       )}
       {...props}
@@ -426,7 +448,7 @@ const SidebarGroupLabel = React.forwardRef<
       ref={ref}
       data-sidebar="group-label"
       className={cn(
-        "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-semibold text-foreground/70 outline-none ring-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-1 [&>svg]:size-4 [&>svg]:shrink-0",
+        "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-semibold text-foreground/70 outline-none ring-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
         "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
         className,
       )}
@@ -447,9 +469,9 @@ const SidebarGroupAction = React.forwardRef<
       ref={ref}
       data-sidebar="group-action"
       className={cn(
-        "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 [&>svg]:size-4 [&>svg]:shrink-0",
+        "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
         // Increases the hit area of the button on mobile.
-        "after:-inset-2 after:hidden",
+        "after:absolute after:-inset-2 after:md:hidden",
         "group-data-[collapsible=icon]:hidden",
         className,
       )}
@@ -499,12 +521,11 @@ const SidebarMenuItem = React.forwardRef<
 SidebarMenuItem.displayName = "SidebarMenuItem";
 
 const sidebarMenuButtonVariants = cva(
-  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-ring transition-[width,height,padding] hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-accent data-[active=true]:font-medium data-[active=true]:text-accent-foreground data-[state=open]:hover:bg-accent data-[state=open]:hover:text-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-ring transition-[width,height,padding] hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-accent data-[active=true]:font-medium data-[active=true]:text-accent-foreground data-[state=open]:hover:bg-accent data-[state=open]:hover:text-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
   {
     variants: {
       variant: {
-        default:
-          "text-secondary-foreground hover:bg-accent hover:text-accent-foreground ",
+        default: "hover:bg-accent hover:text-accent-foreground",
         outline:
           "bg-background shadow-[0_0_0_1px_hsl(var(--border))] hover:bg-accent hover:text-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--accent))]",
       },
@@ -542,7 +563,7 @@ const SidebarMenuButton = React.forwardRef<
     ref,
   ) => {
     const Comp = asChild ? Slot : "button";
-    const { state } = useSidebar();
+    const { isMobile, state } = useSidebar();
 
     const button = (
       <Comp
@@ -571,7 +592,7 @@ const SidebarMenuButton = React.forwardRef<
         <TooltipContent
           side="right"
           align="center"
-          hidden={state !== "collapsed"}
+          hidden={state !== "collapsed" || isMobile}
           {...tooltip}
         />
       </Tooltip>
@@ -594,9 +615,9 @@ const SidebarMenuAction = React.forwardRef<
       ref={ref}
       data-sidebar="menu-action"
       className={cn(
-        "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 peer-hover/menu-button:text-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
+        "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
         // Increases the hit area of the button on mobile.
-        "after:-inset-2 after:hidden",
+        "after:absolute after:-inset-2 after:md:hidden",
         "peer-data-[size=sm]/menu-button:top-1",
         "peer-data-[size=default]/menu-button:top-1.5",
         "peer-data-[size=lg]/menu-button:top-2.5",
@@ -710,7 +731,7 @@ const SidebarMenuSubButton = React.forwardRef<
       data-size={size}
       data-active={isActive}
       className={cn(
-        "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-foreground outline-none ring-ring hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-accent-foreground",
+        "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-foreground outline-none ring-ring hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-accent-foreground",
         "data-[active=true]:bg-accent data-[active=true]:text-accent-foreground",
         size === "sm" && "text-xs",
         size === "md" && "text-sm",
diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts
index 0e227e5b5..bc390edf9 100644
--- a/src/frontend/src/constants/constants.ts
+++ b/src/frontend/src/constants/constants.ts
@@ -908,7 +908,7 @@ export const LANGFLOW_ACCESS_TOKEN_EXPIRE_SECONDS_ENV =
   Number(process.env.ACCESS_TOKEN_EXPIRE_SECONDS) -
   Number(process.env.ACCESS_TOKEN_EXPIRE_SECONDS) * 0.1;
 export const TEXT_FIELD_TYPES: string[] = ["str", "SecretStr"];
-export const NODE_WIDTH = 400;
+export const NODE_WIDTH = 384;
 export const NODE_HEIGHT = NODE_WIDTH * 3;
 
 export const SHORTCUT_KEYS = ["cmd", "ctrl", "alt", "shift"];
diff --git a/src/frontend/src/controllers/API/helpers/constants.ts b/src/frontend/src/controllers/API/helpers/constants.ts
index 0bdba73f8..6a63eac70 100644
--- a/src/frontend/src/controllers/API/helpers/constants.ts
+++ b/src/frontend/src/controllers/API/helpers/constants.ts
@@ -21,6 +21,7 @@ export const URLs = {
   VALIDATE: `validate`,
   CONFIG: `config`,
   STARTER_PROJECTS: `starter-projects`,
+  SIDEBAR_CATEGORIES: `sidebar_categories`,
 } as const;
 
 export function getURL(key: keyof typeof URLs, params: any = {}) {
diff --git a/src/frontend/src/hooks/use-mobile.ts b/src/frontend/src/hooks/use-mobile.ts
index 6066b9e2e..a93d58393 100644
--- a/src/frontend/src/hooks/use-mobile.ts
+++ b/src/frontend/src/hooks/use-mobile.ts
@@ -1,22 +1,21 @@
-import { useEffect, useState } from "react";
+import * as React from "react";
 
-export function useMobile(breakpoint: number = 768) {
-  const [isMobile, setIsMobile] = useState(false);
+const MOBILE_BREAKPOINT = 768;
 
-  useEffect(() => {
-    const checkMobile = () => {
-      setIsMobile(window.innerWidth < breakpoint);
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
+    undefined,
+  );
+
+  React.useEffect(() => {
+    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+    const onChange = () => {
+      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
     };
+    mql.addEventListener("change", onChange);
+    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+    return () => mql.removeEventListener("change", onChange);
+  }, []);
 
-    // Check initially
-    checkMobile();
-
-    // Add event listener
-    window.addEventListener("resize", checkMobile);
-
-    // Cleanup
-    return () => window.removeEventListener("resize", checkMobile);
-  }, [breakpoint]);
-
-  return isMobile;
+  return !!isMobile;
 }
diff --git a/src/frontend/src/hooks/useAddComponent.ts b/src/frontend/src/hooks/useAddComponent.ts
new file mode 100644
index 000000000..924b5ba60
--- /dev/null
+++ b/src/frontend/src/hooks/useAddComponent.ts
@@ -0,0 +1,70 @@
+import { NODE_WIDTH } from "@/constants/constants";
+import { track } from "@/customization/utils/analytics";
+import useFlowStore from "@/stores/flowStore";
+import { APIClassType } from "@/types/api";
+import { NodeType } from "@/types/flow";
+import { getNodeId } from "@/utils/reactflowUtils";
+import { getNodeRenderType } from "@/utils/utils";
+import { useCallback } from "react";
+import { useStoreApi } from "reactflow";
+
+export function useAddComponent() {
+  const store = useStoreApi();
+  const paste = useFlowStore((state) => state.paste);
+
+  const addComponent = useCallback(
+    (
+      component: APIClassType,
+      type: string,
+      position?: { x: number; y: number },
+    ) => {
+      track("Component Added", { componentType: component.display_name });
+
+      const {
+        height,
+        width,
+        transform: [transformX, transformY, zoomLevel],
+      } = store.getState();
+
+      const zoomMultiplier = 1 / zoomLevel;
+
+      let pos;
+
+      if (position) {
+        pos = position;
+      } else {
+        let centerX, centerY;
+
+        centerX = -transformX * zoomMultiplier + (width * zoomMultiplier) / 2;
+        centerY = -transformY * zoomMultiplier + (height * zoomMultiplier) / 2;
+
+        const nodeOffset = NODE_WIDTH / 2;
+
+        pos = {
+          x: -nodeOffset,
+          y: -nodeOffset,
+          paneX: centerX,
+          paneY: centerY,
+        };
+      }
+
+      const newId = getNodeId(type);
+
+      const newNode: NodeType = {
+        id: newId,
+        type: getNodeRenderType("genericnode"),
+        position: { x: 0, y: 0 },
+        data: {
+          node: component,
+          type: type,
+          id: newId,
+        },
+      };
+
+      paste({ nodes: [newNode], edges: [] }, pos);
+    },
+    [store, paste],
+  );
+
+  return addComponent;
+}
diff --git a/src/frontend/src/icons/AstraDB/AstraDB.jsx b/src/frontend/src/icons/AstraDB/AstraDB.jsx
index c4f4a0f54..76f993223 100644
--- a/src/frontend/src/icons/AstraDB/AstraDB.jsx
+++ b/src/frontend/src/icons/AstraDB/AstraDB.jsx
@@ -9,11 +9,11 @@ const AstraSVG = (props) => (
   >
     <path
       d="M60.2338 0.25H0.000244141V67.75H60.2338L75.365 56.0752V11.9248L60.2338 0.25ZM11.6732 11.9248H63.692V56.0874H11.6732V11.9248Z"
-      fill={props.isDark ? "#ffffff" : "#0A0A0A"}
+      fill={props.isdark ? "#ffffff" : "#0A0A0A"}
     />
     <path
       d="M162.038 12.415V1H106.964L92.0097 12.415V28.088L106.964 39.503H154.962V55.585H94.9883V67H151.546L166.5 55.585V39.503L151.546 28.088H103.547V12.415H162.038Z"
-      fill={props.isDark ? "#ffffff" : "#0A0A0A"}
+      fill={props.isdark ? "#ffffff" : "#0A0A0A"}
     />
   </svg>
 );
diff --git a/src/frontend/src/icons/AstraDB/index.tsx b/src/frontend/src/icons/AstraDB/index.tsx
index 4ea124878..fcf38b255 100644
--- a/src/frontend/src/icons/AstraDB/index.tsx
+++ b/src/frontend/src/icons/AstraDB/index.tsx
@@ -6,6 +6,6 @@ export const AstraDBIcon = forwardRef<
   SVGSVGElement,
   React.PropsWithChildren<{}>
 >((props, ref) => {
-  const isDark = useDarkStore((state) => state.dark);
-  return <AstraSVG ref={ref} isDark={isDark} {...props} />;
+  const isdark = useDarkStore((state) => state.dark);
+  return <AstraSVG ref={ref} isdark={isdark} {...props} />;
 });
diff --git a/src/frontend/src/icons/Azure/Azure.jsx b/src/frontend/src/icons/Azure/Azure.jsx
index 644fdd9f8..038fe264c 100644
--- a/src/frontend/src/icons/Azure/Azure.jsx
+++ b/src/frontend/src/icons/Azure/Azure.jsx
@@ -6,6 +6,7 @@ export const SvgAzure = (props) => (
     height="35"
     version="1"
     viewBox="0 0 750 750"
+    {...props}
   >
     <defs>
       <filter id="ac4759936b" width="100%" height="100%" x="0%" y="0%">
diff --git a/src/frontend/src/icons/CrewAI/CrewAiIcon.jsx b/src/frontend/src/icons/CrewAI/CrewAiIcon.jsx
index d2a02f8f3..8bf1a994c 100644
--- a/src/frontend/src/icons/CrewAI/CrewAiIcon.jsx
+++ b/src/frontend/src/icons/CrewAI/CrewAiIcon.jsx
@@ -7,6 +7,7 @@ const SvgCrewAiIcon = (props) => (
     height="640"
     viewBox="0 0 1856 640"
     style={{ width: "20%", height: "25%" }}
+    {...props}
   >
     <path
       d="M0 0 C1.29195282 0.00182281 2.58390564 0.00364563 3.91500854 0.00552368 C28.44466527 0.06336198 52.75720004 1.17052794 77.1875 3.3125 C78.14779114 3.395 79.10808228 3.4775 80.09747314 3.5625 C162.75674065 10.67724112 244.77476948 24.60656275 326.1875 40.3125 C327.42462234 40.5508683 327.42462234 40.5508683 328.68673706 40.79405212 C392.75627044 53.14070168 456.64332972 66.34761292 520.50215197 79.73350489 C522.8103573 80.21725859 525.11861427 80.70076509 527.42689133 81.18417645 C528.17686606 81.34124563 528.9268408 81.49831482 529.69954205 81.66014367 C531.19345428 81.97301537 532.68736918 82.28587435 534.18128681 82.59872025 C537.73611766 83.34334518 541.29074231 84.08892686 544.84488297 84.83683968 C546.18533291 85.1188657 547.5257857 85.40087819 548.86624146 85.68287659 C549.8440098 85.88861387 549.8440098 85.88861387 550.84153104 86.09850746 C555.22339309 87.01904766 559.6084231 87.92327295 563.99478149 88.82211304 C568.87722425 89.82296796 573.74432595 90.87725216 578.60848999 91.96328735 C580.95572685 92.46586605 583.30310238 92.96779766 585.65063477 93.46899414 C587.24624379 93.84245295 587.24624379 93.84245295 588.87408733 94.22345638 C595.26923801 95.57579208 595.26923801 95.57579208 601.28048706 93.53863525 C604.58771139 90.89919861 606.91616231 88.16705294 609.4375 84.8125 C610.3743232 83.7114717 611.32101423 82.61876777 612.27709961 81.53442383 C614.13232578 79.42320585 615.95132445 77.28898838 617.74755859 75.12744141 C620.78842848 71.61921349 624.02248383 68.74670314 627.75 66 C628.29438721 65.59281738 628.83877441 65.18563477 629.3996582 64.76611328 C630.98427502 63.59936187 632.58581947 62.45571424 634.1875 61.3125 C635.33195404 60.46388898 636.47515401 59.61358447 637.6171875 58.76171875 C645.81164262 52.70907418 654.34457522 47.36126903 663.1875 42.3125 C664.321875 41.65636719 665.45625 41.00023437 666.625 40.32421875 C691.14862939 26.48815866 718.45873383 17.78722058 746.1875 13.3125 C747.0734082 13.16296875 747.95931641 13.0134375 748.87207031 12.859375 C810.48495664 2.85994189 882.91456827 11.15742334 935.171875 47.13671875 C950.37650242 58.10689682 964.94427179 70.19158907 976.1875 85.3125 C976.63029297 85.90691895 977.07308594 86.50133789 977.52929688 87.11376953 C978.9468329 89.02666537 980.35176233 90.94795904 981.75 92.875 C982.19255127 93.4834375 982.63510254 94.091875 983.09106445 94.71875 C986.1875 99.07189788 986.1875 99.07189788 986.1875 101.3125 C986.76193848 101.135979 987.33637695 100.95945801 987.92822266 100.77758789 C990.55512803 99.97279046 993.18378101 99.17385271 995.8125 98.375 C996.71613281 98.09720703 997.61976562 97.81941406 998.55078125 97.53320312 C999.87529297 97.13198242 999.87529297 97.13198242 1001.2265625 96.72265625 C1002.03303223 96.47652588 1002.83950195 96.23039551 1003.67041016 95.97680664 C1021.37884927 91.3032215 1042.77294738 92.9872214 1060.1875 98.3125 C1060.89148926 98.52680664 1061.59547852 98.74111328 1062.32080078 98.96191406 C1084.12317859 105.85955788 1103.54743981 120.15462132 1114.51171875 140.4609375 C1127.03464323 165.15382917 1128.03927933 191.38439299 1120.125 217.625 C1110.37135065 245.23131111 1090.37246577 271.79168406 1067.734375 290.3203125 C1065.87682899 292.23956863 1065.87682899 292.23956863 1066.453125 294.921875 C1066.77796875 295.95828125 1067.1028125 296.9946875 1067.4375 298.0625 C1076.1432187 333.17800398 1060.45054416 370.09988153 1049.1875 402.8125 C1036.87725477 438.56988551 1026.13155656 474.70398462 1021.1875 512.3125 C1021.0836499 513.07159668 1020.9797998 513.83069336 1020.87280273 514.61279297 C1019.9632795 522.21986127 1020.00070622 529.86119779 1020.00109863 537.51104736 C1020.00035921 539.14415257 1019.99514984 540.77726121 1019.98571777 542.41033936 C1019.93334271 551.7132893 1020.20911393 560.69226333 1021.5168457 569.92163086 C1023.12001362 581.41549813 1023.12001362 581.41549813 1021.23339844 585.25341797 C1018.66086337 588.63047243 1015.57880139 590.87760459 1011.97241211 593.11669922 C1009.17787449 594.988898 1006.75659085 597.25448742 1004.25 599.48999023 C976.81874908 623.72937093 942.87375621 641.96694084 905.51660156 640.46484375 C885.65974929 639.16603077 869.02901672 630.04970776 855.421875 615.88671875 C851.98764891 611.93015407 849.0172876 607.71647409 846.1875 603.3125 C841.31885449 604.35578118 836.50532487 605.49297047 831.69555664 606.78320312 C800.08982724 615.1140507 765.61025247 612.99238468 736.93359375 596.43359375 C732.71309028 593.70980077 728.7322819 590.81743677 724.921875 587.546875 C724.38079102 587.0825708 723.83970703 586.6182666 723.28222656 586.13989258 C721.76595065 584.81837409 720.27287586 583.47037359 718.78125 582.12109375 C716.44001566 580.04925807 716.44001566 580.04925807 714.23999023 580.5949707 C710.92030637 581.75549775 707.86289569 583.44332192 704.75 585.0625 C674.88599085 600.16288532 641.99822363 602.88140675 610 592.625 C582.65713561 583.25275103 562.82538309 563.81625338 550.04931641 538.14453125 C548.09463663 533.98931396 546.56978327 529.68669903 545.1875 525.3125 C541.6202081 527.9988259 538.86867276 530.73450407 536.125 534.25 C524.60723048 548.59468476 511.67609218 561.97360177 497.1875 573.3125 C496.14557539 574.1455108 495.10391637 574.97885389 494.0625 575.8125 C486.77950225 581.58886066 479.2589614 586.67351407 471.1875 591.3125 C470.60242676 591.65023437 470.01735352 591.98796875 469.41455078 592.3359375 C435.2616975 611.86758807 396.93045915 615.78205387 359.0625 605.5625 C338.21706381 599.67929967 318.55331675 592.25659937 301.82421875 578.18359375 C299.18267512 575.92668594 299.18267512 575.92668594 295.1875 576.3125 C293.49738471 577.51668809 293.49738471 577.51668809 292.0078125 579.2421875 C291.41589111 579.86810791 290.82396973 580.49402832 290.21411133 581.13891602 C289.58657959 581.81494873 288.95904785 582.49098145 288.3125 583.1875 C273.08065705 598.974176 254.55721784 610.83173939 232.0625 611.5625 C195.56826202 611.15296366 157.14066176 597.97177566 130.1875 573.3125 C128.25 570.9375 128.25 570.9375 127.1875 569.3125 C122.75582986 570.2263397 119.55850446 572.61391125 115.875 575.125 C65.51596954 608.35010575 3.21046538 618.78071709 -55.82836914 607.1809082 C-78.74530259 602.25648421 -101.57993229 593.33723249 -119.8125 578.3125 C-120.34891113 577.88388672 -120.88532227 577.45527344 -121.43798828 577.01367188 C-139.14643932 562.83113075 -160.48067666 539.7721876 -163.8125 516.3125 C-164.68390625 516.57804688 -165.5553125 516.84359375 -166.453125 517.1171875 C-167.64421875 517.47039063 -168.8353125 517.82359375 -170.0625 518.1875 C-171.22265625 518.53554688 -172.3828125 518.88359375 -173.578125 519.2421875 C-183.91296946 521.99031946 -194.09467143 522.65922945 -204.73754883 522.62817383 C-206.97983175 522.62502829 -209.22077089 522.64851427 -211.46289062 522.67382812 C-239.33359732 522.79648892 -265.84530267 514.3312582 -286 494.5 C-291.25792444 489.20652616 -295.65896953 483.51836317 -299.8125 477.3125 C-320.91143244 509.99317834 -320.91143244 509.99317834 -337.8125 544.9375 C-343.0208897 557.72726372 -349.84737112 568.76998764 -358.8125 579.3125 C-359.575625 580.323125 -360.33875 581.33375 -361.125 582.375 C-377.61982832 600.40423096 -401.6040005 610.92329319 -425.83032227 612.4387207 C-441.96467034 613.04906292 -457.36866948 611.05284397 -472.515625 605.3984375 C-480.21899536 602.86107143 -484.2353236 603.43060621 -491.3125 606.8125 C-537.35999578 627.41544707 -591.34643269 630.78040647 -638.9375 613.5625 C-674.48780291 599.98802136 -702.20291477 573.15009849 -718 538.6875 C-722.30966604 528.86451028 -725.3554911 518.74233342 -727.8125 508.3125 C-727.99184082 507.55936523 -728.17118164 506.80623047 -728.35595703 506.03027344 C-741.93334361 445.43764654 -718.17438422 380.58304029 -686.25537109 329.83691406 C-668.12087723 301.60241186 -645.81524962 273.58237406 -618.8125 253.3125 C-618.19922852 252.83925293 -617.58595703 252.36600586 -616.95410156 251.87841797 C-582.62449764 225.46154946 -542.58988916 210.11181418 -498.89746094 214.61279297 C-493.72897602 215.39574562 -488.76997841 216.66631442 -483.8125 218.3125 C-482.86262207 218.62598389 -482.86262207 218.62598389 -481.89355469 218.94580078 C-467.15447643 223.9988746 -452.99532152 231.62631217 -440.8125 241.3125 C-439.92433594 241.99828125 -439.03617187 242.6840625 -438.12109375 243.390625 C-430.80404485 249.17765087 -424.2944334 255.62694566 -417.8125 262.3125 C-413.94686284 260.71916946 -411.47406903 258.20841231 -408.5 255.3125 C-386.01348077 234.13819144 -359.0270948 226.41888485 -328.71289062 227.17626953 C-307.28252699 228.18284722 -288.27881619 238.93620586 -273.8125 254.3125 C-273.8125 254.9725 -273.8125 255.6325 -273.8125 256.3125 C-272.81992187 255.80460938 -271.82734375 255.29671875 -270.8046875 254.7734375 C-234.4897253 236.30728598 -200.1400663 229.59553252 -159.8125 238.3125 C-160.2971875 237.54550781 -160.781875 236.77851563 -161.28125 235.98828125 C-183.7275879 198.82232561 -188.12680522 151.66513969 -177.90039062 109.92236328 C-172.73019143 89.97437965 -163.20568691 70.99028374 -149.8125 55.3125 C-148.99910156 54.34828125 -148.18570313 53.3840625 -147.34765625 52.390625 C-141.71109995 45.94375808 -135.64310068 40.46557188 -128.8125 35.3125 C-127.40291016 34.23742188 -127.40291016 34.23742188 -125.96484375 33.140625 C-105.71381022 18.40309866 -82.87219845 9.65969104 -58.5 4.4375 C-57.60756592 4.24623535 -56.71513184 4.0549707 -55.7956543 3.85791016 C-37.30992786 0.2062039 -18.78289093 -0.05510038 0 0 Z "
diff --git a/src/frontend/src/icons/Groq/GroqLogo.jsx b/src/frontend/src/icons/Groq/GroqLogo.jsx
index aa1d98232..a25f40a56 100644
--- a/src/frontend/src/icons/Groq/GroqLogo.jsx
+++ b/src/frontend/src/icons/Groq/GroqLogo.jsx
@@ -1,4 +1,4 @@
-const SvgGroqLogo = ({ color, ...props }) => (
+const SvgGroqLogo = ({ ...props }) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     aria-label="groq logo"
@@ -7,7 +7,8 @@ const SvgGroqLogo = ({ color, ...props }) => (
     height="48"
     viewBox="0 0 24 24"
     fill="none"
-    class="fill-foreground"
+    className="fill-foreground"
+    {...props}
   >
     <path
       fill="#F55036"
diff --git a/src/frontend/src/icons/HCD/HCD.jsx b/src/frontend/src/icons/HCD/HCD.jsx
index 0e28be6dc..9f31a5a00 100644
--- a/src/frontend/src/icons/HCD/HCD.jsx
+++ b/src/frontend/src/icons/HCD/HCD.jsx
@@ -11,11 +11,11 @@ const HCDSVG = (props) => (
       {/* <rect width="96" height="96" rx="6" fill="white"/> */}
       <path
         d="M38.0469 33H12V62.1892H38.0469L44.5902 57.1406V38.0485L38.0469 33ZM17.0478 38.0485H39.5424V57.1459H17.0478V38.0485Z"
-        fill={props.isDark ? "#ffffff" : "#0A0A0A"}
+        fill={props.isdark ? "#ffffff" : "#0A0A0A"}
       />
       <path
         d="M82.0705 38.2605V33.3243H58.2546L51.788 38.2605V45.038L58.2546 49.9742H79.0107V56.9286H53.076V61.8648H77.5334L84 56.9286V49.9742L77.5334 45.038H56.7772V38.2605H82.0705Z"
-        fill={props.isDark ? "#ffffff" : "#0A0A0A"}
+        fill={props.isdark ? "#ffffff" : "#0A0A0A"}
       />
     </g>
     <defs>
diff --git a/src/frontend/src/icons/HCD/index.tsx b/src/frontend/src/icons/HCD/index.tsx
index d43b6e0aa..b59784e8f 100644
--- a/src/frontend/src/icons/HCD/index.tsx
+++ b/src/frontend/src/icons/HCD/index.tsx
@@ -4,8 +4,8 @@ import HCDSVG from "./HCD";
 
 export const HCDIcon = forwardRef<SVGSVGElement, React.PropsWithChildren<{}>>(
   (props, ref) => {
-    const isDark = useDarkStore((state) => state.dark);
+    const isdark = useDarkStore((state) => state.dark);
 
-    return <HCDSVG ref={ref} isDark={isDark} {...props} />;
+    return <HCDSVG ref={ref} isdark={isdark} {...props} />;
   },
 );
diff --git a/src/frontend/src/icons/Ollama/Ollama.jsx b/src/frontend/src/icons/Ollama/Ollama.jsx
index 8b604893a..408ff20d8 100644
--- a/src/frontend/src/icons/Ollama/Ollama.jsx
+++ b/src/frontend/src/icons/Ollama/Ollama.jsx
@@ -1,10 +1,10 @@
 export const SvgOllama = (props) => (
   <svg
-    width="646"
-    height="854"
-    viewBox="0 0 646 854"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
+    xmlnsXlink="http://www.w3.org/1999/xlink"
+    width="40"
+    height="40"
+    version="1"
+    viewBox="0 0 550 850"
     {...props}
   >
     <path
diff --git a/src/frontend/src/icons/mistral/mistralIcon.jsx b/src/frontend/src/icons/mistral/mistralIcon.jsx
index 9e8e2a903..593e1e09c 100644
--- a/src/frontend/src/icons/mistral/mistralIcon.jsx
+++ b/src/frontend/src/icons/mistral/mistralIcon.jsx
@@ -6,6 +6,7 @@ const SvgMistralIcon = (props) => (
     viewBox="0 0 256 233"
     xmlns="http://www.w3.org/2000/svg"
     preserveAspectRatio="xMidYMid"
+    {...props}
   >
     <title>Mistral AI</title>
     <g>
diff --git a/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
index 1a52599a6..17d8b2366 100644
--- a/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
@@ -11,12 +11,13 @@ import {
   SidebarMenuItem,
   SidebarTrigger,
 } from "@/components/ui/sidebar";
-import { useMobile } from "@/hooks/use-mobile";
+import { useIsMobile } from "../../../../hooks/use-mobile";
+
 import { cn } from "@/utils/utils";
 import { NavProps } from "../../../../types/templates/types";
 
 export function Nav({ categories, currentTab, setCurrentTab }: NavProps) {
-  const isMobile = useMobile();
+  const isMobile = useIsMobile();
 
   return (
     <Sidebar collapsible={isMobile ? "icon" : "none"}>
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index c3b81ca7f..1c7f9cb89 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -14,8 +14,9 @@ import { useGetBuildsQuery } from "@/controllers/API/queries/_builds";
 import { track } from "@/customization/utils/analytics";
 import useAutoSaveFlow from "@/hooks/flows/use-autosave-flow";
 import useUploadFlow from "@/hooks/flows/use-upload-flow";
-import { nodeColors, nodeColorsName } from "@/utils/styleUtils";
-import { getNodeRenderType, isSupportedNodeTypes } from "@/utils/utils";
+import { useAddComponent } from "@/hooks/useAddComponent";
+import { nodeColorsName } from "@/utils/styleUtils";
+import { isSupportedNodeTypes } from "@/utils/utils";
 import _, { cloneDeep } from "lodash";
 import {
   KeyboardEvent,
@@ -120,6 +121,7 @@ export default function Page({ view }: { view?: boolean }): JSX.Element {
   const [isAddingNote, setIsAddingNote] = useState(false);
   const [isHighlightingCursor, setIsHighlightingCursor] = useState(false);
 
+  const addComponent = useAddComponent();
   const { zoomIn, zoomOut, fitView } = useReactFlow();
   const { zoom } = useViewport();
 
@@ -439,23 +441,10 @@ export default function Page({ view }: { view?: boolean }): JSX.Element {
           event.dataTransfer.getData(datakey!),
         );
 
-        track("Component Added", { componentType: data.node?.display_name });
-
-        const newId = getNodeId(data.type);
-
-        const newNode: NodeType = {
-          id: newId,
-          type: getNodeRenderType(datakey!),
-          position: { x: 0, y: 0 },
-          data: {
-            ...data,
-            id: newId,
-          },
-        };
-        paste(
-          { nodes: [newNode], edges: [] },
-          { x: event.clientX, y: event.clientY },
-        );
+        addComponent(data.node!, data.type, {
+          x: event.clientX,
+          y: event.clientY,
+        });
       } else if (event.dataTransfer.types.some((types) => types === "Files")) {
         takeSnapshot();
         const position = {
@@ -478,8 +467,7 @@ export default function Page({ view }: { view?: boolean }): JSX.Element {
         });
       }
     },
-    // Specify dependencies for useCallback
-    [getNodeId, setNodes, takeSnapshot, paste],
+    [takeSnapshot, addComponent],
   );
 
   const onEdgeUpdateStart = useCallback(() => {
@@ -596,7 +584,7 @@ export default function Page({ view }: { view?: boolean }): JSX.Element {
   };
 
   return (
-    <div className="h-full w-full" ref={reactFlowWrapper}>
+    <div className="h-full w-full bg-canvas" ref={reactFlowWrapper}>
       {showCanvas ? (
         <div id="react-flow-id" className="h-full w-full bg-canvas">
           <ReactFlow
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sidebarFilterComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sidebarFilterComponent/index.tsx
index 3193b2c84..fdce78a0f 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sidebarFilterComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/sidebarFilterComponent/index.tsx
@@ -12,7 +12,7 @@ export function SidebarFilterComponent({
   resetFilters: () => void;
 }) {
   return (
-    <div className="mb-0.5 flex w-full items-center justify-between rounded border bg-muted p-1 px-2 text-xs font-medium text-primary">
+    <div className="mb-0.5 flex w-full items-center justify-between rounded border bg-accent-indigo p-2 text-sm text-accent-indigo-foreground">
       <div className="flex flex-1 items-center gap-1.5">
         <ForwardedIconComponent
           name="ListFilter"
@@ -30,7 +30,12 @@ export function SidebarFilterComponent({
         styleClasses="max-w-full"
         content="Remove filter"
       >
-        <Button unstyled className="shrink-0" onClick={resetFilters}>
+        <Button
+          unstyled
+          className="shrink-0"
+          onClick={resetFilters}
+          data-testid="sidebar-filter-reset"
+        >
           <ForwardedIconComponent
             name="X"
             className="h-4 w-4 stroke-2"
diff --git a/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/components/sidebarDraggableComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/components/sidebarDraggableComponent/index.tsx
new file mode 100644
index 000000000..b5feeb600
--- /dev/null
+++ b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/components/sidebarDraggableComponent/index.tsx
@@ -0,0 +1,218 @@
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import useDeleteFlow from "@/hooks/flows/use-delete-flow";
+import { useAddComponent } from "@/hooks/useAddComponent";
+import { DragEventHandler, forwardRef, useRef, useState } from "react";
+import IconComponent, {
+  ForwardedIconComponent,
+} from "../../../../../../components/genericIconComponent";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+} from "../../../../../../components/ui/select-custom";
+import { useDarkStore } from "../../../../../../stores/darkStore";
+import useFlowsManagerStore from "../../../../../../stores/flowsManagerStore";
+import { APIClassType } from "../../../../../../types/api";
+import {
+  createFlowComponent,
+  downloadNode,
+  getNodeId,
+} from "../../../../../../utils/reactflowUtils";
+import { cn, removeCountFromString } from "../../../../../../utils/utils";
+
+export const SidebarDraggableComponent = forwardRef(
+  (
+    {
+      sectionName,
+      display_name,
+      icon,
+      itemName,
+      error,
+      color,
+      onDragStart,
+      apiClass,
+      official,
+      beta,
+      legacy,
+    }: {
+      sectionName: string;
+      apiClass: APIClassType;
+      icon: string;
+      display_name: string;
+      itemName: string;
+      error: boolean;
+      color: string;
+      onDragStart: DragEventHandler<HTMLDivElement>;
+      official: boolean;
+      beta: boolean;
+      legacy: boolean;
+    },
+    ref,
+  ) => {
+    const [open, setOpen] = useState(false);
+    const { deleteFlow } = useDeleteFlow();
+    const flows = useFlowsManagerStore((state) => state.flows);
+    const addComponent = useAddComponent();
+
+    const version = useDarkStore((state) => state.version);
+    const [cursorPos, setCursorPos] = useState({ x: 0, y: 0 });
+    const popoverRef = useRef<HTMLDivElement>(null);
+
+    const handlePointerDown = (e) => {
+      if (!open) {
+        const rect = popoverRef.current?.getBoundingClientRect() ?? {
+          left: 0,
+          top: 0,
+        };
+        setCursorPos({ x: e.clientX - rect.left, y: e.clientY - rect.top });
+      }
+    };
+
+    function handleSelectChange(value: string) {
+      switch (value) {
+        case "download":
+          const type = removeCountFromString(itemName);
+          downloadNode(
+            createFlowComponent(
+              { id: getNodeId(type), type, node: apiClass },
+              version,
+            ),
+          );
+          break;
+        case "delete":
+          const flowId = flows?.find((f) => f.name === display_name);
+          if (flowId) deleteFlow({ id: flowId.id });
+          break;
+      }
+    }
+
+    const handleKeyDown = (e) => {
+      if (e.key === "Enter" || e.key === " ") {
+        e.preventDefault();
+        addComponent(apiClass, itemName);
+      }
+    };
+
+    return (
+      <Select
+        onValueChange={handleSelectChange}
+        onOpenChange={(change) => setOpen(change)}
+        open={open}
+        key={itemName}
+      >
+        <div
+          onPointerDown={handlePointerDown}
+          onContextMenuCapture={(e) => {
+            e.preventDefault();
+            setOpen(true);
+          }}
+          key={itemName}
+          data-tooltip-id={itemName}
+          tabIndex={0}
+          onKeyDown={handleKeyDown}
+          className="rounded-md outline-none ring-ring focus-visible:ring-2"
+        >
+          <div
+            data-testid={sectionName + display_name}
+            id={sectionName + display_name}
+            className={cn(
+              "group/draggable flex cursor-grab items-center gap-2 rounded-md bg-muted p-3 hover:bg-accent",
+              error ? "cursor-not-allowed select-none" : "",
+            )}
+            draggable={!error}
+            style={{
+              borderLeftColor: color,
+            }}
+            onDragStart={onDragStart}
+            onDragEnd={() => {
+              document.body.removeChild(
+                document.getElementsByClassName("cursor-grabbing")[0],
+              );
+            }}
+          >
+            <ForwardedIconComponent name={icon} className="h-5 w-5 shrink-0" />
+            <div className="flex flex-1 items-center overflow-hidden">
+              <span className="truncate text-sm font-semibold">
+                {display_name}
+              </span>
+              {beta && (
+                <Badge
+                  variant="pinkStatic"
+                  size="sq"
+                  className="ml-1.5 shrink-0"
+                >
+                  BETA
+                </Badge>
+              )}
+              {legacy && (
+                <Badge
+                  variant="secondaryStatic"
+                  size="sq"
+                  className="ml-1.5 shrink-0"
+                >
+                  LEGACY
+                </Badge>
+              )}
+            </div>
+            <div className="flex shrink-0 items-center gap-1">
+              <Button
+                variant="ghost"
+                size="icon"
+                tabIndex={-1}
+                className="text-muted-foreground hover:text-primary group-focus/draggable:text-primary"
+                onClick={() => addComponent(apiClass, itemName)}
+              >
+                <ForwardedIconComponent
+                  name="Plus"
+                  className="h-4 w-4 shrink-0 opacity-0 transition-all group-hover/draggable:opacity-100 group-focus/draggable:opacity-100"
+                />
+              </Button>
+              <div ref={popoverRef}>
+                <ForwardedIconComponent
+                  name="GripVertical"
+                  className="h-4 w-4 shrink-0 text-muted-foreground"
+                />
+                <SelectTrigger tabIndex={-1}></SelectTrigger>
+                <SelectContent
+                  position="popper"
+                  side="bottom"
+                  sideOffset={-25}
+                  style={{
+                    position: "absolute",
+                    left: cursorPos.x,
+                    top: cursorPos.y,
+                  }}
+                >
+                  <SelectItem value={"download"}>
+                    <div className="flex">
+                      <IconComponent
+                        name="Download"
+                        className="relative top-0.5 mr-2 h-4 w-4"
+                      />{" "}
+                      Download{" "}
+                    </div>{" "}
+                  </SelectItem>
+                  {!official && (
+                    <SelectItem value={"delete"}>
+                      <div className="flex">
+                        <IconComponent
+                          name="Trash2"
+                          className="relative top-0.5 mr-2 h-4 w-4"
+                        />{" "}
+                        Delete{" "}
+                      </div>{" "}
+                    </SelectItem>
+                  )}
+                </SelectContent>
+              </div>
+            </div>
+          </div>
+        </div>
+      </Select>
+    );
+  },
+);
+
+export default SidebarDraggableComponent;
diff --git a/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
new file mode 100644
index 000000000..0dfc9d7ab
--- /dev/null
+++ b/src/frontend/src/pages/FlowPage/components/flowSidebarComponent/index.tsx
@@ -0,0 +1,708 @@
+import Fuse from "fuse.js";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useHotkeys } from "react-hotkeys-hook"; // Import useHotkeys
+
+import ForwardedIconComponent from "@/components/genericIconComponent";
+import ShadTooltip from "@/components/shadTooltipComponent";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import {
+  Disclosure,
+  DisclosureContent,
+  DisclosureTrigger,
+} from "@/components/ui/disclosure";
+import { Input } from "@/components/ui/input";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+} from "@/components/ui/sidebar";
+import { Switch } from "@/components/ui/switch";
+import { CustomLink } from "@/customization/components/custom-link";
+import { useAddComponent } from "@/hooks/useAddComponent";
+import { useStoreStore } from "@/stores/storeStore";
+import {
+  nodeColors,
+  SIDEBAR_BUNDLES,
+  SIDEBAR_CATEGORIES,
+} from "@/utils/styleUtils";
+import { removeCountFromString } from "@/utils/utils";
+import { cloneDeep } from "lodash";
+import useAlertStore from "../../../../stores/alertStore";
+import useFlowStore from "../../../../stores/flowStore";
+import { useTypesStore } from "../../../../stores/typesStore";
+import { APIClassType } from "../../../../types/api";
+import { SidebarFilterComponent } from "../extraSidebarComponent/sidebarFilterComponent";
+import sensitiveSort from "../extraSidebarComponent/utils/sensitive-sort";
+import ShortcutDisplay from "../nodeToolbarComponent/shortcutDisplay";
+import SidebarDraggableComponent from "./components/sidebarDraggableComponent";
+
+export function FlowSidebarComponent() {
+  const [isInputFocused, setIsInputFocused] = useState(false);
+  const searchInputRef = useRef<HTMLInputElement | null>(null);
+
+  useHotkeys("/", (event) => {
+    event.preventDefault();
+    searchInputRef.current?.focus();
+  });
+
+  // Add this new useHotkeys hook
+  useHotkeys(
+    "esc",
+    (event) => {
+      event.preventDefault();
+      searchInputRef.current?.blur();
+    },
+    {
+      // Only enable this hotkey when the input is focused
+      enableOnFormTags: true,
+      enabled: isInputFocused,
+    },
+  );
+
+  const categories = SIDEBAR_CATEGORIES;
+  const bundles = SIDEBAR_BUNDLES;
+
+  const data = useTypesStore((state) => state.data);
+  const templates = useTypesStore((state) => state.templates);
+  const getFilterEdge = useFlowStore((state) => state.getFilterEdge);
+  const setFilterEdge = useFlowStore((state) => state.setFilterEdge);
+  const hasStore = useStoreStore((state) => state.hasStore);
+  const filterType = useFlowStore((state) => state.filterType);
+
+  const setErrorData = useAlertStore((state) => state.setErrorData);
+  const [dataFilter, setFilterData] = useState(data);
+  const [search, setSearch] = useState("");
+  const addComponent = useAddComponent();
+
+  const [fuse, setFuse] = useState<Fuse<any> | null>(null);
+
+  const [openCategories, setOpenCategories] = useState<string[]>([]);
+
+  const [showConfig, setShowConfig] = useState(false);
+  const [showBeta, setShowBeta] = useState(true);
+  const [showLegacy, setShowLegacy] = useState(false);
+
+  const hasResults = useMemo(() => {
+    return Object.values(dataFilter).some(
+      (category) => Object.keys(category).length > 0,
+    );
+  }, [dataFilter]);
+
+  useEffect(() => {
+    filterComponents();
+  }, [data, search, filterType, getFilterEdge, showBeta, showLegacy]);
+  function normalizeString(str: string): string {
+    return str.toLowerCase().replace(/_/g, " ").replace(/\s+/g, "");
+  }
+
+  function searchInMetadata(metadata: any, searchTerm: string): boolean {
+    if (!metadata || typeof metadata !== "object") return false;
+
+    return Object.entries(metadata).some(([key, value]) => {
+      if (typeof value === "string") {
+        return (
+          normalizeString(key).includes(searchTerm) ||
+          normalizeString(value).includes(searchTerm)
+        );
+      }
+      if (typeof value === "object") {
+        return searchInMetadata(value, searchTerm);
+      }
+      return false;
+    });
+  }
+
+  const filterComponents = () => {
+    let filteredData = cloneDeep(data);
+
+    // Apply search filter
+    if (search && fuse) {
+      const results = fuse.search(search);
+      filteredData = Object.fromEntries(
+        Object.entries(data).map(([category, items]) => {
+          const categoryResults = results.filter(
+            (result) => result.item.category === category,
+          );
+          const filteredItems = Object.fromEntries(
+            categoryResults.map((result) => [result.item.key, result.item]),
+          );
+          return [category, filteredItems];
+        }),
+      );
+    } else {
+      // Fallback to traditional search if Fuse.js is not available
+      const searchTerm = normalizeString(search);
+      filteredData = Object.fromEntries(
+        Object.entries(data).map(([category, items]) => {
+          const filteredItems = Object.fromEntries(
+            Object.entries(items).filter(
+              ([key, item]) =>
+                normalizeString(key).includes(searchTerm) ||
+                normalizeString(item.display_name).includes(searchTerm) ||
+                normalizeString(category).includes(searchTerm) ||
+                (item.metadata && searchInMetadata(item.metadata, searchTerm)),
+            ),
+          );
+          return [category, filteredItems];
+        }),
+      );
+    }
+
+    // Apply edge filter
+    if (getFilterEdge?.length > 0) {
+      filteredData = Object.fromEntries(
+        Object.entries(filteredData).map(([family, familyData]) => {
+          const edgeFilter = getFilterEdge.find((x) => x.family === family);
+          if (!edgeFilter) return [family, {}];
+
+          const filteredTypes = edgeFilter.type
+            .split(",")
+            .map((t) => t.trim())
+            .filter((t) => t !== "");
+
+          if (filteredTypes.length === 0) return [family, familyData];
+
+          const filteredFamilyData = Object.fromEntries(
+            Object.entries(familyData).filter(([key]) =>
+              filteredTypes.includes(key),
+            ),
+          );
+
+          return [family, filteredFamilyData];
+        }),
+      );
+    }
+
+    // Apply beta filter
+    if (!showBeta) {
+      filteredData = Object.fromEntries(
+        Object.entries(filteredData).map(([category, items]) => [
+          category,
+          Object.fromEntries(
+            Object.entries(items).filter(([_, value]) => !value.beta),
+          ),
+        ]),
+      );
+    }
+
+    // Apply legacy filter
+    if (!showLegacy) {
+      filteredData = Object.fromEntries(
+        Object.entries(filteredData).map(([category, items]) => [
+          category,
+          Object.fromEntries(
+            Object.entries(items).filter(([_, value]) => !value.legacy),
+          ),
+        ]),
+      );
+    }
+
+    setFilterData(filteredData);
+    if (search !== "" || filterType || getFilterEdge.length > 0) {
+      setOpenCategories(
+        Object.keys(filteredData).filter(
+          (cat) => Object.keys(filteredData[cat]).length > 0,
+        ),
+      );
+    }
+  };
+
+  useEffect(() => {
+    if (search === "" && getFilterEdge.length === 0) {
+      setOpenCategories([]);
+    }
+  }, [search, getFilterEdge]);
+
+  function handleSearchInput(e: string) {
+    setSearch(e);
+    filterComponents();
+  }
+
+  function onDragStart(
+    event: React.DragEvent<any>,
+    data: { type: string; node?: APIClassType },
+  ): void {
+    //start drag event
+    var crt = event.currentTarget.cloneNode(true);
+    crt.style.position = "absolute";
+    crt.style.width = "215px";
+    crt.style.top = "-500px";
+    crt.style.right = "-500px";
+    crt.classList.add("cursor-grabbing");
+    document.body.appendChild(crt);
+    event.dataTransfer.setDragImage(crt, 0, 0);
+    event.dataTransfer.setData("genericNode", JSON.stringify(data));
+  }
+
+  useEffect(() => {
+    // show components with error on load
+    let errors: string[] = [];
+    Object.keys(templates).forEach((component) => {
+      if (templates[component].error) {
+        errors.push(component);
+      }
+    });
+    if (errors.length > 0)
+      setErrorData({ title: " Components with errors: ", list: errors });
+  }, []);
+
+  useEffect(() => {
+    if (getFilterEdge.length !== 0) {
+      setSearch("");
+    }
+  }, [getFilterEdge, data]);
+
+  useEffect(() => {
+    const options = {
+      keys: ["display_name", "description", "type"],
+      threshold: 0.3,
+    };
+
+    const fuseData = Object.entries(data).flatMap(([category, items]) =>
+      Object.entries(items).map(([key, value]) => ({
+        ...value,
+        category,
+        key,
+      })),
+    );
+
+    setFuse(new Fuse(fuseData, options));
+    handleSearchInput(search);
+  }, [data]);
+
+  const customComponent = useMemo(() => {
+    return data?.["custom_component"]?.["CustomComponent"] ?? null;
+  }, [data]);
+
+  const handleKeyDown = (
+    e: React.KeyboardEvent<HTMLDivElement>,
+    name: string,
+  ) => {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault();
+      setOpenCategories((prev) =>
+        prev.includes(name)
+          ? prev.filter((cat) => cat !== name)
+          : [...prev, name],
+      );
+    }
+  };
+
+  return (
+    <Sidebar data-testid="shad-sidebar">
+      <SidebarHeader className="flex w-full flex-col gap-4 p-4 pb-1">
+        <Disclosure open={showConfig} onOpenChange={setShowConfig}>
+          <div className="flex w-full items-center justify-between">
+            <h3 className="text-sm font-semibold">Components</h3>
+            <DisclosureTrigger>
+              <Button
+                variant={showConfig ? "ghostActive" : "ghost"}
+                size="iconMd"
+                data-testid="sidebar-options-trigger"
+              >
+                <ForwardedIconComponent
+                  name="SlidersHorizontal"
+                  className="h-4 w-4"
+                />
+              </Button>
+            </DisclosureTrigger>
+          </div>
+          <DisclosureContent>
+            <div className="flex flex-col gap-7 border-b pb-7 pt-5">
+              <div className="flex items-center justify-between">
+                <div className="flex items-center space-x-2">
+                  <span className="text-sm font-medium">
+                    Show{" "}
+                    <Badge variant="pinkStatic" size="sq">
+                      BETA
+                    </Badge>{" "}
+                    Components
+                  </span>
+                </div>
+                <Switch
+                  checked={showBeta}
+                  onCheckedChange={setShowBeta}
+                  data-testid="sidebar-beta-switch"
+                />
+              </div>
+              <div className="flex items-center justify-between">
+                <div className="flex items-center space-x-2">
+                  <span className="text-sm font-medium">
+                    Show{" "}
+                    <Badge variant="secondaryStatic" size="sq">
+                      LEGACY
+                    </Badge>{" "}
+                    Components
+                  </span>
+                </div>
+                <Switch
+                  checked={showLegacy}
+                  onCheckedChange={setShowLegacy}
+                  data-testid="sidebar-legacy-switch"
+                />
+              </div>
+            </div>
+          </DisclosureContent>
+        </Disclosure>
+        <div className="relative w-full flex-1">
+          <ForwardedIconComponent
+            name="Search"
+            className="absolute inset-y-0 left-2 top-1/2 h-4 w-4 -translate-y-1/2 text-primary"
+          />
+          <Input
+            ref={searchInputRef}
+            type="search"
+            data-testid="sidebar-search-input"
+            className="w-full rounded-lg bg-background pl-8 text-sm"
+            onFocus={() => setIsInputFocused(true)}
+            onBlur={() => setIsInputFocused(false)}
+            value={search}
+            onChange={(e) => handleSearchInput(e.target.value)}
+          />
+          {!isInputFocused && search === "" && (
+            <div className="pointer-events-none absolute inset-y-0 left-8 top-1/2 flex -translate-y-1/2 items-center gap-2 text-sm text-muted-foreground">
+              Type{" "}
+              <span>
+                <ShortcutDisplay sidebar shortcut="/" />
+              </span>{" "}
+              to search components
+            </div>
+          )}
+        </div>
+        {filterType && (
+          <SidebarFilterComponent
+            isInput={!!filterType.source}
+            type={filterType.type}
+            resetFilters={() => {
+              setFilterEdge([]);
+              setFilterData(data);
+            }}
+          />
+        )}
+      </SidebarHeader>
+      <SidebarContent className="p-2">
+        {hasResults ? (
+          <>
+            <SidebarGroup>
+              <SidebarGroupContent>
+                <SidebarMenu>
+                  {!data
+                    ? Array.from({ length: 5 }).map((_, index) => (
+                        <SidebarMenuItem key={index}>
+                          <SidebarMenuSkeleton />
+                        </SidebarMenuItem>
+                      ))
+                    : categories.map(
+                        (item) =>
+                          dataFilter[item.name] &&
+                          Object.keys(dataFilter[item.name]).length > 0 && (
+                            <Collapsible
+                              key={item.name}
+                              className="group/collapsible"
+                              open={openCategories.includes(item.name)}
+                              onOpenChange={(isOpen) => {
+                                setOpenCategories((prev) =>
+                                  isOpen
+                                    ? [...prev, item.name]
+                                    : prev.filter((cat) => cat !== item.name),
+                                );
+                              }}
+                            >
+                              <SidebarMenuItem>
+                                <CollapsibleTrigger asChild>
+                                  <SidebarMenuButton asChild>
+                                    <div
+                                      data-testid={`disclosure-${item.display_name.toLocaleLowerCase()}`}
+                                      tabIndex={0}
+                                      onKeyDown={(e) =>
+                                        handleKeyDown(e, item.name)
+                                      }
+                                      className="flex cursor-pointer items-center gap-2"
+                                    >
+                                      <ForwardedIconComponent
+                                        name={item.icon}
+                                        className="h-4 w-4 text-muted-foreground group-data-[state=open]/collapsible:text-pink-600 group-data-[state=open]/collapsible:dark:text-pink-400"
+                                      />
+                                      <span className="group-data-[state=open]/collapsible:font-semibold">
+                                        {item.display_name}
+                                      </span>
+                                      <ForwardedIconComponent
+                                        name="ChevronRight"
+                                        className="h-4 w-4 text-muted-foreground transition-all group-data-[state=open]/collapsible:rotate-90"
+                                      />
+                                    </div>
+                                  </SidebarMenuButton>
+                                </CollapsibleTrigger>
+                                <CollapsibleContent>
+                                  <div className="flex flex-col gap-1 py-2">
+                                    {Object.keys(dataFilter[item.name])
+                                      .sort((a, b) =>
+                                        sensitiveSort(
+                                          dataFilter[item.name][a].display_name,
+                                          dataFilter[item.name][b].display_name,
+                                        ),
+                                      )
+                                      .map((SBItemName: string, idx) => (
+                                        <ShadTooltip
+                                          content={
+                                            dataFilter[item.name][SBItemName]
+                                              .display_name
+                                          }
+                                          side="right"
+                                          key={idx}
+                                        >
+                                          <SidebarDraggableComponent
+                                            sectionName={item.name as string}
+                                            apiClass={
+                                              dataFilter[item.name][SBItemName]
+                                            }
+                                            icon={
+                                              dataFilter[item.name][SBItemName]
+                                                .icon ??
+                                              item.icon ??
+                                              "Unknown"
+                                            }
+                                            key={idx}
+                                            onDragStart={(event) =>
+                                              onDragStart(event, {
+                                                type: removeCountFromString(
+                                                  SBItemName,
+                                                ),
+                                                node: dataFilter[item.name][
+                                                  SBItemName
+                                                ],
+                                              })
+                                            }
+                                            color={nodeColors[item.name]}
+                                            itemName={SBItemName}
+                                            error={
+                                              !!dataFilter[item.name][
+                                                SBItemName
+                                              ].error
+                                            }
+                                            display_name={
+                                              dataFilter[item.name][SBItemName]
+                                                .display_name
+                                            }
+                                            official={
+                                              dataFilter[item.name][SBItemName]
+                                                .official === false
+                                                ? false
+                                                : true
+                                            }
+                                            beta={
+                                              dataFilter[item.name][SBItemName]
+                                                .beta ?? false
+                                            }
+                                            legacy={
+                                              dataFilter[item.name][SBItemName]
+                                                .legacy ?? false
+                                            }
+                                          />
+                                        </ShadTooltip>
+                                      ))}
+                                  </div>
+                                </CollapsibleContent>
+                              </SidebarMenuItem>
+                            </Collapsible>
+                          ),
+                      )}
+                </SidebarMenu>
+              </SidebarGroupContent>
+            </SidebarGroup>
+            <SidebarGroup>
+              <SidebarGroupLabel>Bundles</SidebarGroupLabel>
+              <SidebarGroupContent>
+                <SidebarMenu>
+                  {!data
+                    ? Array.from({ length: 5 }).map((_, index) => (
+                        <SidebarMenuItem key={index}>
+                          <SidebarMenuSkeleton />
+                        </SidebarMenuItem>
+                      ))
+                    : bundles.map(
+                        (item) =>
+                          dataFilter[item.name] &&
+                          Object.keys(dataFilter[item.name]).length > 0 && (
+                            <Collapsible
+                              key={item.name}
+                              className="group/collapsible"
+                              open={openCategories.includes(item.name)}
+                              onOpenChange={(isOpen) => {
+                                setOpenCategories((prev) =>
+                                  isOpen
+                                    ? [...prev, item.name]
+                                    : prev.filter((cat) => cat !== item.name),
+                                );
+                              }}
+                            >
+                              <SidebarMenuItem>
+                                <CollapsibleTrigger asChild>
+                                  <SidebarMenuButton asChild>
+                                    <div
+                                      tabIndex={0}
+                                      onKeyDown={(e) =>
+                                        handleKeyDown(e, item.name)
+                                      }
+                                      className="flex cursor-pointer items-center gap-2"
+                                    >
+                                      <ForwardedIconComponent
+                                        name={item.icon}
+                                        className="h-4 w-4 text-muted-foreground group-data-[state=open]/collapsible:text-pink-600 group-data-[state=open]/collapsible:dark:text-pink-400"
+                                      />
+                                      <span className="group-data-[state=open]/collapsible:font-semibold">
+                                        {item.display_name}
+                                      </span>
+                                      <ForwardedIconComponent
+                                        name="ChevronRight"
+                                        className="h-4 w-4 text-muted-foreground transition-all group-data-[state=open]/collapsible:rotate-90"
+                                      />
+                                    </div>
+                                  </SidebarMenuButton>
+                                </CollapsibleTrigger>
+                                <CollapsibleContent>
+                                  <div className="flex flex-col gap-1 py-2">
+                                    {Object.keys(dataFilter[item.name])
+                                      .sort((a, b) =>
+                                        sensitiveSort(
+                                          dataFilter[item.name][a].display_name,
+                                          dataFilter[item.name][b].display_name,
+                                        ),
+                                      )
+                                      .map((SBItemName: string, idx) => (
+                                        <ShadTooltip
+                                          content={
+                                            dataFilter[item.name][SBItemName]
+                                              .display_name
+                                          }
+                                          side="right"
+                                          key={idx}
+                                        >
+                                          <SidebarDraggableComponent
+                                            sectionName={item.name as string}
+                                            apiClass={
+                                              dataFilter[item.name][SBItemName]
+                                            }
+                                            icon={
+                                              dataFilter[item.name][SBItemName]
+                                                .icon ??
+                                              item.icon ??
+                                              "Unknown"
+                                            }
+                                            key={idx}
+                                            onDragStart={(event) =>
+                                              onDragStart(event, {
+                                                type: removeCountFromString(
+                                                  SBItemName,
+                                                ),
+                                                node: dataFilter[item.name][
+                                                  SBItemName
+                                                ],
+                                              })
+                                            }
+                                            color={nodeColors[item.name]}
+                                            itemName={SBItemName}
+                                            error={
+                                              !!dataFilter[item.name][
+                                                SBItemName
+                                              ].error
+                                            }
+                                            display_name={
+                                              dataFilter[item.name][SBItemName]
+                                                .display_name
+                                            }
+                                            official={
+                                              dataFilter[item.name][SBItemName]
+                                                .official === false
+                                                ? false
+                                                : true
+                                            }
+                                            beta={
+                                              dataFilter[item.name][SBItemName]
+                                                .beta ?? false
+                                            }
+                                            legacy={
+                                              dataFilter[item.name][SBItemName]
+                                                .legacy ?? false
+                                            }
+                                          />
+                                        </ShadTooltip>
+                                      ))}
+                                  </div>
+                                </CollapsibleContent>
+                              </SidebarMenuItem>
+                            </Collapsible>
+                          ),
+                      )}
+                </SidebarMenu>
+              </SidebarGroupContent>
+            </SidebarGroup>
+          </>
+        ) : (
+          <div className="flex h-full flex-col items-center justify-center p-4 text-center">
+            <ForwardedIconComponent
+              name="Search"
+              className="mb-4 h-8 w-8 text-muted-foreground"
+            />
+            <h3 className="mb-2 text-lg font-semibold">No results found</h3>
+            <p className="text-sm text-muted-foreground">
+              Try adjusting your search or filter to find what you're looking
+              for.
+            </p>
+          </div>
+        )}
+      </SidebarContent>
+      <SidebarFooter className="border-t p-4 py-3">
+        {hasStore && (
+          <SidebarMenuButton asChild>
+            <CustomLink to="/store">
+              <div className="flex items-center gap-2">
+                <ForwardedIconComponent
+                  name="Store"
+                  className="h-4 w-4 text-muted-foreground"
+                />
+                <span className="group-data-[state=open]/collapsible:font-semibold">
+                  Discover more components
+                </span>
+              </div>
+            </CustomLink>
+          </SidebarMenuButton>
+        )}
+        <SidebarMenuButton asChild>
+          <Button
+            unstyled
+            onClick={() => {
+              if (customComponent) {
+                addComponent(customComponent, "CustomComponent");
+              }
+            }}
+            data-testid="sidebar-custom-component-button"
+            className="flex items-center gap-2"
+          >
+            <ForwardedIconComponent
+              name="Plus"
+              className="h-4 w-4 text-muted-foreground"
+            />
+            <span className="group-data-[state=open]/collapsible:font-semibold">
+              Custom Component
+            </span>
+          </Button>
+        </SidebarMenuButton>
+      </SidebarFooter>
+    </Sidebar>
+  );
+}
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
index 078e3123a..6fac536af 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
@@ -1,21 +1,40 @@
 import RenderIcons from "@/components/renderIconComponent";
+import { cn } from "@/utils/utils";
 
 export default function ShortcutDisplay({
   name,
   shortcut,
+  sidebar = false,
 }: {
-  name: string;
+  name?: string;
   shortcut: string;
+  sidebar?: boolean;
 }): JSX.Element {
   const fixedShortcut = shortcut?.split("+");
   return (
-    <div className="flex content-center items-center justify-center self-center text-[12px]">
-      <span> {name} </span>
-      <span
-        className={`ml-3 flex items-center rounded-sm bg-primary-hover px-1.5 py-[0.1em] text-muted`}
-      >
-        <RenderIcons filteredShortcut={fixedShortcut} />
-      </span>
-    </div>
+    <>
+      {sidebar ? (
+        <div className="flex justify-center">
+          {name && <span> {name} </span>}
+          <span
+            className={cn(
+              "flex items-center rounded-sm bg-muted px-1.5 py-[0.1em] text-lg text-muted-foreground",
+              name && "ml-3",
+            )}
+          >
+            <RenderIcons filteredShortcut={fixedShortcut} />
+          </span>
+        </div>
+      ) : (
+        <div className="flex content-center items-center justify-center self-center text-[12px]">
+          <span> {name} </span>
+          <span
+            className={`ml-3 flex items-center rounded-sm bg-primary-hover px-1.5 py-[0.1em] text-muted`}
+          >
+            <RenderIcons filteredShortcut={fixedShortcut} />
+          </span>
+        </div>
+      )}
+    </>
   );
 }
diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx
index e20719d1c..72e700f44 100644
--- a/src/frontend/src/pages/FlowPage/index.tsx
+++ b/src/frontend/src/pages/FlowPage/index.tsx
@@ -1,6 +1,6 @@
+import { SidebarProvider } from "@/components/ui/sidebar";
 import { useGetFlow } from "@/controllers/API/queries/flows/use-get-flow";
 import { useGetRefreshFlows } from "@/controllers/API/queries/flows/use-get-refresh-flows";
-import { ENABLE_BRANDING } from "@/customization/feature-flags";
 import { useCustomNavigate } from "@/customization/hooks/use-custom-navigate";
 import useSaveFlow from "@/hooks/flows/use-save-flow";
 import { SaveChangesModal } from "@/modals/saveChangesModal";
@@ -14,7 +14,7 @@ import { useDarkStore } from "../../stores/darkStore";
 import useFlowStore from "../../stores/flowStore";
 import useFlowsManagerStore from "../../stores/flowsManagerStore";
 import Page from "./components/PageComponent";
-import ExtraSidebar from "./components/extraSidebarComponent";
+import { FlowSidebarComponent } from "./components/flowSidebarComponent";
 
 export default function FlowPage({ view }: { view?: boolean }): JSX.Element {
   const setCurrentFlow = useFlowsManagerStore((state) => state.setCurrentFlow);
@@ -165,16 +165,17 @@ export default function FlowPage({ view }: { view?: boolean }): JSX.Element {
       <div className="flow-page-positioning">
         {currentFlow && (
           <div className="flex h-full overflow-hidden">
-            {!view && <ExtraSidebar />}
-            <main className="flex flex-1">
-              {/* Primary column */}
-              <div className="h-full w-full">
-                <Page />
-              </div>
-            </main>
+            <SidebarProvider>
+              {!view && <FlowSidebarComponent />}
+              <main className="flex flex-1">
+                <div className="h-full w-full">
+                  <Page />
+                </div>
+              </main>
+            </SidebarProvider>
           </div>
         )}
-        {ENABLE_BRANDING && version && (
+        {/* {ENABLE_BRANDING && version && (
           <a
             target={"_blank"}
             href="https://medium.com/logspace/langflow-datastax-better-together-1b7462cebc4d"
@@ -184,7 +185,7 @@ export default function FlowPage({ view }: { view?: boolean }): JSX.Element {
 
             <div className={version ? "mt-2" : "mt-1"}>⛓️ v{version}</div>
           </a>
-        )}
+        )} */}
       </div>
       {blocker.state === "blocked" && (
         <>
diff --git a/src/frontend/src/stores/typesStore.ts b/src/frontend/src/stores/typesStore.ts
index 3fc9a4873..2aedc0d65 100644
--- a/src/frontend/src/stores/typesStore.ts
+++ b/src/frontend/src/stores/typesStore.ts
@@ -7,7 +7,6 @@ import {
   templatesGenerator,
   typesGenerator,
 } from "../utils/reactflowUtils";
-import useAlertStore from "./alertStore";
 import useFlowsManagerStore from "./flowsManagerStore";
 
 export const useTypesStore = create<TypesStoreType>((set, get) => ({
diff --git a/src/frontend/src/style/classes.css b/src/frontend/src/style/classes.css
index a527393d4..07f169a0c 100644
--- a/src/frontend/src/style/classes.css
+++ b/src/frontend/src/style/classes.css
@@ -260,8 +260,7 @@ pre {
   -webkit-appearance: none;
   background-color: hsl(var(--primary));
   -webkit-mask-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23777'><path d='M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z'/></svg>");
-  background-size: 16px 16px;
-  height: 16px;
-  opacity: 1 !important;
-  width: 16px;
+  background-size: 20px 20px;
+  height: 20px;
+  width: 20px;
 }
diff --git a/src/frontend/src/style/index.css b/src/frontend/src/style/index.css
index 2c4ddc448..ed2d7f090 100644
--- a/src/frontend/src/style/index.css
+++ b/src/frontend/src/style/index.css
@@ -248,6 +248,14 @@
     --chat-bot-icon: #235d70;
     --chat-user-icon: #4f3d6e;
 
+    --sidebar-background: 240 5.9% 10%;
+    --sidebar-foreground: 240 4.8% 95.9%;
+    --sidebar-primary: 224.3 76.3% 48%;
+    --sidebar-primary-foreground: 0 0% 100%;
+    --sidebar-accent: 240 3.7% 15.9%;
+    --sidebar-accent-foreground: 240 4.8% 95.9%;
+    --sidebar-border: 240 3.7% 15.9%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
     --emerald-success: 160.1 84.1% 39.4%;
     --accent-emerald-foreground: 161.4 93.5% 30.4%;
     --placeholder: 240 5% 64.9%;
diff --git a/src/frontend/src/types/api/index.ts b/src/frontend/src/types/api/index.ts
index cb56db791..aac15174b 100644
--- a/src/frontend/src/types/api/index.ts
+++ b/src/frontend/src/types/api/index.ts
@@ -43,6 +43,7 @@ export type APIClassType = {
   output_types?: Array<string>;
   custom_fields?: CustomFieldsType;
   beta?: boolean;
+  legacy?: boolean;
   documentation: string;
   error?: string;
   official?: boolean;
diff --git a/src/frontend/src/types/sidebar/index.ts b/src/frontend/src/types/sidebar/index.ts
new file mode 100644
index 000000000..dc323b62e
--- /dev/null
+++ b/src/frontend/src/types/sidebar/index.ts
@@ -0,0 +1,5 @@
+export interface SidebarCategory {
+  display_name: string;
+  name: string;
+  icon: string;
+}
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index f82509b84..e4761e25a 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -84,6 +84,7 @@ import {
   GitFork,
   GithubIcon,
   Globe,
+  GripVertical,
   Group,
   Hammer,
   Heart,
@@ -295,7 +296,7 @@ export const gradients = [
   "bg-gradient-to-br from-lime-600 via-yellow-300 to-red-600",
 ];
 
-/* 
+/*
 Specifications
 #FF3276 -> #F480FF
 #1A0250 -> #2F10FE
@@ -416,41 +417,49 @@ export const nodeColorsName: { [char: string]: string } = {
   BaseChatMemory: "cyan",
 };
 
-export const nodeNames: { [char: string]: string } = {
-  inputs: "Inputs",
-  outputs: "Outputs",
-  data: "Data",
-  prompts: "Prompts",
-  models: "Models",
-  notion: "Notion",
-  Notion: "Notion",
-  AssemblyAI: "AssemblyAI",
-  assemblyai: "AssemblyAI",
-  model_specs: "Model Specs",
-  chains: "Chains",
-  agents: "Agents",
-  tools: "Tools",
-  memories: "Memories",
-  saved_components: "Saved",
-  advanced: "Advanced",
-  chat: "Chat",
-  embeddings: "Embeddings",
-  documentloaders: "Loaders",
-  vectorstores: "Vector Stores",
-  vectorsearch: "Vector Search",
-  toolkits: "Toolkits",
-  wrappers: "Wrappers",
-  textsplitters: "Text Splitters",
-  retrievers: "Retrievers",
-  helpers: "Helpers",
-  prototypes: "Prototypes",
-  astra_assistants: "Astra Assistants",
-  langchain_utilities: "Utilities",
-  output_parsers: "Output Parsers",
-  custom_components: "Custom",
-  link_extractors: "Link Extractors",
-  unknown: "Other",
-};
+export const SIDEBAR_CATEGORIES = [
+  { display_name: "Saved", name: "saved_components", icon: "GradientSave" },
+  { display_name: "Inputs", name: "inputs", icon: "Download" },
+  { display_name: "Outputs", name: "outputs", icon: "Upload" },
+  { display_name: "Prompts", name: "prompts", icon: "TerminalSquare" },
+  { display_name: "Data", name: "data", icon: "Database" },
+  { display_name: "Models", name: "models", icon: "BrainCircuit" },
+  { display_name: "Helpers", name: "helpers", icon: "Wand2" },
+  { display_name: "Vector Stores", name: "vectorstores", icon: "Layers" },
+  { display_name: "Embeddings", name: "embeddings", icon: "Binary" },
+  { display_name: "Agents", name: "agents", icon: "Bot" },
+  { display_name: "Chains", name: "chains", icon: "Link" },
+  { display_name: "Loaders", name: "documentloaders", icon: "Paperclip" },
+  {
+    display_name: "Utilities",
+    name: "langchain_utilities",
+    icon: "PocketKnife",
+  },
+  { display_name: "Link Extractors", name: "link_extractors", icon: "Link2" },
+  { display_name: "Memories", name: "memories", icon: "Cpu" },
+  { display_name: "Output Parsers", name: "output_parsers", icon: "Compass" },
+  { display_name: "Prototypes", name: "prototypes", icon: "FlaskConical" },
+  { display_name: "Retrievers", name: "retrievers", icon: "FileSearch" },
+  { display_name: "Text Splitters", name: "textsplitters", icon: "Scissors" },
+  { display_name: "Toolkits", name: "toolkits", icon: "Package2" },
+  { display_name: "Tools", name: "tools", icon: "Hammer" },
+];
+
+export const SIDEBAR_BUNDLES = [
+  { display_name: "CrewAI", name: "crewai", icon: "CrewAi" },
+  { display_name: "LangChain", name: "langchain_utilities", icon: "LangChain" },
+  { display_name: "AssemblyAI", name: "assemblyai", icon: "AssemblyAI" },
+  {
+    display_name: "Astra Assistants",
+    name: "astra_assistants",
+    icon: "Sparkles",
+  },
+  { display_name: "Google", name: "google", icon: "Google" },
+  { display_name: "Firecrawl", name: "firecrawl", icon: "FirecrawlCrawlApi" },
+  { display_name: "Notion", name: "Notion", icon: "Notion" },
+  { display_name: "NVIDIA", name: "nvidia", icon: "NVIDIA" },
+  { display_name: "Vectara", name: "vectara", icon: "Vectara" },
+];
 
 export const categoryIcons = {
   saved_components: GradientSave,
@@ -669,6 +678,16 @@ export const nodeIconsLucide: iconsType = {
   Blocks,
   ChevronDown,
   ArrowLeft,
+  BrainCircuit,
+  Wand2,
+  Layers,
+  Binary,
+  Paperclip,
+  PocketKnife,
+  Scissors,
+  Cpu,
+  Hammer,
+  GradientSave,
   Shield,
   Plus,
   Redo,
@@ -743,6 +762,10 @@ export const nodeIconsLucide: iconsType = {
   Loader2,
   BookmarkPlus,
   Heart,
+  Package2,
+  FileSearch,
+  Compass,
+  Link2,
   Pin,
   Link,
   ToyBrick,
@@ -768,6 +791,7 @@ export const nodeIconsLucide: iconsType = {
   note: StickyNote,
   RotateCcw,
   Wrench,
+  GripVertical,
   FolderPlusIcon,
   PaperclipIcon,
   Settings,
diff --git a/src/frontend/tests/core/features/componentHoverAdd.spec.ts b/src/frontend/tests/core/features/componentHoverAdd.spec.ts
new file mode 100644
index 000000000..55059a724
--- /dev/null
+++ b/src/frontend/tests/core/features/componentHoverAdd.spec.ts
@@ -0,0 +1,73 @@
+import { expect, test } from "@playwright/test";
+
+test("user can add components by hovering and clicking the plus icon", async ({
+  page,
+}) => {
+  // Navigate to homepage and handle initial modal
+  await page.goto("/");
+  await page.waitForSelector('[data-testid="mainpage_title"]', {
+    timeout: 30000,
+  });
+
+  let modalCount = 0;
+  try {
+    const modalTitleElement = await page?.getByTestId("modal-title");
+    if (modalTitleElement) {
+      modalCount = await modalTitleElement.count();
+    }
+  } catch (error) {
+    modalCount = 0;
+  }
+
+  while (modalCount === 0) {
+    await page.getByText("New Project", { exact: true }).click();
+    await page.waitForTimeout(3000);
+    modalCount = await page.getByTestId("modal-title")?.count();
+  }
+
+  // Start with blank flow
+  await page.getByTestId("blank-flow").click();
+  await page.waitForTimeout(1000);
+
+  // Search for a component
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat input");
+  await page.waitForTimeout(500);
+
+  // Hover over the component and verify plus icon
+  const componentLocator = page.getByTestId("inputsChat Input");
+  // Find the plus icon within the specific component container
+  const plusIcon = componentLocator.getByTestId("icon-Plus");
+
+  // Get the opacity
+  const opacity = await plusIcon.evaluate((el) =>
+    window.getComputedStyle(el).getPropertyValue("opacity"),
+  );
+
+  await expect(plusIcon).toBeVisible();
+
+  await expect(opacity).toBe("0");
+
+  // Hover over the component
+  await componentLocator.hover();
+
+  // Check if the plus icon is visible and has full opacity
+
+  await expect(plusIcon).toBeVisible();
+
+  await page.waitForTimeout(500);
+
+  const opacityAfterHover = await plusIcon.evaluate((el) =>
+    window.getComputedStyle(el).getPropertyValue("opacity"),
+  );
+
+  await expect(opacityAfterHover).toBe("1");
+
+  // Click the plus icon associated with this component
+  await plusIcon.click();
+  await page.waitForTimeout(500);
+
+  // Verify component was added to the flow
+  const addedComponent = await page.locator(".react-flow__node").first();
+  await expect(addedComponent).toBeVisible();
+});
diff --git a/src/frontend/tests/core/features/filterEdge-shard-0.spec.ts b/src/frontend/tests/core/features/filterEdge-shard-0.spec.ts
index ea839d925..70937aa1e 100644
--- a/src/frontend/tests/core/features/filterEdge-shard-0.spec.ts
+++ b/src/frontend/tests/core/features/filterEdge-shard-0.spec.ts
@@ -23,12 +23,14 @@ test("user must see on handle hover a tooltip with possibility connections", asy
   }
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("retrievalqa");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("retrievalqa");
+
+  await page.getByTestId("sidebar-options-trigger").click();
+  await page.getByTestId("sidebar-legacy-switch").isVisible({ timeout: 5000 });
+  await page.getByTestId("sidebar-legacy-switch").click();
+  await expect(page.getByTestId("sidebar-legacy-switch")).toBeChecked();
+  await page.getByTestId("sidebar-options-trigger").click();
 
   await page.waitForTimeout(1000);
   await page
diff --git a/src/frontend/tests/core/features/filterSidebar.spec.ts b/src/frontend/tests/core/features/filterSidebar.spec.ts
index 511adc75a..fa19fc17d 100644
--- a/src/frontend/tests/core/features/filterSidebar.spec.ts
+++ b/src/frontend/tests/core/features/filterSidebar.spec.ts
@@ -32,13 +32,8 @@ test("user must see on handle click the possibility connections - LLMChain", asy
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(3000);
 
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 100000,
-  });
-
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("api request");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("api request");
 
   await page.waitForTimeout(1000);
   await page
@@ -77,6 +72,14 @@ test("user must see on handle click the possibility connections - LLMChain", asy
   await expect(page.getByTestId("disclosure-models")).toBeVisible();
   await expect(page.getByTestId("disclosure-helpers")).toBeVisible();
   await expect(page.getByTestId("disclosure-agents")).toBeVisible();
+  await expect(page.getByTestId("disclosure-chains")).not.toBeVisible();
+
+  await page.getByTestId("sidebar-options-trigger").click();
+  await page.getByTestId("sidebar-legacy-switch").isVisible({ timeout: 5000 });
+  await page.getByTestId("sidebar-legacy-switch").click();
+  await expect(page.getByTestId("sidebar-legacy-switch")).toBeChecked();
+  await page.getByTestId("sidebar-options-trigger").click();
+
   await expect(page.getByTestId("disclosure-chains")).toBeVisible();
   await expect(page.getByTestId("disclosure-prototypes")).toBeVisible();
 
@@ -89,7 +92,17 @@ test("user must see on handle click the possibility connections - LLMChain", asy
   await expect(page.getByTestId("chainsConversationChain")).toBeVisible();
   await expect(page.getByTestId("prototypesConditional Router")).toBeVisible();
 
-  await page.getByPlaceholder("Search").click();
+  await expect(page.getByTestId("helpersCurrent Date")).toBeVisible();
+
+  await page.getByTestId("sidebar-options-trigger").click();
+  await page.getByTestId("sidebar-beta-switch").isVisible({ timeout: 5000 });
+  await page.getByTestId("sidebar-beta-switch").click();
+  await expect(page.getByTestId("sidebar-beta-switch")).not.toBeChecked();
+  await page.getByTestId("sidebar-options-trigger").click();
+
+  await expect(page.getByTestId("helpersCurrent Date")).not.toBeVisible();
+
+  await page.getByTestId("sidebar-filter-reset").click();
 
   await expect(page.getByTestId("inputsChat Input")).not.toBeVisible();
   await expect(page.getByTestId("outputsChat Output")).not.toBeVisible();
@@ -117,7 +130,16 @@ test("user must see on handle click the possibility connections - LLMChain", asy
   await expect(page.getByTestId("helpersChat Memory")).toBeVisible();
   await expect(page.getByTestId("vectorstoresAstra DB")).toBeVisible();
   await expect(page.getByTestId("toolsSearch API")).toBeVisible();
+  await expect(page.getByTestId("prototypesSub Flow")).not.toBeVisible();
+
+  await page.getByTestId("sidebar-options-trigger").click();
+  await page.getByTestId("sidebar-beta-switch").isVisible({ timeout: 5000 });
+  await page.getByTestId("sidebar-beta-switch").click();
+  await expect(page.getByTestId("sidebar-beta-switch")).toBeChecked();
+  await page.getByTestId("sidebar-options-trigger").click();
+
   await expect(page.getByTestId("prototypesSub Flow")).toBeVisible();
+
   await expect(
     page.getByTestId("retrieversSelf Query Retriever"),
   ).toBeVisible();
diff --git a/src/frontend/tests/core/features/freeze.spec.ts b/src/frontend/tests/core/features/freeze.spec.ts
index 22e4fc2bf..87d3fed65 100644
--- a/src/frontend/tests/core/features/freeze.spec.ts
+++ b/src/frontend/tests/core/features/freeze.spec.ts
@@ -30,9 +30,8 @@ test.skip("user must be able to freeze a component", async ({ page }) => {
 
   //first component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text input");
   await page.waitForTimeout(1000);
 
   await page
@@ -52,9 +51,8 @@ test.skip("user must be able to freeze a component", async ({ page }) => {
 
   //second component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("url");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("url");
   await page.waitForTimeout(1000);
 
   await page
@@ -74,9 +72,8 @@ test.skip("user must be able to freeze a component", async ({ page }) => {
 
   //third component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("split text");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("split text");
   await page.waitForTimeout(1000);
 
   await page
@@ -96,9 +93,8 @@ test.skip("user must be able to freeze a component", async ({ page }) => {
 
   //fourth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("parse data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("parse data");
   await page.waitForTimeout(1000);
 
   await page
@@ -118,9 +114,8 @@ test.skip("user must be able to freeze a component", async ({ page }) => {
 
   //fifth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/core/features/globalVariables.spec.ts b/src/frontend/tests/core/features/globalVariables.spec.ts
index 63f49e853..323c333a9 100644
--- a/src/frontend/tests/core/features/globalVariables.spec.ts
+++ b/src/frontend/tests/core/features/globalVariables.spec.ts
@@ -31,12 +31,8 @@ test("user must be able to save or delete a global variable", async ({
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/features/keyboardComponentSearch.spec.ts b/src/frontend/tests/core/features/keyboardComponentSearch.spec.ts
new file mode 100644
index 000000000..7d73beb45
--- /dev/null
+++ b/src/frontend/tests/core/features/keyboardComponentSearch.spec.ts
@@ -0,0 +1,96 @@
+import { expect, test } from "@playwright/test";
+
+test("user can search and add components using keyboard shortcuts", async ({
+  page,
+}) => {
+  // Navigate to homepage and handle initial modal
+  await page.goto("/");
+  await page.waitForSelector('[data-testid="mainpage_title"]', {
+    timeout: 30000,
+  });
+
+  let modalCount = 0;
+  try {
+    const modalTitleElement = await page?.getByTestId("modal-title");
+    if (modalTitleElement) {
+      modalCount = await modalTitleElement.count();
+    }
+  } catch (error) {
+    modalCount = 0;
+  }
+
+  while (modalCount === 0) {
+    await page.getByText("New Project", { exact: true }).click();
+    await page.waitForTimeout(3000);
+    modalCount = await page.getByTestId("modal-title")?.count();
+  }
+
+  // Start with blank flow
+  await page.getByTestId("blank-flow").click();
+  await page.waitForTimeout(1000);
+
+  // Press "/" to activate search
+  await page.keyboard.press("/");
+  await page.waitForTimeout(500);
+
+  // Verify search is focused and disclosures are closed when search is empty
+  await expect(page.getByTestId("sidebar-search-input")).toBeFocused();
+  await expect(page.getByTestId("inputsChat Input")).not.toBeVisible();
+
+  // Type "chat" to search for chat components
+  await page.keyboard.type("chat");
+  await page.waitForTimeout(500);
+
+  // Verify disclosures open when search has content
+  await expect(page.getByTestId("inputsChat Input")).toBeVisible();
+
+  // Press Tab to focus first result
+  await page.keyboard.press("Tab");
+  await page.keyboard.press("Tab");
+
+  // Verify some expected chat-related components are visible
+  await expect(page.getByTestId("inputsChat Input")).toBeVisible();
+  await expect(page.getByTestId("outputsChat Output")).toBeVisible();
+
+  // Press Space to select the component
+  await page.keyboard.press("Space");
+  await page.waitForTimeout(500);
+
+  // Verify component was added to flow
+  const addedComponent = await page.locator(".react-flow__node").first();
+  await expect(addedComponent).toBeVisible();
+
+  // Clear search input and verify disclosures are closed
+  await page.getByTestId("sidebar-search-input").clear();
+  await page.waitForTimeout(500);
+  await expect(page.getByTestId("inputsChat Input")).not.toBeVisible();
+
+  // Test Enter key selection
+  await page.keyboard.press("/");
+  await page.keyboard.type("prompt");
+  await page.waitForTimeout(500);
+
+  // Verify disclosures open with new search
+  await expect(page.getByTestId("promptsPrompt")).toBeVisible();
+
+  await page.keyboard.press("Tab");
+  await page.keyboard.press("Tab");
+  await page.keyboard.press("Enter");
+  await page.waitForTimeout(500);
+
+  // Verify second component was added
+  const nodeCount = await page.locator(".react-flow__node").count();
+  expect(nodeCount).toBe(2);
+
+  // Verify search is cleared and disclosures are closed after adding component
+  await page.keyboard.press("/");
+  await page.getByTestId("sidebar-search-input").clear();
+  await page.waitForTimeout(500);
+  await expect(page.getByTestId("sidebar-search-input")).toHaveValue("");
+  await expect(page.getByTestId("inputsChat Input")).not.toBeVisible();
+
+  await expect(page.getByTestId("sidebar-search-input")).toBeFocused();
+  await page.keyboard.press("Escape");
+  await expect(page.getByTestId("sidebar-search-input")).not.toBeFocused();
+  await expect(page.getByTestId("inputsChat Input")).not.toBeVisible();
+});
diff --git a/src/frontend/tests/core/features/playground.spec.ts b/src/frontend/tests/core/features/playground.spec.ts
index 8cf00a314..77f45e2b6 100644
--- a/src/frontend/tests/core/features/playground.spec.ts
+++ b/src/frontend/tests/core/features/playground.spec.ts
@@ -38,12 +38,9 @@ test("fresh start playground", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   await page.waitForTimeout(1000);
 
   await page
@@ -52,8 +49,8 @@ test("fresh start playground", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat input");
   await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/core/features/saveComponents.spec.ts b/src/frontend/tests/core/features/saveComponents.spec.ts
index 3976e7672..b2c179f12 100644
--- a/src/frontend/tests/core/features/saveComponents.spec.ts
+++ b/src/frontend/tests/core/features/saveComponents.spec.ts
@@ -103,12 +103,8 @@ test.describe("save component tests", () => {
     if (replaceButton) {
       await page.getByTestId("replace-button").click();
     }
-
-    await page.waitForSelector('[data-testid="extended-disclosure"]', {
-      timeout: 30000,
-    });
-    await page.getByPlaceholder("Search").click();
-    await page.getByPlaceholder("Search").fill("group");
+    await page.getByTestId("sidebar-search-input").click();
+    await page.getByTestId("sidebar-search-input").fill("group");
     await page.waitForTimeout(1000);
 
     await page
diff --git a/src/frontend/tests/core/features/stop-building.spec.ts b/src/frontend/tests/core/features/stop-building.spec.ts
index 2b9e6fa38..1dcf51fa9 100644
--- a/src/frontend/tests/core/features/stop-building.spec.ts
+++ b/src/frontend/tests/core/features/stop-building.spec.ts
@@ -33,9 +33,8 @@ test("user must be able to stop a building", async ({ page }) => {
 
   //first component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text input");
   // await page.waitForTimeout(1000);
 
   await page
@@ -55,9 +54,8 @@ test("user must be able to stop a building", async ({ page }) => {
 
   //second component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("url");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("url");
   // await page.waitForTimeout(1000);
 
   await page
@@ -77,9 +75,8 @@ test("user must be able to stop a building", async ({ page }) => {
 
   //third component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("split text");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("split text");
   // await page.waitForTimeout(1000);
 
   await page
@@ -99,9 +96,8 @@ test("user must be able to stop a building", async ({ page }) => {
 
   //fourth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("parse data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("parse data");
   // await page.waitForTimeout(1000);
 
   await page
@@ -121,9 +117,8 @@ test("user must be able to stop a building", async ({ page }) => {
 
   //fifth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   // await page.waitForTimeout(1000);
 
   await page
@@ -248,17 +243,7 @@ class CustomComponent(Component):
         return data
   `;
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("custom component");
-
-  await page.waitForTimeout(1000);
-
-  await page
-    .locator('//*[@id="helpersCustom Component"]')
-    .dragTo(page.locator('//*[@id="react-flow-id"]'));
-  await page.mouse.up();
-  await page.mouse.down();
+  await page.getByTestId("sidebar-custom-component-button").click();
   await page.getByTestId("fit_view").click();
   await page.getByTestId("zoom_out").click();
 
diff --git a/src/frontend/tests/core/features/tweaksTest.spec.ts b/src/frontend/tests/core/features/tweaksTest.spec.ts
index 3a5a61df3..052883566 100644
--- a/src/frontend/tests/core/features/tweaksTest.spec.ts
+++ b/src/frontend/tests/core/features/tweaksTest.spec.ts
@@ -88,12 +88,8 @@ test("check if tweaks are updating when someothing on the flow changes", async (
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("Chroma");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("Chroma");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/integrations/decisionFlow.spec.ts b/src/frontend/tests/core/integrations/decisionFlow.spec.ts
index eb5be1095..41813bb1f 100644
--- a/src/frontend/tests/core/integrations/decisionFlow.spec.ts
+++ b/src/frontend/tests/core/integrations/decisionFlow.spec.ts
@@ -1,83 +1,150 @@
-import { expect, test } from "@playwright/test";
+import { Page, test } from "@playwright/test";
 import * as dotenv from "dotenv";
 import path from "path";
+// Helper function to wait for element to be ready
+async function waitForElement(page: Page, elementId: string, nth: number) {
+  const element = page.getByTestId(`title-${elementId}`).nth(nth);
 
-// Add this function at the beginning of the file, after the imports
+  // Wait for element to be visible and stable
+  await element.waitFor({
+    state: "visible",
+    timeout: 30000,
+  });
+
+  // Additional wait to ensure element is fully rendered and interactive
+  await page.waitForTimeout(1000);
+
+  return element;
+}
+
+// Improved version of moveElementByX with better error handling and waits
 async function moveElementByX(
-  page: any,
+  page: Page,
   elementId: string,
   moveX: number,
   nth: number,
 ) {
-  const element = await page.getByTestId(`title-${elementId}`).nth(nth);
-  await element.hover();
+  try {
+    const element = await waitForElement(page, elementId, nth);
+    await element.hover();
 
-  const boundingBox = await element.boundingBox();
+    const boundingBox = await element.boundingBox();
+    if (!boundingBox) {
+      throw new Error(
+        `Unable to get bounding box for the element: ${elementId}`,
+      );
+    }
 
-  if (boundingBox) {
     const startX = boundingBox.x + boundingBox.width / 2;
     const startY = boundingBox.y + boundingBox.height / 2;
 
+    // Break down mouse movements into smaller steps for more reliability
     await page.mouse.move(startX, startY);
+    await page.waitForTimeout(50);
     await page.mouse.down();
-    await page.mouse.move(startX + moveX, startY);
+    await page.waitForTimeout(50);
+
+    // Move in smaller increments
+    const steps = 3;
+    const stepX = moveX / steps;
+    for (let i = 1; i <= steps; i++) {
+      await page.mouse.move(startX + stepX * i, startY);
+      await page.waitForTimeout(50);
+    }
+
     await page.mouse.up();
-  } else {
-    throw new Error(`Unable to get bounding box for the element: ${elementId}`);
+    await page.waitForTimeout(100);
+  } catch (error) {
+    console.error(`Failed to move element ${elementId}:`, error);
+    throw error;
   }
 }
 
-// Add this function at the beginning of the file, after the imports
+// Improved version of moveElementByY with better error handling and waits
 async function moveElementByY(
-  page: any,
+  page: Page,
   elementId: string,
   moveY: number,
   nth: number,
 ) {
-  const element = await page.getByTestId(`title-${elementId}`).nth(nth);
-  await element.hover();
+  try {
+    const element = await waitForElement(page, elementId, nth);
+    await element.hover();
 
-  const boundingBox = await element.boundingBox();
+    const boundingBox = await element.boundingBox();
+    if (!boundingBox) {
+      throw new Error(
+        `Unable to get bounding box for the element: ${elementId}`,
+      );
+    }
 
-  if (boundingBox) {
     const startX = boundingBox.x + boundingBox.width / 2;
     const startY = boundingBox.y + boundingBox.height / 2;
 
     await page.mouse.move(startX, startY);
+    await page.waitForTimeout(100);
     await page.mouse.down();
-    await page.mouse.move(startX, startY + moveY);
+    await page.waitForTimeout(100);
+
+    // Move in smaller increments
+    const steps = 5;
+    const stepY = moveY / steps;
+    for (let i = 1; i <= steps; i++) {
+      await page.mouse.move(startX, startY + stepY * i);
+      await page.waitForTimeout(50);
+    }
+
     await page.mouse.up();
-  } else {
-    throw new Error(`Unable to get bounding box for the element: ${elementId}`);
+    await page.waitForTimeout(100);
+  } catch (error) {
+    console.error(`Failed to move element ${elementId}:`, error);
+    throw error;
   }
 }
 
-// Add this function at the beginning of the file, after the imports
+// Improved version of moveElementByXY with better error handling and waits
 async function moveElementByXY(
-  page: any,
+  page: Page,
   elementId: string,
   moveX: number,
   moveY: number,
   nth: number,
 ) {
-  const element = await page.getByTestId(`title-${elementId}`).nth(nth);
-  await element.hover();
+  try {
+    const element = await waitForElement(page, elementId, nth);
+    await element.hover();
 
-  const boundingBox = await element.boundingBox();
+    const boundingBox = await element.boundingBox();
+    if (!boundingBox) {
+      throw new Error(
+        `Unable to get bounding box for the element: ${elementId}`,
+      );
+    }
 
-  if (boundingBox) {
     const startX = boundingBox.x + boundingBox.width / 2;
     const startY = boundingBox.y + boundingBox.height / 2;
 
     await page.mouse.move(startX, startY);
+    await page.waitForTimeout(100);
     await page.mouse.down();
-    await page.mouse.move(startX + moveX, startY + moveY);
+    await page.waitForTimeout(100);
+
+    // Move in smaller increments
+    const steps = 5;
+    const stepX = moveX / steps;
+    const stepY = moveY / steps;
+    for (let i = 1; i <= steps; i++) {
+      await page.mouse.move(startX + stepX * i, startY + stepY * i);
+      await page.waitForTimeout(50);
+    }
+
     await page.mouse.up();
-  } else {
-    throw new Error(`Unable to get bounding box for the element: ${elementId}`);
+    await page.waitForTimeout(100);
+  } catch (error) {
+    console.error(`Failed to move element ${elementId}:`, error);
+    throw error;
   }
 }
-
 test("should create a flow with decision", async ({ page }) => {
   test.skip(
     !process?.env?.OPENAI_API_KEY,
@@ -111,21 +178,17 @@ test("should create a flow with decision", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
   //---------------------------------- CHAT INPUT
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat input");
   await page.waitForTimeout(500);
   await page
     .getByTestId("inputsChat Input")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
 
   //---------------------------------- CREATE LIST
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("list");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("list");
   await page.waitForTimeout(500);
   await page
     .getByTestId("helpersCreate List")
@@ -158,8 +221,8 @@ test("should create a flow with decision", async ({ page }) => {
   await page.getByTestId("inputlist_str_texts_2").last().fill("not cool..");
 
   //---------------------------------- PARSE DATA
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("parse data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("parse data");
   await page.waitForTimeout(500);
 
   await page
@@ -170,8 +233,8 @@ test("should create a flow with decision", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
 
   //---------------------------------- PASS
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("pass");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("pass");
   await page.waitForTimeout(500);
   await page
     .getByTestId("prototypesPass")
@@ -185,30 +248,30 @@ test("should create a flow with decision", async ({ page }) => {
     .getByTestId("prototypesPass")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   //---------------------------------- PROMPT
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("prompt");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("prompt");
   await page.waitForTimeout(500);
   await page
     .getByTestId("promptsPrompt")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   //---------------------------------- OPENAI
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
   await page.waitForTimeout(500);
   await page
     .getByTestId("modelsOpenAI")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
 
   //---------------------------------- CONDITIONAL ROUTER
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("conditional router");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("conditional router");
   await page.waitForTimeout(500);
   await page
     .getByTestId("prototypesConditional Router")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   //---------------------------------- CHAT OUTPUT
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   await page.waitForTimeout(500);
   await page
     .getByTestId("outputsChat Output")
@@ -222,32 +285,42 @@ test("should create a flow with decision", async ({ page }) => {
 
   await page.getByTestId("fit_view").click();
 
-  await moveElementByX(page, "Chat Output", 500, 1);
   await page.waitForTimeout(500);
-  await moveElementByX(page, "Chat Output", 1000, 0);
+
+  await moveElementByX(page, "Chat Output", 400, 1);
   await page.waitForTimeout(500);
-  await moveElementByX(page, "Conditional Router", 1500, 0);
+  await moveElementByX(page, "Chat Output", 700, 0);
   await page.waitForTimeout(500);
-  await moveElementByX(page, "OpenAI", 2000, 0);
+  await moveElementByX(page, "Conditional Router", 1000, 0);
   await page.waitForTimeout(500);
-  await moveElementByX(page, "Prompt", 2500, 0);
+  await page.getByTestId("fit_view").click();
+  await moveElementByX(page, "OpenAI", 980, 0);
+  await page.getByTestId("fit_view").click();
+
   await page.waitForTimeout(500);
-  await moveElementByX(page, "Pass", 3000, 2);
+  await moveElementByX(page, "Prompt", 990, 0);
+  await page.getByTestId("fit_view").click();
+
+  await page.waitForTimeout(500);
+  await moveElementByX(page, "Pass", 1000, 2);
   await page.getByTestId("fit_view").click();
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Pass", 0, 200, 1);
+  await page.getByTestId("fit_view").click();
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Pass", 150, 200, 0);
+  await page.getByTestId("fit_view").click();
+
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Parse Data", 300, 200, 1);
+  await page.getByTestId("fit_view").click();
+
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Parse Data", 450, 200, 0);
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Create List", 600, 200, 1);
   await page.waitForTimeout(500);
   await moveElementByXY(page, "Create List", 800, 200, 0);
-  await page.waitForTimeout(500);
-  await moveElementByXY(page, "Chat Input", 1000, 200, 0);
 
   await page.waitForTimeout(500);
   await page.getByTestId("fit_view").click();
diff --git a/src/frontend/tests/core/integrations/similarity.spec.ts b/src/frontend/tests/core/integrations/similarity.spec.ts
index dbf221599..1d36cd0cf 100644
--- a/src/frontend/tests/core/integrations/similarity.spec.ts
+++ b/src/frontend/tests/core/integrations/similarity.spec.ts
@@ -31,9 +31,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   //first component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
   // await page.waitForTimeout(1000);
 
   await page
@@ -70,9 +69,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   //third component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text embedder");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text embedder");
   // await page.waitForTimeout(1000);
 
   await page
@@ -109,9 +107,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   //fifth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("embedding similarity");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("embedding similarity");
   // await page.waitForTimeout(1000);
 
   await page
@@ -131,9 +128,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   //sisxth component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("parse data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("parse data");
   // await page.waitForTimeout(1000);
 
   await page
@@ -153,9 +149,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   //seventh component
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text output");
   // await page.waitForTimeout(1000);
 
   await page
@@ -173,9 +168,8 @@ test("user must be able to check similarity between embedding texts", async ({
 
   await page.mouse.up();
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("filter data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("filter data");
   // await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/core/integrations/textInputOutput.spec.ts b/src/frontend/tests/core/integrations/textInputOutput.spec.ts
index e385b1631..98a37a703 100644
--- a/src/frontend/tests/core/integrations/textInputOutput.spec.ts
+++ b/src/frontend/tests/core/integrations/textInputOutput.spec.ts
@@ -41,19 +41,9 @@ test("TextInputOutputComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  const focusElementsOnBoard = async ({ page }) => {
-    const focusElements = await page.getByTestId("extended-disclosure");
-    focusElements.click();
-  };
-
-  await focusElementsOnBoard({ page });
-
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text input");
   await page.waitForTimeout(1000);
 
   await page
@@ -62,8 +52,8 @@ test("TextInputOutputComponent", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
   await page.waitForTimeout(1000);
 
   await page
@@ -120,8 +110,8 @@ test("TextInputOutputComponent", async ({ page }) => {
   // Release the mouse
   await page.mouse.up();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text output");
 
   await page
     .getByTestId("outputsText Output")
diff --git a/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts b/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts
index 6fd68300c..b6036afd5 100644
--- a/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts
+++ b/src/frontend/tests/core/regression/generalBugs-shard-5.spec.ts
@@ -30,13 +30,9 @@ test("should be able to see output preview from grouped components and connect c
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text input");
   await page.waitForTimeout(1000);
 
   await page
@@ -61,9 +57,8 @@ test("should be able to see output preview from grouped components and connect c
     .getByTestId("inputsText Input")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("combine text");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("combine text");
   await page.waitForTimeout(1000);
 
   await page
@@ -107,9 +102,8 @@ test("should be able to see output preview from grouped components and connect c
 
   await page.mouse.up();
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text output");
   await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/core/regression/generalBugs-shard-9.spec.ts b/src/frontend/tests/core/regression/generalBugs-shard-9.spec.ts
index 86d4ef03e..8eeea7773 100644
--- a/src/frontend/tests/core/regression/generalBugs-shard-9.spec.ts
+++ b/src/frontend/tests/core/regression/generalBugs-shard-9.spec.ts
@@ -38,9 +38,8 @@ test("memory should work as expect", async ({ page }) => {
 
   await page.getByTestId("fit_view").click();
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat memory");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat memory");
 
   // Locate the canvas element
   const canvas = page.locator("#react-flow-id"); // Update the selector if needed
diff --git a/src/frontend/tests/core/unit/chatInputOutput.spec.ts b/src/frontend/tests/core/unit/chatInputOutput.spec.ts
index c6da3a6a9..2f1c2949b 100644
--- a/src/frontend/tests/core/unit/chatInputOutput.spec.ts
+++ b/src/frontend/tests/core/unit/chatInputOutput.spec.ts
@@ -32,12 +32,8 @@ test("chat_io_teste", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   await page.waitForTimeout(1000);
 
   await page
@@ -46,8 +42,8 @@ test("chat_io_teste", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat input");
   await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/core/unit/codeAreaModalComponent.spec.ts b/src/frontend/tests/core/unit/codeAreaModalComponent.spec.ts
index 94a682589..e39fc5a0d 100644
--- a/src/frontend/tests/core/unit/codeAreaModalComponent.spec.ts
+++ b/src/frontend/tests/core/unit/codeAreaModalComponent.spec.ts
@@ -31,12 +31,8 @@ test("CodeAreaModalComponent", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("python function");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("python function");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/dropdownComponent.spec.ts b/src/frontend/tests/core/unit/dropdownComponent.spec.ts
index b5d5d6faf..b7114eb14 100644
--- a/src/frontend/tests/core/unit/dropdownComponent.spec.ts
+++ b/src/frontend/tests/core/unit/dropdownComponent.spec.ts
@@ -30,13 +30,9 @@ test("dropDownComponent", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("amazon");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("amazon");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
index 71267c4b1..10ef06648 100644
--- a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
+++ b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts
@@ -30,13 +30,9 @@ test("should be able to upload a file", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("file");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("file");
 
   await page.waitForTimeout(1000);
 
@@ -58,8 +54,8 @@ test("should be able to upload a file", async ({ page }) => {
   );
   await page.getByText("test_file.txt").isVisible();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("text output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("text output");
 
   await page
     .getByTestId("outputsText Output")
@@ -72,8 +68,8 @@ test("should be able to upload a file", async ({ page }) => {
   await page.getByTestId("zoom_out").click();
   await page.getByTestId("zoom_out").click();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("parse data");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("parse data");
   await page
     .getByTestId("helpersParse Data")
     .first()
diff --git a/src/frontend/tests/core/unit/floatComponent.spec.ts b/src/frontend/tests/core/unit/floatComponent.spec.ts
index 3ede4f621..a59b4578d 100644
--- a/src/frontend/tests/core/unit/floatComponent.spec.ts
+++ b/src/frontend/tests/core/unit/floatComponent.spec.ts
@@ -29,12 +29,8 @@ test("FloatComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("ollama");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("ollama");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/inputComponent.spec.ts b/src/frontend/tests/core/unit/inputComponent.spec.ts
index ba304688b..5024b9fca 100644
--- a/src/frontend/tests/core/unit/inputComponent.spec.ts
+++ b/src/frontend/tests/core/unit/inputComponent.spec.ts
@@ -29,12 +29,8 @@ test("InputComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("Chroma");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("Chroma");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/inputListComponent.spec.ts b/src/frontend/tests/core/unit/inputListComponent.spec.ts
index ec8552971..46df3220d 100644
--- a/src/frontend/tests/core/unit/inputListComponent.spec.ts
+++ b/src/frontend/tests/core/unit/inputListComponent.spec.ts
@@ -21,12 +21,8 @@ test("InputListComponent", async ({ page }) => {
   }
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("url");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("url");
 
   await page.waitForTimeout(1000);
   await page
diff --git a/src/frontend/tests/core/unit/intComponent.spec.ts b/src/frontend/tests/core/unit/intComponent.spec.ts
index 31335c358..d84fae243 100644
--- a/src/frontend/tests/core/unit/intComponent.spec.ts
+++ b/src/frontend/tests/core/unit/intComponent.spec.ts
@@ -29,12 +29,8 @@ test("IntComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts b/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
index e9259ea80..72b0e132f 100644
--- a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
+++ b/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
@@ -29,12 +29,8 @@ test("KeypairListComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("amazon bedrock");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("amazon bedrock");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/linkComponent.spec.ts b/src/frontend/tests/core/unit/linkComponent.spec.ts
index 353802bcf..769834111 100644
--- a/src/frontend/tests/core/unit/linkComponent.spec.ts
+++ b/src/frontend/tests/core/unit/linkComponent.spec.ts
@@ -40,28 +40,11 @@ test("user should interact with link component", async ({ context, page }) => {
   });
   await page.getByTestId("blank-flow").click();
 
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  const focusElementsOnBoard = async ({ page }) => {
-    const focusElements = await page.getByTestId("extended-disclosure");
-    focusElements.click();
-  };
-
-  await focusElementsOnBoard({ page });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("custom component");
-
   await page.waitForTimeout(1000);
 
-  await page
-    .locator('//*[@id="helpersCustom Component"]')
-    .dragTo(page.locator('//*[@id="react-flow-id"]'));
-  await page.mouse.up();
-  await page.mouse.down();
-  await page.getByTestId("fit_view").click();
-  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("sidebar-custom-component-button").click();
+  await page.getByTitle("fit view").click();
+  await page.getByTitle("zoom out").click();
 
   await page.getByTestId("title-Custom Component").first().click();
 
diff --git a/src/frontend/tests/core/unit/nestedComponent.spec.ts b/src/frontend/tests/core/unit/nestedComponent.spec.ts
index 2a8213b07..c87d97379 100644
--- a/src/frontend/tests/core/unit/nestedComponent.spec.ts
+++ b/src/frontend/tests/core/unit/nestedComponent.spec.ts
@@ -29,12 +29,8 @@ test("NestedComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("api request");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("api request");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/promptModalComponent.spec.ts b/src/frontend/tests/core/unit/promptModalComponent.spec.ts
index dd99951d8..6f89d2379 100644
--- a/src/frontend/tests/core/unit/promptModalComponent.spec.ts
+++ b/src/frontend/tests/core/unit/promptModalComponent.spec.ts
@@ -29,12 +29,8 @@ test("PromptTemplateComponent", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("prompt");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("prompt");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/sliderComponent.spec.ts b/src/frontend/tests/core/unit/sliderComponent.spec.ts
index 4dc5126e0..7ac8b9cf0 100644
--- a/src/frontend/tests/core/unit/sliderComponent.spec.ts
+++ b/src/frontend/tests/core/unit/sliderComponent.spec.ts
@@ -39,12 +39,8 @@ test("user should be able to use slider input", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("ollama");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("ollama");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/tableInputComponent.spec.ts b/src/frontend/tests/core/unit/tableInputComponent.spec.ts
index 178a73b92..06e424236 100644
--- a/src/frontend/tests/core/unit/tableInputComponent.spec.ts
+++ b/src/frontend/tests/core/unit/tableInputComponent.spec.ts
@@ -44,18 +44,10 @@ test("user must be able to interact with table input component", async ({
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("custom component");
   await page.waitForTimeout(1000);
 
-  await page
-    .getByTestId("helpersCustom Component")
-    .dragTo(page.locator('//*[@id="react-flow-id"]'));
+  await page.getByTestId("sidebar-custom-component-button").click();
 
   await page.getByTestId("zoom_out").click();
   await page.getByTestId("zoom_out").click();
diff --git a/src/frontend/tests/core/unit/textAreaModalComponent.spec.ts b/src/frontend/tests/core/unit/textAreaModalComponent.spec.ts
index afd449877..b72e0f914 100644
--- a/src/frontend/tests/core/unit/textAreaModalComponent.spec.ts
+++ b/src/frontend/tests/core/unit/textAreaModalComponent.spec.ts
@@ -24,18 +24,8 @@ test("TextAreaModalComponent", async ({ page }) => {
   });
   await page.getByTestId("blank-flow").click();
 
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  const focusElementsOnBoard = async ({ page }) => {
-    const focusElements = await page.getByTestId("extended-disclosure");
-    await focusElements.click();
-  };
-
-  await focusElementsOnBoard({ page });
-
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("prompt");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("prompt");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/core/unit/toggleComponent.spec.ts b/src/frontend/tests/core/unit/toggleComponent.spec.ts
index ba7ec4347..36344940c 100644
--- a/src/frontend/tests/core/unit/toggleComponent.spec.ts
+++ b/src/frontend/tests/core/unit/toggleComponent.spec.ts
@@ -30,17 +30,8 @@ test("ToggleComponent", async ({ page }) => {
   });
   await page.getByTestId("blank-flow").click();
 
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  const focusElementsOnBoard = async ({ page }) => {
-    const focusElements = await page.getByTestId("extended-disclosure");
-    focusElements.click();
-  };
-
-  await focusElementsOnBoard({ page });
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("directory");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("directory");
 
   await page.waitForTimeout(1000);
   await page
diff --git a/src/frontend/tests/extended/features/auto-save-off.spec.ts b/src/frontend/tests/extended/features/auto-save-off.spec.ts
index 26972a4e5..870f8e592 100644
--- a/src/frontend/tests/extended/features/auto-save-off.spec.ts
+++ b/src/frontend/tests/extended/features/auto-save-off.spec.ts
@@ -50,12 +50,9 @@ test("user should be able to manually save a flow when the auto_save is off", as
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 5000,
-  });
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("NVIDIA");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("NVIDIA");
 
   await page.waitForTimeout(1000);
 
@@ -111,8 +108,8 @@ test("user should be able to manually save a flow when the auto_save is off", as
 
   expect(await page.getByText("NVIDIA").isVisible()).toBeFalsy();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("NVIDIA");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("NVIDIA");
 
   await page.waitForTimeout(1000);
 
@@ -143,8 +140,8 @@ test("user should be able to manually save a flow when the auto_save is off", as
 
   expect(await page.getByTestId("title-NVIDIA").isVisible()).toBeTruthy();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("NVIDIA");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("NVIDIA");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/features/filterEdge-shard-1.spec.ts b/src/frontend/tests/extended/features/filterEdge-shard-1.spec.ts
index 8077b05ad..cc27daafb 100644
--- a/src/frontend/tests/extended/features/filterEdge-shard-1.spec.ts
+++ b/src/frontend/tests/extended/features/filterEdge-shard-1.spec.ts
@@ -34,12 +34,17 @@ test("user must see on handle click the possibility connections - RetrievalQA",
   );
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("retrievalqa");
+
+  await page.waitForTimeout(1000);
+
+  await page.getByTestId("sidebar-options-trigger").click();
+  await page.getByTestId("sidebar-legacy-switch").isVisible({ timeout: 5000 });
+  await page.getByTestId("sidebar-legacy-switch").click();
+  await expect(page.getByTestId("sidebar-legacy-switch")).toBeChecked();
+  await page.getByTestId("sidebar-options-trigger").click();
+
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("retrievalqa");
 
   await page.waitForTimeout(1000);
   await page
@@ -112,24 +117,31 @@ test("user must see on handle click the possibility connections - RetrievalQA",
     ),
   );
 
-  await page.getByPlaceholder("Search").click();
+  await page.getByTestId("sidebar-search-input").click();
 
-  const notVisibleModelSpecsTestIds = [
-    "model_specsVertexAI",
-    "model_specsCTransformers",
-    "model_specsAmazon Bedrock",
+  const visibleModelSpecsTestIds = [
+    "modelsAIML",
+    "modelsAmazon Bedrock",
+    "modelsAnthropic",
     "modelsAzure OpenAI",
-    "model_specsAzureChatOpenAI",
-    "model_specsChatAnthropic",
-    "model_specsChatLiteLLM",
-    "model_specsChatOllama",
-    "model_specsChatOpenAI",
-    "model_specsChatVertexAI",
+    "modelsCohere",
+    "modelsGoogle Generative AI",
+    "modelsGroq",
+    "modelsHuggingFace",
+    "modelsLM Studio",
+    "modelsMaritalk",
+    "modelsMistralAI",
+    "modelsNVIDIA",
+    "modelsOllama",
+    "modelsOpenAI",
+    "modelsPerplexity",
+    "modelsQianfan",
+    "modelsVertex AI",
   ];
 
   await Promise.all(
-    notVisibleModelSpecsTestIds.map((id) =>
-      expect(page.getByTestId(id)).not.toBeVisible(),
+    visibleModelSpecsTestIds.map((id) =>
+      expect(page.getByTestId(id)).toBeVisible(),
     ),
   );
 
diff --git a/src/frontend/tests/extended/features/flowPage.spec.ts b/src/frontend/tests/extended/features/flowPage.spec.ts
index 965195d1a..b56e41b4c 100644
--- a/src/frontend/tests/extended/features/flowPage.spec.ts
+++ b/src/frontend/tests/extended/features/flowPage.spec.ts
@@ -28,23 +28,14 @@ test.describe("Flow Page tests", () => {
     }
 
     await page.getByTestId("blank-flow").click();
-    await page.waitForSelector('[data-testid="extended-disclosure"]', {
-      timeout: 30000,
-    });
-    await page.getByTestId("extended-disclosure").click();
-    await page.getByPlaceholder("Search").click();
-    await page.getByPlaceholder("Search").fill("custom");
 
     await page.waitForTimeout(1000);
 
-    await page
-      .locator('//*[@id="helpersCustom Component"]')
-      .dragTo(page.locator('//*[@id="react-flow-id"]'));
-    await page.mouse.up();
-    await page.mouse.down();
-    await page.getByTestId("fit_view").click();
-    await page.getByTestId("zoom_out").click();
-    await page.getByTestId("zoom_out").click();
-    await page.getByTestId("zoom_out").click();
+    await page.getByTestId("sidebar-custom-component-button").click();
+
+    await page.getByTitle("fit view").click();
+    await page.getByTitle("zoom out").click();
+    await page.getByTitle("zoom out").click();
+    await page.getByTitle("zoom out").click();
   });
 });
diff --git a/src/frontend/tests/extended/features/integration-side-bar.spec.ts b/src/frontend/tests/extended/features/integration-side-bar.spec.ts
index 99f64efde..1a0586bd4 100644
--- a/src/frontend/tests/extended/features/integration-side-bar.spec.ts
+++ b/src/frontend/tests/extended/features/integration-side-bar.spec.ts
@@ -3,25 +3,23 @@ import { expect, test } from "@playwright/test";
 test("user should be able to see integrations in the sidebar if mvp_components is true", async ({
   page,
 }) => {
-  await page.route("**/api/v1/config", (route) => {
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({
-        feature_flags: {
-          mvp_components: true,
-        },
-      }),
-      headers: {
-        "content-type": "application/json",
-        ...route.request().headers(),
-      },
-    });
-  });
-
+  // await page.route("**/api/v1/config", (route) => {
+  //   route.fulfill({
+  //     status: 200,
+  //     contentType: "application/json",
+  //     body: JSON.stringify({
+  //       feature_flags: {
+  //         mvp_components: true,
+  //       },
+  //     }),
+  //     headers: {
+  //       "content-type": "application/json",
+  //       ...route.request().headers(),
+  //     },
+  //   });
+  // });
   await page.goto("/");
   await page.waitForTimeout(1000);
-
   let modalCount = 0;
   try {
     const modalTitleElement = await page?.getByTestId("modal-title");
@@ -31,66 +29,59 @@ test("user should be able to see integrations in the sidebar if mvp_components i
   } catch (error) {
     modalCount = 0;
   }
-
   while (modalCount === 0) {
     await page.getByText("New Project", { exact: true }).click();
     await page.waitForTimeout(3000);
     modalCount = await page.getByTestId("modal-title")?.count();
   }
-
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
+  await page.waitForSelector('[data-testid="shad-sidebar"]', {
     timeout: 30000,
   });
-
-  await expect(page.getByText("Integrations")).toBeVisible();
+  await expect(page.getByText("Bundles")).toBeVisible();
   await expect(page.getByText("Notion")).toBeVisible();
+  await expect(page.getByText("AssemblyAI")).toBeVisible();
 });
 
 test("user should NOT be able to see integrations in the sidebar if mvp_components is false", async ({
   page,
 }) => {
-  await page.waitForTimeout(4000);
-  await page.route("**/api/v1/config", (route) => {
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({
-        feature_flags: {
-          mvp_components: false,
-        },
-      }),
-      headers: {
-        "content-type": "application/json",
-        ...route.request().headers(),
-      },
-    });
-  });
-
-  await page.goto("/");
-  await page.waitForTimeout(1000);
-
-  let modalCount = 0;
-  try {
-    const modalTitleElement = await page?.getByTestId("modal-title");
-    if (modalTitleElement) {
-      modalCount = await modalTitleElement.count();
-    }
-  } catch (error) {
-    modalCount = 0;
-  }
-
-  while (modalCount === 0) {
-    await page.getByText("New Project", { exact: true }).click();
-    await page.waitForTimeout(3000);
-    modalCount = await page.getByTestId("modal-title")?.count();
-  }
-
-  await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-
-  await expect(page.getByText("Integrations")).not.toBeVisible();
-  await expect(page.getByText("Notion")).not.toBeVisible();
+  // await page.waitForTimeout(4000);
+  // await page.route("**/api/v1/config", (route) => {
+  //   route.fulfill({
+  //     status: 200,
+  //     contentType: "application/json",
+  //     body: JSON.stringify({
+  //       feature_flags: {
+  //         mvp_components: false,
+  //       },
+  //     }),
+  //     headers: {
+  //       "content-type": "application/json",
+  //       ...route.request().headers(),
+  //     },
+  //   });
+  // });
+  // await page.goto("/");
+  // await page.waitForTimeout(1000);
+  // let modalCount = 0;
+  // try {
+  //   const modalTitleElement = await page?.getByTestId("modal-title");
+  //   if (modalTitleElement) {
+  //     modalCount = await modalTitleElement.count();
+  //   }
+  // } catch (error) {
+  //   modalCount = 0;
+  // }
+  // while (modalCount === 0) {
+  //   await page.getByText("New Project", { exact: true }).click();
+  //   await page.waitForTimeout(3000);
+  //   modalCount = await page.getByTestId("modal-title")?.count();
+  // }
+  // await page.getByTestId("blank-flow").click();
+  // await page.waitForSelector('[data-testid="shad-sidebar"]', {
+  //   timeout: 30000,
+  // });
+  // await expect(page.getByText("Integrations")).not.toBeVisible();
+  // await expect(page.getByText("Notion")).not.toBeVisible();
 });
diff --git a/src/frontend/tests/extended/features/langflowShortcuts.spec.ts b/src/frontend/tests/extended/features/langflowShortcuts.spec.ts
index be252f3aa..2e8383211 100644
--- a/src/frontend/tests/extended/features/langflowShortcuts.spec.ts
+++ b/src/frontend/tests/extended/features/langflowShortcuts.spec.ts
@@ -32,13 +32,8 @@ test("LangflowShortcuts", async ({ page }) => {
   });
   await page.getByTestId("blank-flow").click();
 
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("ollama");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("ollama");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/features/sticky-notes.spec.ts b/src/frontend/tests/extended/features/sticky-notes.spec.ts
index 866842f95..a692ba065 100644
--- a/src/frontend/tests/extended/features/sticky-notes.spec.ts
+++ b/src/frontend/tests/extended/features/sticky-notes.spec.ts
@@ -1,4 +1,3 @@
-import { ENABLE_MVPS } from "@/../../src/customization/feature-flags";
 import { expect, test } from "@playwright/test";
 import uaParser from "ua-parser-js";
 
@@ -67,9 +66,6 @@ The future of AI is both exciting and uncertain. As the technology continues to
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
   await page.getByTestId("add_note").click();
 
   await page.waitForTimeout(1000);
diff --git a/src/frontend/tests/extended/features/stop-button-playground.spec.ts b/src/frontend/tests/extended/features/stop-button-playground.spec.ts
index 87d22050f..dd1fb7355 100644
--- a/src/frontend/tests/extended/features/stop-button-playground.spec.ts
+++ b/src/frontend/tests/extended/features/stop-button-playground.spec.ts
@@ -30,27 +30,17 @@ test("User must be able to stop building from inside Playground", async ({
   }
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 1000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("custom");
 
   await page.waitForTimeout(1000);
 
-  await page
-    .locator('//*[@id="helpersCustom Component"]')
-    .dragTo(page.locator('//*[@id="react-flow-id"]'));
-  await page.mouse.up();
-  await page.mouse.down();
-  await page.getByTestId("fit_view").click();
-  await page.getByTestId("zoom_out").click();
-  await page.getByTestId("zoom_out").click();
-  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("sidebar-custom-component-button").click();
+  await page.getByTitle("fit view").click();
+  await page.getByTitle("zoom out").click();
+  await page.getByTitle("zoom out").click();
+  await page.getByTitle("zoom out").click();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/integrations/duckduckgo.spec.ts b/src/frontend/tests/extended/integrations/duckduckgo.spec.ts
index 6f25abbe6..f6b24d064 100644
--- a/src/frontend/tests/extended/integrations/duckduckgo.spec.ts
+++ b/src/frontend/tests/extended/integrations/duckduckgo.spec.ts
@@ -29,12 +29,8 @@ test("user should be able to use duckduckgo search component", async ({
   }
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("duck");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("duck");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-11.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-11.spec.ts
index fbe3e3d54..c598aa254 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-11.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-11.spec.ts
@@ -30,12 +30,8 @@ test("user should be able to use ComposIO without getting api_key error", async
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("composio");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("composio");
 
   await page.waitForTimeout(1000);
 
@@ -83,12 +79,8 @@ test("user should be able to use connect tools", async ({ page }) => {
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("search api");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("search api");
 
   await page.waitForTimeout(1000);
 
@@ -105,8 +97,8 @@ test("user should be able to use connect tools", async ({ page }) => {
 
   await page.waitForTimeout(1000);
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("tool calling agent");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("tool calling agent");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-12.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-12.spec.ts
index 4916f0a92..2deb08e01 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-12.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-12.spec.ts
@@ -30,12 +30,8 @@ test("user should be able to connect RetrieverTool to another components", async
     timeout: 30000,
   });
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("retriever");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("retriever");
 
   await page.waitForTimeout(1000);
 
@@ -62,8 +58,8 @@ test("user should be able to connect RetrieverTool to another components", async
 
   await page.mouse.up();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chroma");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chroma");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-2.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-2.spec.ts
index 3e80aa900..e1dc19213 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-2.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-2.spec.ts
@@ -36,13 +36,9 @@ test("should use webhook component on API", async ({ page }) => {
   }
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("webhook");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("webhook");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-3.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-3.spec.ts
index 6eb09870f..33e0b8165 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-3.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-3.spec.ts
@@ -43,12 +43,8 @@ test("should copy code from playground modal", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
   await page.waitForTimeout(1000);
 
   await page
@@ -62,8 +58,8 @@ test("should copy code from playground modal", async ({ page }) => {
   await page.getByTestId("zoom_out").click();
   await page.getByTestId("zoom_out").click();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat input");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat input");
   await page.waitForTimeout(1000);
 
   await page
@@ -72,8 +68,8 @@ test("should copy code from playground modal", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("openai");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("openai");
   await page.waitForTimeout(1000);
 
   await page.getByTestId("fit_view").click();
@@ -256,16 +252,13 @@ test("playground button should be enabled or disabled", async ({ page }) => {
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
   expect(await page.getByTestId("playground-btn-flow").isDisabled());
 
   expect(await page.getByText("Langflow Chat").isHidden());
 
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("chat output");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("chat output");
 
   await page.waitForTimeout(1000);
 
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-6.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-6.spec.ts
index a53231ebc..609ad44b4 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-6.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-6.spec.ts
@@ -27,18 +27,8 @@ test("should be able to see error when something goes wrong on Code Modal", asyn
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("custom component");
-  await page.waitForTimeout(1000);
-
-  await page
-    .getByTestId("helpersCustom Component")
-    .dragTo(page.locator('//*[@id="react-flow-id"]'));
+  await page.getByTestId("sidebar-custom-component-button").click();
 
   await page.getByTestId("zoom_out").click();
   await page.getByTestId("zoom_out").click();
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
index 145eff8bf..a412e502f 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-7.spec.ts
@@ -28,13 +28,9 @@ test("should be able to select all with ctrl + A on advanced modal", async ({
   });
 
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
 
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("ollama");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("ollama");
   await page.waitForTimeout(1000);
 
   await page
diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-8.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-8.spec.ts
index cc207dafd..90c70c782 100644
--- a/src/frontend/tests/extended/regression/generalBugs-shard-8.spec.ts
+++ b/src/frontend/tests/extended/regression/generalBugs-shard-8.spec.ts
@@ -26,12 +26,8 @@ test("should interact with api request", async ({ page }) => {
     modalCount = await page.getByTestId("modal-title")?.count();
   }
   await page.getByTestId("blank-flow").click();
-  await page.waitForSelector('[data-testid="extended-disclosure"]', {
-    timeout: 30000,
-  });
-  await page.getByTestId("extended-disclosure").click();
-  await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("api request");
+  await page.getByTestId("sidebar-search-input").click();
+  await page.getByTestId("sidebar-search-input").fill("api request");
 
   await page.waitForTimeout(1000);