diff --git a/README.md b/README.md
index c99d219..b640643 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@ Out of the box you'll get an app layout with chrome (header/sidebar), routing, b
 Create a .env file with the following values (ask for the real URLs)
 
 ```
-REACT_APP_ROUTER_URL=''
-REACT_APP_INFO_URL=''
-REACT_APP_RETRIEVER_URL=''
-REACT_APP_LLM_URL=''
+REACT_APP_ROUTER_URL='http://localhost:8080/assistant/chat/streaming'
+REACT_APP_INFO_URL='http://localhost:8080/admin/assistant'
+REACT_APP_RETRIEVER_URL='http://localhost:8080/admin/assistant/retrieverConnection'
+REACT_APP_LLM_URL='http://localhost:8080/admin/assistant/llm'
 ```
 
 ```bash
diff --git a/package-lock.json b/package-lock.json
index e012a48..2f10b90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.2",
       "license": "MIT",
       "dependencies": {
-        "@patternfly/chatbot": "^2.1.0-prerelease.17",
+        "@patternfly/chatbot": "^2.1.0-prerelease.26",
         "@patternfly/react-core": "^6.0.0",
         "@patternfly/react-icons": "^6.0.0",
         "@patternfly/react-styles": "^6.0.0",
@@ -3134,9 +3134,9 @@
       }
     },
     "node_modules/@patternfly/chatbot": {
-      "version": "2.1.0-prerelease.17",
-      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-2.1.0-prerelease.17.tgz",
-      "integrity": "sha512-fped4uypC7pci4jUgjguSo04v6h4YTow7x3Z9rU5+AjHfvE98vf7H7YAskd8wrhZOvjITHxhNiFGIZvQm4MViw==",
+      "version": "2.1.0-prerelease.26",
+      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-2.1.0-prerelease.26.tgz",
+      "integrity": "sha512-Gaw2YgA53s2dikHun6asAV+QPhjgri5stYeAIwMK9jw+GNaniNh7dQTDwuoBcTjcapN3rdK/dOL7dPS2wzDMcw==",
       "license": "MIT",
       "dependencies": {
         "@patternfly/react-code-editor": "^6.0.0",
@@ -3192,6 +3192,35 @@
         "react-dom": "^17 || ^18"
       }
     },
+    "node_modules/@patternfly/react-core/node_modules/file-selector": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-2.1.2.tgz",
+      "integrity": "sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.7.0"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@patternfly/react-core/node_modules/react-dropzone": {
+      "version": "14.3.5",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.5.tgz",
+      "integrity": "sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "attr-accept": "^2.2.4",
+        "file-selector": "^2.1.0",
+        "prop-types": "^15.8.1"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8 || 18.0.0"
+      }
+    },
     "node_modules/@patternfly/react-icons": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-6.0.0.tgz",
@@ -5160,9 +5189,10 @@
       }
     },
     "node_modules/attr-accept": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
-      "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.5.tgz",
+      "integrity": "sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -20539,9 +20569,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tty-browserify": {
diff --git a/package.json b/package.json
index 5d11990..a0c9ab5 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@patternfly/react-core": "^6.0.0",
     "@patternfly/react-icons": "^6.0.0",
     "@patternfly/react-styles": "^6.0.0",
-    "@patternfly/chatbot": "^2.1.0-prerelease.17",
+    "@patternfly/chatbot": "^2.1.0-prerelease.26",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sirv-cli": "^2.0.2",
diff --git a/src/app/BaseChatbot/BaseChatbot.test.tsx b/src/app/BaseChatbot/BaseChatbot.test.tsx
index 1c2e8c6..fe7076a 100644
--- a/src/app/BaseChatbot/BaseChatbot.test.tsx
+++ b/src/app/BaseChatbot/BaseChatbot.test.tsx
@@ -50,7 +50,7 @@ describe('Base chatbot', () => {
         <RouterProvider router={router} />
       </AppDataProvider>,
     );
-    screen.getByText('Red Hat AI Assistant');
+    screen.getByText('Test');
     screen.getByText('Hello, Chatbot User');
     screen.getByText('How may I help you today?');
     screen.getByText('Verify all information from this tool. LLMs make mistakes.');
diff --git a/src/app/BaseChatbot/BaseChatbot.tsx b/src/app/BaseChatbot/BaseChatbot.tsx
index a47e11c..ed5be62 100644
--- a/src/app/BaseChatbot/BaseChatbot.tsx
+++ b/src/app/BaseChatbot/BaseChatbot.tsx
@@ -29,12 +29,7 @@ import { useAppData } from '@app/AppData/AppDataContext';
 
 const BaseChatbot: React.FunctionComponent = () => {
   const { chatbots } = useLoaderData() as { chatbots: CannedChatbot[] };
-  const {
-    flyoutMenuSelectedChatbot,
-    updateFlyoutMenuSelectedChatbot,
-    chatbots: appDataChatbots,
-    setChatbots,
-  } = useAppData();
+  const { flyoutMenuSelectedChatbot, updateFlyoutMenuSelectedChatbot, chatbots: appDataChatbots } = useAppData();
   const [isSendButtonDisabled, setIsSendButtonDisabled] = React.useState(true);
   const [messages, setMessages] = React.useState<MessageProps[]>([]);
   const [currentMessage, setCurrentMessage] = React.useState<string[]>([]);
@@ -48,17 +43,16 @@ const BaseChatbot: React.FunctionComponent = () => {
   const [hasStopButton, setHasStopButton] = React.useState(false);
   const [files, setFiles] = React.useState<UserFacingFile[]>([]);
   const [isLoadingFile, setIsLoadingFile] = React.useState<boolean>(false);
+  const [allChatbots, setAllChatbots] = React.useState<CannedChatbot[]>(chatbots);
 
   React.useEffect(() => {
     document.title = `Red Hat Composer AI Studio | ${currentChatbot?.name}`;
   }, []);
 
   React.useEffect(() => {
-    setChatbots(chatbots);
-  }, [chatbots]);
-
-  React.useEffect(() => {
-    setChatbots(appDataChatbots);
+    if (appDataChatbots.length > 0) {
+      setAllChatbots(appDataChatbots);
+    }
   }, [appDataChatbots]);
 
   React.useEffect(() => {
@@ -370,10 +364,10 @@ const BaseChatbot: React.FunctionComponent = () => {
     <Chatbot displayMode={displayMode}>
       <ChatbotHeader>
         <ChatbotHeaderMain>
-          <HeaderDropdown selectedChatbot={currentChatbot} chatbots={chatbots} onSelect={onSelect} />
+          <HeaderDropdown selectedChatbot={currentChatbot} chatbots={allChatbots} onSelect={onSelect} />
         </ChatbotHeaderMain>
-        {chatbots.length >= 2 && (
-          <Button component="a" href={`/compare?assistants=${chatbots[0].name}%2C${chatbots[1].name}`}>
+        {allChatbots.length >= 2 && (
+          <Button component="a" href={`/compare?assistants=${allChatbots[0].name}%2C${allChatbots[1].name}`}>
             Compare
           </Button>
         )}
diff --git a/src/app/Compare/CompareLayout.tsx b/src/app/Compare/CompareLayout.tsx
index 531763e..bc824a5 100644
--- a/src/app/Compare/CompareLayout.tsx
+++ b/src/app/Compare/CompareLayout.tsx
@@ -13,7 +13,7 @@ import { useAppData } from '@app/AppData/AppDataContext';
 
 export const CompareLayout: React.FunctionComponent = () => {
   // information from api
-  const { chatbots } = useLoaderData() as { chatbots: CannedChatbot[] };
+  const { chatbots: initialChatbots } = useLoaderData() as { chatbots: CannedChatbot[] };
 
   // state
   const [isSendButtonDisabled, setIsSendButtonDisabled] = React.useState(true);
@@ -30,6 +30,7 @@ export const CompareLayout: React.FunctionComponent = () => {
   const [files, setFiles] = React.useState<UserFacingFile[]>([]);
   const [isLoadingFile, setIsLoadingFile] = React.useState<boolean>(false);
   const [error, setError] = React.useState<ErrorObject>();
+  const [allChatbots, setAllChatbots] = React.useState<CannedChatbot[]>(initialChatbots);
 
   // constants for search params
   const [searchParams, setSearchParams] = useSearchParams();
@@ -40,16 +41,18 @@ export const CompareLayout: React.FunctionComponent = () => {
   const { status } = useChildStatus();
 
   // context, used for panels
-  const { setChatbots } = useAppData();
+  const { chatbots: appDataChatbots } = useAppData();
 
   React.useEffect(() => {
-    setChatbots(chatbots);
-  }, [chatbots]);
+    if (appDataChatbots.length > 0) {
+      setAllChatbots(appDataChatbots);
+    }
+  }, [appDataChatbots]);
 
   React.useEffect(() => {
     document.title = `Red Hat Composer AI Studio | Compare`;
     if (assistants && assistants.length === 2) {
-      const actualChatbots = chatbots.filter(
+      const actualChatbots = allChatbots.filter(
         (chatbot) => chatbot.name === assistants[0] || chatbot.name === assistants[1],
       );
       if (actualChatbots.length === 2) {
@@ -229,7 +232,7 @@ export const CompareLayout: React.FunctionComponent = () => {
           <div className={css('compare-item', !showFirstChatbot ? 'compare-item-hidden' : undefined)}>
             <CompareChild
               chatbot={firstChatbot}
-              allChatbots={chatbots}
+              allChatbots={allChatbots}
               controller={firstController}
               setController={setFirstController}
               input={input}
@@ -246,7 +249,7 @@ export const CompareLayout: React.FunctionComponent = () => {
           <div className={css('compare-item', !showSecondChatbot ? 'compare-item-hidden' : undefined)}>
             <CompareChild
               chatbot={secondChatbot}
-              allChatbots={chatbots}
+              allChatbots={allChatbots}
               controller={secondController}
               setController={setSecondController}
               input={input}
diff --git a/src/app/FlyoutForm/ExpandingTextInputs.tsx b/src/app/FlyoutForm/ExpandingTextInputs.tsx
index 055f9f5..cbd2d1f 100644
--- a/src/app/FlyoutForm/ExpandingTextInputs.tsx
+++ b/src/app/FlyoutForm/ExpandingTextInputs.tsx
@@ -53,7 +53,7 @@ export const ExpandingTextInputs: React.FunctionComponent<ExpandingTextInputsPro
         </Button>
       </div>
       {values.length > 0 && (
-        <section aria-label="Example questions" tabIndex={-1}>
+        <section className="expanding-text-input__section" aria-label="Example questions" tabIndex={-1}>
           {values.map((value, index) => {
             return (
               <div key={index} className="expanding-text-inputs__row expanding-text-input__row-with-background">
diff --git a/src/app/HeaderDropdown/HeaderDropdown.tsx b/src/app/HeaderDropdown/HeaderDropdown.tsx
index 4ba3ed6..07fc24a 100644
--- a/src/app/HeaderDropdown/HeaderDropdown.tsx
+++ b/src/app/HeaderDropdown/HeaderDropdown.tsx
@@ -54,6 +54,7 @@ export const HeaderDropdown: React.FunctionComponent<HeaderDropdownProps> = ({
     }
   };
 
+  const selectedChatbotName = selectedChatbot?.displayName ?? selectedChatbot?.name;
   return (
     <Dropdown
       className="assistant-selector-menu"
@@ -67,7 +68,7 @@ export const HeaderDropdown: React.FunctionComponent<HeaderDropdownProps> = ({
       toggle={(toggleRef: React.Ref<MenuToggleElement>) => {
         return (
           <MenuToggle ref={toggleRef} onClick={onToggleClick} isExpanded={isOpen}>
-            Red Hat AI Assistant
+            {selectedChatbotName ?? 'Red Hat AI Assistant'}
           </MenuToggle>
         );
       }}
diff --git a/src/app/app.css b/src/app/app.css
index 6ae1c5d..6c627a1 100644
--- a/src/app/app.css
+++ b/src/app/app.css
@@ -552,6 +552,12 @@ pf-v6-c-page__main-container.pf-m-fill {
   position: relative;
 }
 
+.expanding-text-input__section {
+  display: flex;
+  gap: var(--pf-t--global--spacer--sm);
+  flex-direction: column;
+}
+
 .hidden {
   position: absolute;
   opacity: 0;