diff --git a/backend/danswer/configs/chat_configs.py b/backend/danswer/configs/chat_configs.py
index 6e1874b37..d4f5a5e80 100644
--- a/backend/danswer/configs/chat_configs.py
+++ b/backend/danswer/configs/chat_configs.py
@@ -44,7 +44,7 @@ DISABLE_LLM_QUERY_REPHRASE = (
 QUOTE_ALLOWED_ERROR_PERCENT = 0.05
 QA_TIMEOUT = int(os.environ.get("QA_TIMEOUT") or "60")  # 60 seconds
 # Weighting factor between Vector and Keyword Search, 1 for completely vector search
-HYBRID_ALPHA = max(0, min(1, float(os.environ.get("HYBRID_ALPHA") or 0.62)))
+HYBRID_ALPHA = max(0, min(1, float(os.environ.get("HYBRID_ALPHA") or 0.5)))
 HYBRID_ALPHA_KEYWORD = max(
     0, min(1, float(os.environ.get("HYBRID_ALPHA_KEYWORD") or 0.4))
 )
@@ -53,7 +53,7 @@ HYBRID_ALPHA_KEYWORD = max(
 # Content. This is to avoid cases where the Content is very relevant but it may not be clear
 # if the title is separated out. Title is most of a "boost" than a separate field.
 TITLE_CONTENT_RATIO = max(
-    0, min(1, float(os.environ.get("TITLE_CONTENT_RATIO") or 0.20))
+    0, min(1, float(os.environ.get("TITLE_CONTENT_RATIO") or 0.10))
 )
 
 # A list of languages passed to the LLM to rephase the query
diff --git a/backend/danswer/db/swap_index.py b/backend/danswer/db/swap_index.py
index f14a45f29..7d55fb961 100644
--- a/backend/danswer/db/swap_index.py
+++ b/backend/danswer/db/swap_index.py
@@ -1,5 +1,6 @@
 from sqlalchemy.orm import Session
 
+from danswer.configs.constants import KV_REINDEX_KEY
 from danswer.db.connector_credential_pair import get_connector_credential_pairs
 from danswer.db.connector_credential_pair import resync_cc_pair
 from danswer.db.embedding_model import get_current_db_embedding_model
@@ -10,6 +11,7 @@ from danswer.db.index_attempt import cancel_indexing_attempts_past_model
 from danswer.db.index_attempt import (
     count_unique_cc_pairs_with_successful_index_attempts,
 )
+from danswer.dynamic_configs.factory import get_dynamic_config_store
 from danswer.utils.logger import setup_logger
 
 logger = setup_logger()
@@ -52,6 +54,9 @@ def check_index_swap(db_session: Session) -> None:
         )
 
         if cc_pair_count > 0:
+            kv_store = get_dynamic_config_store()
+            kv_store.store(KV_REINDEX_KEY, False)
+
             # Expire jobs for the now past index/embedding model
             cancel_indexing_attempts_past_model(db_session)
 
diff --git a/backend/danswer/document_index/vespa/app_config/schemas/danswer_chunk.sd b/backend/danswer/document_index/vespa/app_config/schemas/danswer_chunk.sd
index bf7772e15..be279f6a6 100644
--- a/backend/danswer/document_index/vespa/app_config/schemas/danswer_chunk.sd
+++ b/backend/danswer/document_index/vespa/app_config/schemas/danswer_chunk.sd
@@ -20,18 +20,10 @@ schema DANSWER_CHUNK_NAME {
         # `semantic_identifier` will be the channel name, but the `title` will be empty
         field title type string {
             indexing: summary | index | attribute
-            match {
-                gram
-                gram-size: 3
-            }
             index: enable-bm25
         }
         field content type string {
             indexing: summary | index
-            match {
-                gram
-                gram-size: 3
-            }
             index: enable-bm25
         }
         # duplication of `content` is far from ideal, but is needed for 
@@ -157,43 +149,45 @@ schema DANSWER_CHUNK_NAME {
             query(query_embedding) tensor<float>(x[VARIABLE_DIM])
         }
 
-        # This must be separate function for normalize_linear to work
-        function vector_score() {
+        function title_vector_score() {
             expression {
-                # If no title, the full vector score comes from the content embedding
-                (query(title_content_ratio) * if(attribute(skip_title), closeness(field, embeddings), closeness(field, title_embedding))) +
-                ((1 - query(title_content_ratio)) * closeness(field, embeddings))
-            }
-        }
-
-        # This must be separate function for normalize_linear to work
-        function keyword_score() {
-            expression {
-                (query(title_content_ratio) * bm25(title)) +
-                ((1 - query(title_content_ratio)) * bm25(content))
+                # If no good matching titles, then it should use the context embeddings rather than having some
+                # irrelevant title have a vector score of 1. This way at least it will be the doc with the highest
+                # matching content score getting the full score
+                max(closeness(field, embeddings), closeness(field, title_embedding))
             }
         }
 
+        # First phase must be vector to allow hits that have no keyword matches
         first-phase {
-            expression: vector_score
+            expression: closeness(field, embeddings)
         }
 
         # Weighted average between Vector Search and BM-25
-        # Each is a weighted average between the Title and Content fields
-        # Finally each doc is boosted by it's user feedback based boost and recency
-        # If any embedding or index field is missing, it just receives a score of 0
-        # Assumptions:
-        # - For a given query + corpus, the BM-25 scores will be relatively similar in distribution
-        #   therefore not normalizing before combining.
-        # - For documents without title, it gets a score of 0 for that and this is ok as documents
-        #   without any title match should be penalized.
         global-phase {
             expression {
                 (
                     # Weighted Vector Similarity Score
-                    (query(alpha) * normalize_linear(vector_score)) +
+                    (
+                        query(alpha) * (
+                            (query(title_content_ratio) * normalize_linear(title_vector_score))
+                            +
+                            ((1 - query(title_content_ratio)) * normalize_linear(closeness(field, embeddings)))
+                        )
+                    )
+
+                    +
+
                     # Weighted Keyword Similarity Score
-                    ((1 - query(alpha)) * normalize_linear(keyword_score))
+                    # Note: for the BM25 Title score, it requires decent stopword removal in the query
+                    # This needs to be the case so there aren't irrelevant titles being normalized to a score of 1
+                    (
+                        (1 - query(alpha)) * (
+                            (query(title_content_ratio) * normalize_linear(bm25(title)))
+                            +
+                            ((1 - query(title_content_ratio)) * normalize_linear(bm25(content)))
+                        )
+                    )
                 )
                 # Boost based on user feedback
                 * document_boost
@@ -208,8 +202,6 @@ schema DANSWER_CHUNK_NAME {
             bm25(content)
             closeness(field, title_embedding)
             closeness(field, embeddings)
-            keyword_score
-            vector_score
             document_boost
             recency_bias
             closest(embeddings)
diff --git a/backend/danswer/document_index/vespa/index.py b/backend/danswer/document_index/vespa/index.py
index f380d53c9..26c34c499 100644
--- a/backend/danswer/document_index/vespa/index.py
+++ b/backend/danswer/document_index/vespa/index.py
@@ -1,12 +1,14 @@
 import concurrent.futures
 import io
 import os
+import re
 import time
 import zipfile
 from dataclasses import dataclass
 from datetime import datetime
 from datetime import timedelta
 from typing import BinaryIO
+from typing import cast
 
 import httpx
 import requests
@@ -14,6 +16,7 @@ import requests
 from danswer.configs.chat_configs import DOC_TIME_DECAY
 from danswer.configs.chat_configs import NUM_RETURNED_HITS
 from danswer.configs.chat_configs import TITLE_CONTENT_RATIO
+from danswer.configs.constants import KV_REINDEX_KEY
 from danswer.document_index.interfaces import DocumentIndex
 from danswer.document_index.interfaces import DocumentInsertionRecord
 from danswer.document_index.interfaces import UpdateRequest
@@ -53,6 +56,7 @@ from danswer.document_index.vespa_constants import VESPA_APPLICATION_ENDPOINT
 from danswer.document_index.vespa_constants import VESPA_DIM_REPLACEMENT_PAT
 from danswer.document_index.vespa_constants import VESPA_TIMEOUT
 from danswer.document_index.vespa_constants import YQL_BASE
+from danswer.dynamic_configs.factory import get_dynamic_config_store
 from danswer.indexing.models import DocMetadataAwareIndexChunk
 from danswer.search.models import IndexFilters
 from danswer.search.models import InferenceChunkUncleaned
@@ -88,6 +92,21 @@ def _create_document_xml_lines(doc_names: list[str | None]) -> str:
     return "\n".join(doc_lines)
 
 
+def add_ngrams_to_schema(schema_content: str) -> str:
+    # Add the match blocks containing gram and gram-size to title and content fields
+    schema_content = re.sub(
+        r"(field title type string \{[^}]*indexing: summary \| index \| attribute)",
+        r"\1\n            match {\n                gram\n                gram-size: 3\n            }",
+        schema_content,
+    )
+    schema_content = re.sub(
+        r"(field content type string \{[^}]*indexing: summary \| index)",
+        r"\1\n            match {\n                gram\n                gram-size: 3\n            }",
+        schema_content,
+    )
+    return schema_content
+
+
 class VespaIndex(DocumentIndex):
     def __init__(self, index_name: str, secondary_index_name: str | None) -> None:
         self.index_name = index_name
@@ -115,6 +134,13 @@ class VespaIndex(DocumentIndex):
 
         doc_lines = _create_document_xml_lines(schema_names)
         services = services_template.replace(DOCUMENT_REPLACEMENT_PAT, doc_lines)
+        kv_store = get_dynamic_config_store()
+
+        needs_reindexing = False
+        try:
+            needs_reindexing = cast(bool, kv_store.load(KV_REINDEX_KEY))
+        except Exception:
+            logger.debug("Could not load the reindexing flag. Using ngrams")
 
         with open(overrides_file, "r") as overrides_f:
             overrides_template = overrides_f.read()
@@ -134,10 +160,10 @@ class VespaIndex(DocumentIndex):
 
         with open(schema_file, "r") as schema_f:
             schema_template = schema_f.read()
-
         schema = schema_template.replace(
             DANSWER_CHUNK_REPLACEMENT_PAT, self.index_name
         ).replace(VESPA_DIM_REPLACEMENT_PAT, str(index_embedding_dim))
+        schema = add_ngrams_to_schema(schema) if needs_reindexing else schema
         zip_dict[f"schemas/{schema_names[0]}.sd"] = schema.encode("utf-8")
 
         if self.secondary_index_name:
diff --git a/backend/danswer/indexing/models.py b/backend/danswer/indexing/models.py
index 317a4404a..c70176b8f 100644
--- a/backend/danswer/indexing/models.py
+++ b/backend/danswer/indexing/models.py
@@ -5,6 +5,7 @@ from pydantic import BaseModel
 from danswer.access.models import DocumentAccess
 from danswer.connectors.models import Document
 from danswer.utils.logger import setup_logger
+from shared_configs.configs import ALT_INDEX_SUFFIX
 from shared_configs.model_server_models import Embedding
 
 if TYPE_CHECKING:
@@ -108,7 +109,9 @@ class EmbeddingModelDetail(BaseModel):
         embedding_model: "EmbeddingModel",
     ) -> "EmbeddingModelDetail":
         return cls(
-            model_name=embedding_model.model_name,
+            # When constructing EmbeddingModel Detail for user-facing flows, strip the
+            # unneeded additional data after the `_`s
+            model_name=embedding_model.model_name.removesuffix(ALT_INDEX_SUFFIX),
             model_dim=embedding_model.model_dim,
             normalize=embedding_model.normalize,
             query_prefix=embedding_model.query_prefix,
diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index 549798adc..7a58722b8 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -38,11 +38,13 @@ from danswer.configs.chat_configs import NUM_POSTPROCESSED_RESULTS
 from danswer.configs.constants import AuthType
 from danswer.configs.constants import KV_REINDEX_KEY
 from danswer.configs.constants import POSTGRES_WEB_APP_NAME
+from danswer.db.connector import check_connectors_exist
 from danswer.db.connector import create_initial_default_connector
 from danswer.db.connector_credential_pair import associate_default_cc_pair
 from danswer.db.connector_credential_pair import get_connector_credential_pairs
 from danswer.db.connector_credential_pair import resync_cc_pair
 from danswer.db.credentials import create_initial_public_credential
+from danswer.db.document import check_docs_exist
 from danswer.db.embedding_model import get_current_db_embedding_model
 from danswer.db.embedding_model import get_secondary_db_embedding_model
 from danswer.db.engine import get_sqlalchemy_engine
@@ -198,21 +200,22 @@ def setup_postgres(db_session: Session) -> None:
 def mark_reindex_flag(db_session: Session) -> None:
     kv_store = get_dynamic_config_store()
     try:
-        kv_store.load(KV_REINDEX_KEY)
+        value = kv_store.load(KV_REINDEX_KEY)
+        logger.debug(f"Re-indexing flag has value {value}")
         return
     except ConfigNotFoundError:
         # Only need to update the flag if it hasn't been set
         pass
 
     # If their first deployment is after the changes, it will
-    # TODO enable this when the other changes go in, need to avoid
+    # enable this when the other changes go in, need to avoid
     # this being set to False, then the user indexes things on the old version
-    # docs_exist = check_docs_exist(db_session)
-    # connectors_exist = check_connectors_exist(db_session)
-    # if docs_exist or connectors_exist:
-    #     kv_store.store(KV_REINDEX_KEY, True)
-    # else:
-    #     kv_store.store(KV_REINDEX_KEY, False)
+    docs_exist = check_docs_exist(db_session)
+    connectors_exist = check_connectors_exist(db_session)
+    if docs_exist or connectors_exist:
+        kv_store.store(KV_REINDEX_KEY, True)
+    else:
+        kv_store.store(KV_REINDEX_KEY, False)
 
 
 def setup_vespa(
diff --git a/backend/danswer/server/manage/search_settings.py b/backend/danswer/server/manage/search_settings.py
index b604c0491..39356521d 100644
--- a/backend/danswer/server/manage/search_settings.py
+++ b/backend/danswer/server/manage/search_settings.py
@@ -26,6 +26,7 @@ from danswer.search.search_settings import update_search_settings
 from danswer.server.manage.models import FullModelVersionResponse
 from danswer.server.models import IdReturn
 from danswer.utils.logger import setup_logger
+from shared_configs.configs import ALT_INDEX_SUFFIX
 
 router = APIRouter(prefix="/search-settings")
 logger = setup_logger()
@@ -55,11 +56,10 @@ def set_new_embedding_model(
 
         embed_model_details.cloud_provider_id = cloud_id
 
+    # account for same model name being indexed with two different configurations
     if embed_model_details.model_name == current_model.model_name:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="New embedding model is the same as the currently active one.",
-        )
+        if not current_model.model_name.endswith(ALT_INDEX_SUFFIX):
+            embed_model_details.model_name += ALT_INDEX_SUFFIX
 
     secondary_model = get_secondary_db_embedding_model(db_session)
 
diff --git a/backend/danswer/server/settings/api.py b/backend/danswer/server/settings/api.py
index f75dc38a9..8dfb07869 100644
--- a/backend/danswer/server/settings/api.py
+++ b/backend/danswer/server/settings/api.py
@@ -3,6 +3,7 @@ from typing import cast
 from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
 from danswer.auth.users import current_admin_user
@@ -55,7 +56,18 @@ def fetch_settings(
     Postgres calls"""
     general_settings = load_settings()
     user_notifications = get_user_notifications(user, db_session)
-    return UserSettings(**general_settings.dict(), notifications=user_notifications)
+
+    try:
+        kv_store = get_dynamic_config_store()
+        needs_reindexing = cast(bool, kv_store.load(KV_REINDEX_KEY))
+    except ConfigNotFoundError:
+        needs_reindexing = False
+
+    return UserSettings(
+        **general_settings.dict(),
+        notifications=user_notifications,
+        needs_reindexing=needs_reindexing
+    )
 
 
 @basic_router.post("/notifications/{notification_id}/dismiss")
@@ -87,8 +99,8 @@ def get_user_notifications(
 
     kv_store = get_dynamic_config_store()
     try:
-        need_index = cast(bool, kv_store.load(KV_REINDEX_KEY))
-        if not need_index:
+        needs_index = cast(bool, kv_store.load(KV_REINDEX_KEY))
+        if not needs_index:
             dismiss_all_notifications(
                 notif_type=NotificationType.REINDEX, db_session=db_session
             )
@@ -99,21 +111,35 @@ def get_user_notifications(
         logger.warning("Could not find reindex flag")
         return []
 
-    reindex_notifs = get_notifications(
-        user=user, notif_type=NotificationType.REINDEX, db_session=db_session
-    )
+    try:
+        # Need a transaction in order to prevent under-counting current notifications
+        db_session.begin()
 
-    if not reindex_notifs:
-        notif = create_notification(
+        reindex_notifs = get_notifications(
             user=user, notif_type=NotificationType.REINDEX, db_session=db_session
         )
-        return [Notification.from_model(notif)]
 
-    if len(reindex_notifs) > 1:
-        logger.error("User has multiple reindex notifications")
+        if not reindex_notifs:
+            notif = create_notification(
+                user=user,
+                notif_type=NotificationType.REINDEX,
+                db_session=db_session,
+            )
+            db_session.flush()
+            db_session.commit()
+            return [Notification.from_model(notif)]
 
-    reindex_notif = reindex_notifs[0]
+        if len(reindex_notifs) > 1:
+            logger.error("User has multiple reindex notifications")
 
-    update_notification_last_shown(notification=reindex_notif, db_session=db_session)
+        reindex_notif = reindex_notifs[0]
+        update_notification_last_shown(
+            notification=reindex_notif, db_session=db_session
+        )
 
-    return [Notification.from_model(reindex_notif)]
+        db_session.commit()
+        return [Notification.from_model(reindex_notif)]
+    except SQLAlchemyError:
+        logger.exception("Error while processing notifications")
+        db_session.rollback()
+        return []
diff --git a/backend/danswer/server/settings/models.py b/backend/danswer/server/settings/models.py
index 5a574fb14..e999e7294 100644
--- a/backend/danswer/server/settings/models.py
+++ b/backend/danswer/server/settings/models.py
@@ -61,3 +61,4 @@ class Settings(BaseModel):
 
 class UserSettings(Settings):
     notifications: list[Notification]
+    needs_reindexing: bool
diff --git a/backend/model_server/encoders.py b/backend/model_server/encoders.py
index 46f66fa8e..623782857 100644
--- a/backend/model_server/encoders.py
+++ b/backend/model_server/encoders.py
@@ -23,6 +23,7 @@ from model_server.constants import DEFAULT_VOYAGE_MODEL
 from model_server.constants import EmbeddingModelTextType
 from model_server.constants import EmbeddingProvider
 from model_server.utils import simple_log_function_time
+from shared_configs.configs import ALT_INDEX_SUFFIX
 from shared_configs.configs import INDEXING_ONLY
 from shared_configs.enums import EmbedTextType
 from shared_configs.enums import RerankerProvider
@@ -283,8 +284,11 @@ def embed_text(
 
     elif model_name is not None:
         prefixed_texts = [f"{prefix}{text}" for text in texts] if prefix else texts
+
+        # strip additional metadata from model name right before constructing from Huggingface
+        stripped_model_name = model_name.removesuffix(ALT_INDEX_SUFFIX)
         local_model = get_embedding_model(
-            model_name=model_name, max_context_length=max_context_length
+            model_name=stripped_model_name, max_context_length=max_context_length
         )
         embeddings_vectors = local_model.encode(
             prefixed_texts, normalize_embeddings=normalize_embeddings
diff --git a/backend/shared_configs/configs.py b/backend/shared_configs/configs.py
index 236379dd8..2311daca5 100644
--- a/backend/shared_configs/configs.py
+++ b/backend/shared_configs/configs.py
@@ -20,6 +20,8 @@ INTENT_MODEL_TAG = "v1.0.3"
 # Bi-Encoder, other details
 DOC_EMBEDDING_CONTEXT_SIZE = 512
 
+# Used to distinguish alternative indices
+ALT_INDEX_SUFFIX = "__danswer_alt_index"
 
 # Used for loading defaults for automatic deployments and dev flows
 # For local, use: mixedbread-ai/mxbai-rerank-xsmall-v1
diff --git a/web/public/Mixedbread.png b/web/public/Mixedbread.png
new file mode 100644
index 000000000..5a2f720ca
Binary files /dev/null and b/web/public/Mixedbread.png differ
diff --git a/web/public/microsoft.png b/web/public/microsoft.png
new file mode 100644
index 000000000..11feffc1d
Binary files /dev/null and b/web/public/microsoft.png differ
diff --git a/web/public/nomic.svg b/web/public/nomic.svg
new file mode 100644
index 000000000..aa32de038
--- /dev/null
+++ b/web/public/nomic.svg
@@ -0,0 +1,8 @@
+
+<svg width="207" height="144" viewBox="0 0 207 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M25.9375 107.812V0H32.1875V143.75H25.9375L7.1875 35.9375V143.75H0.9375V0H7.1875L25.9375 107.812Z" fill="#3C593D"/>
+<path d="M64.0234 137.5C65.7161 137.5 67.1484 136.914 68.3203 135.742C69.6224 134.57 70.2734 133.073 70.2734 131.25V12.5C70.2734 10.8073 69.6224 9.375 68.3203 8.20312C67.1484 6.90104 65.7161 6.25 64.0234 6.25C62.2005 6.25 60.7031 6.90104 59.5312 8.20312C58.3594 9.375 57.7734 10.8073 57.7734 12.5V131.25C57.7734 133.073 58.3594 134.57 59.5312 135.742C60.7031 136.914 62.2005 137.5 64.0234 137.5ZM64.0234 143.75C60.5078 143.75 57.513 142.578 55.0391 140.234C52.6953 137.76 51.5234 134.766 51.5234 131.25V12.5C51.5234 9.11458 52.6953 6.1849 55.0391 3.71094C57.513 1.23698 60.5078 0 64.0234 0C67.4089 0 70.3385 1.23698 72.8125 3.71094C75.2865 6.1849 76.5234 9.11458 76.5234 12.5V131.25C76.5234 134.766 75.2865 137.76 72.8125 140.234C70.3385 142.578 67.4089 143.75 64.0234 143.75Z" fill="#3C593D"/>
+<path d="M131.797 0H138.047V143.75H131.797V25L116.172 87.5L100.547 25V143.75H94.2969V0H100.547L116.172 62.5L131.797 0Z" fill="#3C593D"/>
+<path d="M156.602 143.75V0H162.852V143.75H156.602Z" fill="#3C593D"/>
+<path d="M193.906 143.75C190.391 143.75 187.396 142.578 184.922 140.234C182.578 137.76 181.406 134.766 181.406 131.25V12.5C181.406 9.11458 182.578 6.1849 184.922 3.71094C187.396 1.23698 190.391 0 193.906 0C197.292 0 200.221 1.23698 202.695 3.71094C205.169 6.1849 206.406 9.11458 206.406 12.5V25H200.156V12.5C200.156 10.8073 199.505 9.375 198.203 8.20312C197.031 6.90104 195.599 6.25 193.906 6.25C192.083 6.25 190.586 6.90104 189.414 8.20312C188.242 9.375 187.656 10.8073 187.656 12.5V131.25C187.656 133.073 188.242 134.57 189.414 135.742C190.586 136.914 192.083 137.5 193.906 137.5C195.599 137.5 197.031 136.914 198.203 135.742C199.505 134.57 200.156 133.073 200.156 131.25V118.75H206.406V131.25C206.406 134.766 205.169 137.76 202.695 140.234C200.221 142.578 197.292 143.75 193.906 143.75Z" fill="#3C593D"/>
+</svg>
diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
index 3aa73a98b..c9e4e2be2 100644
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -42,7 +42,7 @@ import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { FiInfo, FiPlus, FiX } from "react-icons/fi";
 import * as Yup from "yup";
-import { FullLLMProvider } from "../models/llm/interfaces";
+import { FullLLMProvider } from "../configuration/llm/interfaces";
 import CollapsibleSection from "./CollapsibleSection";
 import { SuccessfulPersonaUpdateRedirectType } from "./enums";
 import { Persona, StarterMessage } from "./interfaces";
diff --git a/web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx b/web/src/app/admin/configuration/llm/ConfiguredLLMProviderDisplay.tsx
similarity index 100%
rename from web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx
rename to web/src/app/admin/configuration/llm/ConfiguredLLMProviderDisplay.tsx
diff --git a/web/src/app/admin/models/llm/CustomLLMProviderUpdateForm.tsx b/web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
similarity index 100%
rename from web/src/app/admin/models/llm/CustomLLMProviderUpdateForm.tsx
rename to web/src/app/admin/configuration/llm/CustomLLMProviderUpdateForm.tsx
diff --git a/web/src/app/admin/models/llm/LLMConfiguration.tsx b/web/src/app/admin/configuration/llm/LLMConfiguration.tsx
similarity index 100%
rename from web/src/app/admin/models/llm/LLMConfiguration.tsx
rename to web/src/app/admin/configuration/llm/LLMConfiguration.tsx
diff --git a/web/src/app/admin/models/llm/LLMProviderUpdateForm.tsx b/web/src/app/admin/configuration/llm/LLMProviderUpdateForm.tsx
similarity index 100%
rename from web/src/app/admin/models/llm/LLMProviderUpdateForm.tsx
rename to web/src/app/admin/configuration/llm/LLMProviderUpdateForm.tsx
diff --git a/web/src/app/admin/models/llm/constants.ts b/web/src/app/admin/configuration/llm/constants.ts
similarity index 100%
rename from web/src/app/admin/models/llm/constants.ts
rename to web/src/app/admin/configuration/llm/constants.ts
diff --git a/web/src/app/admin/models/llm/interfaces.ts b/web/src/app/admin/configuration/llm/interfaces.ts
similarity index 100%
rename from web/src/app/admin/models/llm/interfaces.ts
rename to web/src/app/admin/configuration/llm/interfaces.ts
diff --git a/web/src/app/admin/models/llm/page.tsx b/web/src/app/admin/configuration/llm/page.tsx
similarity index 100%
rename from web/src/app/admin/models/llm/page.tsx
rename to web/src/app/admin/configuration/llm/page.tsx
diff --git a/web/src/app/admin/configuration/search/UpgradingPage.tsx b/web/src/app/admin/configuration/search/UpgradingPage.tsx
new file mode 100644
index 000000000..270b5ddf2
--- /dev/null
+++ b/web/src/app/admin/configuration/search/UpgradingPage.tsx
@@ -0,0 +1,117 @@
+import { ThreeDotsLoader } from "@/components/Loading";
+import { Modal } from "@/components/Modal";
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import { ConnectorIndexingStatus } from "@/lib/types";
+import { Button, Text, Title } from "@tremor/react";
+import Link from "next/link";
+import { useState } from "react";
+import useSWR, { mutate } from "swr";
+import { ReindexingProgressTable } from "../../../../components/embedding/ReindexingProgressTable";
+import { ErrorCallout } from "@/components/ErrorCallout";
+import {
+  CloudEmbeddingModel,
+  HostedEmbeddingModel,
+} from "../../../../components/embedding/interfaces";
+import { Connector } from "@/lib/connectors/connectors";
+
+export default function UpgradingPage({
+  futureEmbeddingModel,
+}: {
+  futureEmbeddingModel: CloudEmbeddingModel | HostedEmbeddingModel;
+}) {
+  const [isCancelling, setIsCancelling] = useState<boolean>(false);
+
+  const { data: connectors } = useSWR<Connector<any>[]>(
+    "/api/manage/connector",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  const {
+    data: ongoingReIndexingStatus,
+    isLoading: isLoadingOngoingReIndexingStatus,
+  } = useSWR<ConnectorIndexingStatus<any, any>[]>(
+    "/api/manage/admin/connector/indexing-status?secondary_index=true",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  const onCancel = async () => {
+    const response = await fetch("/api/search-settings/cancel-new-embedding", {
+      method: "POST",
+    });
+    if (response.ok) {
+      mutate("/api/search-settings/get-secondary-embedding-model");
+    } else {
+      alert(
+        `Failed to cancel embedding model update - ${await response.text()}`
+      );
+    }
+    setIsCancelling(false);
+  };
+
+  return (
+    <>
+      {isCancelling && (
+        <Modal
+          onOutsideClick={() => setIsCancelling(false)}
+          title="Cancel Embedding Model Switch"
+        >
+          <div>
+            <div>
+              Are you sure you want to cancel?
+              <br />
+              <br />
+              Cancelling will revert to the previous model and all progress will
+              be lost.
+            </div>
+            <div className="flex">
+              <Button onClick={onCancel} className="mt-3 mx-auto" color="green">
+                Confirm
+              </Button>
+            </div>
+          </div>
+        </Modal>
+      )}
+
+      {futureEmbeddingModel && connectors && connectors.length > 0 && (
+        <div>
+          <Title className="mt-8">Current Upgrade Status</Title>
+          <div className="mt-4">
+            <div className="italic text-lg mb-2">
+              Currently in the process of switching to:{" "}
+              {futureEmbeddingModel.model_name}
+            </div>
+
+            <Button
+              color="red"
+              size="xs"
+              className="mt-4"
+              onClick={() => setIsCancelling(true)}
+            >
+              Cancel
+            </Button>
+
+            <Text className="my-4">
+              The table below shows the re-indexing progress of all existing
+              connectors. Once all connectors have been re-indexed successfully,
+              the new model will be used for all search queries. Until then, we
+              will use the old model so that no downtime is necessary during
+              this transition.
+            </Text>
+
+            {isLoadingOngoingReIndexingStatus ? (
+              <ThreeDotsLoader />
+            ) : ongoingReIndexingStatus ? (
+              <ReindexingProgressTable
+                reindexingProgress={ongoingReIndexingStatus}
+              />
+            ) : (
+              <ErrorCallout errorTitle="Failed to fetch re-indexing progress" />
+            )}
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/web/src/app/admin/configuration/search/page.tsx b/web/src/app/admin/configuration/search/page.tsx
new file mode 100644
index 000000000..705ddc9f2
--- /dev/null
+++ b/web/src/app/admin/configuration/search/page.tsx
@@ -0,0 +1,191 @@
+"use client";
+
+import { ThreeDotsLoader } from "@/components/Loading";
+import { AdminPageTitle } from "@/components/admin/Title";
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import { Button, Card, Text, Title } from "@tremor/react";
+import useSWR from "swr";
+import { ModelPreview } from "../../../../components/embedding/ModelSelector";
+import {
+  AVAILABLE_CLOUD_PROVIDERS,
+  HostedEmbeddingModel,
+  CloudEmbeddingModel,
+  AVAILABLE_MODELS,
+} from "@/components/embedding/interfaces";
+
+import { ErrorCallout } from "@/components/ErrorCallout";
+
+export interface EmbeddingDetails {
+  api_key: string;
+  custom_config: any;
+  default_model_id?: number;
+  name: string;
+}
+import { EmbeddingIcon } from "@/components/icons/icons";
+
+import Link from "next/link";
+import { SavedSearchSettings } from "../../embeddings/interfaces";
+import UpgradingPage from "./UpgradingPage";
+import { useContext } from "react";
+import { SettingsContext } from "@/components/settings/SettingsProvider";
+
+function Main() {
+  const settings = useContext(SettingsContext);
+  const {
+    data: currentEmeddingModel,
+    isLoading: isLoadingCurrentModel,
+    error: currentEmeddingModelError,
+  } = useSWR<CloudEmbeddingModel | HostedEmbeddingModel | null>(
+    "/api/search-settings/get-current-embedding-model",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  const { data: searchSettings, isLoading: isLoadingSearchSettings } =
+    useSWR<SavedSearchSettings | null>(
+      "/api/search-settings/get-search-settings",
+      errorHandlingFetcher,
+      { refreshInterval: 5000 } // 5 seconds
+    );
+
+  const {
+    data: futureEmbeddingModel,
+    isLoading: isLoadingFutureModel,
+    error: futureEmeddingModelError,
+  } = useSWR<CloudEmbeddingModel | HostedEmbeddingModel | null>(
+    "/api/search-settings/get-secondary-embedding-model",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  if (
+    isLoadingCurrentModel ||
+    isLoadingFutureModel ||
+    isLoadingSearchSettings
+  ) {
+    return <ThreeDotsLoader />;
+  }
+
+  if (
+    currentEmeddingModelError ||
+    !currentEmeddingModel ||
+    futureEmeddingModelError
+  ) {
+    return <ErrorCallout errorTitle="Failed to fetch embedding model status" />;
+  }
+
+  const currentModelName = currentEmeddingModel?.model_name;
+  const AVAILABLE_CLOUD_PROVIDERS_FLATTENED = AVAILABLE_CLOUD_PROVIDERS.flatMap(
+    (provider) =>
+      provider.embedding_models.map((model) => ({
+        ...model,
+        cloud_provider_id: provider.id,
+        model_name: model.model_name, // Ensure model_name is set for consistency
+      }))
+  );
+
+  const currentModel: CloudEmbeddingModel | HostedEmbeddingModel =
+    AVAILABLE_MODELS.find((model) => model.model_name === currentModelName) ||
+    AVAILABLE_CLOUD_PROVIDERS_FLATTENED.find(
+      (model) => model.model_name === currentEmeddingModel.model_name
+    )!;
+
+  return (
+    <div className="h-screen">
+      {!futureEmbeddingModel ? (
+        <>
+          {settings?.settings.needs_reindexing && (
+            <p className="max-w-3xl">
+              Your search settings are currently out of date! We recommend
+              updating your search settings and re-indexing.
+            </p>
+          )}
+          <Title className="mb-6 mt-8 !text-2xl">Embedding Model</Title>
+
+          {currentModel ? (
+            <ModelPreview model={currentModel} display />
+          ) : (
+            <Title className="mt-8 mb-4">Choose your Embedding Model</Title>
+          )}
+
+          <Title className="mb-2 mt-8 !text-2xl">Post-processing</Title>
+
+          <Card className="!mr-auto mt-8 !w-96">
+            {searchSettings && (
+              <>
+                <div className="px-1 w-full rounded-lg">
+                  <div className="space-y-4">
+                    <div>
+                      <Text className="font-semibold">Reranking Model</Text>
+                      <Text className="text-gray-700">
+                        {searchSettings.rerank_model_name || "Not set"}
+                      </Text>
+                    </div>
+
+                    <div>
+                      <Text className="font-semibold">Results to Rerank</Text>
+                      <Text className="text-gray-700">
+                        {searchSettings.num_rerank}
+                      </Text>
+                    </div>
+
+                    <div>
+                      <Text className="font-semibold">
+                        Multilingual Expansion
+                      </Text>
+                      <Text className="text-gray-700">
+                        {searchSettings.multilingual_expansion.length > 0
+                          ? searchSettings.multilingual_expansion.join(", ")
+                          : "None"}
+                      </Text>
+                    </div>
+
+                    <div>
+                      <Text className="font-semibold">Multipass Indexing</Text>
+                      <Text className="text-gray-700">
+                        {searchSettings.multipass_indexing
+                          ? "Enabled"
+                          : "Disabled"}
+                      </Text>
+                    </div>
+
+                    <div>
+                      <Text className="font-semibold">
+                        Disable Reranking for Streaming
+                      </Text>
+                      <Text className="text-gray-700">
+                        {searchSettings.disable_rerank_for_streaming
+                          ? "Yes"
+                          : "No"}
+                      </Text>
+                    </div>
+                  </div>
+                </div>
+              </>
+            )}
+          </Card>
+
+          <Link href="/admin/embeddings">
+            <Button className="mt-8">Update Search Settings</Button>
+          </Link>
+        </>
+      ) : (
+        <UpgradingPage futureEmbeddingModel={futureEmbeddingModel} />
+      )}
+    </div>
+  );
+}
+
+function Page() {
+  return (
+    <div className="mx-auto container">
+      <AdminPageTitle
+        title="Search Settings"
+        icon={<EmbeddingIcon size={32} className="my-auto" />}
+      />
+      <Main />
+    </div>
+  );
+}
+
+export default Page;
diff --git a/web/src/app/admin/connectors/[connector]/pages/Create.tsx b/web/src/app/admin/connectors/[connector]/pages/Create.tsx
index 11170b4cb..2614a3463 100644
--- a/web/src/app/admin/connectors/[connector]/pages/Create.tsx
+++ b/web/src/app/admin/connectors/[connector]/pages/Create.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, SetStateAction, useEffect } from "react";
+import React, { Dispatch, SetStateAction } from "react";
 import { Formik, Form, Field, FieldArray } from "formik";
 import * as Yup from "yup";
 import { FaPlus } from "react-icons/fa";
diff --git a/web/src/app/admin/embeddings/EmbeddingModelSelectionForm.tsx b/web/src/app/admin/embeddings/EmbeddingModelSelectionForm.tsx
new file mode 100644
index 000000000..ed83c18fb
--- /dev/null
+++ b/web/src/app/admin/embeddings/EmbeddingModelSelectionForm.tsx
@@ -0,0 +1,306 @@
+"use client";
+
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import useSWR, { mutate } from "swr";
+import { Dispatch, SetStateAction, useState } from "react";
+import {
+  CloudEmbeddingProvider,
+  CloudEmbeddingModel,
+  AVAILABLE_CLOUD_PROVIDERS,
+  AVAILABLE_MODELS,
+  INVALID_OLD_MODEL,
+  HostedEmbeddingModel,
+  EmbeddingModelDescriptor,
+} from "../../../components/embedding/interfaces";
+import { Connector } from "@/lib/connectors/connectors";
+import OpenEmbeddingPage from "./pages/OpenEmbeddingPage";
+import CloudEmbeddingPage from "./pages/CloudEmbeddingPage";
+import { ProviderCreationModal } from "./modals/ProviderCreationModal";
+
+import { DeleteCredentialsModal } from "./modals/DeleteCredentialsModal";
+import { SelectModelModal } from "./modals/SelectModelModal";
+import { ChangeCredentialsModal } from "./modals/ChangeCredentialsModal";
+import { ModelSelectionConfirmationModal } from "./modals/ModelSelectionModal";
+import { AlreadyPickedModal } from "./modals/AlreadyPickedModal";
+import { ModelOption } from "../../../components/embedding/ModelSelector";
+import { EMBEDDING_PROVIDERS_ADMIN_URL } from "../configuration/llm/constants";
+
+export interface EmbeddingDetails {
+  api_key: string;
+  custom_config: any;
+  default_model_id?: number;
+  name: string;
+}
+
+export function EmbeddingModelSelection({
+  selectedProvider,
+  currentEmbeddingModel,
+  updateSelectedProvider,
+  modelTab,
+  setModelTab,
+}: {
+  modelTab: "open" | "cloud" | null;
+  setModelTab: Dispatch<SetStateAction<"open" | "cloud" | null>>;
+  currentEmbeddingModel: CloudEmbeddingModel | HostedEmbeddingModel;
+  selectedProvider: CloudEmbeddingModel | HostedEmbeddingModel;
+  updateSelectedProvider: (
+    model: CloudEmbeddingModel | HostedEmbeddingModel
+  ) => void;
+}) {
+  // Cloud Provider based modals
+  const [showTentativeProvider, setShowTentativeProvider] =
+    useState<CloudEmbeddingProvider | null>(null);
+
+  const [showUnconfiguredProvider, setShowUnconfiguredProvider] =
+    useState<CloudEmbeddingProvider | null>(null);
+  const [changeCredentialsProvider, setChangeCredentialsProvider] =
+    useState<CloudEmbeddingProvider | null>(null);
+
+  // Cloud Model based modals
+  const [alreadySelectedModel, setAlreadySelectedModel] =
+    useState<CloudEmbeddingModel | null>(null);
+  const [showTentativeModel, setShowTentativeModel] =
+    useState<CloudEmbeddingModel | null>(null);
+
+  const [showModelInQueue, setShowModelInQueue] =
+    useState<CloudEmbeddingModel | null>(null);
+
+  // Open Model based modals
+  const [showTentativeOpenProvider, setShowTentativeOpenProvider] =
+    useState<HostedEmbeddingModel | null>(null);
+
+  // Enabled / unenabled providers
+  const [newEnabledProviders, setNewEnabledProviders] = useState<string[]>([]);
+  const [newUnenabledProviders, setNewUnenabledProviders] = useState<string[]>(
+    []
+  );
+
+  const [showDeleteCredentialsModal, setShowDeleteCredentialsModal] =
+    useState<boolean>(false);
+  const [showAddConnectorPopup, setShowAddConnectorPopup] =
+    useState<boolean>(false);
+
+  const { data: embeddingProviderDetails } = useSWR<EmbeddingDetails[]>(
+    EMBEDDING_PROVIDERS_ADMIN_URL,
+    errorHandlingFetcher
+  );
+
+  const { data: connectors } = useSWR<Connector<any>[]>(
+    "/api/manage/connector",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  const onConfirmSelection = async (model: EmbeddingModelDescriptor) => {
+    const response = await fetch(
+      "/api/search-settings/set-new-embedding-model",
+      {
+        method: "POST",
+        body: JSON.stringify(model),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    );
+    if (response.ok) {
+      setShowTentativeModel(null);
+      mutate("/api/search-settings/get-secondary-embedding-model");
+      if (!connectors || !connectors.length) {
+        setShowAddConnectorPopup(true);
+      }
+    } else {
+      alert(`Failed to update embedding model - ${await response.text()}`);
+    }
+  };
+
+  const onSelectOpenSource = async (model: HostedEmbeddingModel) => {
+    if (selectedProvider?.model_name === INVALID_OLD_MODEL) {
+      await onConfirmSelection(model);
+    } else {
+      setShowTentativeOpenProvider(model);
+    }
+  };
+
+  const clientsideAddProvider = (provider: CloudEmbeddingProvider) => {
+    const providerName = provider.name;
+    setNewEnabledProviders((newEnabledProviders) => [
+      ...newEnabledProviders,
+      providerName,
+    ]);
+    setNewUnenabledProviders((newUnenabledProviders) =>
+      newUnenabledProviders.filter(
+        (givenProvidername) => givenProvidername != providerName
+      )
+    );
+  };
+
+  const clientsideRemoveProvider = (provider: CloudEmbeddingProvider) => {
+    const providerName = provider.name;
+    setNewEnabledProviders((newEnabledProviders) =>
+      newEnabledProviders.filter(
+        (givenProvidername) => givenProvidername != providerName
+      )
+    );
+    setNewUnenabledProviders((newUnenabledProviders) => [
+      ...newUnenabledProviders,
+      providerName,
+    ]);
+  };
+
+  return (
+    <div className="p-2">
+      {alreadySelectedModel && (
+        <AlreadyPickedModal
+          model={alreadySelectedModel}
+          onClose={() => setAlreadySelectedModel(null)}
+        />
+      )}
+
+      {showTentativeOpenProvider && (
+        <ModelSelectionConfirmationModal
+          selectedModel={showTentativeOpenProvider}
+          isCustom={
+            AVAILABLE_MODELS.find(
+              (model) =>
+                model.model_name === showTentativeOpenProvider.model_name
+            ) === undefined
+          }
+          onConfirm={() => {
+            updateSelectedProvider(showTentativeOpenProvider);
+            setShowTentativeOpenProvider(null);
+          }}
+          onCancel={() => setShowTentativeOpenProvider(null)}
+        />
+      )}
+
+      {showTentativeProvider && (
+        <ProviderCreationModal
+          selectedProvider={showTentativeProvider}
+          onConfirm={() => {
+            setShowTentativeProvider(showUnconfiguredProvider);
+            clientsideAddProvider(showTentativeProvider);
+            if (showModelInQueue) {
+              setShowTentativeModel(showModelInQueue);
+            }
+          }}
+          onCancel={() => {
+            setShowModelInQueue(null);
+            setShowTentativeProvider(null);
+          }}
+        />
+      )}
+      {changeCredentialsProvider && (
+        <ChangeCredentialsModal
+          useFileUpload={changeCredentialsProvider.name == "Google"}
+          onDeleted={() => {
+            clientsideRemoveProvider(changeCredentialsProvider);
+            setChangeCredentialsProvider(null);
+          }}
+          provider={changeCredentialsProvider}
+          onConfirm={() => setChangeCredentialsProvider(null)}
+          onCancel={() => setChangeCredentialsProvider(null)}
+        />
+      )}
+
+      {showTentativeModel && (
+        <SelectModelModal
+          model={showTentativeModel}
+          onConfirm={() => {
+            setShowModelInQueue(null);
+            updateSelectedProvider(showTentativeModel);
+            setShowTentativeModel(null);
+          }}
+          onCancel={() => {
+            setShowModelInQueue(null);
+            setShowTentativeModel(null);
+          }}
+        />
+      )}
+
+      {showDeleteCredentialsModal && (
+        <DeleteCredentialsModal
+          modelProvider={showTentativeProvider!}
+          onConfirm={() => {
+            setShowDeleteCredentialsModal(false);
+          }}
+          onCancel={() => setShowDeleteCredentialsModal(false)}
+        />
+      )}
+
+      <p className=" t mb-4">
+        Select from cloud, self-hosted models, or continue with your current
+        embedding model.
+      </p>
+      <div className="text-sm mr-auto mb-6 divide-x-2 flex">
+        <button
+          onClick={() => setModelTab(null)}
+          className={`mr-4 p-2 font-bold  ${
+            !modelTab
+              ? "rounded bg-background-900 text-text-100 underline"
+              : " hover:underline bg-background-100"
+          }`}
+        >
+          Current
+        </button>
+        <div className="px-2 ">
+          <button
+            onClick={() => setModelTab("cloud")}
+            className={`mx-2 p-2 font-bold  ${
+              modelTab == "cloud"
+                ? "rounded bg-background-900 text-text-100 underline"
+                : " hover:underline bg-background-100"
+            }`}
+          >
+            Cloud-based
+          </button>
+        </div>
+        <div className="px-2 ">
+          <button
+            onClick={() => setModelTab("open")}
+            className={` mx-2 p-2 font-bold  ${
+              modelTab == "open"
+                ? "rounded bg-background-900 text-text-100 underline"
+                : "hover:underline bg-background-100"
+            }`}
+          >
+            Self-hosted
+          </button>
+        </div>
+      </div>
+
+      {modelTab == "open" && (
+        <OpenEmbeddingPage
+          selectedProvider={selectedProvider}
+          onSelectOpenSource={onSelectOpenSource}
+        />
+      )}
+
+      {modelTab == "cloud" && (
+        <CloudEmbeddingPage
+          setShowModelInQueue={setShowModelInQueue}
+          setShowTentativeModel={setShowTentativeModel}
+          currentModel={selectedProvider}
+          setAlreadySelectedModel={setAlreadySelectedModel}
+          embeddingProviderDetails={embeddingProviderDetails}
+          newEnabledProviders={newEnabledProviders}
+          newUnenabledProviders={newUnenabledProviders}
+          setShowTentativeProvider={setShowTentativeProvider}
+          setChangeCredentialsProvider={setChangeCredentialsProvider}
+        />
+      )}
+
+      {!modelTab && (
+        <>
+          <button onClick={() => updateSelectedProvider(currentEmbeddingModel)}>
+            <ModelOption
+              model={currentEmbeddingModel}
+              selected={
+                selectedProvider.model_name == currentEmbeddingModel.model_name
+              }
+            />
+          </button>
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/web/src/app/admin/embeddings/RerankingFormPage.tsx b/web/src/app/admin/embeddings/RerankingFormPage.tsx
new file mode 100644
index 000000000..37bb4c11a
--- /dev/null
+++ b/web/src/app/admin/embeddings/RerankingFormPage.tsx
@@ -0,0 +1,243 @@
+import React, { Dispatch, forwardRef, SetStateAction, useState } from "react";
+import { Formik, Form, FormikProps } from "formik";
+import * as Yup from "yup";
+import { EditingValue } from "@/components/credentials/EditingValue";
+import {
+  RerankerProvider,
+  RerankingDetails,
+  rerankingModels,
+} from "./interfaces";
+import { FiExternalLink } from "react-icons/fi";
+import { CohereIcon, MixedBreadIcon } from "@/components/icons/icons";
+import { Modal } from "@/components/Modal";
+import { Button } from "@tremor/react";
+
+interface RerankingDetailsFormProps {
+  setRerankingDetails: Dispatch<SetStateAction<RerankingDetails>>;
+  currentRerankingDetails: RerankingDetails;
+  originalRerankingDetails: RerankingDetails;
+  modelTab: "open" | "cloud" | null;
+  setModelTab: Dispatch<SetStateAction<"open" | "cloud" | null>>;
+}
+
+const RerankingDetailsForm = forwardRef<
+  FormikProps<RerankingDetails>,
+  RerankingDetailsFormProps
+>(
+  (
+    {
+      setRerankingDetails,
+      originalRerankingDetails,
+      currentRerankingDetails,
+      modelTab,
+      setModelTab,
+    },
+    ref
+  ) => {
+    const [isApiKeyModalOpen, setIsApiKeyModalOpen] = useState(false);
+
+    return (
+      <div className="p-2 rounded-lg max-w-4xl mx-auto">
+        <h2 className="text-2xl font-bold mb-4 text-text-800">
+          Post-processing
+        </h2>
+        <div className="text-sm mr-auto mb-6 divide-x-2 flex">
+          {originalRerankingDetails.rerank_model_name && (
+            <button
+              onClick={() => setModelTab(null)}
+              className={`mx-2 p-2 font-bold  ${
+                !modelTab
+                  ? "rounded bg-background-900 text-text-100 underline"
+                  : " hover:underline bg-background-100"
+              }`}
+            >
+              Current
+            </button>
+          )}
+          <div
+            className={`${originalRerankingDetails.rerank_model_name && "px-2 ml-2"}`}
+          >
+            <button
+              onClick={() => setModelTab("cloud")}
+              className={`mr-2 p-2 font-bold  ${
+                modelTab == "cloud"
+                  ? "rounded bg-background-900 text-text-100 underline"
+                  : " hover:underline bg-background-100"
+              }`}
+            >
+              Cloud-based
+            </button>
+          </div>
+
+          <div className="px-2 ">
+            <button
+              onClick={() => setModelTab("open")}
+              className={` mx-2 p-2 font-bold  ${
+                modelTab == "open"
+                  ? "rounded bg-background-900 text-text-100 underline"
+                  : "hover:underline bg-background-100"
+              }`}
+            >
+              Self-hosted
+            </button>
+          </div>
+        </div>
+
+        <Formik
+          innerRef={ref}
+          initialValues={currentRerankingDetails}
+          validationSchema={Yup.object().shape({
+            rerank_model_name: Yup.string().nullable(),
+            provider_type: Yup.mixed<RerankerProvider>()
+              .nullable()
+              .oneOf(Object.values(RerankerProvider))
+              .optional(),
+            api_key: Yup.string().nullable(),
+            num_rerank: Yup.number().min(1, "Must be at least 1"),
+          })}
+          onSubmit={async (_, { setSubmitting }) => {
+            setSubmitting(false);
+          }}
+          enableReinitialize={true}
+        >
+          {({ values, setFieldValue }) => (
+            <Form className="space-y-6">
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                {(modelTab
+                  ? rerankingModels.filter(
+                      (model) => model.cloud == (modelTab == "cloud")
+                    )
+                  : rerankingModels.filter(
+                      (modelCard) =>
+                        modelCard.modelName ==
+                        originalRerankingDetails.rerank_model_name
+                    )
+                ).map((card) => {
+                  const isSelected =
+                    values.provider_type === card.provider &&
+                    values.rerank_model_name === card.modelName;
+                  return (
+                    <div
+                      key={`${card.provider}-${card.modelName}`}
+                      className={`p-4 border rounded-lg cursor-pointer transition-all duration-200 ${
+                        isSelected
+                          ? "border-blue-500 bg-blue-50 shadow-md"
+                          : "border-gray-200 hover:border-blue-300 hover:shadow-sm"
+                      }`}
+                      onClick={() => {
+                        if (card.provider) {
+                          setIsApiKeyModalOpen(true);
+                        }
+                        setRerankingDetails({
+                          ...values,
+                          provider_type: card.provider!,
+                          rerank_model_name: card.modelName,
+                        });
+                        setFieldValue("provider_type", card.provider);
+                        setFieldValue("rerank_model_name", card.modelName);
+                      }}
+                    >
+                      <div className="flex items-center justify-between mb-3">
+                        <div className="flex items-center">
+                          {card.provider === RerankerProvider.COHERE ? (
+                            <CohereIcon size={24} className="mr-2" />
+                          ) : (
+                            <MixedBreadIcon size={24} className="mr-2" />
+                          )}
+                          <h3 className="font-bold text-lg">
+                            {card.displayName}
+                          </h3>
+                        </div>
+                        {card.link && (
+                          <a
+                            href={card.link}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            onClick={(e) => e.stopPropagation()}
+                            className="text-blue-500 hover:text-blue-700 transition-colors duration-200"
+                          >
+                            <FiExternalLink size={18} />
+                          </a>
+                        )}
+                      </div>
+                      <p className="text-sm text-gray-600 mb-2">
+                        {card.description}
+                      </p>
+                      <div className="text-xs text-gray-500">
+                        {card.cloud ? "Cloud-based" : "Self-hosted"}
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+
+              {isApiKeyModalOpen && (
+                <Modal
+                  onOutsideClick={() => {
+                    Object.keys(originalRerankingDetails).forEach((key) => {
+                      setFieldValue(
+                        key,
+                        originalRerankingDetails[key as keyof RerankingDetails]
+                      );
+                    });
+
+                    setIsApiKeyModalOpen(false);
+                  }}
+                  width="w-[800px]"
+                  title="API Key Configuration"
+                >
+                  <div className="w-full px-4">
+                    <EditingValue
+                      optional={false}
+                      currentValue={values.api_key}
+                      onChange={(value: string | null) => {
+                        setRerankingDetails({ ...values, api_key: value });
+                        setFieldValue("api_key", value);
+                      }}
+                      setFieldValue={setFieldValue}
+                      type="password"
+                      label="Cohere API Key"
+                      name="api_key"
+                    />
+                    <div className="mt-4 flex justify-between">
+                      <Button
+                        onClick={() => {
+                          Object.keys(originalRerankingDetails).forEach(
+                            (key) => {
+                              setFieldValue(
+                                key,
+                                originalRerankingDetails[
+                                  key as keyof RerankingDetails
+                                ]
+                              );
+                            }
+                          );
+
+                          setIsApiKeyModalOpen(false);
+                        }}
+                        color="red"
+                        size="xs"
+                      >
+                        Abandon
+                      </Button>
+                      <Button
+                        onClick={() => setIsApiKeyModalOpen(false)}
+                        color="blue"
+                        size="xs"
+                      >
+                        Update
+                      </Button>
+                    </div>
+                  </div>
+                </Modal>
+              )}
+            </Form>
+          )}
+        </Formik>
+      </div>
+    );
+  }
+);
+
+RerankingDetailsForm.displayName = "RerankingDetailsForm";
+export default RerankingDetailsForm;
diff --git a/web/src/app/admin/embeddings/interfaces.ts b/web/src/app/admin/embeddings/interfaces.ts
new file mode 100644
index 000000000..f42df4e68
--- /dev/null
+++ b/web/src/app/admin/embeddings/interfaces.ts
@@ -0,0 +1,70 @@
+export interface RerankingDetails {
+  rerank_model_name: string | null;
+  provider_type: RerankerProvider | null;
+  api_key: string | null;
+  num_rerank: number;
+}
+
+export enum RerankerProvider {
+  COHERE = "cohere",
+}
+export interface AdvancedDetails {
+  multilingual_expansion: string[];
+  multipass_indexing: boolean;
+  disable_rerank_for_streaming: boolean;
+}
+
+export interface SavedSearchSettings extends RerankingDetails {
+  multilingual_expansion: string[];
+  multipass_indexing: boolean;
+  disable_rerank_for_streaming: boolean;
+}
+
+export interface RerankingModel {
+  provider?: RerankerProvider;
+  modelName: string;
+  displayName: string;
+  description: string;
+  link: string;
+  cloud: boolean;
+}
+
+export const rerankingModels: RerankingModel[] = [
+  {
+    cloud: false,
+    modelName: "mixedbread-ai/mxbai-rerank-xsmall-v1",
+    displayName: "MixedBread XSmall",
+    description: "Fastest, smallest model for basic reranking tasks.",
+    link: "https://huggingface.co/mixedbread-ai/mxbai-rerank-xsmall-v1",
+  },
+  {
+    cloud: false,
+    modelName: "mixedbread-ai/mxbai-rerank-base-v1",
+    displayName: "MixedBread Base",
+    description: "Balanced performance for general reranking needs.",
+    link: "https://huggingface.co/mixedbread-ai/mxbai-rerank-base-v1",
+  },
+  {
+    cloud: false,
+    modelName: "mixedbread-ai/mxbai-rerank-large-v1",
+    displayName: "MixedBread Large",
+    description: "Most powerful model for complex reranking tasks.",
+    link: "https://huggingface.co/mixedbread-ai/mxbai-rerank-large-v1",
+  },
+  {
+    cloud: true,
+    provider: RerankerProvider.COHERE,
+    modelName: "rerank-english-v3.0",
+    displayName: "Cohere English",
+    description: "High-performance English-focused reranking model.",
+    link: "https://docs.cohere.com/docs/rerank",
+  },
+  {
+    cloud: true,
+    provider: RerankerProvider.COHERE,
+    modelName: "rerank-multilingual-v3.0",
+    displayName: "Cohere Multilingual",
+    description: "Powerful multilingual reranking model.",
+    link: "https://docs.cohere.com/docs/rerank",
+  },
+];
diff --git a/web/src/app/admin/models/embedding/modals/AlreadyPickedModal.tsx b/web/src/app/admin/embeddings/modals/AlreadyPickedModal.tsx
similarity index 86%
rename from web/src/app/admin/models/embedding/modals/AlreadyPickedModal.tsx
rename to web/src/app/admin/embeddings/modals/AlreadyPickedModal.tsx
index c8d9430c9..d6e294241 100644
--- a/web/src/app/admin/models/embedding/modals/AlreadyPickedModal.tsx
+++ b/web/src/app/admin/embeddings/modals/AlreadyPickedModal.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Modal } from "@/components/Modal";
 import { Button, Text } from "@tremor/react";
 
-import { CloudEmbeddingModel } from "../components/types";
+import { CloudEmbeddingModel } from "../../../../components/embedding/interfaces";
 
 export function AlreadyPickedModal({
   model,
@@ -13,6 +13,7 @@ export function AlreadyPickedModal({
 }) {
   return (
     <Modal
+      width="max-w-3xl"
       title={`${model.model_name} already chosen`}
       onOutsideClick={onClose}
     >
diff --git a/web/src/app/admin/models/embedding/modals/ChangeCredentialsModal.tsx b/web/src/app/admin/embeddings/modals/ChangeCredentialsModal.tsx
similarity index 88%
rename from web/src/app/admin/models/embedding/modals/ChangeCredentialsModal.tsx
rename to web/src/app/admin/embeddings/modals/ChangeCredentialsModal.tsx
index fa94ba9cc..aeeea06dc 100644
--- a/web/src/app/admin/models/embedding/modals/ChangeCredentialsModal.tsx
+++ b/web/src/app/admin/embeddings/modals/ChangeCredentialsModal.tsx
@@ -2,14 +2,12 @@ import React, { useRef, useState } from "react";
 import { Modal } from "@/components/Modal";
 import { Button, Text, Callout, Subtitle, Divider } from "@tremor/react";
 import { Label, TextFormField } from "@/components/admin/connectors/Field";
-import { CloudEmbeddingProvider } from "../components/types";
+import { CloudEmbeddingProvider } from "../../../../components/embedding/interfaces";
 import {
   EMBEDDING_PROVIDERS_ADMIN_URL,
   LLM_PROVIDERS_ADMIN_URL,
-} from "../../llm/constants";
+} from "../../configuration/llm/constants";
 import { mutate } from "swr";
-import { PopupSpec, usePopup } from "@/components/admin/connectors/Popup";
-import { Field } from "formik";
 
 export function ChangeCredentialsModal({
   provider,
@@ -151,16 +149,25 @@ export function ChangeCredentialsModal({
 
   return (
     <Modal
+      width="max-w-3xl"
       icon={provider.icon}
       title={`Modify your ${provider.name} key`}
       onOutsideClick={onCancel}
     >
       <div className="mb-4">
-        <Subtitle className="mt-4 font-bold text-lg mb-2">
+        <Subtitle className="font-bold text-lg">
           Want to swap out your key?
         </Subtitle>
+        <a
+          href={provider.apiLink}
+          target="_blank"
+          rel="noopener noreferrer"
+          className="underline cursor-pointer mt-2 mb-4"
+        >
+          Visit API
+        </a>
 
-        <div className="flex flex-col gap-y-2">
+        <div className="flex flex-col mt-4 gap-y-2">
           {useFileUpload ? (
             <>
               <Label>Upload JSON File</Label>
@@ -175,9 +182,6 @@ export function ChangeCredentialsModal({
             </>
           ) : (
             <>
-              <div className="flex gap-x-2 items-center">
-                <Label>New API Key</Label>
-              </div>
               <input
                 className={`
                     border 
@@ -186,7 +190,6 @@ export function ChangeCredentialsModal({
                     w-full 
                     py-2 
                     px-3 
-                    mt-1
                     bg-background-emphasis
                 `}
                 value={apiKey}
@@ -195,14 +198,6 @@ export function ChangeCredentialsModal({
               />
             </>
           )}
-          <a
-            href={provider.apiLink}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="underline cursor-pointer"
-          >
-            Visit API
-          </a>
         </div>
 
         {testError && (
@@ -211,13 +206,13 @@ export function ChangeCredentialsModal({
           </Callout>
         )}
 
-        <div className="flex mt-8 justify-between">
+        <div className="flex mt-4 justify-between">
           <Button
             color="blue"
             onClick={() => handleSubmit()}
             disabled={!apiKey}
           >
-            Execute Key Swap
+            Swap Key
           </Button>
         </div>
         <Divider />
diff --git a/web/src/app/admin/models/embedding/modals/DeleteCredentialsModal.tsx b/web/src/app/admin/embeddings/modals/DeleteCredentialsModal.tsx
similarity index 90%
rename from web/src/app/admin/models/embedding/modals/DeleteCredentialsModal.tsx
rename to web/src/app/admin/embeddings/modals/DeleteCredentialsModal.tsx
index b13d8051c..335393060 100644
--- a/web/src/app/admin/models/embedding/modals/DeleteCredentialsModal.tsx
+++ b/web/src/app/admin/embeddings/modals/DeleteCredentialsModal.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Modal } from "@/components/Modal";
 import { Button, Text, Callout } from "@tremor/react";
-import { CloudEmbeddingProvider } from "../components/types";
+import { CloudEmbeddingProvider } from "../../../../components/embedding/interfaces";
 
 export function DeleteCredentialsModal({
   modelProvider,
@@ -14,6 +14,7 @@ export function DeleteCredentialsModal({
 }) {
   return (
     <Modal
+      width="max-w-3xl"
       title={`Nuke ${modelProvider.name} Credentials?`}
       onOutsideClick={onCancel}
     >
diff --git a/web/src/app/admin/models/embedding/modals/ModelSelectionModal.tsx b/web/src/app/admin/embeddings/modals/ModelSelectionModal.tsx
similarity index 91%
rename from web/src/app/admin/models/embedding/modals/ModelSelectionModal.tsx
rename to web/src/app/admin/embeddings/modals/ModelSelectionModal.tsx
index e5918740e..3f59de116 100644
--- a/web/src/app/admin/models/embedding/modals/ModelSelectionModal.tsx
+++ b/web/src/app/admin/embeddings/modals/ModelSelectionModal.tsx
@@ -3,7 +3,7 @@ import { Button, Text, Callout } from "@tremor/react";
 import {
   EmbeddingModelDescriptor,
   HostedEmbeddingModel,
-} from "../components/types";
+} from "../../../../components/embedding/interfaces";
 
 export function ModelSelectionConfirmationModal({
   selectedModel,
@@ -17,7 +17,11 @@ export function ModelSelectionConfirmationModal({
   onCancel: () => void;
 }) {
   return (
-    <Modal title="Update Embedding Model" onOutsideClick={onCancel}>
+    <Modal
+      width="max-w-3xl"
+      title="Update Embedding Model"
+      onOutsideClick={onCancel}
+    >
       <div>
         <div className="mb-4">
           <Text className="text-lg mb-4">
@@ -50,7 +54,7 @@ export function ModelSelectionConfirmationModal({
 
           <div className="flex mt-8">
             <Button className="mx-auto" color="green" onClick={onConfirm}>
-              Confirm
+              Yes
             </Button>
           </div>
         </div>
diff --git a/web/src/app/admin/models/embedding/modals/ProviderCreationModal.tsx b/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
similarity index 97%
rename from web/src/app/admin/models/embedding/modals/ProviderCreationModal.tsx
rename to web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
index 981dfa0ca..3984709c8 100644
--- a/web/src/app/admin/models/embedding/modals/ProviderCreationModal.tsx
+++ b/web/src/app/admin/embeddings/modals/ProviderCreationModal.tsx
@@ -4,8 +4,8 @@ import { Formik, Form, Field } from "formik";
 import * as Yup from "yup";
 import { Label, TextFormField } from "@/components/admin/connectors/Field";
 import { LoadingAnimation } from "@/components/Loading";
-import { CloudEmbeddingProvider } from "../components/types";
-import { EMBEDDING_PROVIDERS_ADMIN_URL } from "../../llm/constants";
+import { CloudEmbeddingProvider } from "../../../../components/embedding/interfaces";
+import { EMBEDDING_PROVIDERS_ADMIN_URL } from "../../configuration/llm/constants";
 import { Modal } from "@/components/Modal";
 
 export function ProviderCreationModal({
@@ -133,6 +133,7 @@ export function ProviderCreationModal({
 
   return (
     <Modal
+      width="max-w-3xl"
       title={`Configure ${selectedProvider.name}`}
       onOutsideClick={onCancel}
       icon={selectedProvider.icon}
diff --git a/web/src/app/admin/models/embedding/modals/SelectModelModal.tsx b/web/src/app/admin/embeddings/modals/SelectModelModal.tsx
similarity index 60%
rename from web/src/app/admin/models/embedding/modals/SelectModelModal.tsx
rename to web/src/app/admin/embeddings/modals/SelectModelModal.tsx
index 721034442..ed84fdc93 100644
--- a/web/src/app/admin/models/embedding/modals/SelectModelModal.tsx
+++ b/web/src/app/admin/embeddings/modals/SelectModelModal.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Modal } from "@/components/Modal";
-import { Button, Text, Callout } from "@tremor/react";
-import { CloudEmbeddingModel } from "../components/types";
+import { Button, Text } from "@tremor/react";
+import { CloudEmbeddingModel } from "../../../../components/embedding/interfaces";
 
 export function SelectModelModal({
   model,
@@ -14,18 +14,21 @@ export function SelectModelModal({
 }) {
   return (
     <Modal
+      width="max-w-3xl"
       onOutsideClick={onCancel}
-      title={`Update model to ${model.model_name}`}
+      title={`Select ${model.model_name}`}
     >
       <div className="mb-4">
         <Text className="text-lg mb-2">
-          You&apos;re about to set your embedding model to {model.model_name}.
+          You&apos;re selecting a new embedding model, {model.model_name}. If
+          you update to this model, you will need to undergo a complete
+          re-indexing.
           <br />
           Are you sure?
         </Text>
         <div className="flex mt-8 justify-end">
           <Button color="green" onClick={onConfirm}>
-            Continue
+            Yes
           </Button>
         </div>
       </div>
diff --git a/web/src/app/admin/embeddings/page.tsx b/web/src/app/admin/embeddings/page.tsx
new file mode 100644
index 000000000..137602fa1
--- /dev/null
+++ b/web/src/app/admin/embeddings/page.tsx
@@ -0,0 +1,18 @@
+"use client";
+
+import { EmbeddingFormProvider } from "@/components/context/EmbeddingContext";
+import EmbeddingSidebar from "../../../components/embedding/EmbeddingSidebar";
+import EmbeddingForm from "./pages/EmbeddingFormPage";
+
+export default function EmbeddingWrapper() {
+  return (
+    <EmbeddingFormProvider>
+      <div className="flex justify-center w-full h-full">
+        <EmbeddingSidebar />
+        <div className="mt-12 w-full max-w-5xl mx-auto">
+          <EmbeddingForm />
+        </div>
+      </div>
+    </EmbeddingFormProvider>
+  );
+}
diff --git a/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
new file mode 100644
index 000000000..c6bd89d11
--- /dev/null
+++ b/web/src/app/admin/embeddings/pages/AdvancedEmbeddingFormPage.tsx
@@ -0,0 +1,191 @@
+import React, { Dispatch, forwardRef, SetStateAction } from "react";
+import { Formik, Form, FormikProps, FieldArray, Field } from "formik";
+import * as Yup from "yup";
+import { EditingValue } from "@/components/credentials/EditingValue";
+import CredentialSubText from "@/components/credentials/CredentialFields";
+import { TrashIcon } from "@/components/icons/icons";
+import { FaPlus } from "react-icons/fa";
+import { AdvancedDetails, RerankingDetails } from "../interfaces";
+
+interface AdvancedEmbeddingFormPageProps {
+  updateAdvancedEmbeddingDetails: (
+    key: keyof AdvancedDetails,
+    value: any
+  ) => void;
+  advancedEmbeddingDetails: AdvancedDetails;
+  setRerankingDetails: Dispatch<SetStateAction<RerankingDetails>>;
+  numRerank: number;
+}
+
+const AdvancedEmbeddingFormPage = forwardRef<
+  FormikProps<any>,
+  AdvancedEmbeddingFormPageProps
+>(
+  (
+    {
+      updateAdvancedEmbeddingDetails,
+      advancedEmbeddingDetails,
+      setRerankingDetails,
+      numRerank,
+    },
+    ref
+  ) => {
+    return (
+      <div className="py-4 rounded-lg max-w-4xl px-4 mx-auto">
+        <h2 className="text-2xl font-bold mb-4 text-text-800">
+          Advanced Configuration
+        </h2>
+        <Formik
+          innerRef={ref}
+          initialValues={{
+            multilingual_expansion:
+              advancedEmbeddingDetails.multilingual_expansion,
+            multipass_indexing: advancedEmbeddingDetails.multipass_indexing,
+            disable_rerank_for_streaming:
+              advancedEmbeddingDetails.disable_rerank_for_streaming,
+            num_rerank: numRerank,
+          }}
+          validationSchema={Yup.object().shape({
+            multilingual_expansion: Yup.array().of(Yup.string()),
+            multipass_indexing: Yup.boolean(),
+            disable_rerank_for_streaming: Yup.boolean(),
+          })}
+          onSubmit={async (_, { setSubmitting }) => {
+            setSubmitting(false);
+          }}
+          enableReinitialize={true}
+        >
+          {({ values, setFieldValue }) => (
+            <Form className="space-y-6">
+              <FieldArray name="multilingual_expansion">
+                {({ push, remove }) => (
+                  <div>
+                    <label
+                      htmlFor="multilingual_expansion"
+                      className="block text-sm font-medium text-text-700 mb-1"
+                    >
+                      Multilingual Expansion
+                      <span className="text-text-500 ml-1">(optional)</span>
+                    </label>
+                    <CredentialSubText>
+                      List of languages for multilingual expansion. Leave empty
+                      for no additional expansion.
+                    </CredentialSubText>
+                    {values.multilingual_expansion.map(
+                      (_: any, index: number) => (
+                        <div key={index} className="w-full flex mb-4">
+                          <Field
+                            name={`multilingual_expansion.${index}`}
+                            className={`w-full bg-input text-sm p-2  border border-border-medium rounded-md
+                                      focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 mr-2`}
+                            onChange={(
+                              e: React.ChangeEvent<HTMLInputElement>
+                            ) => {
+                              const newValue = [
+                                ...values.multilingual_expansion,
+                              ];
+                              newValue[index] = e.target.value;
+                              setFieldValue("multilingual_expansion", newValue);
+                              updateAdvancedEmbeddingDetails(
+                                "multilingual_expansion",
+                                newValue
+                              );
+                            }}
+                            value={values.multilingual_expansion[index]}
+                          />
+
+                          <button
+                            type="button"
+                            onClick={() => {
+                              remove(index);
+                              const newValue =
+                                values.multilingual_expansion.filter(
+                                  (_: any, i: number) => i !== index
+                                );
+                              setFieldValue("multilingual_expansion", newValue);
+                              updateAdvancedEmbeddingDetails(
+                                "multilingual_expansion",
+                                newValue
+                              );
+                            }}
+                            className={`p-2 my-auto bg-input flex-none rounded-md 
+                              bg-red-500 text-white hover:bg-red-600
+                              focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50`}
+                          >
+                            <TrashIcon className="text-white my-auto" />
+                          </button>
+                        </div>
+                      )
+                    )}
+
+                    <button
+                      type="button"
+                      onClick={() => push("")}
+                      className={`mt-2 p-2 bg-rose-500 text-xs text-white rounded-md flex items-center
+                        hover:bg-rose-600 focus:outline-none focus:ring-2 focus:ring-rose-500 focus:ring-opacity-50`}
+                    >
+                      <FaPlus className="mr-2" />
+                      Add Language
+                    </button>
+                  </div>
+                )}
+              </FieldArray>
+
+              <div key="multipass_indexing">
+                <EditingValue
+                  description="Enable multipass indexing for both mini and large chunks."
+                  optional
+                  currentValue={values.multipass_indexing}
+                  onChangeBool={(value: boolean) => {
+                    updateAdvancedEmbeddingDetails("multipass_indexing", value);
+                    setFieldValue("multipass_indexing", value);
+                  }}
+                  setFieldValue={setFieldValue}
+                  type="checkbox"
+                  label="Multipass Indexing"
+                  name="multipassIndexing"
+                />
+              </div>
+              <div key="disable_rerank_for_streaming">
+                <EditingValue
+                  description="Disable reranking for streaming to improve response time."
+                  optional
+                  currentValue={values.disable_rerank_for_streaming}
+                  onChangeBool={(value: boolean) => {
+                    updateAdvancedEmbeddingDetails(
+                      "disable_rerank_for_streaming",
+                      value
+                    );
+                    setFieldValue("disable_rerank_for_streaming", value);
+                  }}
+                  setFieldValue={setFieldValue}
+                  type="checkbox"
+                  label="Disable Rerank for Streaming"
+                  name="disableRerankForStreaming"
+                />
+              </div>
+              <div key="num_rerank">
+                <EditingValue
+                  description="Number of results to rerank"
+                  optional={false}
+                  currentValue={values.num_rerank}
+                  onChangeNumber={(value: number) => {
+                    setRerankingDetails({ ...values, num_rerank: value });
+                    setFieldValue("num_rerank", value);
+                  }}
+                  setFieldValue={setFieldValue}
+                  type="number"
+                  label="Number of Results to Rerank"
+                  name="num_rerank"
+                />
+              </div>
+            </Form>
+          )}
+        </Formik>
+      </div>
+    );
+  }
+);
+
+AdvancedEmbeddingFormPage.displayName = "AdvancedEmbeddingFormPage";
+export default AdvancedEmbeddingFormPage;
diff --git a/web/src/app/admin/embeddings/pages/CloudEmbeddingPage.tsx b/web/src/app/admin/embeddings/pages/CloudEmbeddingPage.tsx
new file mode 100644
index 000000000..acf4c8d78
--- /dev/null
+++ b/web/src/app/admin/embeddings/pages/CloudEmbeddingPage.tsx
@@ -0,0 +1,195 @@
+"use client";
+
+import { Text, Title } from "@tremor/react";
+
+import {
+  CloudEmbeddingProvider,
+  CloudEmbeddingModel,
+  AVAILABLE_CLOUD_PROVIDERS,
+  CloudEmbeddingProviderFull,
+  EmbeddingModelDescriptor,
+} from "../../../../components/embedding/interfaces";
+import { EmbeddingDetails } from "../EmbeddingModelSelectionForm";
+import { FiExternalLink, FiInfo } from "react-icons/fi";
+import { HoverPopup } from "@/components/HoverPopup";
+import { Dispatch, SetStateAction } from "react";
+
+export default function CloudEmbeddingPage({
+  currentModel,
+  embeddingProviderDetails,
+  newEnabledProviders,
+  newUnenabledProviders,
+  setShowTentativeProvider,
+  setChangeCredentialsProvider,
+  setAlreadySelectedModel,
+  setShowTentativeModel,
+  setShowModelInQueue,
+}: {
+  setShowModelInQueue: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  setShowTentativeModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  currentModel: EmbeddingModelDescriptor | CloudEmbeddingModel;
+  setAlreadySelectedModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  newUnenabledProviders: string[];
+  embeddingProviderDetails?: EmbeddingDetails[];
+  newEnabledProviders: string[];
+  setShowTentativeProvider: React.Dispatch<
+    React.SetStateAction<CloudEmbeddingProvider | null>
+  >;
+  setChangeCredentialsProvider: React.Dispatch<
+    React.SetStateAction<CloudEmbeddingProvider | null>
+  >;
+}) {
+  function hasNameInArray(
+    arr: Array<{ name: string }>,
+    searchName: string
+  ): boolean {
+    return arr.some(
+      (item) => item.name.toLowerCase() === searchName.toLowerCase()
+    );
+  }
+
+  let providers: CloudEmbeddingProviderFull[] = AVAILABLE_CLOUD_PROVIDERS.map(
+    (model) => ({
+      ...model,
+      configured:
+        !newUnenabledProviders.includes(model.name) &&
+        (newEnabledProviders.includes(model.name) ||
+          (embeddingProviderDetails &&
+            hasNameInArray(embeddingProviderDetails, model.name))!),
+    })
+  );
+
+  return (
+    <div>
+      <Title className="mt-8">
+        Here are some cloud-based models to choose from.
+      </Title>
+      <Text className="mb-4">
+        These models require API keys and run in the clouds of the respective
+        providers.
+      </Text>
+
+      <div className="gap-4 mt-2 pb-10 flex content-start flex-wrap">
+        {providers.map((provider) => (
+          <div key={provider.name} className="mt-4 w-full">
+            <div className="flex items-center mb-2">
+              {provider.icon({ size: 40 })}
+              <h2 className="ml-2  mt-2 text-xl font-bold">
+                {provider.name} {provider.name == "Cohere" && "(recommended)"}
+              </h2>
+              <HoverPopup
+                mainContent={
+                  <FiInfo className="ml-2 mt-2 cursor-pointer" size={18} />
+                }
+                popupContent={
+                  <div className="text-sm text-text-800 w-52">
+                    <div className="my-auto">{provider.description}</div>
+                  </div>
+                }
+                style="dark"
+              />
+            </div>
+
+            <button
+              onClick={() => {
+                if (!provider.configured) {
+                  setShowTentativeProvider(provider);
+                } else {
+                  setChangeCredentialsProvider(provider);
+                }
+              }}
+              className="mb-2  hover:underline text-sm cursor-pointer"
+            >
+              {provider.configured ? "Modify API key" : "Provide API key"}
+            </button>
+            <div className="flex flex-wrap gap-4">
+              {provider.embedding_models.map((model) => (
+                <CloudModelCard
+                  key={model.model_name}
+                  model={model}
+                  provider={provider}
+                  currentModel={currentModel}
+                  setAlreadySelectedModel={setAlreadySelectedModel}
+                  setShowTentativeModel={setShowTentativeModel}
+                  setShowModelInQueue={setShowModelInQueue}
+                  setShowTentativeProvider={setShowTentativeProvider}
+                />
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+export function CloudModelCard({
+  model,
+  provider,
+  currentModel,
+  setAlreadySelectedModel,
+  setShowTentativeModel,
+  setShowModelInQueue,
+  setShowTentativeProvider,
+}: {
+  model: CloudEmbeddingModel;
+  provider: CloudEmbeddingProviderFull;
+  currentModel: EmbeddingModelDescriptor | CloudEmbeddingModel;
+  setAlreadySelectedModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  setShowTentativeModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  setShowModelInQueue: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
+  setShowTentativeProvider: React.Dispatch<
+    React.SetStateAction<CloudEmbeddingProvider | null>
+  >;
+}) {
+  const enabled = model.model_name === currentModel.model_name;
+
+  return (
+    <div
+      className={`p-4 w-96 border rounded-lg transition-all duration-200 ${
+        enabled
+          ? "border-blue-500 bg-blue-50 shadow-md"
+          : "border-gray-300 hover:border-blue-300 hover:shadow-sm"
+      } ${!provider.configured && "opacity-80 hover:opacity-100"}`}
+    >
+      <div className="flex items-center justify-between mb-3">
+        <h3 className="font-bold text-lg">{model.model_name}</h3>
+        <a
+          href={provider.website}
+          target="_blank"
+          rel="noopener noreferrer"
+          onClick={(e) => e.stopPropagation()}
+          className="text-blue-500 hover:text-blue-700 transition-colors duration-200"
+        >
+          <FiExternalLink size={18} />
+        </a>
+      </div>
+      <p className="text-sm text-gray-600 mb-2">{model.description}</p>
+      <div className="text-xs text-gray-500 mb-2">
+        ${model.pricePerMillion}/M tokens
+      </div>
+      <div className="mt-3">
+        <button
+          className={`w-full p-2 rounded-lg text-sm ${
+            enabled
+              ? "bg-background-125 border border-border cursor-not-allowed"
+              : "bg-background border border-border hover:bg-hover cursor-pointer"
+          }`}
+          onClick={() => {
+            if (enabled) {
+              setAlreadySelectedModel(model);
+            } else if (provider.configured) {
+              setShowTentativeModel(model);
+            } else {
+              setShowModelInQueue(model);
+              setShowTentativeProvider(provider);
+            }
+          }}
+          disabled={enabled}
+        >
+          {enabled ? "Selected Model" : "Select Model"}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
new file mode 100644
index 000000000..c156dad5c
--- /dev/null
+++ b/web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx
@@ -0,0 +1,431 @@
+"use client";
+import { usePopup } from "@/components/admin/connectors/Popup";
+import { HealthCheckBanner } from "@/components/health/healthcheck";
+
+import { EmbeddingModelSelection } from "../EmbeddingModelSelectionForm";
+import { useEffect, useState } from "react";
+import { Button, Card, Text } from "@tremor/react";
+import { ArrowLeft, ArrowRight, WarningCircle } from "@phosphor-icons/react";
+import {
+  CloudEmbeddingModel,
+  EmbeddingModelDescriptor,
+  HostedEmbeddingModel,
+} from "../../../../components/embedding/interfaces";
+import { errorHandlingFetcher } from "@/lib/fetcher";
+import { ErrorCallout } from "@/components/ErrorCallout";
+import useSWR, { mutate } from "swr";
+import { ThreeDotsLoader } from "@/components/Loading";
+import AdvancedEmbeddingFormPage from "./AdvancedEmbeddingFormPage";
+import {
+  AdvancedDetails,
+  RerankingDetails,
+  SavedSearchSettings,
+} from "../interfaces";
+import RerankingDetailsForm from "../RerankingFormPage";
+import { useEmbeddingFormContext } from "@/components/context/EmbeddingContext";
+import { Modal } from "@/components/Modal";
+
+export default function EmbeddingForm() {
+  const { formStep, nextFormStep, prevFormStep } = useEmbeddingFormContext();
+  const { popup, setPopup } = usePopup();
+
+  const [advancedEmbeddingDetails, setAdvancedEmbeddingDetails] =
+    useState<AdvancedDetails>({
+      disable_rerank_for_streaming: false,
+      multilingual_expansion: [],
+      multipass_indexing: true,
+    });
+
+  const [rerankingDetails, setRerankingDetails] = useState<RerankingDetails>({
+    api_key: "",
+    num_rerank: 0,
+    provider_type: null,
+    rerank_model_name: "",
+  });
+
+  const updateAdvancedEmbeddingDetails = (
+    key: keyof AdvancedDetails,
+    value: any
+  ) => {
+    setAdvancedEmbeddingDetails((values) => ({ ...values, [key]: value }));
+  };
+
+  async function updateSearchSettings(searchSettings: SavedSearchSettings) {
+    const response = await fetch(
+      "/api/search-settings/update-search-settings",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          ...searchSettings,
+        }),
+      }
+    );
+    return response;
+  }
+
+  const updateSelectedProvider = (
+    model: CloudEmbeddingModel | HostedEmbeddingModel
+  ) => {
+    setSelectedProvider(model);
+  };
+  const [displayPoorModelName, setDisplayPoorModelName] = useState(true);
+  const [showPoorModel, setShowPoorModel] = useState(false);
+  const [modelTab, setModelTab] = useState<"open" | "cloud" | null>(null);
+
+  const {
+    data: currentEmbeddingModel,
+    isLoading: isLoadingCurrentModel,
+    error: currentEmbeddingModelError,
+  } = useSWR<CloudEmbeddingModel | HostedEmbeddingModel | null>(
+    "/api/search-settings/get-current-embedding-model",
+    errorHandlingFetcher,
+    { refreshInterval: 5000 } // 5 seconds
+  );
+
+  const [selectedProvider, setSelectedProvider] = useState<
+    CloudEmbeddingModel | HostedEmbeddingModel | null
+  >(currentEmbeddingModel!);
+
+  const { data: searchSettings, isLoading: isLoadingSearchSettings } =
+    useSWR<SavedSearchSettings | null>(
+      "/api/search-settings/get-search-settings",
+      errorHandlingFetcher,
+      { refreshInterval: 5000 } // 5 seconds
+    );
+
+  useEffect(() => {
+    if (searchSettings) {
+      setAdvancedEmbeddingDetails({
+        disable_rerank_for_streaming:
+          searchSettings.disable_rerank_for_streaming,
+        multilingual_expansion: searchSettings.multilingual_expansion,
+        multipass_indexing: searchSettings.multipass_indexing,
+      });
+      setRerankingDetails({
+        api_key: searchSettings.api_key,
+        num_rerank: searchSettings.num_rerank,
+        provider_type: searchSettings.provider_type,
+        rerank_model_name: searchSettings.rerank_model_name,
+      });
+    }
+  }, [searchSettings]);
+
+  const originalRerankingDetails = searchSettings
+    ? {
+        api_key: searchSettings.api_key,
+        num_rerank: searchSettings.num_rerank,
+        provider_type: searchSettings.provider_type,
+        rerank_model_name: searchSettings.rerank_model_name,
+      }
+    : {
+        api_key: "",
+        num_rerank: 0,
+        provider_type: null,
+        rerank_model_name: "",
+      };
+
+  useEffect(() => {
+    if (currentEmbeddingModel) {
+      setSelectedProvider(currentEmbeddingModel);
+    }
+  }, [currentEmbeddingModel]);
+
+  useEffect(() => {
+    if (currentEmbeddingModel) {
+      setSelectedProvider(currentEmbeddingModel);
+    }
+  }, [currentEmbeddingModel]);
+  if (!selectedProvider) {
+    return <ThreeDotsLoader />;
+  }
+  if (currentEmbeddingModelError || !currentEmbeddingModel) {
+    return <ErrorCallout errorTitle="Failed to fetch embedding model status" />;
+  }
+
+  const updateSearch = async () => {
+    let values: SavedSearchSettings = {
+      ...rerankingDetails,
+      ...advancedEmbeddingDetails,
+    };
+    const response = await updateSearchSettings(values);
+    if (response.ok) {
+      setPopup({
+        message: "Updated search settings succesffuly",
+        type: "success",
+      });
+      mutate("/api/search-settings/get-search-settings");
+      return true;
+    } else {
+      setPopup({ message: "Failed to update search settings", type: "error" });
+      return false;
+    }
+  };
+
+  const onConfirm = async () => {
+    let newModel: EmbeddingModelDescriptor;
+
+    if ("cloud_provider_name" in selectedProvider) {
+      // This is a CloudEmbeddingModel
+      newModel = {
+        ...selectedProvider,
+        model_name: selectedProvider.model_name,
+        cloud_provider_name: selectedProvider.cloud_provider_name,
+      };
+    } else {
+      // This is an EmbeddingModelDescriptor
+      newModel = {
+        ...selectedProvider,
+        model_name: selectedProvider.model_name!,
+        description: "",
+        cloud_provider_name: null,
+      };
+    }
+
+    const response = await fetch(
+      "/api/search-settings/set-new-embedding-model",
+      {
+        method: "POST",
+        body: JSON.stringify(newModel),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    );
+    if (response.ok) {
+      setPopup({
+        message: "Changed provider suceessfully. Redirecing to embedding page",
+        type: "success",
+      });
+      mutate("/api/search-settings/get-secondary-embedding-model");
+      setTimeout(() => {
+        window.open("/admin/configuration/search", "_self");
+      }, 2000);
+    } else {
+      setPopup({ message: "Failed to update embedding model", type: "error" });
+
+      alert(`Failed to update embedding model - ${await response.text()}`);
+    }
+  };
+
+  const needsReIndex =
+    currentEmbeddingModel != selectedProvider ||
+    searchSettings?.multipass_indexing !=
+      advancedEmbeddingDetails.multipass_indexing;
+
+  const ReIndxingButton = () => {
+    return (
+      <div className="flex mx-auto gap-x-1 ml-auto items-center">
+        <button
+          className="enabled:cursor-pointer disabled:bg-accent/50 disabled:cursor-not-allowed bg-accent flex gap-x-1 items-center text-white py-2.5 px-3.5 text-sm font-regular rounded-sm"
+          onClick={async () => {
+            const updated = await updateSearch();
+            if (updated) {
+              await onConfirm();
+            }
+          }}
+        >
+          Re-index
+        </button>
+        <div className="relative group">
+          <WarningCircle
+            className="text-text-800 cursor-help"
+            size={20}
+            weight="fill"
+          />
+          <div className="absolute z-10 invisible group-hover:visible bg-background-800 text-text-200 text-sm rounded-md shadow-md p-2 right-0 mt-1 w-64">
+            <p className="font-semibold mb-2">Needs re-indexing due to:</p>
+            <ul className="list-disc pl-5">
+              {currentEmbeddingModel != selectedProvider && (
+                <li>Changed embedding provider</li>
+              )}
+              {searchSettings?.multipass_indexing !=
+                advancedEmbeddingDetails.multipass_indexing && (
+                <li>Multipass indexing modification</li>
+              )}
+            </ul>
+          </div>
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <div className="mx-auto mb-8 w-full">
+      {popup}
+
+      <div className="mb-4">
+        <HealthCheckBanner />
+      </div>
+      <div className="mx-auto max-w-4xl">
+        {formStep == 0 && (
+          <>
+            <h2 className="text-2xl font-bold mb-4 text-text-800">
+              Select an Embedding Model
+            </h2>
+            <Text className="mb-4">
+              Note that updating the backing model will require a complete
+              re-indexing of all documents across every connected source. This
+              is taken care of in the background so that the system can continue
+              to be used, but depending on the size of the corpus, this could
+              take hours or days. You can monitor the progress of the
+              re-indexing on this page while the models are being switched.
+            </Text>
+            <Card>
+              <EmbeddingModelSelection
+                setModelTab={setModelTab}
+                modelTab={modelTab}
+                selectedProvider={selectedProvider}
+                currentEmbeddingModel={currentEmbeddingModel}
+                updateSelectedProvider={updateSelectedProvider}
+              />
+            </Card>
+            <div className="mt-4 flex w-full justify-end">
+              <button
+                className="enabled:cursor-pointer disabled:cursor-not-allowed disabled:bg-blue-200 bg-blue-400 flex gap-x-1 items-center text-white py-2.5 px-3.5 text-sm font-regular rounded-sm"
+                onClick={() => {
+                  if (
+                    selectedProvider.model_name.includes("e5") &&
+                    displayPoorModelName
+                  ) {
+                    setDisplayPoorModelName(false);
+                    setShowPoorModel(true);
+                  } else {
+                    nextFormStep();
+                  }
+                }}
+              >
+                Continue
+                <ArrowRight />
+              </button>
+            </div>
+          </>
+        )}
+        {showPoorModel && (
+          <Modal
+            onOutsideClick={() => setShowPoorModel(false)}
+            width="max-w-3xl"
+            title={`Are you sure you want to select ${selectedProvider.model_name}?`}
+          >
+            <>
+              <div className="text-lg">
+                {selectedProvider.model_name} is a low-performance model.
+                <br />
+                We recommend the following alternatives.
+                <li>OpenAI for cloud-based</li>
+                <li>Nomic for self-hosted</li>
+              </div>
+              <div className="flex mt-4 justify-between">
+                <Button color="green" onClick={() => setShowPoorModel(false)}>
+                  Cancel update
+                </Button>
+                <Button
+                  onClick={() => {
+                    setShowPoorModel(false);
+                    nextFormStep();
+                  }}
+                >
+                  Continue with {selectedProvider.model_name}
+                </Button>
+              </div>
+            </>
+          </Modal>
+        )}
+
+        {formStep == 1 && (
+          <>
+            <Card>
+              <RerankingDetailsForm
+                setModelTab={setModelTab}
+                modelTab={
+                  originalRerankingDetails.rerank_model_name
+                    ? modelTab
+                    : modelTab || "cloud"
+                }
+                currentRerankingDetails={rerankingDetails}
+                originalRerankingDetails={originalRerankingDetails}
+                setRerankingDetails={setRerankingDetails}
+              />
+            </Card>
+
+            <div className={` mt-4 w-full grid grid-cols-3`}>
+              <button
+                className="border-border-dark mr-auto border flex gap-x-1 items-center text-text p-2.5 text-sm font-regular rounded-sm "
+                onClick={() => prevFormStep()}
+              >
+                <ArrowLeft />
+                Previous
+              </button>
+
+              {needsReIndex ? (
+                <ReIndxingButton />
+              ) : (
+                <button
+                  className="enabled:cursor-pointer ml-auto disabled:bg-accent/50 disabled:cursor-not-allowed bg-accent flex mx-auto gap-x-1 items-center text-white py-2.5 px-3.5 text-sm font-regular rounded-sm"
+                  onClick={async () => {
+                    updateSearch();
+                  }}
+                >
+                  Update Search
+                </button>
+              )}
+
+              <div className="flex w-full justify-end">
+                <button
+                  className={`enabled:cursor-pointer enabled:hover:underline disabled:cursor-not-allowed mt-auto enabled:text-text-600 disabled:text-text-400 ml-auto flex gap-x-1 items-center py-2.5 px-3.5 text-sm font-regular rounded-sm`}
+                  // disabled={!isFormValid}
+                  onClick={() => {
+                    nextFormStep();
+                  }}
+                >
+                  Advanced
+                  <ArrowRight />
+                </button>
+              </div>
+            </div>
+          </>
+        )}
+        {formStep == 2 && (
+          <>
+            <Card>
+              <AdvancedEmbeddingFormPage
+                numRerank={rerankingDetails.num_rerank}
+                setRerankingDetails={setRerankingDetails}
+                advancedEmbeddingDetails={advancedEmbeddingDetails}
+                updateAdvancedEmbeddingDetails={updateAdvancedEmbeddingDetails}
+              />
+            </Card>
+
+            <div className={`mt-4 grid  grid-cols-3 w-full `}>
+              <button
+                className={`border-border-dark border mr-auto flex gap-x-1 
+                  items-center text-text py-2.5 px-3.5 text-sm font-regular rounded-sm`}
+                onClick={() => prevFormStep()}
+              >
+                <ArrowLeft />
+                Previous
+              </button>
+
+              {needsReIndex ? (
+                <ReIndxingButton />
+              ) : (
+                <button
+                  className="enabled:cursor-pointer ml-auto disabled:bg-accent/50 
+                    disabled:cursor-not-allowed bg-accent flex mx-auto gap-x-1 items-center 
+                    text-white py-2.5 px-3.5 text-sm font-regular rounded-sm"
+                  onClick={async () => {
+                    updateSearch();
+                  }}
+                >
+                  Update Search
+                </button>
+              )}
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/app/admin/embeddings/pages/OpenEmbeddingPage.tsx b/web/src/app/admin/embeddings/pages/OpenEmbeddingPage.tsx
new file mode 100644
index 000000000..2e28ce8e4
--- /dev/null
+++ b/web/src/app/admin/embeddings/pages/OpenEmbeddingPage.tsx
@@ -0,0 +1,69 @@
+"use client";
+import { Button, Card, Text } from "@tremor/react";
+import { ModelSelector } from "../../../../components/embedding/ModelSelector";
+import {
+  AVAILABLE_MODELS,
+  CloudEmbeddingModel,
+  HostedEmbeddingModel,
+} from "../../../../components/embedding/interfaces";
+import { CustomModelForm } from "../../../../components/embedding/CustomModelForm";
+import { useState } from "react";
+import { Title } from "@tremor/react";
+export default function OpenEmbeddingPage({
+  onSelectOpenSource,
+  selectedProvider,
+}: {
+  onSelectOpenSource: (model: HostedEmbeddingModel) => Promise<void>;
+  selectedProvider: HostedEmbeddingModel | CloudEmbeddingModel;
+}) {
+  const [configureModel, setConfigureModel] = useState(false);
+  return (
+    <div>
+      <Title className="mt-8">
+        Here are some locally-hosted models to choose from.
+      </Title>
+      <Text className="mb-4">
+        These models can be used without any API keys, and can leverage a GPU
+        for faster inference.
+      </Text>
+      <ModelSelector
+        modelOptions={AVAILABLE_MODELS}
+        setSelectedModel={onSelectOpenSource}
+        currentEmbeddingModel={selectedProvider}
+      />
+
+      <Text className="mt-6">
+        Alternatively, (if you know what you&apos;re doing) you can specify a{" "}
+        <a target="_blank" href="https://www.sbert.net/" className="text-link">
+          SentenceTransformers
+        </a>
+        -compatible model of your choice below. The rough list of supported
+        models can be found{" "}
+        <a
+          target="_blank"
+          href="https://huggingface.co/models?library=sentence-transformers&sort=trending"
+          className="text-link"
+        >
+          here
+        </a>
+        .
+        <br />
+        <b>NOTE:</b> not all models listed will work with Danswer, since some
+        have unique interfaces or special requirements. If in doubt, reach out
+        to the Danswer team.
+      </Text>
+      {!configureModel && (
+        <Button onClick={() => setConfigureModel(true)} className="mt-4">
+          Configure custom model
+        </Button>
+      )}
+      {configureModel && (
+        <div className="w-full flex">
+          <Card className="mt-4 2xl:w-4/6 mx-auto">
+            <CustomModelForm onSubmit={onSelectOpenSource} />
+          </Card>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/web/src/app/admin/models/embedding/CloudEmbeddingPage.tsx b/web/src/app/admin/models/embedding/CloudEmbeddingPage.tsx
deleted file mode 100644
index db0388a21..000000000
--- a/web/src/app/admin/models/embedding/CloudEmbeddingPage.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-"use client";
-
-import { Text, Title } from "@tremor/react";
-
-import {
-  CloudEmbeddingProvider,
-  CloudEmbeddingModel,
-  AVAILABLE_CLOUD_PROVIDERS,
-  CloudEmbeddingProviderFull,
-  EmbeddingModelDescriptor,
-} from "./components/types";
-import { EmbeddingDetails } from "./page";
-import { FiInfo } from "react-icons/fi";
-import { HoverPopup } from "@/components/HoverPopup";
-import { Dispatch, SetStateAction } from "react";
-
-export default function CloudEmbeddingPage({
-  currentModel,
-  embeddingProviderDetails,
-  newEnabledProviders,
-  newUnenabledProviders,
-  setShowTentativeProvider,
-  setChangeCredentialsProvider,
-  setAlreadySelectedModel,
-  setShowTentativeModel,
-  setShowModelInQueue,
-}: {
-  setShowModelInQueue: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
-  setShowTentativeModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
-  currentModel: EmbeddingModelDescriptor | CloudEmbeddingModel;
-  setAlreadySelectedModel: Dispatch<SetStateAction<CloudEmbeddingModel | null>>;
-  newUnenabledProviders: string[];
-  embeddingProviderDetails?: EmbeddingDetails[];
-  newEnabledProviders: string[];
-  selectedModel: CloudEmbeddingProvider;
-
-  // create modal functions
-
-  setShowTentativeProvider: React.Dispatch<
-    React.SetStateAction<CloudEmbeddingProvider | null>
-  >;
-  setChangeCredentialsProvider: React.Dispatch<
-    React.SetStateAction<CloudEmbeddingProvider | null>
-  >;
-}) {
-  function hasNameInArray(
-    arr: Array<{ name: string }>,
-    searchName: string
-  ): boolean {
-    return arr.some(
-      (item) => item.name.toLowerCase() === searchName.toLowerCase()
-    );
-  }
-
-  let providers: CloudEmbeddingProviderFull[] = [];
-  AVAILABLE_CLOUD_PROVIDERS.forEach((model, ind) => {
-    let temporary_model: CloudEmbeddingProviderFull = {
-      ...model,
-      configured:
-        !newUnenabledProviders.includes(model.name) &&
-        (newEnabledProviders.includes(model.name) ||
-          (embeddingProviderDetails &&
-            hasNameInArray(embeddingProviderDetails, model.name))!),
-    };
-    providers.push(temporary_model);
-  });
-
-  return (
-    <div>
-      <Title className="mt-8">
-        Here are some cloud-based models to choose from.
-      </Title>
-      <Text className="mb-4">
-        They require API keys and run in the clouds of the respective providers.
-      </Text>
-
-      <div className="gap-4 mt-2 pb-10 flex content-start flex-wrap">
-        {providers.map((provider, ind) => (
-          <div
-            key={ind}
-            className="p-4 border border-border rounded-lg shadow-md bg-hover-light w-96 flex flex-col"
-          >
-            <div className="font-bold text-text-900 text-lg items-center py-1 gap-x-2 flex">
-              {provider.icon({ size: 40 })}
-              <p className="my-auto">{provider.name}</p>
-              <button
-                onClick={() => {
-                  setShowTentativeProvider(provider);
-                }}
-                className="cursor-pointer ml-auto"
-              >
-                <a className="my-auto hover:underline cursor-pointer">
-                  <HoverPopup
-                    mainContent={
-                      <FiInfo className="cusror-pointer" size={20} />
-                    }
-                    popupContent={
-                      <div className="text-sm text-text-800 w-52 flex">
-                        <div className="flex mx-auto">
-                          <div className="my-auto">{provider.description}</div>
-                        </div>
-                      </div>
-                    }
-                    direction="left-top"
-                    style="dark"
-                  />
-                </a>
-              </button>
-            </div>
-
-            <div>
-              {provider.embedding_models.map((model, index) => {
-                const enabled = model.model_name == currentModel.model_name;
-
-                return (
-                  <div
-                    key={index}
-                    className={`p-3 my-2 border-2 border-border-medium border-opacity-40 rounded-md rounded cursor-pointer  
-                    ${
-                      !provider.configured
-                        ? "opacity-80 hover:opacity-100"
-                        : enabled
-                          ? "bg-background-stronger"
-                          : "hover:bg-background-strong"
-                    }`}
-                    onClick={() => {
-                      if (enabled) {
-                        setAlreadySelectedModel(model);
-                      } else if (provider.configured) {
-                        setShowTentativeModel(model);
-                      } else {
-                        setShowModelInQueue(model);
-                        setShowTentativeProvider(provider);
-                      }
-                    }}
-                  >
-                    <div className="flex justify-between">
-                      <div className="font-medium text-sm">
-                        {model.model_name}
-                      </div>
-                      <p className="text-sm flex-none">
-                        ${model.pricePerMillion}/M tokens
-                      </p>
-                    </div>
-                    <div className="text-sm text-gray-600">
-                      {model.description}
-                    </div>
-                  </div>
-                );
-              })}
-            </div>
-            <button
-              onClick={() => {
-                if (!provider.configured) {
-                  setShowTentativeProvider(provider);
-                } else {
-                  setChangeCredentialsProvider(provider);
-                }
-              }}
-              className="hover:underline mb-1 text-sm mr-auto cursor-pointer"
-            >
-              {provider.configured && "Modify credentials"}
-            </button>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/web/src/app/admin/models/embedding/OpenEmbeddingPage.tsx b/web/src/app/admin/models/embedding/OpenEmbeddingPage.tsx
deleted file mode 100644
index 0777a4e38..000000000
--- a/web/src/app/admin/models/embedding/OpenEmbeddingPage.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-"use client";
-import { Card, Text } from "@tremor/react";
-import { ModelSelector } from "./components/ModelSelector";
-import { AVAILABLE_MODELS, HostedEmbeddingModel } from "./components/types";
-import { CustomModelForm } from "./components/CustomModelForm";
-
-export default function OpenEmbeddingPage({
-  onSelectOpenSource,
-  currentModelName,
-}: {
-  currentModelName: string;
-  onSelectOpenSource: (model: HostedEmbeddingModel) => Promise<void>;
-}) {
-  return (
-    <div>
-      <ModelSelector
-        modelOptions={AVAILABLE_MODELS.filter(
-          (modelOption) => modelOption.model_name !== currentModelName
-        )}
-        setSelectedModel={onSelectOpenSource}
-      />
-
-      <Text className="mt-6">
-        Alternatively, (if you know what you&apos;re doing) you can specify a{" "}
-        <a target="_blank" href="https://www.sbert.net/" className="text-link">
-          SentenceTransformers
-        </a>
-        -compatible model of your choice below. The rough list of supported
-        models can be found{" "}
-        <a
-          target="_blank"
-          href="https://huggingface.co/models?library=sentence-transformers&sort=trending"
-          className="text-link"
-        >
-          here
-        </a>
-        .
-        <br />
-        <b>NOTE:</b> not all models listed will work with Danswer, since some
-        have unique interfaces or special requirements. If in doubt, reach out
-        to the Danswer team.
-      </Text>
-
-      <div className="w-full flex">
-        <Card className="mt-4 2xl:w-4/6 mx-auto">
-          <CustomModelForm onSubmit={onSelectOpenSource} />
-        </Card>
-      </div>
-    </div>
-  );
-}
diff --git a/web/src/app/admin/models/embedding/components/ModelSelector.tsx b/web/src/app/admin/models/embedding/components/ModelSelector.tsx
deleted file mode 100644
index 2819fa5ce..000000000
--- a/web/src/app/admin/models/embedding/components/ModelSelector.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { EmbeddingModelDescriptor, HostedEmbeddingModel } from "./types";
-import { FiStar } from "react-icons/fi";
-
-export function ModelPreview({ model }: { model: EmbeddingModelDescriptor }) {
-  return (
-    <div
-      className={
-        "p-2 border border-border rounded shadow-md bg-hover-light w-96 flex flex-col"
-      }
-    >
-      <div className="font-bold text-lg flex">{model.model_name}</div>
-      <div className="text-sm mt-1 mx-1">
-        {model.description
-          ? model.description
-          : "Custom model—no description is available."}
-      </div>
-    </div>
-  );
-}
-
-export function ModelOption({
-  model,
-  onSelect,
-}: {
-  model: HostedEmbeddingModel;
-  onSelect?: (model: HostedEmbeddingModel) => void;
-}) {
-  return (
-    <div
-      className={
-        "p-2 border border-border rounded shadow-md bg-hover-light w-96 flex flex-col"
-      }
-    >
-      <div className="font-bold text-lg flex">
-        {model.isDefault && <FiStar className="my-auto mr-1 text-accent" />}
-        {model.model_name}
-      </div>
-      <div className="text-sm mt-1 mx-1">
-        {model.description
-          ? model.description
-          : "Custom model—no description is available."}
-      </div>
-      {model.link && (
-        <a
-          target="_blank"
-          href={model.link}
-          className="text-xs text-link mx-1 mt-1"
-        >
-          See More Details
-        </a>
-      )}
-      {onSelect && (
-        <div
-          className={`
-            m-auto 
-            flex 
-            mt-3
-            mb-1 
-            w-fit 
-            p-2 
-            rounded-lg
-            bg-background
-            border
-            border-border
-            cursor-pointer
-            hover:bg-hover
-            text-sm
-            mt-auto`}
-          onClick={() => onSelect(model)}
-        >
-          Select Model
-        </div>
-      )}
-    </div>
-  );
-}
-
-export function ModelSelector({
-  modelOptions,
-  setSelectedModel,
-}: {
-  modelOptions: HostedEmbeddingModel[];
-  setSelectedModel: (model: HostedEmbeddingModel) => void;
-}) {
-  return (
-    <div>
-      <div className="flex flex-wrap gap-4">
-        {modelOptions.map((modelOption) => (
-          <ModelOption
-            key={modelOption.model_name}
-            model={modelOption}
-            onSelect={setSelectedModel}
-          />
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/web/src/app/admin/models/embedding/page.tsx b/web/src/app/admin/models/embedding/page.tsx
deleted file mode 100644
index 45ae9d6ce..000000000
--- a/web/src/app/admin/models/embedding/page.tsx
+++ /dev/null
@@ -1,536 +0,0 @@
-"use client";
-
-import { ThreeDotsLoader } from "@/components/Loading";
-import { AdminPageTitle } from "@/components/admin/Title";
-import { errorHandlingFetcher } from "@/lib/fetcher";
-import { Button, Text, Title } from "@tremor/react";
-import useSWR, { mutate } from "swr";
-import { ModelPreview } from "./components/ModelSelector";
-import { useState } from "react";
-import { ReindexingProgressTable } from "./components/ReindexingProgressTable";
-import { Modal } from "@/components/Modal";
-import {
-  CloudEmbeddingProvider,
-  CloudEmbeddingModel,
-  AVAILABLE_CLOUD_PROVIDERS,
-  AVAILABLE_MODELS,
-  INVALID_OLD_MODEL,
-  HostedEmbeddingModel,
-  EmbeddingModelDescriptor,
-} from "./components/types";
-import { ErrorCallout } from "@/components/ErrorCallout";
-import { ConnectorIndexingStatus } from "@/lib/types";
-import { Connector } from "@/lib/connectors/connectors";
-import Link from "next/link";
-import OpenEmbeddingPage from "./OpenEmbeddingPage";
-import CloudEmbeddingPage from "./CloudEmbeddingPage";
-import { ProviderCreationModal } from "./modals/ProviderCreationModal";
-
-import { DeleteCredentialsModal } from "./modals/DeleteCredentialsModal";
-import { SelectModelModal } from "./modals/SelectModelModal";
-import { ChangeCredentialsModal } from "./modals/ChangeCredentialsModal";
-import { ModelSelectionConfirmationModal } from "./modals/ModelSelectionModal";
-import { EMBEDDING_PROVIDERS_ADMIN_URL } from "../llm/constants";
-import { AlreadyPickedModal } from "./modals/AlreadyPickedModal";
-
-export interface EmbeddingDetails {
-  api_key: string;
-  custom_config: any;
-  default_model_id?: number;
-  name: string;
-}
-import { EmbeddingIcon, PackageIcon } from "@/components/icons/icons";
-
-function Main() {
-  const [openToggle, setOpenToggle] = useState(true);
-
-  // Cloud Provider based modals
-  const [showTentativeProvider, setShowTentativeProvider] =
-    useState<CloudEmbeddingProvider | null>(null);
-  const [showUnconfiguredProvider, setShowUnconfiguredProvider] =
-    useState<CloudEmbeddingProvider | null>(null);
-  const [changeCredentialsProvider, setChangeCredentialsProvider] =
-    useState<CloudEmbeddingProvider | null>(null);
-
-  // Cloud Model based modals
-  const [alreadySelectedModel, setAlreadySelectedModel] =
-    useState<CloudEmbeddingModel | null>(null);
-  const [showTentativeModel, setShowTentativeModel] =
-    useState<CloudEmbeddingModel | null>(null);
-
-  const [showModelInQueue, setShowModelInQueue] =
-    useState<CloudEmbeddingModel | null>(null);
-
-  // Open Model based modals
-  const [showTentativeOpenProvider, setShowTentativeOpenProvider] =
-    useState<HostedEmbeddingModel | null>(null);
-
-  // Enabled / unenabled providers
-  const [newEnabledProviders, setNewEnabledProviders] = useState<string[]>([]);
-  const [newUnenabledProviders, setNewUnenabledProviders] = useState<string[]>(
-    []
-  );
-
-  const [showDeleteCredentialsModal, setShowDeleteCredentialsModal] =
-    useState<boolean>(false);
-  const [isCancelling, setIsCancelling] = useState<boolean>(false);
-  const [showAddConnectorPopup, setShowAddConnectorPopup] =
-    useState<boolean>(false);
-
-  const {
-    data: currentEmeddingModel,
-    isLoading: isLoadingCurrentModel,
-    error: currentEmeddingModelError,
-  } = useSWR<CloudEmbeddingModel | HostedEmbeddingModel | null>(
-    "/api/search-settings/get-current-embedding-model",
-    errorHandlingFetcher,
-    { refreshInterval: 5000 } // 5 seconds
-  );
-
-  const { data: embeddingProviderDetails } = useSWR<EmbeddingDetails[]>(
-    EMBEDDING_PROVIDERS_ADMIN_URL,
-    errorHandlingFetcher
-  );
-
-  const {
-    data: futureEmbeddingModel,
-    isLoading: isLoadingFutureModel,
-    error: futureEmeddingModelError,
-  } = useSWR<CloudEmbeddingModel | HostedEmbeddingModel | null>(
-    "/api/search-settings/get-secondary-embedding-model",
-    errorHandlingFetcher,
-    { refreshInterval: 5000 } // 5 seconds
-  );
-  const {
-    data: ongoingReIndexingStatus,
-    isLoading: isLoadingOngoingReIndexingStatus,
-  } = useSWR<ConnectorIndexingStatus<any, any>[]>(
-    "/api/manage/admin/connector/indexing-status?secondary_index=true",
-    errorHandlingFetcher,
-    { refreshInterval: 5000 } // 5 seconds
-  );
-  const { data: connectors } = useSWR<Connector<any>[]>(
-    "/api/manage/connector",
-    errorHandlingFetcher,
-    { refreshInterval: 5000 } // 5 seconds
-  );
-
-  const onConfirm = async (
-    model: CloudEmbeddingModel | HostedEmbeddingModel
-  ) => {
-    let newModel: EmbeddingModelDescriptor;
-
-    if ("cloud_provider_name" in model) {
-      // This is a CloudEmbeddingModel
-      newModel = {
-        ...model,
-        model_name: model.model_name,
-        cloud_provider_name: model.cloud_provider_name,
-        // cloud_provider_id: model.cloud_provider_id || 0,
-      };
-    } else {
-      // This is an EmbeddingModelDescriptor
-      newModel = {
-        ...model,
-        model_name: model.model_name!,
-        description: "",
-        cloud_provider_name: null,
-      };
-    }
-
-    const response = await fetch(
-      "/api/search-settings/set-new-embedding-model",
-      {
-        method: "POST",
-        body: JSON.stringify(newModel),
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    );
-    if (response.ok) {
-      setShowTentativeOpenProvider(null);
-      setShowTentativeModel(null);
-      mutate("/api/search-settings/get-secondary-embedding-model");
-      if (!connectors || !connectors.length) {
-        setShowAddConnectorPopup(true);
-      }
-    } else {
-      alert(`Failed to update embedding model - ${await response.text()}`);
-    }
-  };
-
-  const onCancel = async () => {
-    const response = await fetch("/api/search-settings/cancel-new-embedding", {
-      method: "POST",
-    });
-    if (response.ok) {
-      setShowTentativeModel(null);
-      mutate("/api/search-settings/get-secondary-embedding-model");
-    } else {
-      alert(
-        `Failed to cancel embedding model update - ${await response.text()}`
-      );
-    }
-    setIsCancelling(false);
-  };
-
-  if (isLoadingCurrentModel || isLoadingFutureModel) {
-    return <ThreeDotsLoader />;
-  }
-
-  if (
-    currentEmeddingModelError ||
-    !currentEmeddingModel ||
-    futureEmeddingModelError
-  ) {
-    return <ErrorCallout errorTitle="Failed to fetch embedding model status" />;
-  }
-
-  const onConfirmSelection = async (model: EmbeddingModelDescriptor) => {
-    const response = await fetch(
-      "/api/search-settings/set-new-embedding-model",
-      {
-        method: "POST",
-        body: JSON.stringify(model),
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    );
-    if (response.ok) {
-      setShowTentativeModel(null);
-      mutate("/api/search-settings/get-secondary-embedding-model");
-      if (!connectors || !connectors.length) {
-        setShowAddConnectorPopup(true);
-      }
-    } else {
-      alert(`Failed to update embedding model - ${await response.text()}`);
-    }
-  };
-
-  const currentModelName = currentEmeddingModel?.model_name;
-  const AVAILABLE_CLOUD_PROVIDERS_FLATTENED = AVAILABLE_CLOUD_PROVIDERS.flatMap(
-    (provider) =>
-      provider.embedding_models.map((model) => ({
-        ...model,
-        cloud_provider_id: provider.id,
-        model_name: model.model_name, // Ensure model_name is set for consistency
-      }))
-  );
-
-  const currentModel: CloudEmbeddingModel | HostedEmbeddingModel =
-    AVAILABLE_MODELS.find((model) => model.model_name === currentModelName) ||
-    AVAILABLE_CLOUD_PROVIDERS_FLATTENED.find(
-      (model) => model.model_name === currentEmeddingModel.model_name
-    )!;
-  // ||
-  // fillOutEmeddingModelDescriptor(currentEmeddingModel);
-
-  const onSelectOpenSource = async (model: HostedEmbeddingModel) => {
-    if (currentEmeddingModel?.model_name === INVALID_OLD_MODEL) {
-      await onConfirmSelection(model);
-    } else {
-      setShowTentativeOpenProvider(model);
-    }
-  };
-
-  const selectedModel = AVAILABLE_CLOUD_PROVIDERS[0];
-  const clientsideAddProvider = (provider: CloudEmbeddingProvider) => {
-    const providerName = provider.name;
-    setNewEnabledProviders((newEnabledProviders) => [
-      ...newEnabledProviders,
-      providerName,
-    ]);
-    setNewUnenabledProviders((newUnenabledProviders) =>
-      newUnenabledProviders.filter(
-        (givenProvidername) => givenProvidername != providerName
-      )
-    );
-  };
-
-  const clientsideRemoveProvider = (provider: CloudEmbeddingProvider) => {
-    const providerName = provider.name;
-    setNewEnabledProviders((newEnabledProviders) =>
-      newEnabledProviders.filter(
-        (givenProvidername) => givenProvidername != providerName
-      )
-    );
-    setNewUnenabledProviders((newUnenabledProviders) => [
-      ...newUnenabledProviders,
-      providerName,
-    ]);
-  };
-
-  return (
-    <div className="h-screen">
-      <Text>
-        These deep learning models are used to generate vector representations
-        of your documents, which then power Danswer&apos;s search.
-      </Text>
-
-      {alreadySelectedModel && (
-        <AlreadyPickedModal
-          model={alreadySelectedModel}
-          onClose={() => setAlreadySelectedModel(null)}
-        />
-      )}
-
-      {showTentativeOpenProvider && (
-        <ModelSelectionConfirmationModal
-          selectedModel={showTentativeOpenProvider}
-          isCustom={
-            AVAILABLE_MODELS.find(
-              (model) =>
-                model.model_name === showTentativeOpenProvider.model_name
-            ) === undefined
-          }
-          onConfirm={() => onConfirm(showTentativeOpenProvider)}
-          onCancel={() => setShowTentativeOpenProvider(null)}
-        />
-      )}
-
-      {showTentativeProvider && (
-        <ProviderCreationModal
-          selectedProvider={showTentativeProvider}
-          onConfirm={() => {
-            setShowTentativeProvider(showUnconfiguredProvider);
-            clientsideAddProvider(showTentativeProvider);
-            if (showModelInQueue) {
-              setShowTentativeModel(showModelInQueue);
-            }
-          }}
-          onCancel={() => {
-            setShowModelInQueue(null);
-            setShowTentativeProvider(null);
-          }}
-        />
-      )}
-      {changeCredentialsProvider && (
-        <ChangeCredentialsModal
-          // setPopup={setPopup}
-          useFileUpload={changeCredentialsProvider.name == "Google"}
-          onDeleted={() => {
-            clientsideRemoveProvider(changeCredentialsProvider);
-            setChangeCredentialsProvider(null);
-          }}
-          provider={changeCredentialsProvider}
-          onConfirm={() => setChangeCredentialsProvider(null)}
-          onCancel={() => setChangeCredentialsProvider(null)}
-        />
-      )}
-
-      {showTentativeModel && (
-        <SelectModelModal
-          model={showTentativeModel}
-          onConfirm={() => {
-            setShowModelInQueue(null);
-            onConfirm(showTentativeModel);
-          }}
-          onCancel={() => {
-            setShowModelInQueue(null);
-            setShowTentativeModel(null);
-          }}
-        />
-      )}
-
-      {showDeleteCredentialsModal && (
-        <DeleteCredentialsModal
-          modelProvider={showTentativeProvider!}
-          onConfirm={() => {
-            setShowDeleteCredentialsModal(false);
-          }}
-          onCancel={() => setShowDeleteCredentialsModal(false)}
-        />
-      )}
-
-      {currentModel ? (
-        <>
-          <Title className="mt-8 mb-2">Current Embedding Model</Title>
-          <ModelPreview model={currentModel} />
-        </>
-      ) : (
-        <Title className="mt-8 mb-4">Choose your Embedding Model</Title>
-      )}
-
-      {!(futureEmbeddingModel && connectors && connectors.length > 0) && (
-        <>
-          <Title className="mt-8">Switch your Embedding Model</Title>
-          <Text className="mb-4">
-            Note that updating the backing model will require a complete
-            re-indexing of all documents across every connected source. This is
-            taken care of in the background so that the system can continue to
-            be used, but depending on the size of the corpus, this could take
-            hours or days. You can monitor the progress of the re-indexing on
-            this page while the models are being switched.
-          </Text>
-
-          <div className="mt-8 text-sm mr-auto mb-12 divide-x-2 flex">
-            <button
-              onClick={() => setOpenToggle(true)}
-              className={` mx-2 p-2 font-bold  ${
-                openToggle
-                  ? "rounded bg-background-900 text-text-100 underline"
-                  : "hover:underline"
-              }`}
-            >
-              Self-hosted
-            </button>
-            <div className="px-2 ">
-              <button
-                onClick={() => setOpenToggle(false)}
-                className={`mx-2 p-2 font-bold  ${
-                  !openToggle
-                    ? "rounded bg-background-900 text-text-100 underline"
-                    : " hover:underline"
-                }`}
-              >
-                Cloud-based
-              </button>
-            </div>
-          </div>
-        </>
-      )}
-
-      {!showAddConnectorPopup &&
-        !futureEmbeddingModel &&
-        (openToggle ? (
-          <OpenEmbeddingPage
-            onSelectOpenSource={onSelectOpenSource}
-            currentModelName={currentModelName!}
-          />
-        ) : (
-          <CloudEmbeddingPage
-            setShowModelInQueue={setShowModelInQueue}
-            setShowTentativeModel={setShowTentativeModel}
-            currentModel={currentModel}
-            setAlreadySelectedModel={setAlreadySelectedModel}
-            embeddingProviderDetails={embeddingProviderDetails}
-            newEnabledProviders={newEnabledProviders}
-            newUnenabledProviders={newUnenabledProviders}
-            setShowTentativeProvider={setShowTentativeProvider}
-            selectedModel={selectedModel}
-            setChangeCredentialsProvider={setChangeCredentialsProvider}
-          />
-        ))}
-
-      {openToggle && (
-        <>
-          {showAddConnectorPopup && (
-            <Modal>
-              <div>
-                <div>
-                  <b className="text-base">
-                    Embedding model successfully selected
-                  </b>{" "}
-                  🙌
-                  <br />
-                  <br />
-                  To complete the initial setup, let&apos;s add a connector!
-                  <br />
-                  <br />
-                  Connectors are the way that Danswer gets data from your
-                  organization&apos;s various data sources. Once setup,
-                  we&apos;ll automatically sync data from your apps and docs
-                  into Danswer, so you can search all through all of them in one
-                  place.
-                </div>
-                <div className="flex">
-                  <Link
-                    className="mx-auto mt-2 w-fit"
-                    href="/admin/add-connector"
-                  >
-                    <Button className="mt-3 mx-auto" size="xs">
-                      Add Connector
-                    </Button>
-                  </Link>
-                </div>
-              </div>
-            </Modal>
-          )}
-
-          {isCancelling && (
-            <Modal
-              onOutsideClick={() => setIsCancelling(false)}
-              title="Cancel Embedding Model Switch"
-            >
-              <div>
-                <div>
-                  Are you sure you want to cancel?
-                  <br />
-                  <br />
-                  Cancelling will revert to the previous model and all progress
-                  will be lost.
-                </div>
-                <div className="flex">
-                  <Button
-                    onClick={onCancel}
-                    className="mt-3 mx-auto"
-                    color="green"
-                  >
-                    Confirm
-                  </Button>
-                </div>
-              </div>
-            </Modal>
-          )}
-        </>
-      )}
-
-      {futureEmbeddingModel && connectors && connectors.length > 0 && (
-        <div>
-          <Title className="mt-8">Current Upgrade Status</Title>
-          <div className="mt-4">
-            <div className="italic text-lg mb-2">
-              Currently in the process of switching to:{" "}
-              {futureEmbeddingModel.model_name}
-            </div>
-            {/* <ModelOption model={futureEmbeddingModel} /> */}
-
-            <Button
-              color="red"
-              size="xs"
-              className="mt-4"
-              onClick={() => setIsCancelling(true)}
-            >
-              Cancel
-            </Button>
-
-            <Text className="my-4">
-              The table below shows the re-indexing progress of all existing
-              connectors. Once all connectors have been re-indexed successfully,
-              the new model will be used for all search queries. Until then, we
-              will use the old model so that no downtime is necessary during
-              this transition.
-            </Text>
-
-            {isLoadingOngoingReIndexingStatus ? (
-              <ThreeDotsLoader />
-            ) : ongoingReIndexingStatus ? (
-              <ReindexingProgressTable
-                reindexingProgress={ongoingReIndexingStatus}
-              />
-            ) : (
-              <ErrorCallout errorTitle="Failed to fetch re-indexing progress" />
-            )}
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
-
-function Page() {
-  return (
-    <div className="mx-auto container">
-      <AdminPageTitle
-        title="Embedding"
-        icon={<EmbeddingIcon size={32} className="my-auto" />}
-      />
-
-      <Main />
-    </div>
-  );
-}
-
-export default Page;
diff --git a/web/src/app/admin/settings/interfaces.ts b/web/src/app/admin/settings/interfaces.ts
index 910403f1a..247bfd09d 100644
--- a/web/src/app/admin/settings/interfaces.ts
+++ b/web/src/app/admin/settings/interfaces.ts
@@ -3,6 +3,16 @@ export interface Settings {
   search_page_enabled: boolean;
   default_page: "search" | "chat";
   maximum_chat_retention_days: number | null;
+  notifications: Notification[];
+  needs_reindexing: boolean;
+}
+
+export interface Notification {
+  id: number;
+  notif_type: string;
+  dismissed: boolean;
+  last_shown: string;
+  first_shown: string;
 }
 
 export interface EnterpriseSettings {
diff --git a/web/src/app/chat/modal/SetDefaultModelModal.tsx b/web/src/app/chat/modal/SetDefaultModelModal.tsx
index b930870b5..d8d75679d 100644
--- a/web/src/app/chat/modal/SetDefaultModelModal.tsx
+++ b/web/src/app/chat/modal/SetDefaultModelModal.tsx
@@ -1,13 +1,9 @@
-import { Dispatch, SetStateAction, useState } from "react";
+import { Dispatch, SetStateAction } from "react";
 import { ModalWrapper } from "./ModalWrapper";
 import { Badge, Text } from "@tremor/react";
-import {
-  getDisplayNameForModel,
-  LlmOverride,
-  LlmOverrideManager,
-  useLlmOverride,
-} from "@/lib/hooks";
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { getDisplayNameForModel, LlmOverride } from "@/lib/hooks";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
+
 import { destructureValue, structureValue } from "@/lib/llm/utils";
 import { setUserDefaultModel } from "@/lib/users/UserSettings";
 import { useRouter } from "next/navigation";
diff --git a/web/src/app/chat/modal/configuration/AssistantsTab.tsx b/web/src/app/chat/modal/configuration/AssistantsTab.tsx
index c03796cca..d4933771f 100644
--- a/web/src/app/chat/modal/configuration/AssistantsTab.tsx
+++ b/web/src/app/chat/modal/configuration/AssistantsTab.tsx
@@ -15,7 +15,7 @@ import {
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { Persona } from "@/app/admin/assistants/interfaces";
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { getFinalLLM } from "@/lib/llm/utils";
 import React, { useState } from "react";
 import { updateUserAssistantList } from "@/lib/assistants/updateAssistantPreferences";
diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
index 4f0b4e217..2cc53e474 100644
--- a/web/src/app/search/page.tsx
+++ b/web/src/app/search/page.tsx
@@ -19,7 +19,7 @@ import {
 import { unstable_noStore as noStore } from "next/cache";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
 import { personaComparator } from "../admin/assistants/lib";
-import { FullEmbeddingModelResponse } from "../admin/models/embedding/components/types";
+import { FullEmbeddingModelResponse } from "@/components/embedding/interfaces";
 import { NoSourcesModal } from "@/components/initialSetup/search/NoSourcesModal";
 import { NoCompleteSourcesModal } from "@/components/initialSetup/search/NoCompleteSourceModal";
 import { ChatPopup } from "../chat/ChatPopup";
@@ -27,10 +27,8 @@ import {
   FetchAssistantsResponse,
   fetchAssistantsSS,
 } from "@/lib/assistants/fetchAssistantsSS";
-import FunctionalWrapper from "../chat/shared_chat_search/FunctionalWrapper";
 import { ChatSession } from "../chat/interfaces";
 import { SIDEBAR_TOGGLED_COOKIE_NAME } from "@/components/resizable/constants";
-import ToggleSearch from "./WrappedSearch";
 import {
   AGENTIC_SEARCH_TYPE_COOKIE_NAME,
   NEXT_PUBLIC_DEFAULT_SIDEBAR_OPEN,
diff --git a/web/src/components/admin/ClientLayout.tsx b/web/src/components/admin/ClientLayout.tsx
index cdb6f5aa1..fe9349300 100644
--- a/web/src/components/admin/ClientLayout.tsx
+++ b/web/src/components/admin/ClientLayout.tsx
@@ -18,15 +18,18 @@ import {
   ZoomInIconSkeleton,
   SlackIconSkeleton,
   DocumentSetIconSkeleton,
-  EmbeddingIconSkeleton,
   AssistantsIconSkeleton,
   ClosedBookIcon,
+  SearchIcon,
 } from "@/components/icons/icons";
 
 import { FiActivity, FiBarChart2 } from "react-icons/fi";
 import { UserDropdown } from "../UserDropdown";
 import { User } from "@/lib/types";
 import { usePathname } from "next/navigation";
+import { SettingsContext } from "../settings/SettingsProvider";
+import { useContext } from "react";
+import { CustomTooltip } from "../tooltip/CustomTooltip";
 
 export function ClientLayout({
   user,
@@ -38,8 +41,12 @@ export function ClientLayout({
   enableEnterprise: boolean;
 }) {
   const pathname = usePathname();
+  const settings = useContext(SettingsContext);
 
-  if (pathname.startsWith("/admin/connectors")) {
+  if (
+    pathname.startsWith("/admin/connectors") ||
+    pathname.startsWith("/admin/embeddings")
+  ) {
     return <>{children}</>;
   }
 
@@ -157,26 +164,28 @@ export function ClientLayout({
                 ],
               },
               {
-                name: "Model Configs",
+                name: "Configuration",
                 items: [
                   {
                     name: (
                       <div className="flex">
-                        {/* <FiCpu size={18} /> */}
                         <CpuIconSkeleton size={18} />
                         <div className="ml-1">LLM</div>
                       </div>
                     ),
-                    link: "/admin/models/llm",
+                    link: "/admin/configuration/llm",
                   },
                   {
+                    error: settings?.settings.needs_reindexing,
                     name: (
                       <div className="flex">
-                        <EmbeddingIconSkeleton />
-                        <div className="ml-1">Embedding</div>
+                        <SearchIcon />
+                        <CustomTooltip content="Navigate here to update your search settings">
+                          <div className="ml-1">Search Settings</div>
+                        </CustomTooltip>
                       </div>
                     ),
-                    link: "/admin/models/embedding",
+                    link: "/admin/configuration/search",
                   },
                 ],
               },
diff --git a/web/src/components/admin/Layout.tsx b/web/src/components/admin/Layout.tsx
index 2450d21a3..11f31a623 100644
--- a/web/src/components/admin/Layout.tsx
+++ b/web/src/components/admin/Layout.tsx
@@ -7,6 +7,7 @@ import {
 import { redirect } from "next/navigation";
 import { ClientLayout } from "./ClientLayout";
 import { SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED } from "@/lib/constants";
+import { AnnouncementBanner } from "../header/AnnouncementBanner";
 
 export async function Layout({ children }: { children: React.ReactNode }) {
   const tasks = [getAuthTypeMetadataSS(), getCurrentUserSS()];
@@ -44,6 +45,7 @@ export async function Layout({ children }: { children: React.ReactNode }) {
       enableEnterprise={SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED}
       user={user}
     >
+      <AnnouncementBanner />
       {children}
     </ClientLayout>
   );
diff --git a/web/src/components/admin/connectors/AdminSidebar.tsx b/web/src/components/admin/connectors/AdminSidebar.tsx
index 8cd26b993..b1679d858 100644
--- a/web/src/components/admin/connectors/AdminSidebar.tsx
+++ b/web/src/components/admin/connectors/AdminSidebar.tsx
@@ -7,10 +7,18 @@ import { NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED } from "@/lib/constan
 import { HeaderTitle } from "@/components/header/HeaderTitle";
 import { SettingsContext } from "@/components/settings/SettingsProvider";
 import { BackIcon } from "@/components/icons/icons";
+import { WarningCircle, WarningDiamond } from "@phosphor-icons/react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@radix-ui/react-tooltip";
 
 interface Item {
   name: string | JSX.Element;
   link: string;
+  error?: boolean;
 }
 
 interface Collection {
@@ -86,8 +94,24 @@ export function AdminSidebar({ collections }: { collections: Collection[] }) {
             </h2>
             {collection.items.map((item) => (
               <Link key={item.link} href={item.link}>
-                <button className="text-sm block w-52 py-2.5 px-2 text-left hover:bg-hover rounded">
+                <button
+                  className={`  text-sm block  flex gap-x-2 items-center w-52 py-2.5 px-2 text-left hover:bg-hover rounded`}
+                >
                   {item.name}
+                  {item.error && (
+                    <TooltipProvider>
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <WarningCircle size={18} className="text-error" />
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          <p className="max-w-xs text-text-100 mb-1 p-2 rounded-lg bg-background-900">
+                            Navigate here to update your search settings
+                          </p>
+                        </TooltipContent>
+                      </Tooltip>
+                    </TooltipProvider>
+                  )}
                 </button>
               </Link>
             ))}
diff --git a/web/src/components/context/ChatContext.tsx b/web/src/components/context/ChatContext.tsx
index 74772cc29..76cdf8adc 100644
--- a/web/src/components/context/ChatContext.tsx
+++ b/web/src/components/context/ChatContext.tsx
@@ -10,7 +10,7 @@ import {
 } from "@/lib/types";
 import { ChatSession } from "@/app/chat/interfaces";
 import { Persona } from "@/app/admin/assistants/interfaces";
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { Folder } from "@/app/chat/folders/interfaces";
 import { InputPrompt } from "@/app/admin/prompt-library/interfaces";
 
diff --git a/web/src/components/context/EmbeddingContext.tsx b/web/src/components/context/EmbeddingContext.tsx
new file mode 100644
index 000000000..2ca18dc95
--- /dev/null
+++ b/web/src/components/context/EmbeddingContext.tsx
@@ -0,0 +1,103 @@
+import React, {
+  createContext,
+  useState,
+  useContext,
+  ReactNode,
+  useEffect,
+} from "react";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { ValidSources } from "@/lib/types";
+
+interface EmbeddingFormContextType {
+  formStep: number;
+  formValues: Record<string, any>;
+  setFormValues: (values: Record<string, any>) => void;
+  nextFormStep: (contract?: string) => void;
+  prevFormStep: () => void;
+  formStepToLast: () => void;
+  setFormStep: React.Dispatch<React.SetStateAction<number>>;
+  allowAdvanced: boolean;
+  setAllowAdvanced: React.Dispatch<React.SetStateAction<boolean>>;
+  allowCreate: boolean;
+  setAlowCreate: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+const EmbeddingFormContext = createContext<
+  EmbeddingFormContextType | undefined
+>(undefined);
+
+export const EmbeddingFormProvider: React.FC<{
+  children: ReactNode;
+}> = ({ children }) => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const pathname = usePathname();
+
+  // Initialize formStep based on the URL parameter
+  const initialStep = parseInt(searchParams.get("step") || "0", 10);
+  const [formStep, setFormStep] = useState(initialStep);
+  const [formValues, setFormValues] = useState<Record<string, any>>({});
+
+  const [allowAdvanced, setAllowAdvanced] = useState(false);
+  const [allowCreate, setAlowCreate] = useState(false);
+
+  const nextFormStep = (values = "") => {
+    setFormStep((prevStep) => prevStep + 1);
+    setFormValues((prevValues) => ({ ...prevValues, values }));
+  };
+
+  const prevFormStep = () => {
+    setFormStep((currentStep) => Math.max(currentStep - 1, 0));
+  };
+
+  const formStepToLast = () => {
+    setFormStep(2);
+  };
+
+  useEffect(() => {
+    // Update URL when formStep changes
+    const updatedSearchParams = new URLSearchParams(searchParams.toString());
+    updatedSearchParams.set("step", formStep.toString());
+    const newUrl = `${pathname}?${updatedSearchParams.toString()}`;
+    router.push(newUrl);
+  }, [formStep, router, pathname, searchParams]);
+
+  // Update formStep when URL changes
+  useEffect(() => {
+    const stepFromUrl = parseInt(searchParams.get("step") || "0", 10);
+    if (stepFromUrl !== formStep) {
+      setFormStep(stepFromUrl);
+    }
+  }, [searchParams]);
+
+  const contextValue: EmbeddingFormContextType = {
+    formStep,
+    formValues,
+    setFormValues: (values) =>
+      setFormValues((prevValues) => ({ ...prevValues, ...values })),
+    nextFormStep,
+    prevFormStep,
+    formStepToLast,
+    setFormStep,
+    allowAdvanced,
+    setAllowAdvanced,
+    allowCreate,
+    setAlowCreate,
+  };
+
+  return (
+    <EmbeddingFormContext.Provider value={contextValue}>
+      {children}
+    </EmbeddingFormContext.Provider>
+  );
+};
+
+export const useEmbeddingFormContext = () => {
+  const context = useContext(EmbeddingFormContext);
+  if (context === undefined) {
+    throw new Error(
+      "useEmbeddingFormContext must be used within a FormProvider"
+    );
+  }
+  return context;
+};
diff --git a/web/src/components/credentials/EditingValue.tsx b/web/src/components/credentials/EditingValue.tsx
index d59be500f..26308f025 100644
--- a/web/src/components/credentials/EditingValue.tsx
+++ b/web/src/components/credentials/EditingValue.tsx
@@ -18,6 +18,7 @@ export const EditingValue: React.FC<{
 
   // These are escape hatches from the overall
   // value editing component (when need to modify)
+  options?: { value: string; label: string }[];
   onChange?: (value: string) => void;
   onChangeBool?: (value: boolean) => void;
   onChangeNumber?: (value: number) => void;
@@ -26,6 +27,7 @@ export const EditingValue: React.FC<{
   name,
   currentValue,
   label,
+  options,
   type,
   includRevert,
   className,
@@ -38,7 +40,9 @@ export const EditingValue: React.FC<{
   onChangeNumber,
   onChangeDate,
 }) => {
-  const [value, setValue] = useState<boolean | string | number | Date>();
+  const [value, setValue] = useState<boolean | string | number | Date>(
+    currentValue
+  );
 
   const updateValue = (newValue: string | boolean | number | Date) => {
     setValue(newValue);
@@ -148,6 +152,36 @@ export const EditingValue: React.FC<{
                     focus:invalid:border-pink-500 focus:invalid:ring-pink-500`}
               />
             </>
+          ) : type === "select" ? (
+            <div>
+              <label className="block text-sm font-medium text-text-700 mb-1">
+                {label}
+                {optional && (
+                  <span className="text-text-500 ml-1">(optional)</span>
+                )}
+              </label>
+              {description && <SubLabel>{description}</SubLabel>}
+
+              <select
+                name={name}
+                value={value as string}
+                onChange={(e) => {
+                  updateValue(e.target.value);
+                  if (onChange) {
+                    onChange(e.target.value);
+                  }
+                }}
+                className="mt-2 block w-full px-3 py-2 bg-white border border-gray-300 rounded-md text-sm shadow-sm
+                    focus:outline-none focus:border-sky-500 focus:ring-1 focus:ring-sky-500"
+              >
+                <option value="">Select an option</option>
+                {options?.map((option) => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </select>
+            </div>
           ) : (
             // Default
             <AdminTextField
diff --git a/web/src/app/admin/models/embedding/components/CustomModelForm.tsx b/web/src/components/embedding/CustomModelForm.tsx
similarity index 98%
rename from web/src/app/admin/models/embedding/components/CustomModelForm.tsx
rename to web/src/components/embedding/CustomModelForm.tsx
index ab8a4a2f3..f9b48d406 100644
--- a/web/src/app/admin/models/embedding/components/CustomModelForm.tsx
+++ b/web/src/components/embedding/CustomModelForm.tsx
@@ -5,7 +5,7 @@ import {
 import { Button } from "@tremor/react";
 import { Form, Formik } from "formik";
 import * as Yup from "yup";
-import { HostedEmbeddingModel } from "./types";
+import { HostedEmbeddingModel } from "./interfaces";
 
 export function CustomModelForm({
   onSubmit,
diff --git a/web/src/components/embedding/EmbeddingSidebar.tsx b/web/src/components/embedding/EmbeddingSidebar.tsx
new file mode 100644
index 000000000..6840930cf
--- /dev/null
+++ b/web/src/components/embedding/EmbeddingSidebar.tsx
@@ -0,0 +1,96 @@
+import { useEmbeddingFormContext } from "@/components/context/EmbeddingContext";
+import { HeaderTitle } from "@/components/header/HeaderTitle";
+
+import { SettingsIcon } from "@/components/icons/icons";
+import { Logo } from "@/components/Logo";
+import { SettingsContext } from "@/components/settings/SettingsProvider";
+import Link from "next/link";
+import { useContext } from "react";
+
+export default function EmbeddingSidebar() {
+  const { formStep, setFormStep, allowAdvanced, allowCreate } =
+    useEmbeddingFormContext();
+  const combinedSettings = useContext(SettingsContext);
+  if (!combinedSettings) {
+    return null;
+  }
+  const enterpriseSettings = combinedSettings.enterpriseSettings;
+
+  const settingSteps = ["Embedding Model", "Reranking Model", "Advanced"];
+
+  return (
+    <div className="flex bg-background text-default ">
+      <div
+        className={`flex-none
+                  bg-background-100
+                  h-screen
+                  transition-all
+                  bg-opacity-80
+                  duration-300
+                  ease-in-out
+                  w-[250px]
+                  `}
+      >
+        <div className="fixed h-full left-0 top-0 w-[250px]">
+          <div className="ml-4 mr-3 flex flex gap-x-1 items-center mt-2 my-auto text-text-700 text-xl">
+            <div className="mr-1 my-auto h-6 w-6">
+              <Logo height={24} width={24} />
+            </div>
+
+            <div>
+              {enterpriseSettings && enterpriseSettings.application_name ? (
+                <HeaderTitle>{enterpriseSettings.application_name}</HeaderTitle>
+              ) : (
+                <HeaderTitle>Danswer</HeaderTitle>
+              )}
+            </div>
+          </div>
+
+          <div className="mx-3 mt-6 gap-y-1 flex-col flex gap-x-1.5 items-center items-center">
+            <Link
+              href={"/admin/configuration/search"}
+              className="w-full p-2 bg-white border-border border rounded items-center hover:bg-background-200 cursor-pointer transition-all duration-150 flex gap-x-2"
+            >
+              <SettingsIcon className="flex-none " />
+              <p className="my-auto flex items-center text-sm">
+                Search Settings
+              </p>
+            </Link>
+          </div>
+
+          <div className="h-full flex">
+            <div className="mx-auto w-full max-w-2xl px-4 py-8">
+              <div className="relative">
+                <div className="absolute h-[85%] left-[6px] top-[8px] bottom-0 w-0.5 bg-gray-300"></div>
+                {settingSteps.map((step, index) => {
+                  return (
+                    <div
+                      key={index}
+                      className="flex items-center mb-6 relative cursor-pointer"
+                      onClick={() => {
+                        setFormStep(index);
+                      }}
+                    >
+                      <div className="flex-shrink-0 mr-4 z-10">
+                        <div className="rounded-full h-3.5 w-3.5 flex items-center justify-center bg-blue-500">
+                          {formStep === index && (
+                            <div className="h-2 w-2 rounded-full bg-white"></div>
+                          )}
+                        </div>
+                      </div>
+                      <div
+                        className={`${index <= formStep ? "text-gray-800" : "text-gray-500"}`}
+                      >
+                        {step}
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/components/embedding/ModelSelector.tsx b/web/src/components/embedding/ModelSelector.tsx
new file mode 100644
index 000000000..93be374d1
--- /dev/null
+++ b/web/src/components/embedding/ModelSelector.tsx
@@ -0,0 +1,142 @@
+import {
+  MicrosoftIcon,
+  NomicIcon,
+  OpenSourceIcon,
+} from "@/components/icons/icons";
+import {
+  EmbeddingModelDescriptor,
+  getIconForRerankType,
+  getTitleForRerankType,
+  HostedEmbeddingModel,
+} from "./interfaces";
+import { FiExternalLink, FiStar } from "react-icons/fi";
+
+export function ModelPreview({
+  model,
+  display,
+}: {
+  model: EmbeddingModelDescriptor;
+  display?: boolean;
+}) {
+  return (
+    <div
+      className={`border border-border rounded shadow-md ${display ? "bg-inverted rounded-lg p-4" : "bg-hover-light p-2"} w-96 flex flex-col`}
+    >
+      <div className="font-bold text-lg flex">{model.model_name}</div>
+      <div className="text-sm mt-1 mx-1">
+        {model.description
+          ? model.description
+          : "Custom model—no description is available."}
+      </div>
+    </div>
+  );
+}
+
+export function ModelOption({
+  model,
+  onSelect,
+  selected,
+}: {
+  model: HostedEmbeddingModel;
+  onSelect?: (model: HostedEmbeddingModel) => void;
+  selected: boolean;
+}) {
+  return (
+    <div
+      className={`p-4 w-96 border rounded-lg transition-all duration-200 ${
+        selected
+          ? "border-blue-500 bg-blue-50 shadow-md"
+          : "border-gray-200 hover:border-blue-300 hover:shadow-sm"
+      }`}
+    >
+      <div className="flex items-center justify-between mb-3">
+        <h3 className="font-bold text-lg">{model.model_name}</h3>
+
+        {model.link && (
+          <a
+            href={model.link}
+            target="_blank"
+            rel="noopener noreferrer"
+            onClick={(e) => e.stopPropagation()}
+            className="text-blue-500 hover:text-blue-700 transition-colors duration-200"
+          >
+            <FiExternalLink size={18} />
+          </a>
+        )}
+      </div>
+      <p className="text-sm k text-gray-600 text-left mb-2">
+        {model.description || "Custom model—no description is available."}
+      </p>
+      <div className="text-xs text-gray-500">
+        {model.isDefault ? "Default" : "Self-hosted"}
+      </div>
+      {onSelect && (
+        <div className="mt-3">
+          <button
+            className={`w-full p-2 rounded-lg text-sm ${
+              selected
+                ? "bg-background-125 border border-border cursor-not-allowed"
+                : "bg-background border border-border hover:bg-hover cursor-pointer"
+            }`}
+            onClick={(e) => {
+              e.stopPropagation();
+              if (!selected) onSelect(model);
+            }}
+            disabled={selected}
+          >
+            {selected ? "Selected Model" : "Select Model"}
+          </button>
+        </div>
+      )}
+    </div>
+  );
+}
+export function ModelSelector({
+  modelOptions,
+  setSelectedModel,
+  currentEmbeddingModel,
+}: {
+  currentEmbeddingModel: HostedEmbeddingModel;
+  modelOptions: HostedEmbeddingModel[];
+  setSelectedModel: (model: HostedEmbeddingModel) => void;
+}) {
+  const groupedModelOptions = modelOptions.reduce(
+    (acc, model) => {
+      const [type] = model.model_name.split("/");
+      if (!acc[type]) {
+        acc[type] = [];
+      }
+      acc[type].push(model);
+      return acc;
+    },
+    {} as Record<string, HostedEmbeddingModel[]>
+  );
+
+  return (
+    <div>
+      <div className="flex flex-col gap-y-6 gap-6">
+        {Object.entries(groupedModelOptions).map(([type, models]) => (
+          <div key={type}>
+            <div className="flex items-center mb-2">
+              {getIconForRerankType(type)}
+              <h2 className="ml-2 mt-2 text-xl font-bold">
+                {getTitleForRerankType(type)}
+              </h2>
+            </div>
+
+            <div className="flex mt-4 flex-wrap gap-4">
+              {models.map((modelOption) => (
+                <ModelOption
+                  key={modelOption.model_name}
+                  model={modelOption}
+                  onSelect={setSelectedModel}
+                  selected={currentEmbeddingModel === modelOption}
+                />
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/app/admin/models/embedding/components/ReindexingProgressTable.tsx b/web/src/components/embedding/ReindexingProgressTable.tsx
similarity index 100%
rename from web/src/app/admin/models/embedding/components/ReindexingProgressTable.tsx
rename to web/src/components/embedding/ReindexingProgressTable.tsx
diff --git a/web/src/app/admin/models/embedding/components/types.ts b/web/src/components/embedding/interfaces.tsx
similarity index 94%
rename from web/src/app/admin/models/embedding/components/types.ts
rename to web/src/components/embedding/interfaces.tsx
index 3a97ee400..c77e9951e 100644
--- a/web/src/app/admin/models/embedding/components/types.ts
+++ b/web/src/components/embedding/interfaces.tsx
@@ -2,7 +2,10 @@ import {
   CohereIcon,
   GoogleIcon,
   IconProps,
+  MicrosoftIcon,
+  NomicIcon,
   OpenAIIcon,
+  OpenSourceIcon,
   VoyageIcon,
 } from "@/components/icons/icons";
 
@@ -120,47 +123,6 @@ export const AVAILABLE_MODELS: HostedEmbeddingModel[] = [
 ];
 
 export const AVAILABLE_CLOUD_PROVIDERS: CloudEmbeddingProvider[] = [
-  {
-    id: 0,
-    name: "OpenAI",
-    website: "https://openai.com",
-    icon: OpenAIIcon,
-    description: "AI industry leader known for ChatGPT and DALL-E",
-    apiLink: "https://platform.openai.com/api-keys",
-    docsLink:
-      "https://docs.danswer.dev/guides/embedding_providers#openai-models",
-    costslink: "https://openai.com/pricing",
-    embedding_models: [
-      {
-        model_name: "text-embedding-3-large",
-        cloud_provider_name: "OpenAI",
-        description:
-          "OpenAI's large embedding model. Best performance, but more expensive.",
-        pricePerMillion: 0.13,
-        model_dim: 3072,
-        normalize: false,
-        query_prefix: "",
-        passage_prefix: "",
-        mtebScore: 64.6,
-        maxContext: 8191,
-        enabled: false,
-      },
-      {
-        model_name: "text-embedding-3-small",
-        cloud_provider_name: "OpenAI",
-        model_dim: 1536,
-        normalize: false,
-        query_prefix: "",
-        passage_prefix: "",
-        description:
-          "OpenAI's newer, more efficient embedding model. Good balance of performance and cost.",
-        pricePerMillion: 0.02,
-        enabled: false,
-        mtebScore: 62.3,
-        maxContext: 8191,
-      },
-    ],
-  },
   {
     id: 1,
     name: "Cohere",
@@ -203,6 +165,47 @@ export const AVAILABLE_CLOUD_PROVIDERS: CloudEmbeddingProvider[] = [
       },
     ],
   },
+  {
+    id: 0,
+    name: "OpenAI",
+    website: "https://openai.com",
+    icon: OpenAIIcon,
+    description: "AI industry leader known for ChatGPT and DALL-E",
+    apiLink: "https://platform.openai.com/api-keys",
+    docsLink:
+      "https://docs.danswer.dev/guides/embedding_providers#openai-models",
+    costslink: "https://openai.com/pricing",
+    embedding_models: [
+      {
+        model_name: "text-embedding-3-large",
+        cloud_provider_name: "OpenAI",
+        description:
+          "OpenAI's large embedding model. Best performance, but more expensive.",
+        pricePerMillion: 0.13,
+        model_dim: 3072,
+        normalize: false,
+        query_prefix: "",
+        passage_prefix: "",
+        mtebScore: 64.6,
+        maxContext: 8191,
+        enabled: false,
+      },
+      {
+        model_name: "text-embedding-3-small",
+        cloud_provider_name: "OpenAI",
+        model_dim: 1536,
+        normalize: false,
+        query_prefix: "",
+        passage_prefix: "",
+        description:
+          "OpenAI's newer, more efficient embedding model. Good balance of performance and cost.",
+        pricePerMillion: 0.02,
+        enabled: false,
+        mtebScore: 62.3,
+        maxContext: 8191,
+      },
+    ],
+  },
 
   {
     id: 2,
@@ -287,6 +290,28 @@ export const AVAILABLE_CLOUD_PROVIDERS: CloudEmbeddingProvider[] = [
   },
 ];
 
+export const getTitleForRerankType = (type: string) => {
+  switch (type) {
+    case "nomic-ai":
+      return "Nomic (recommended)";
+    case "intfloat":
+      return "Microsoft";
+    default:
+      return "Open Source";
+  }
+};
+
+export const getIconForRerankType = (type: string) => {
+  switch (type) {
+    case "nomic-ai":
+      return <NomicIcon size={40} />;
+    case "intfloat":
+      return <MicrosoftIcon size={40} />;
+    default:
+      return <OpenSourceIcon size={40} />;
+  }
+};
+
 export const INVALID_OLD_MODEL = "thenlper/gte-small";
 
 export function checkModelNameIsValid(
diff --git a/web/src/components/header/AnnouncementBanner.tsx b/web/src/components/header/AnnouncementBanner.tsx
new file mode 100644
index 000000000..19b461a1e
--- /dev/null
+++ b/web/src/components/header/AnnouncementBanner.tsx
@@ -0,0 +1,101 @@
+"use client";
+import { useState, useEffect, useContext } from "react";
+import { XIcon } from "../icons/icons";
+import { CustomTooltip } from "../tooltip/CustomTooltip";
+import { SettingsContext } from "../settings/SettingsProvider";
+import Link from "next/link";
+import Cookies from "js-cookie";
+
+const DISMISSED_NOTIFICATION_COOKIE_PREFIX = "dismissed_notification_";
+const COOKIE_EXPIRY_DAYS = 1;
+
+export function AnnouncementBanner() {
+  const settings = useContext(SettingsContext);
+  const [localNotifications, setLocalNotifications] = useState(
+    settings?.settings.notifications || []
+  );
+
+  useEffect(() => {
+    const filteredNotifications = (
+      settings?.settings.notifications || []
+    ).filter(
+      (notification) =>
+        !Cookies.get(
+          `${DISMISSED_NOTIFICATION_COOKIE_PREFIX}${notification.id}`
+        )
+    );
+    setLocalNotifications(filteredNotifications);
+  }, [settings?.settings.notifications]);
+
+  if (!localNotifications || localNotifications.length === 0) return null;
+
+  const handleDismiss = async (notificationId: number) => {
+    try {
+      const response = await fetch(
+        `/api/settings/notifications/${notificationId}/dismiss`,
+        {
+          method: "POST",
+        }
+      );
+      if (response.ok) {
+        Cookies.set(
+          `${DISMISSED_NOTIFICATION_COOKIE_PREFIX}${notificationId}`,
+          "true",
+          { expires: COOKIE_EXPIRY_DAYS }
+        );
+        setLocalNotifications((prevNotifications) =>
+          prevNotifications.filter(
+            (notification) => notification.id !== notificationId
+          )
+        );
+      } else {
+        console.error("Failed to dismiss notification");
+      }
+    } catch (error) {
+      console.error("Error dismissing notification:", error);
+    }
+  };
+
+  return (
+    <>
+      {localNotifications
+        .filter((notification) => !notification.dismissed)
+        .map((notification) => {
+          if (notification.notif_type == "reindex") {
+            return (
+              <div
+                key={notification.id}
+                className="absolute top-0 left-1/2 transform -translate-x-1/2 bg-blue-600 rounded-sm text-white px-4 pr-8 py-3 mx-auto"
+              >
+                <p className="text-center">
+                  Your index is out of date - we strongly recommend updating
+                  your search settings.{" "}
+                  <Link
+                    href={"/admin/configuration/search"}
+                    className="ml-2 underline cursor-pointer"
+                  >
+                    Update here
+                  </Link>
+                </p>
+                <button
+                  onClick={() => handleDismiss(notification.id)}
+                  className="absolute top-0 right-0 mt-2 mr-2"
+                  aria-label="Dismiss"
+                >
+                  <CustomTooltip
+                    showTick
+                    citation
+                    delay={100}
+                    content="Dismiss"
+                  >
+                    <XIcon className="h-5 w-5" />
+                  </CustomTooltip>
+                </button>
+              </div>
+            );
+          }
+          return null;
+        })}
+    </>
+  );
+}
diff --git a/web/src/components/icons/icons.tsx b/web/src/components/icons/icons.tsx
index 70fa5bb6a..4a7e30ee4 100644
--- a/web/src/components/icons/icons.tsx
+++ b/web/src/components/icons/icons.tsx
@@ -53,6 +53,9 @@ import awsWEBP from "../../../public/Amazon.webp";
 import azureIcon from "../../../public/Azure.png";
 
 import anthropicSVG from "../../../public/Anthropic.svg";
+import nomicSVG from "../../../public/nomic.svg";
+import microsoftIcon from "../../../public/microsoft.png";
+import mixedBreadSVG from "../../../public/Mixedbread.png";
 
 import OCIStorageSVG from "../../../public/OCI.svg";
 import googleCloudStorageIcon from "../../../public/GoogleCloudStorage.png";
@@ -277,6 +280,48 @@ export const OpenSourceIcon = ({
     </div>
   );
 };
+export const MixedBreadIcon = ({
+  size = 16,
+  className = defaultTailwindCSS,
+}: IconProps) => {
+  return (
+    <div
+      style={{ width: `${size + 4}px`, height: `${size + 4}px` }}
+      className={`w-[${size + 4}px] h-[${size + 4}px] -m-0.5 ` + className}
+    >
+      <Image src={mixedBreadSVG} alt="Logo" width="96" height="96" />
+    </div>
+  );
+};
+
+export const NomicIcon = ({
+  size = 16,
+  className = defaultTailwindCSS,
+}: IconProps) => {
+  return (
+    <div
+      style={{ width: `${size + 4}px`, height: `${size + 4}px` }}
+      className={`w-[${size + 4}px] h-[${size + 4}px] -m-0.5 ` + className}
+    >
+      <Image src={nomicSVG} alt="Logo" width="96" height="96" />
+    </div>
+  );
+};
+
+export const MicrosoftIcon = ({
+  size = 16,
+  className = defaultTailwindCSS,
+}: IconProps) => {
+  return (
+    <div
+      style={{ width: `${size + 4}px`, height: `${size + 4}px` }}
+      className={`w-[${size + 4}px] h-[${size + 4}px] -m-0.5 ` + className}
+    >
+      <Image src={microsoftIcon} alt="Logo" width="96" height="96" />
+    </div>
+  );
+};
+
 export const AnthropicIcon = ({
   size = 16,
   className = defaultTailwindCSS,
diff --git a/web/src/components/icons/mixedbread.svg b/web/src/components/icons/mixedbread.svg
new file mode 100644
index 000000000..ae32e53a1
--- /dev/null
+++ b/web/src/components/icons/mixedbread.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 2020 1130" width="24" height="24" aria-hidden="true"><path fill="#e95a0f" d="M398.167 621.992c-1.387-20.362-4.092-40.739-3.851-61.081.355-30.085 6.873-59.139 21.253-85.976 10.487-19.573 24.09-36.822 40.662-51.515 16.394-14.535 34.338-27.046 54.336-36.182 15.224-6.955 31.006-12.609 47.829-14.168 11.809-1.094 23.753-2.514 35.524-1.836 23.033 1.327 45.131 7.255 66.255 16.75 16.24 7.3 31.497 16.165 45.651 26.969 12.997 9.921 24.412 21.37 34.158 34.509 11.733 15.817 20.849 33.037 25.987 52.018 3.468 12.81 6.438 25.928 7.779 39.097 1.722 16.908 1.642 34.003 2.235 51.021.427 12.253.224 24.547 1.117 36.762 1.677 22.93 4.062 45.764 11.8 67.7 5.376 15.239 12.499 29.55 20.846 43.681l-18.282 20.328c-1.536 1.71-2.795 3.665-4.254 5.448l-19.323 23.533c-13.859-5.449-27.446-11.803-41.657-16.086-13.622-4.106-27.793-6.765-41.905-8.775-15.256-2.173-30.701-3.475-46.105-4.049-23.571-.879-47.178-1.056-70.769-1.029-10.858.013-21.723 1.116-32.57 1.926-5.362.4-10.69 1.255-16.464 1.477-2.758-7.675-5.284-14.865-7.367-22.181-3.108-10.92-4.325-22.554-13.16-31.095-2.598-2.512-5.069-5.341-6.883-8.443-6.366-10.884-12.48-21.917-18.571-32.959-4.178-7.573-8.411-14.375-17.016-18.559-10.34-5.028-19.538-12.387-29.311-18.611-3.173-2.021-6.414-4.312-9.952-5.297-5.857-1.63-11.98-2.301-17.991-3.376z"></path><path fill="#ed6d7b" d="M1478.998 758.842c-12.025.042-24.05.085-36.537-.373-.14-8.536.231-16.569.453-24.607.033-1.179-.315-2.986-1.081-3.4-.805-.434-2.376.338-3.518.81-.856.354-1.562 1.069-3.589 2.521-.239-3.308-.664-5.586-.519-7.827.488-7.544 2.212-15.166 1.554-22.589-1.016-11.451 1.397-14.592-12.332-14.419-3.793.048-3.617-2.803-3.332-5.331.499-4.422 1.45-8.803 1.77-13.233.311-4.316.068-8.672.068-12.861-2.554-.464-4.326-.86-6.12-1.098-4.415-.586-6.051-2.251-5.065-7.31 1.224-6.279.848-12.862 1.276-19.306.19-2.86-.971-4.473-3.794-4.753-4.113-.407-8.242-1.057-12.352-.975-4.663.093-5.192-2.272-4.751-6.012.733-6.229 1.252-12.483 1.875-18.726l1.102-10.495c-5.905-.309-11.146-.805-16.385-.778-3.32.017-5.174-1.4-5.566-4.4-1.172-8.968-2.479-17.944-3.001-26.96-.26-4.484-1.936-5.705-6.005-5.774-9.284-.158-18.563-.594-27.843-.953-7.241-.28-10.137-2.764-11.3-9.899-.746-4.576-2.715-7.801-7.777-8.207-7.739-.621-15.511-.992-23.207-1.961-7.327-.923-14.587-2.415-21.853-3.777-5.021-.941-10.003-2.086-15.003-3.14 4.515-22.952 13.122-44.382 26.284-63.587 18.054-26.344 41.439-47.239 69.102-63.294 15.847-9.197 32.541-16.277 50.376-20.599 16.655-4.036 33.617-5.715 50.622-4.385 33.334 2.606 63.836 13.955 92.415 31.15 15.864 9.545 30.241 20.86 42.269 34.758 8.113 9.374 15.201 19.78 21.718 30.359 10.772 17.484 16.846 36.922 20.611 56.991 1.783 9.503 2.815 19.214 3.318 28.876.758 14.578.755 29.196.65 44.311l-51.545 20.013c-7.779 3.059-15.847 5.376-21.753 12.365-4.73 5.598-10.658 10.316-16.547 14.774-9.9 7.496-18.437 15.988-25.083 26.631-3.333 5.337-7.901 10.381-12.999 14.038-11.355 8.144-17.397 18.973-19.615 32.423l-6.988 41.011z"></path><path fill="#ec663e" d="M318.11 923.047c-.702 17.693-.832 35.433-2.255 53.068-1.699 21.052-6.293 41.512-14.793 61.072-9.001 20.711-21.692 38.693-38.496 53.583-16.077 14.245-34.602 24.163-55.333 30.438-21.691 6.565-43.814 8.127-66.013 6.532-22.771-1.636-43.88-9.318-62.74-22.705-20.223-14.355-35.542-32.917-48.075-54.096-9.588-16.203-16.104-33.55-19.201-52.015-2.339-13.944-2.307-28.011-.403-42.182 2.627-19.545 9.021-37.699 17.963-55.067 11.617-22.564 27.317-41.817 48.382-56.118 15.819-10.74 33.452-17.679 52.444-20.455 8.77-1.282 17.696-1.646 26.568-2.055 11.755-.542 23.534-.562 35.289-1.11 8.545-.399 17.067-1.291 26.193-1.675 1.349 1.77 2.24 3.199 2.835 4.742 4.727 12.261 10.575 23.865 18.636 34.358 7.747 10.084 14.83 20.684 22.699 30.666 3.919 4.972 8.37 9.96 13.609 13.352 7.711 4.994 16.238 8.792 24.617 12.668 5.852 2.707 12.037 4.691 18.074 6.998z"></path><path fill="#ea580e" d="M1285.167 162.995c3.796-29.75 13.825-56.841 32.74-80.577 16.339-20.505 36.013-36.502 59.696-47.614 14.666-6.881 29.971-11.669 46.208-12.749 10.068-.669 20.239-1.582 30.255-.863 16.6 1.191 32.646 5.412 47.9 12.273 19.39 8.722 36.44 20.771 50.582 36.655 15.281 17.162 25.313 37.179 31.49 59.286 5.405 19.343 6.31 39.161 4.705 58.825-2.37 29.045-11.836 55.923-30.451 78.885-10.511 12.965-22.483 24.486-37.181 33.649-5.272-5.613-10.008-11.148-14.539-16.846-5.661-7.118-10.958-14.533-16.78-21.513-4.569-5.478-9.548-10.639-14.624-15.658-3.589-3.549-7.411-6.963-11.551-9.827-5.038-3.485-10.565-6.254-15.798-9.468-8.459-5.195-17.011-9.669-26.988-11.898-12.173-2.72-24.838-4.579-35.622-11.834-1.437-.967-3.433-1.192-5.213-1.542-12.871-2.529-25.454-5.639-36.968-12.471-5.21-3.091-11.564-4.195-17.011-6.965-4.808-2.445-8.775-6.605-13.646-8.851-8.859-4.085-18.114-7.311-27.204-10.896z"></path><path fill="#f8ab00" d="M524.963 311.12c-9.461-5.684-19.513-10.592-28.243-17.236-12.877-9.801-24.031-21.578-32.711-35.412-11.272-17.965-19.605-37.147-21.902-58.403-1.291-11.951-2.434-24.073-1.87-36.034.823-17.452 4.909-34.363 11.581-50.703 8.82-21.603 22.25-39.792 39.568-55.065 18.022-15.894 39.162-26.07 62.351-32.332 19.22-5.19 38.842-6.177 58.37-4.674 23.803 1.831 45.56 10.663 65.062 24.496 17.193 12.195 31.688 27.086 42.894 45.622-11.403 8.296-22.633 16.117-34.092 23.586-17.094 11.142-34.262 22.106-48.036 37.528-8.796 9.848-17.201 20.246-27.131 28.837-16.859 14.585-27.745 33.801-41.054 51.019-11.865 15.349-20.663 33.117-30.354 50.08-5.303 9.283-9.654 19.11-14.434 28.692z"></path><path fill="#ea5227" d="M1060.11 1122.049c-7.377 1.649-14.683 4.093-22.147 4.763-11.519 1.033-23.166 1.441-34.723 1.054-19.343-.647-38.002-4.7-55.839-12.65-15.078-6.72-28.606-15.471-40.571-26.836-24.013-22.81-42.053-49.217-49.518-81.936-1.446-6.337-1.958-12.958-2.235-19.477-.591-13.926-.219-27.909-1.237-41.795-.916-12.5-3.16-24.904-4.408-37.805 1.555-1.381 3.134-2.074 3.778-3.27 4.729-8.79 12.141-15.159 19.083-22.03 5.879-5.818 10.688-12.76 16.796-18.293 6.993-6.335 11.86-13.596 14.364-22.612l8.542-29.993c8.015 1.785 15.984 3.821 24.057 5.286 8.145 1.478 16.371 2.59 24.602 3.493 8.453.927 16.956 1.408 25.891 2.609 1.119 16.09 1.569 31.667 2.521 47.214.676 11.045 1.396 22.154 3.234 33.043 2.418 14.329 5.708 28.527 9.075 42.674 3.499 14.705 4.028 29.929 10.415 44.188 10.157 22.674 18.29 46.25 28.281 69.004 7.175 16.341 12.491 32.973 15.078 50.615.645 4.4 3.256 8.511 4.963 12.755z"></path><path fill="#ea5330" d="M1060.512 1122.031c-2.109-4.226-4.72-8.337-5.365-12.737-2.587-17.642-7.904-34.274-15.078-50.615-9.991-22.755-18.124-46.33-28.281-69.004-6.387-14.259-6.916-29.482-10.415-44.188-3.366-14.147-6.656-28.346-9.075-42.674-1.838-10.889-2.558-21.999-3.234-33.043-.951-15.547-1.401-31.124-2.068-47.146 8.568-.18 17.146.487 25.704.286l41.868-1.4c.907 3.746 1.245 7.04 1.881 10.276l8.651 42.704c.903 4.108 2.334 8.422 4.696 11.829 7.165 10.338 14.809 20.351 22.456 30.345 4.218 5.512 8.291 11.304 13.361 15.955 8.641 7.927 18.065 14.995 27.071 22.532 12.011 10.052 24.452 19.302 40.151 22.854-1.656 11.102-2.391 22.44-5.172 33.253-4.792 18.637-12.38 36.209-23.412 52.216-13.053 18.94-29.086 34.662-49.627 45.055-10.757 5.443-22.443 9.048-34.111 13.501z"></path><path fill="#f8aa05" d="M1989.106 883.951c5.198 8.794 11.46 17.148 15.337 26.491 5.325 12.833 9.744 26.207 12.873 39.737 2.95 12.757 3.224 25.908 1.987 39.219-1.391 14.973-4.643 29.268-10.349 43.034-5.775 13.932-13.477 26.707-23.149 38.405-14.141 17.104-31.215 30.458-50.807 40.488-14.361 7.352-29.574 12.797-45.741 14.594-10.297 1.144-20.732 2.361-31.031 1.894-24.275-1.1-47.248-7.445-68.132-20.263-6.096-3.741-11.925-7.917-17.731-12.342 5.319-5.579 10.361-10.852 15.694-15.811l37.072-34.009c.975-.892 2.113-1.606 3.08-2.505 6.936-6.448 14.765-12.2 20.553-19.556 8.88-11.285 20.064-19.639 31.144-28.292 4.306-3.363 9.06-6.353 12.673-10.358 5.868-6.504 10.832-13.814 16.422-20.582 6.826-8.264 13.727-16.481 20.943-24.401 4.065-4.461 8.995-8.121 13.249-12.424 14.802-14.975 28.77-30.825 45.913-43.317z"></path><path fill="#ed6876" d="M1256.099 523.419c5.065.642 10.047 1.787 15.068 2.728 7.267 1.362 14.526 2.854 21.853 3.777 7.696.97 15.468 1.34 23.207 1.961 5.062.406 7.031 3.631 7.777 8.207 1.163 7.135 4.059 9.62 11.3 9.899l27.843.953c4.069.069 5.745 1.291 6.005 5.774.522 9.016 1.829 17.992 3.001 26.96.392 3 2.246 4.417 5.566 4.4 5.239-.026 10.48.469 16.385.778l-1.102 10.495-1.875 18.726c-.44 3.74.088 6.105 4.751 6.012 4.11-.082 8.239.568 12.352.975 2.823.28 3.984 1.892 3.794 4.753-.428 6.444-.052 13.028-1.276 19.306-.986 5.059.651 6.724 5.065 7.31 1.793.238 3.566.634 6.12 1.098 0 4.189.243 8.545-.068 12.861-.319 4.43-1.27 8.811-1.77 13.233-.285 2.528-.461 5.379 3.332 5.331 13.729-.173 11.316 2.968 12.332 14.419.658 7.423-1.066 15.045-1.554 22.589-.145 2.241.28 4.519.519 7.827 2.026-1.452 2.733-2.167 3.589-2.521 1.142-.472 2.713-1.244 3.518-.81.767.414 1.114 2.221 1.081 3.4l-.917 24.539c-11.215.82-22.45.899-33.636 1.674l-43.952 3.436c-1.086-3.01-2.319-5.571-2.296-8.121.084-9.297-4.468-16.583-9.091-24.116-3.872-6.308-8.764-13.052-9.479-19.987-1.071-10.392-5.716-15.936-14.889-18.979-1.097-.364-2.16-.844-3.214-1.327-7.478-3.428-15.548-5.918-19.059-14.735-.904-2.27-3.657-3.775-5.461-5.723-2.437-2.632-4.615-5.525-7.207-7.987-2.648-2.515-5.352-5.346-8.589-6.777-4.799-2.121-10.074-3.185-15.175-4.596l-15.785-4.155c.274-12.896 1.722-25.901.54-38.662-1.647-17.783-3.457-35.526-2.554-53.352.528-10.426 2.539-20.777 3.948-31.574z"></path><path fill="#f6a200" d="M525.146 311.436c4.597-9.898 8.947-19.725 14.251-29.008 9.691-16.963 18.49-34.73 30.354-50.08 13.309-17.218 24.195-36.434 41.054-51.019 9.93-8.591 18.335-18.989 27.131-28.837 13.774-15.422 30.943-26.386 48.036-37.528 11.459-7.469 22.688-15.29 34.243-23.286 11.705 16.744 19.716 35.424 22.534 55.717 2.231 16.066 2.236 32.441 2.753 49.143-4.756 1.62-9.284 2.234-13.259 4.056-6.43 2.948-12.193 7.513-18.774 9.942-19.863 7.331-33.806 22.349-47.926 36.784-7.86 8.035-13.511 18.275-19.886 27.705-4.434 6.558-9.345 13.037-12.358 20.254-4.249 10.177-6.94 21.004-10.296 31.553-12.33.053-24.741 1.027-36.971-.049-20.259-1.783-40.227-5.567-58.755-14.69-.568-.28-1.295-.235-2.132-.658z"></path><path fill="#f7a80d" d="M1989.057 883.598c-17.093 12.845-31.061 28.695-45.863 43.67-4.254 4.304-9.184 7.963-13.249 12.424-7.216 7.92-14.117 16.137-20.943 24.401-5.59 6.768-10.554 14.078-16.422 20.582-3.614 4.005-8.367 6.995-12.673 10.358-11.08 8.653-22.264 17.007-31.144 28.292-5.788 7.356-13.617 13.108-20.553 19.556-.967.899-2.105 1.614-3.08 2.505l-37.072 34.009c-5.333 4.96-10.375 10.232-15.859 15.505-21.401-17.218-37.461-38.439-48.623-63.592 3.503-1.781 7.117-2.604 9.823-4.637 8.696-6.536 20.392-8.406 27.297-17.714.933-1.258 2.646-1.973 4.065-2.828 17.878-10.784 36.338-20.728 53.441-32.624 10.304-7.167 18.637-17.23 27.583-26.261 3.819-3.855 7.436-8.091 10.3-12.681 12.283-19.68 24.43-39.446 40.382-56.471 12.224-13.047 17.258-29.524 22.539-45.927 15.85 4.193 29.819 12.129 42.632 22.08 10.583 8.219 19.782 17.883 27.42 29.351z"></path><path fill="#ef7a72" d="M1479.461 758.907c1.872-13.734 4.268-27.394 6.525-41.076 2.218-13.45 8.26-24.279 19.615-32.423 5.099-3.657 9.667-8.701 12.999-14.038 6.646-10.643 15.183-19.135 25.083-26.631 5.888-4.459 11.817-9.176 16.547-14.774 5.906-6.99 13.974-9.306 21.753-12.365l51.48-19.549c.753 11.848.658 23.787 1.641 35.637 1.771 21.353 4.075 42.672 11.748 62.955.17.449.107.985-.019 2.158-6.945 4.134-13.865 7.337-20.437 11.143-3.935 2.279-7.752 5.096-10.869 8.384-6.011 6.343-11.063 13.624-17.286 19.727-9.096 8.92-12.791 20.684-18.181 31.587-.202.409-.072.984-.096 1.481-8.488-1.72-16.937-3.682-25.476-5.094-9.689-1.602-19.426-3.084-29.201-3.949-15.095-1.335-30.241-2.1-45.828-3.172z"></path><path fill="#e94e3b" d="M957.995 766.838c-20.337-5.467-38.791-14.947-55.703-27.254-8.2-5.967-15.451-13.238-22.958-20.37 2.969-3.504 5.564-6.772 8.598-9.563 7.085-6.518 11.283-14.914 15.8-23.153 4.933-8.996 10.345-17.743 14.966-26.892 2.642-5.231 5.547-11.01 5.691-16.611.12-4.651.194-8.932 2.577-12.742 8.52-13.621 15.483-28.026 18.775-43.704 2.11-10.049 7.888-18.774 7.81-29.825-.064-9.089 4.291-18.215 6.73-27.313 3.212-11.983 7.369-23.797 9.492-35.968 3.202-18.358 5.133-36.945 7.346-55.466l4.879-45.8c6.693.288 13.386.575 20.54 1.365.13 3.458-.41 6.407-.496 9.37l-1.136 42.595c-.597 11.552-2.067 23.058-3.084 34.59l-3.845 44.478c-.939 10.202-1.779 20.432-3.283 30.557-.96 6.464-4.46 12.646-1.136 19.383.348.706-.426 1.894-.448 2.864-.224 9.918-5.99 19.428-2.196 29.646.103.279-.033.657-.092.983l-8.446 46.205c-1.231 6.469-2.936 12.846-4.364 19.279-1.5 6.757-2.602 13.621-4.456 20.277-3.601 12.93-10.657 25.3-5.627 39.47.368 1.036.234 2.352.017 3.476l-5.949 30.123z"></path><path fill="#ea5043" d="M958.343 767.017c1.645-10.218 3.659-20.253 5.602-30.302.217-1.124.351-2.44-.017-3.476-5.03-14.17 2.026-26.539 5.627-39.47 1.854-6.656 2.956-13.52 4.456-20.277 1.428-6.433 3.133-12.81 4.364-19.279l8.446-46.205c.059-.326.196-.705.092-.983-3.794-10.218 1.972-19.728 2.196-29.646.022-.97.796-2.158.448-2.864-3.324-6.737.176-12.919 1.136-19.383 1.504-10.125 2.344-20.355 3.283-30.557l3.845-44.478c1.017-11.532 2.488-23.038 3.084-34.59.733-14.18.722-28.397 1.136-42.595.086-2.963.626-5.912.956-9.301 5.356-.48 10.714-.527 16.536-.081 2.224 15.098 1.855 29.734 1.625 44.408-.157 10.064 1.439 20.142 1.768 30.23.334 10.235-.035 20.49.116 30.733.084 5.713.789 11.418.861 17.13.054 4.289-.469 8.585-.702 12.879-.072 1.323-.138 2.659-.031 3.975l2.534 34.405-1.707 36.293-1.908 48.69c-.182 8.103.993 16.237.811 24.34-.271 12.076-1.275 24.133-1.787 36.207-.102 2.414-.101 5.283 1.06 7.219 4.327 7.22 4.463 15.215 4.736 23.103.365 10.553.088 21.128.086 31.693-11.44 2.602-22.84.688-34.106-.916-11.486-1.635-22.806-4.434-34.546-6.903z"></path><path fill="#eb5d19" d="M398.091 622.45c6.086.617 12.21 1.288 18.067 2.918 3.539.985 6.779 3.277 9.952 5.297 9.773 6.224 18.971 13.583 29.311 18.611 8.606 4.184 12.839 10.986 17.016 18.559l18.571 32.959c1.814 3.102 4.285 5.931 6.883 8.443 8.835 8.542 10.052 20.175 13.16 31.095 2.082 7.317 4.609 14.507 6.946 22.127-29.472 3.021-58.969 5.582-87.584 15.222-1.185-2.302-1.795-4.362-2.769-6.233-4.398-8.449-6.703-18.174-14.942-24.299-2.511-1.866-5.103-3.814-7.047-6.218-8.358-10.332-17.028-20.276-28.772-26.973 4.423-11.478 9.299-22.806 13.151-34.473 4.406-13.348 6.724-27.18 6.998-41.313.098-5.093.643-10.176 1.06-15.722z"></path><path fill="#e94c32" d="M981.557 392.109c-1.172 15.337-2.617 30.625-4.438 45.869-2.213 18.521-4.144 37.108-7.346 55.466-2.123 12.171-6.28 23.985-9.492 35.968-2.439 9.098-6.794 18.224-6.73 27.313.078 11.051-5.7 19.776-7.81 29.825-3.292 15.677-10.255 30.082-18.775 43.704-2.383 3.81-2.458 8.091-2.577 12.742-.144 5.6-3.049 11.38-5.691 16.611-4.621 9.149-10.033 17.896-14.966 26.892-4.517 8.239-8.715 16.635-15.8 23.153-3.034 2.791-5.629 6.06-8.735 9.255-12.197-10.595-21.071-23.644-29.301-37.24-7.608-12.569-13.282-25.962-17.637-40.37 13.303-6.889 25.873-13.878 35.311-25.315.717-.869 1.934-1.312 2.71-2.147 5.025-5.405 10.515-10.481 14.854-16.397 6.141-8.374 10.861-17.813 17.206-26.008 8.22-10.618 13.657-22.643 20.024-34.466 4.448-.626 6.729-3.21 8.114-6.89 1.455-3.866 2.644-7.895 4.609-11.492 4.397-8.05 9.641-15.659 13.708-23.86 3.354-6.761 5.511-14.116 8.203-21.206 5.727-15.082 7.277-31.248 12.521-46.578 3.704-10.828 3.138-23.116 4.478-34.753l7.56-.073z"></path><path fill="#f7a617" d="M1918.661 831.99c-4.937 16.58-9.971 33.057-22.196 46.104-15.952 17.025-28.099 36.791-40.382 56.471-2.864 4.59-6.481 8.825-10.3 12.681-8.947 9.031-17.279 19.094-27.583 26.261-17.103 11.896-35.564 21.84-53.441 32.624-1.419.856-3.132 1.571-4.065 2.828-6.904 9.308-18.6 11.178-27.297 17.714-2.705 2.033-6.319 2.856-9.874 4.281-3.413-9.821-6.916-19.583-9.36-29.602-1.533-6.284-1.474-12.957-1.665-19.913 1.913-.78 3.374-1.057 4.81-1.431 15.822-4.121 31.491-8.029 43.818-20.323 9.452-9.426 20.371-17.372 30.534-26.097 6.146-5.277 13.024-10.052 17.954-16.326 14.812-18.848 28.876-38.285 43.112-57.581 2.624-3.557 5.506-7.264 6.83-11.367 2.681-8.311 4.375-16.94 6.476-25.438 17.89.279 35.333 3.179 52.629 9.113z"></path><path fill="#ea553a" d="M1172.91 977.582c-15.775-3.127-28.215-12.377-40.227-22.43-9.005-7.537-18.43-14.605-27.071-22.532-5.07-4.651-9.143-10.443-13.361-15.955-7.647-9.994-15.291-20.007-22.456-30.345-2.361-3.407-3.792-7.72-4.696-11.829-3.119-14.183-5.848-28.453-8.651-42.704-.636-3.236-.974-6.53-1.452-10.209 15.234-2.19 30.471-3.969 46.408-5.622 2.692 5.705 4.882 11.222 6.63 16.876 2.9 9.381 7.776 17.194 15.035 24.049 7.056 6.662 13.305 14.311 19.146 22.099 9.509 12.677 23.01 19.061 36.907 25.054-1.048 7.441-2.425 14.854-3.066 22.33-.956 11.162-1.393 22.369-2.052 33.557l-1.096 17.661z"></path><path fill="#ea5453" d="M1163.123 704.036c-4.005 5.116-7.685 10.531-12.075 15.293-12.842 13.933-27.653 25.447-44.902 34.538-3.166-5.708-5.656-11.287-8.189-17.251-3.321-12.857-6.259-25.431-9.963-37.775-4.6-15.329-10.6-30.188-11.349-46.562-.314-6.871-1.275-14.287-7.114-19.644-1.047-.961-1.292-3.053-1.465-4.67l-4.092-39.927c-.554-5.245-.383-10.829-2.21-15.623-3.622-9.503-4.546-19.253-4.688-29.163-.088-6.111 1.068-12.256.782-18.344-.67-14.281-1.76-28.546-2.9-42.8-.657-8.222-1.951-16.395-2.564-24.62-.458-6.137-.285-12.322-.104-18.21.959 5.831 1.076 11.525 2.429 16.909 2.007 7.986 5.225 15.664 7.324 23.632 3.222 12.23 1.547 25.219 6.728 37.355 4.311 10.099 6.389 21.136 9.732 31.669 2.228 7.02 6.167 13.722 7.121 20.863 1.119 8.376 6.1 13.974 10.376 20.716l2.026 10.576c1.711 9.216 3.149 18.283 8.494 26.599 6.393 9.946 11.348 20.815 16.943 31.276 4.021 7.519 6.199 16.075 12.925 22.065l24.462 22.26c.556.503 1.507.571 2.274.841z"></path><path fill="#ea5b15" d="M1285.092 163.432c9.165 3.148 18.419 6.374 27.279 10.459 4.871 2.246 8.838 6.406 13.646 8.851 5.446 2.77 11.801 3.874 17.011 6.965 11.514 6.831 24.097 9.942 36.968 12.471 1.78.35 3.777.576 5.213 1.542 10.784 7.255 23.448 9.114 35.622 11.834 9.977 2.23 18.529 6.703 26.988 11.898 5.233 3.214 10.76 5.983 15.798 9.468 4.14 2.864 7.962 6.279 11.551 9.827 5.076 5.02 10.056 10.181 14.624 15.658 5.822 6.98 11.119 14.395 16.78 21.513 4.531 5.698 9.267 11.233 14.222 16.987-10.005 5.806-20.07 12.004-30.719 16.943-7.694 3.569-16.163 5.464-24.688 7.669-2.878-7.088-5.352-13.741-7.833-20.392-.802-2.15-1.244-4.55-2.498-6.396-4.548-6.7-9.712-12.999-14.011-19.847-6.672-10.627-15.34-18.93-26.063-25.376-9.357-5.625-18.367-11.824-27.644-17.587-6.436-3.997-12.902-8.006-19.659-11.405-5.123-2.577-11.107-3.536-16.046-6.37-17.187-9.863-35.13-17.887-54.031-23.767-4.403-1.37-8.953-2.267-13.436-3.382l.926-27.565z"></path><path fill="#ea504b" d="M1098 737l7.789 16.893c-15.04 9.272-31.679 15.004-49.184 17.995-9.464 1.617-19.122 2.097-29.151 3.019-.457-10.636-.18-21.211-.544-31.764-.273-7.888-.409-15.883-4.736-23.103-1.16-1.936-1.162-4.805-1.06-7.219l1.787-36.207c.182-8.103-.993-16.237-.811-24.34.365-16.236 1.253-32.461 1.908-48.69.484-12 .942-24.001 1.98-36.069 5.57 10.19 10.632 20.42 15.528 30.728 1.122 2.362 2.587 5.09 2.339 7.488-1.536 14.819 5.881 26.839 12.962 38.33 10.008 16.241 16.417 33.54 20.331 51.964 2.285 10.756 4.729 21.394 11.958 30.165L1098 737z"></path><path fill="#f6a320" d="M1865.78 822.529c-1.849 8.846-3.544 17.475-6.224 25.786-1.323 4.102-4.206 7.81-6.83 11.367l-43.112 57.581c-4.93 6.273-11.808 11.049-17.954 16.326-10.162 8.725-21.082 16.671-30.534 26.097-12.327 12.294-27.997 16.202-43.818 20.323-1.436.374-2.897.651-4.744.986-1.107-17.032-1.816-34.076-2.079-51.556 1.265-.535 2.183-.428 2.888-.766 10.596-5.072 20.8-11.059 32.586-13.273 1.69-.317 3.307-1.558 4.732-2.662l26.908-21.114c4.992-4.003 11.214-7.393 14.381-12.585 11.286-18.5 22.363-37.263 27.027-58.87l36.046 1.811c3.487.165 6.983.14 10.727.549z"></path><path fill="#ec6333" d="M318.448 922.814c-6.374-2.074-12.56-4.058-18.412-6.765-8.379-3.876-16.906-7.675-24.617-12.668-5.239-3.392-9.69-8.381-13.609-13.352-7.87-9.983-14.953-20.582-22.699-30.666-8.061-10.493-13.909-22.097-18.636-34.358-.595-1.543-1.486-2.972-2.382-4.783 6.84-1.598 13.797-3.023 20.807-4.106 18.852-2.912 36.433-9.493 53.737-17.819.697.888.889 1.555 1.292 2.051l17.921 21.896c4.14 4.939 8.06 10.191 12.862 14.412 5.67 4.984 12.185 9.007 18.334 13.447-8.937 16.282-16.422 33.178-20.696 51.31-1.638 6.951-2.402 14.107-3.903 21.403z"></path><path fill="#f49700" d="M623.467 326.903c2.893-10.618 5.584-21.446 9.833-31.623 3.013-7.217 7.924-13.696 12.358-20.254 6.375-9.43 12.026-19.67 19.886-27.705 14.12-14.434 28.063-29.453 47.926-36.784 6.581-2.429 12.344-6.994 18.774-9.942 3.975-1.822 8.503-2.436 13.186-3.592 1.947 18.557 3.248 37.15 8.307 55.686-15.453 7.931-28.853 18.092-40.46 29.996-10.417 10.683-19.109 23.111-28.013 35.175-3.238 4.388-4.888 9.948-7.262 14.973-17.803-3.987-35.767-6.498-54.535-5.931z"></path><path fill="#ea544c" d="M1097.956 736.615c-2.925-3.218-5.893-6.822-8.862-10.425-7.229-8.771-9.672-19.409-11.958-30.165-3.914-18.424-10.323-35.722-20.331-51.964-7.081-11.491-14.498-23.511-12.962-38.33.249-2.398-1.217-5.126-2.339-7.488l-15.232-31.019-3.103-34.338c-.107-1.316-.041-2.653.031-3.975.233-4.294.756-8.59.702-12.879-.072-5.713-.776-11.417-.861-17.13l-.116-30.733c-.329-10.088-1.926-20.166-1.768-30.23.23-14.674.599-29.31-1.162-44.341 9.369-.803 18.741-1.179 28.558-1.074 1.446 15.814 2.446 31.146 3.446 46.478.108 6.163-.064 12.348.393 18.485.613 8.225 1.907 16.397 2.564 24.62l2.9 42.8c.286 6.088-.869 12.234-.782 18.344.142 9.91 1.066 19.661 4.688 29.163 1.827 4.794 1.657 10.377 2.21 15.623l4.092 39.927c.172 1.617.417 3.71 1.465 4.67 5.839 5.357 6.8 12.773 7.114 19.644.749 16.374 6.749 31.233 11.349 46.562 3.704 12.344 6.642 24.918 9.963 37.775z"></path><path fill="#ec5c61" d="M1204.835 568.008c1.254 25.351-1.675 50.16-10.168 74.61-8.598-4.883-18.177-8.709-24.354-15.59-7.44-8.289-13.929-17.442-21.675-25.711-8.498-9.072-16.731-18.928-21.084-31.113-.54-1.513-1.691-2.807-2.594-4.564-4.605-9.247-7.706-18.544-7.96-29.09-.835-7.149-1.214-13.944-2.609-20.523-2.215-10.454-5.626-20.496-7.101-31.302-2.513-18.419-7.207-36.512-5.347-55.352.24-2.43-.17-4.949-.477-7.402l-4.468-34.792c2.723-.379 5.446-.757 8.585-.667 1.749 8.781 2.952 17.116 4.448 25.399 1.813 10.037 3.64 20.084 5.934 30.017 1.036 4.482 3.953 8.573 4.73 13.064 1.794 10.377 4.73 20.253 9.272 29.771 2.914 6.105 4.761 12.711 7.496 18.912 2.865 6.496 6.264 12.755 9.35 19.156 3.764 7.805 7.667 15.013 16.1 19.441 7.527 3.952 13.713 10.376 20.983 14.924 6.636 4.152 13.932 7.25 20.937 10.813z"></path><path fill="#ed676f" d="M1140.75 379.231c18.38-4.858 36.222-11.21 53.979-18.971 3.222 3.368 5.693 6.744 8.719 9.512 2.333 2.134 5.451 5.07 8.067 4.923 7.623-.429 12.363 2.688 17.309 8.215 5.531 6.18 12.744 10.854 19.224 16.184-5.121 7.193-10.461 14.241-15.323 21.606-13.691 20.739-22.99 43.255-26.782 67.926-.543 3.536-1.281 7.043-2.366 10.925-14.258-6.419-26.411-14.959-32.731-29.803-1.087-2.553-2.596-4.93-3.969-7.355-1.694-2.993-3.569-5.89-5.143-8.943-1.578-3.062-2.922-6.249-4.295-9.413-1.57-3.621-3.505-7.163-4.47-10.946-1.257-4.93-.636-10.572-2.725-15.013-5.831-12.397-7.467-25.628-9.497-38.847z"></path><path fill="#ed656e" d="M1254.103 647.439c5.325.947 10.603 2.272 15.847 3.722 5.101 1.41 10.376 2.475 15.175 4.596 3.237 1.431 5.942 4.262 8.589 6.777 2.592 2.462 4.77 5.355 7.207 7.987 1.804 1.948 4.557 3.453 5.461 5.723 3.51 8.817 11.581 11.307 19.059 14.735 1.053.483 2.116.963 3.214 1.327 9.172 3.043 13.818 8.587 14.889 18.979.715 6.935 5.607 13.679 9.479 19.987 4.623 7.533 9.175 14.819 9.091 24.116-.023 2.55 1.21 5.111 1.874 8.055-19.861 2.555-39.795 4.296-59.597 9.09l-11.596-23.203c-1.107-2.169-2.526-4.353-4.307-5.975-7.349-6.694-14.863-13.209-22.373-19.723l-17.313-14.669c-2.776-2.245-5.935-4.017-8.92-6.003l11.609-38.185c1.508-5.453 1.739-11.258 2.613-17.336z"></path><path fill="#ec6168" d="M1140.315 379.223c2.464 13.227 4.101 26.459 9.931 38.856 2.089 4.441 1.468 10.083 2.725 15.013.965 3.783 2.9 7.325 4.47 10.946 1.372 3.164 2.716 6.351 4.295 9.413 1.574 3.053 3.449 5.95 5.143 8.943 1.372 2.425 2.882 4.803 3.969 7.355 6.319 14.844 18.473 23.384 32.641 30.212.067 5.121-.501 10.201-.435 15.271l.985 38.117c.151 4.586.616 9.162.868 14.201-7.075-3.104-14.371-6.202-21.007-10.354-7.269-4.548-13.456-10.972-20.983-14.924-8.434-4.428-12.337-11.637-16.1-19.441-3.087-6.401-6.485-12.66-9.35-19.156-2.735-6.201-4.583-12.807-7.496-18.912-4.542-9.518-7.477-19.394-9.272-29.771-.777-4.491-3.694-8.581-4.73-13.064-2.294-9.933-4.121-19.98-5.934-30.017-1.496-8.283-2.699-16.618-4.036-25.335 10.349-2.461 20.704-4.511 31.054-6.582.957-.191 1.887-.515 3.264-.769z"></path><path fill="#e94c28" d="M922 537c-6.003 11.784-11.44 23.81-19.66 34.428-6.345 8.196-11.065 17.635-17.206 26.008-4.339 5.916-9.828 10.992-14.854 16.397-.776.835-1.993 1.279-2.71 2.147-9.439 11.437-22.008 18.427-35.357 24.929-4.219-10.885-6.942-22.155-7.205-33.905l-.514-49.542c7.441-2.893 14.452-5.197 21.334-7.841 1.749-.672 3.101-2.401 4.604-3.681 6.749-5.745 12.845-12.627 20.407-16.944 7.719-4.406 14.391-9.101 18.741-16.889.626-1.122 1.689-2.077 2.729-2.877 7.197-5.533 12.583-12.51 16.906-20.439.68-1.247 2.495-1.876 4.105-2.651 2.835 1.408 5.267 2.892 7.884 3.892 3.904 1.491 4.392 3.922 2.833 7.439-1.47 3.318-2.668 6.756-4.069 10.106-1.247 2.981-.435 5.242 2.413 6.544 2.805 1.282 3.125 3.14 1.813 5.601l-6.907 12.799L922 537z"></path><path fill="#eb5659" d="M1124.995 566c.868 1.396 2.018 2.691 2.559 4.203 4.353 12.185 12.586 22.041 21.084 31.113 7.746 8.269 14.235 17.422 21.675 25.711 6.176 6.881 15.756 10.707 24.174 15.932-6.073 22.316-16.675 42.446-31.058 60.937-1.074-.131-2.025-.199-2.581-.702l-24.462-22.26c-6.726-5.99-8.904-14.546-12.925-22.065-5.594-10.461-10.55-21.33-16.943-31.276-5.345-8.315-6.783-17.383-8.494-26.599-.63-3.394-1.348-6.772-1.738-10.848-.371-6.313-1.029-11.934-1.745-18.052l6.34 4.04 1.288-.675-2.143-15.385 9.454 1.208v-8.545L1124.995 566z"></path><path fill="#f5a02d" d="M1818.568 820.096c-4.224 21.679-15.302 40.442-26.587 58.942-3.167 5.192-9.389 8.582-14.381 12.585l-26.908 21.114c-1.425 1.104-3.042 2.345-4.732 2.662-11.786 2.214-21.99 8.201-32.586 13.273-.705.338-1.624.231-2.824.334a824.35 824.35 0 0 1-8.262-42.708c4.646-2.14 9.353-3.139 13.269-5.47 5.582-3.323 11.318-6.942 15.671-11.652 7.949-8.6 14.423-18.572 22.456-27.081 8.539-9.046 13.867-19.641 18.325-30.922l46.559 8.922z"></path><path fill="#eb5a57" d="M1124.96 565.639c-5.086-4.017-10.208-8.395-15.478-12.901v8.545l-9.454-1.208 2.143 15.385-1.288.675-6.34-4.04c.716 6.118 1.375 11.74 1.745 17.633-4.564-6.051-9.544-11.649-10.663-20.025-.954-7.141-4.892-13.843-7.121-20.863-3.344-10.533-5.421-21.57-9.732-31.669-5.181-12.135-3.506-25.125-6.728-37.355-2.099-7.968-5.317-15.646-7.324-23.632-1.353-5.384-1.47-11.078-2.429-16.909l-3.294-46.689a278.63 278.63 0 0 1 27.57-2.084c2.114 12.378 3.647 24.309 5.479 36.195 1.25 8.111 2.832 16.175 4.422 24.23 1.402 7.103 2.991 14.169 4.55 21.241 1.478 6.706.273 14.002 4.6 20.088 5.401 7.597 7.176 16.518 9.467 25.337 1.953 7.515 5.804 14.253 11.917 19.406.254 10.095 3.355 19.392 7.96 28.639z"></path><path fill="#ea541c" d="M911.651 810.999c-2.511 10.165-5.419 20.146-8.2 30.162-2.503 9.015-7.37 16.277-14.364 22.612-6.108 5.533-10.917 12.475-16.796 18.293-6.942 6.871-14.354 13.24-19.083 22.03-.644 1.196-2.222 1.889-3.705 2.857-2.39-7.921-4.101-15.991-6.566-23.823-5.451-17.323-12.404-33.976-23.414-48.835l21.627-21.095c3.182-3.29 5.532-7.382 8.295-11.083l10.663-14.163c9.528 4.78 18.925 9.848 28.625 14.247 7.324 3.321 15.036 5.785 22.917 8.799z"></path><path fill="#eb5d19" d="M1284.092 191.421c4.557.69 9.107 1.587 13.51 2.957 18.901 5.881 36.844 13.904 54.031 23.767 4.938 2.834 10.923 3.792 16.046 6.37 6.757 3.399 13.224 7.408 19.659 11.405l27.644 17.587c10.723 6.446 19.392 14.748 26.063 25.376 4.299 6.848 9.463 13.147 14.011 19.847 1.254 1.847 1.696 4.246 2.498 6.396l7.441 20.332c-11.685 1.754-23.379 3.133-35.533 4.037-.737-2.093-.995-3.716-1.294-5.33-3.157-17.057-14.048-30.161-23.034-44.146-3.027-4.71-7.786-8.529-12.334-11.993-9.346-7.116-19.004-13.834-28.688-20.491-6.653-4.573-13.311-9.251-20.431-13.002-8.048-4.24-16.479-7.85-24.989-11.091-11.722-4.465-23.673-8.328-35.527-12.449l.927-19.572z"></path><path fill="#eb5e24" d="M1283.09 211.415c11.928 3.699 23.88 7.562 35.602 12.027 8.509 3.241 16.941 6.852 24.989 11.091 7.12 3.751 13.778 8.429 20.431 13.002 9.684 6.657 19.342 13.375 28.688 20.491 4.548 3.463 9.307 7.283 12.334 11.993 8.986 13.985 19.877 27.089 23.034 44.146.299 1.615.557 3.237.836 5.263-13.373-.216-26.749-.839-40.564-1.923-2.935-9.681-4.597-18.92-12.286-26.152-15.577-14.651-30.4-30.102-45.564-45.193-.686-.683-1.626-1.156-2.516-1.584l-47.187-22.615 2.203-20.546z"></path><path fill="#e9511f" d="M913 486.001c-1.29.915-3.105 1.543-3.785 2.791-4.323 7.929-9.709 14.906-16.906 20.439-1.04.8-2.103 1.755-2.729 2.877-4.35 7.788-11.022 12.482-18.741 16.889-7.562 4.317-13.658 11.199-20.407 16.944-1.503 1.28-2.856 3.009-4.604 3.681-6.881 2.643-13.893 4.948-21.262 7.377-.128-11.151.202-22.302.378-33.454.03-1.892-.6-3.795-.456-6.12 13.727-1.755 23.588-9.527 33.278-17.663 2.784-2.337 6.074-4.161 8.529-6.784l29.057-31.86c1.545-1.71 3.418-3.401 4.221-5.459 5.665-14.509 11.49-28.977 16.436-43.736 2.817-8.407 4.074-17.338 6.033-26.032 5.039.714 10.078 1.427 15.536 2.629-.909 8.969-2.31 17.438-3.546 25.931-2.41 16.551-5.84 32.839-11.991 48.461L913 486.001z"></path><path fill="#ea5741" d="M1179.451 903.828c-14.224-5.787-27.726-12.171-37.235-24.849-5.841-7.787-12.09-15.436-19.146-22.099-7.259-6.854-12.136-14.667-15.035-24.049-1.748-5.654-3.938-11.171-6.254-17.033 15.099-4.009 30.213-8.629 44.958-15.533l28.367 36.36c6.09 8.015 13.124 14.75 22.72 18.375-7.404 14.472-13.599 29.412-17.48 45.244-.271 1.106-.382 2.25-.895 3.583z"></path><path fill="#ea522a" d="M913.32 486.141c2.693-7.837 5.694-15.539 8.722-23.231 6.151-15.622 9.581-31.91 11.991-48.461l3.963-25.861c7.582.317 15.168 1.031 22.748 1.797 4.171.421 8.333.928 12.877 1.596-.963 11.836-.398 24.125-4.102 34.953-5.244 15.33-6.794 31.496-12.521 46.578-2.692 7.09-4.849 14.445-8.203 21.206-4.068 8.201-9.311 15.81-13.708 23.86-1.965 3.597-3.154 7.627-4.609 11.492-1.385 3.68-3.666 6.265-8.114 6.89-1.994-1.511-3.624-3.059-5.077-4.44l6.907-12.799c1.313-2.461.993-4.318-1.813-5.601-2.849-1.302-3.66-3.563-2.413-6.544 1.401-3.35 2.599-6.788 4.069-10.106 1.558-3.517 1.071-5.948-2.833-7.439-2.617-1-5.049-2.484-7.884-3.892z"></path><path fill="#eb5e24" d="M376.574 714.118c12.053 6.538 20.723 16.481 29.081 26.814 1.945 2.404 4.537 4.352 7.047 6.218 8.24 6.125 10.544 15.85 14.942 24.299.974 1.871 1.584 3.931 2.376 6.29-7.145 3.719-14.633 6.501-21.386 10.517-9.606 5.713-18.673 12.334-28.425 18.399-3.407-3.73-6.231-7.409-9.335-10.834l-30.989-33.862c11.858-11.593 22.368-24.28 31.055-38.431 1.86-3.031 3.553-6.164 5.632-9.409z"></path><path fill="#e95514" d="M859.962 787.636c-3.409 5.037-6.981 9.745-10.516 14.481-2.763 3.701-5.113 7.792-8.295 11.083-6.885 7.118-14.186 13.834-21.65 20.755-13.222-17.677-29.417-31.711-48.178-42.878-.969-.576-2.068-.934-3.27-1.709 6.28-8.159 12.733-15.993 19.16-23.849 1.459-1.783 2.718-3.738 4.254-5.448l18.336-19.969c4.909 5.34 9.619 10.738 14.081 16.333 9.72 12.19 21.813 21.566 34.847 29.867.411.262.725.674 1.231 1.334z"></path><path fill="#eb5f2d" d="M339.582 762.088l31.293 33.733c3.104 3.425 5.928 7.104 9.024 10.979-12.885 11.619-24.548 24.139-33.899 38.704-.872 1.359-1.56 2.837-2.644 4.428-6.459-4.271-12.974-8.294-18.644-13.278-4.802-4.221-8.722-9.473-12.862-14.412l-17.921-21.896c-.403-.496-.595-1.163-.926-2.105 16.738-10.504 32.58-21.87 46.578-36.154z"></path><path fill="#f28d00" d="M678.388 332.912c1.989-5.104 3.638-10.664 6.876-15.051 8.903-12.064 17.596-24.492 28.013-35.175 11.607-11.904 25.007-22.064 40.507-29.592 4.873 11.636 9.419 23.412 13.67 35.592-5.759 4.084-11.517 7.403-16.594 11.553-4.413 3.607-8.124 8.092-12.023 12.301-5.346 5.772-10.82 11.454-15.782 17.547-3.929 4.824-7.17 10.208-10.716 15.344l-33.95-12.518z"></path><path fill="#f08369" d="M1580.181 771.427c-.191-.803-.322-1.377-.119-1.786 5.389-10.903 9.084-22.666 18.181-31.587 6.223-6.103 11.276-13.385 17.286-19.727 3.117-3.289 6.933-6.105 10.869-8.384 6.572-3.806 13.492-7.009 20.461-10.752 1.773 3.23 3.236 6.803 4.951 10.251l12.234 24.993c-1.367 1.966-2.596 3.293-3.935 4.499-7.845 7.07-16.315 13.564-23.407 21.32-6.971 7.623-12.552 16.517-18.743 24.854l-37.777-13.68z"></path><path fill="#f18b5e" d="M1618.142 785.4c6.007-8.63 11.588-17.524 18.559-25.147 7.092-7.755 15.562-14.249 23.407-21.32 1.338-1.206 2.568-2.534 3.997-4.162l28.996 33.733c1.896 2.205 4.424 3.867 6.66 6.394-6.471 7.492-12.967 14.346-19.403 21.255l-18.407 19.953c-12.958-12.409-27.485-22.567-43.809-30.706z"></path><path fill="#f49c3a" d="M1771.617 811.1c-4.066 11.354-9.394 21.949-17.933 30.995-8.032 8.509-14.507 18.481-22.456 27.081-4.353 4.71-10.089 8.329-15.671 11.652-3.915 2.331-8.623 3.331-13.318 5.069-4.298-9.927-8.255-19.998-12.1-30.743 4.741-4.381 9.924-7.582 13.882-11.904 7.345-8.021 14.094-16.603 20.864-25.131 4.897-6.168 9.428-12.626 14.123-18.955l32.61 11.936z"></path><path fill="#f08000" d="M712.601 345.675c3.283-5.381 6.524-10.765 10.453-15.589 4.962-6.093 10.435-11.774 15.782-17.547 3.899-4.21 7.61-8.695 12.023-12.301 5.078-4.15 10.836-7.469 16.636-11.19a934.12 934.12 0 0 1 23.286 35.848c-4.873 6.234-9.676 11.895-14.63 17.421l-25.195 27.801c-11.713-9.615-24.433-17.645-38.355-24.443z"></path><path fill="#ed6e04" d="M751.11 370.42c8.249-9.565 16.693-18.791 25.041-28.103 4.954-5.526 9.757-11.187 14.765-17.106 7.129 6.226 13.892 13.041 21.189 19.225 5.389 4.567 11.475 8.312 17.53 12.92-5.51 7.863-10.622 15.919-17.254 22.427-8.881 8.716-18.938 16.233-28.49 24.264-5.703-6.587-11.146-13.427-17.193-19.682-4.758-4.921-10.261-9.121-15.587-13.944z"></path><path fill="#ea541c" d="M921.823 385.544c-1.739 9.04-2.995 17.971-5.813 26.378-4.946 14.759-10.771 29.227-16.436 43.736-.804 2.058-2.676 3.749-4.221 5.459l-29.057 31.86c-2.455 2.623-5.745 4.447-8.529 6.784-9.69 8.135-19.551 15.908-33.208 17.237-1.773-9.728-3.147-19.457-4.091-29.6l36.13-16.763c.581-.267 1.046-.812 1.525-1.269 8.033-7.688 16.258-15.19 24.011-23.152 4.35-4.467 9.202-9.144 11.588-14.69 6.638-15.425 15.047-30.299 17.274-47.358 3.536.344 7.072.688 10.829 1.377z"></path><path fill="#f3944d" d="M1738.688 798.998c-4.375 6.495-8.906 12.953-13.803 19.121-6.771 8.528-13.519 17.11-20.864 25.131-3.958 4.322-9.141 7.523-13.925 11.54-8.036-13.464-16.465-26.844-27.999-38.387 5.988-6.951 12.094-13.629 18.261-20.25l19.547-20.95 38.783 23.794z"></path><path fill="#ec6168" d="M1239.583 703.142c3.282 1.805 6.441 3.576 9.217 5.821 5.88 4.755 11.599 9.713 17.313 14.669l22.373 19.723c1.781 1.622 3.2 3.806 4.307 5.975 3.843 7.532 7.477 15.171 11.194 23.136-10.764 4.67-21.532 8.973-32.69 12.982l-22.733-27.366c-2.003-2.416-4.096-4.758-6.194-7.093-3.539-3.94-6.927-8.044-10.74-11.701-2.57-2.465-5.762-4.283-8.675-6.39l16.627-29.755z"></path><path fill="#ec663e" d="M1351.006 332.839l-28.499 10.33c-.294.107-.533.367-1.194.264-11.067-19.018-27.026-32.559-44.225-44.855-4.267-3.051-8.753-5.796-13.138-8.682l9.505-24.505c10.055 4.069 19.821 8.227 29.211 13.108 3.998 2.078 7.299 5.565 10.753 8.598 3.077 2.701 5.743 5.891 8.926 8.447 4.116 3.304 9.787 5.345 12.62 9.432 6.083 8.777 10.778 18.517 16.041 27.863z"></path><path fill="#eb5e5b" d="M1222.647 733.051c3.223 1.954 6.415 3.771 8.985 6.237 3.813 3.658 7.201 7.761 10.74 11.701l6.194 7.093 22.384 27.409c-13.056 6.836-25.309 14.613-36.736 24.161l-39.323-44.7 24.494-27.846c1.072-1.224 1.974-2.598 3.264-4.056z"></path><path fill="#ea580e" d="M876.001 376.171c5.874 1.347 11.748 2.694 17.812 4.789-.81 5.265-2.687 9.791-2.639 14.296.124 11.469-4.458 20.383-12.73 27.863-2.075 1.877-3.659 4.286-5.668 6.248l-22.808 21.967c-.442.422-1.212.488-1.813.757l-23.113 10.389-9.875 4.514c-2.305-6.09-4.609-12.181-6.614-18.676 7.64-4.837 15.567-8.54 22.18-13.873 9.697-7.821 18.931-16.361 27.443-25.455 5.613-5.998 12.679-11.331 14.201-20.475.699-4.2 2.384-8.235 3.623-12.345z"></path><path fill="#e95514" d="M815.103 467.384c3.356-1.894 6.641-3.415 9.94-4.903l23.113-10.389c.6-.269 1.371-.335 1.813-.757l22.808-21.967c2.008-1.962 3.593-4.371 5.668-6.248 8.272-7.48 12.854-16.394 12.73-27.863-.049-4.505 1.828-9.031 2.847-13.956 5.427.559 10.836 1.526 16.609 2.68-1.863 17.245-10.272 32.119-16.91 47.544-2.387 5.546-7.239 10.223-11.588 14.69-7.753 7.962-15.978 15.464-24.011 23.152-.478.458-.944 1.002-1.525 1.269l-36.069 16.355c-2.076-6.402-3.783-12.81-5.425-19.607z"></path><path fill="#eb620b" d="M783.944 404.402c9.499-8.388 19.556-15.905 28.437-24.621 6.631-6.508 11.744-14.564 17.575-22.273 9.271 4.016 18.501 8.375 27.893 13.43-4.134 7.07-8.017 13.778-12.833 19.731-5.785 7.15-12.109 13.917-18.666 20.376-7.99 7.869-16.466 15.244-24.731 22.832l-17.674-29.475z"></path><path fill="#ea544c" d="M1197.986 854.686c-9.756-3.309-16.79-10.044-22.88-18.059l-28.001-36.417c8.601-5.939 17.348-11.563 26.758-17.075 1.615 1.026 2.639 1.876 3.505 2.865l26.664 30.44c3.723 4.139 7.995 7.785 12.017 11.656l-18.064 26.591z"></path><path fill="#ec6333" d="M1351.41 332.903c-5.667-9.409-10.361-19.149-16.445-27.926-2.833-4.087-8.504-6.128-12.62-9.432-3.184-2.555-5.849-5.745-8.926-8.447-3.454-3.033-6.756-6.52-10.753-8.598-9.391-4.88-19.157-9.039-29.138-13.499 1.18-5.441 2.727-10.873 4.81-16.607 11.918 4.674 24.209 8.261 34.464 14.962 14.239 9.304 29.011 18.453 39.595 32.464 2.386 3.159 5.121 6.077 7.884 8.923 6.564 6.764 10.148 14.927 11.723 24.093l-20.594 4.067z"></path><path fill="#eb5e5b" d="M1117 536.549c-6.113-4.702-9.965-11.44-11.917-18.955-2.292-8.819-4.066-17.74-9.467-25.337-4.327-6.085-3.122-13.382-4.6-20.088l-4.55-21.241c-1.59-8.054-3.172-16.118-4.422-24.23l-5.037-36.129c6.382-1.43 12.777-2.462 19.582-3.443 1.906 11.646 3.426 23.24 4.878 34.842.307 2.453.717 4.973.477 7.402-1.86 18.84 2.834 36.934 5.347 55.352 1.474 10.806 4.885 20.848 7.101 31.302 1.394 6.579 1.774 13.374 2.609 20.523z"></path><path fill="#ec644b" d="M1263.638 290.071c4.697 2.713 9.183 5.458 13.45 8.509 17.199 12.295 33.158 25.836 43.873 44.907-8.026 4.725-16.095 9.106-24.83 13.372-11.633-15.937-25.648-28.515-41.888-38.689-1.609-1.008-3.555-1.48-5.344-2.2 2.329-3.852 4.766-7.645 6.959-11.573l7.78-14.326z"></path><path fill="#eb5f2d" d="M1372.453 328.903c-2.025-9.233-5.608-17.396-12.172-24.16-2.762-2.846-5.498-5.764-7.884-8.923-10.584-14.01-25.356-23.16-39.595-32.464-10.256-6.701-22.546-10.289-34.284-15.312.325-5.246 1.005-10.444 2.027-15.863l47.529 22.394c.89.428 1.83.901 2.516 1.584l45.564 45.193c7.69 7.233 9.352 16.472 11.849 26.084-5.032.773-10.066 1.154-15.55 1.466z"></path><path fill="#e95a0f" d="M801.776 434.171c8.108-7.882 16.584-15.257 24.573-23.126 6.558-6.459 12.881-13.226 18.666-20.376 4.817-5.953 8.7-12.661 13.011-19.409 5.739 1.338 11.463 3.051 17.581 4.838-.845 4.183-2.53 8.219-3.229 12.418-1.522 9.144-8.588 14.477-14.201 20.475-8.512 9.094-17.745 17.635-27.443 25.455-6.613 5.333-14.54 9.036-22.223 13.51-2.422-4.469-4.499-8.98-6.735-13.786z"></path><path fill="#eb5e5b" d="M1248.533 316.002c2.155.688 4.101 1.159 5.71 2.168 16.24 10.174 30.255 22.752 41.532 38.727-7.166 5.736-14.641 11.319-22.562 16.731-1.16-1.277-1.684-2.585-2.615-3.46l-38.694-36.2 14.203-15.029c.803-.86 1.38-1.93 2.427-2.936z"></path><path fill="#eb5a57" d="M1216.359 827.958c-4.331-3.733-8.603-7.379-12.326-11.518l-26.664-30.44c-.866-.989-1.89-1.839-3.152-2.902 6.483-6.054 13.276-11.959 20.371-18.005l39.315 44.704c-5.648 6.216-11.441 12.12-17.544 18.161z"></path><path fill="#ec6168" d="M1231.598 334.101l38.999 36.066c.931.876 1.456 2.183 2.303 3.608-4.283 4.279-8.7 8.24-13.769 12.091-4.2-3.051-7.512-6.349-11.338-8.867-12.36-8.136-22.893-18.27-32.841-29.093l16.646-13.805z"></path><path fill="#ed656e" d="M1214.597 347.955c10.303 10.775 20.836 20.908 33.196 29.044 3.825 2.518 7.137 5.816 10.992 8.903-3.171 4.397-6.65 8.648-10.432 13.046-6.785-5.184-13.998-9.858-19.529-16.038-4.946-5.527-9.687-8.644-17.309-8.215-2.616.147-5.734-2.788-8.067-4.923-3.026-2.769-5.497-6.144-8.35-9.568 6.286-4.273 12.715-8.237 19.499-12.25z"></path></svg>
\ No newline at end of file
diff --git a/web/src/components/initialSetup/welcome/WelcomeModal.tsx b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
index adba63ada..c9472992f 100644
--- a/web/src/components/initialSetup/welcome/WelcomeModal.tsx
+++ b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
@@ -10,7 +10,7 @@ import { FiCheckCircle, FiMessageSquare, FiShare2 } from "react-icons/fi";
 import { useEffect, useState } from "react";
 import { BackButton } from "@/components/BackButton";
 import { ApiKeyForm } from "@/components/llm/ApiKeyForm";
-import { WellKnownLLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { checkLlmProvider } from "./lib";
 import { User } from "@/lib/types";
 
diff --git a/web/src/components/initialSetup/welcome/lib.ts b/web/src/components/initialSetup/welcome/lib.ts
index 65e7ace95..5cbe54cc3 100644
--- a/web/src/components/initialSetup/welcome/lib.ts
+++ b/web/src/components/initialSetup/welcome/lib.ts
@@ -1,7 +1,7 @@
 import {
   FullLLMProvider,
   WellKnownLLMProviderDescriptor,
-} from "@/app/admin/models/llm/interfaces";
+} from "@/app/admin/configuration/llm/interfaces";
 import { User } from "@/lib/types";
 
 const DEFAULT_LLM_PROVIDER_TEST_COMPLETE_KEY = "defaultLlmProviderTestComplete";
diff --git a/web/src/components/llm/ApiKeyForm.tsx b/web/src/components/llm/ApiKeyForm.tsx
index c46de56a4..0ebe38dc3 100644
--- a/web/src/components/llm/ApiKeyForm.tsx
+++ b/web/src/components/llm/ApiKeyForm.tsx
@@ -1,9 +1,9 @@
 import { Popup } from "../admin/connectors/Popup";
 import { useState } from "react";
 import { TabGroup, TabList, Tab, TabPanels, TabPanel } from "@tremor/react";
-import { WellKnownLLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
-import { LLMProviderUpdateForm } from "@/app/admin/models/llm/LLMProviderUpdateForm";
-import { CustomLLMProviderUpdateForm } from "@/app/admin/models/llm/CustomLLMProviderUpdateForm";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
+import { LLMProviderUpdateForm } from "@/app/admin/configuration/llm/LLMProviderUpdateForm";
+import { CustomLLMProviderUpdateForm } from "@/app/admin/configuration/llm/CustomLLMProviderUpdateForm";
 
 export const ApiKeyForm = ({
   onSuccess,
diff --git a/web/src/components/llm/ApiKeyModal.tsx b/web/src/components/llm/ApiKeyModal.tsx
index ec34d29fc..8c522fdc3 100644
--- a/web/src/components/llm/ApiKeyModal.tsx
+++ b/web/src/components/llm/ApiKeyModal.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect } from "react";
 import { ApiKeyForm } from "./ApiKeyForm";
 import { Modal } from "../Modal";
-import { WellKnownLLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { WellKnownLLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { checkLlmProvider } from "../initialSetup/welcome/lib";
 import { User } from "@/lib/types";
 import { useRouter } from "next/navigation";
diff --git a/web/src/components/tooltip/CustomTooltip.tsx b/web/src/components/tooltip/CustomTooltip.tsx
index c8a18795b..6695b99eb 100644
--- a/web/src/components/tooltip/CustomTooltip.tsx
+++ b/web/src/components/tooltip/CustomTooltip.tsx
@@ -41,11 +41,13 @@ export const CustomTooltip = ({
   light,
   citation,
   line,
+  medium,
   wrap,
   showTick = false,
   delay = 500,
   position = "bottom",
 }: {
+  medium?: boolean;
   content: string | ReactNode;
   children: JSX.Element;
   large?: boolean;
@@ -120,7 +122,7 @@ export const CustomTooltip = ({
         createPortal(
           <div
             className={`fixed z-[1000] ${citation ? "max-w-[350px]" : "w-40"} ${
-              large ? "w-96" : line && "max-w-64 w-auto"
+              large ? (medium ? "w-88" : "w-96") : line && "max-w-64 w-auto"
             } 
             transform -translate-x-1/2 text-sm 
             ${
diff --git a/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
index 0be182387..c1cdc8ee7 100644
--- a/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
+++ b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
@@ -2,7 +2,7 @@ import { Persona } from "@/app/admin/assistants/interfaces";
 import { CCPairBasicInfo, DocumentSet, User } from "../types";
 import { getCurrentUserSS } from "../userSS";
 import { fetchSS } from "../utilsSS";
-import { FullLLMProvider } from "@/app/admin/models/llm/interfaces";
+import { FullLLMProvider } from "@/app/admin/configuration/llm/interfaces";
 import { ToolSnapshot } from "../tools/interfaces";
 import { fetchToolsSS } from "../tools/fetchTools";
 import { IconManifestType } from "react-icons/lib";
diff --git a/web/src/lib/chat/fetchChatData.ts b/web/src/lib/chat/fetchChatData.ts
index 4bd023945..b3c1c4e45 100644
--- a/web/src/lib/chat/fetchChatData.ts
+++ b/web/src/lib/chat/fetchChatData.ts
@@ -14,10 +14,10 @@ import {
 import { ChatSession } from "@/app/chat/interfaces";
 import { Persona } from "@/app/admin/assistants/interfaces";
 import { InputPrompt } from "@/app/admin/prompt-library/interfaces";
-import { FullEmbeddingModelResponse } from "@/app/admin/models/embedding/components/types";
+import { FullEmbeddingModelResponse } from "@/components/embedding/interfaces";
 import { Settings } from "@/app/admin/settings/interfaces";
 import { fetchLLMProvidersSS } from "@/lib/llm/fetchLLMs";
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { Folder } from "@/app/chat/folders/interfaces";
 import { personaComparator } from "@/app/admin/assistants/lib";
 import { cookies } from "next/headers";
diff --git a/web/src/lib/llm/fetchLLMs.ts b/web/src/lib/llm/fetchLLMs.ts
index ca29d8c65..205a4b1c4 100644
--- a/web/src/lib/llm/fetchLLMs.ts
+++ b/web/src/lib/llm/fetchLLMs.ts
@@ -1,4 +1,4 @@
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { fetchSS } from "../utilsSS";
 
 export async function fetchLLMProvidersSS() {
diff --git a/web/src/lib/llm/utils.ts b/web/src/lib/llm/utils.ts
index c2a5a1ce8..e23bc819b 100644
--- a/web/src/lib/llm/utils.ts
+++ b/web/src/lib/llm/utils.ts
@@ -1,5 +1,5 @@
 import { Persona } from "@/app/admin/assistants/interfaces";
-import { LLMProviderDescriptor } from "@/app/admin/models/llm/interfaces";
+import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
 import { LlmOverride } from "@/lib/hooks";
 
 export function getFinalLLM(