diff --git a/docs/migration.md b/docs/migration.md
index a9b901c6f..3e71e7d2d 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -4,7 +4,14 @@ The following changes and services are required to migrate from the old version
 
 Refer the `.env.example` file for the latest environment variable changes.
 
-## New Azure services
+If you previously had Azure Chat running and have pulled the v2 version you will need at minimum to make the following changes:
+
+* Change the "OPENAI_API_KEY" environment setting to "AZURE_OPENAI_API_KEY"
+* Add an additional container to your Cosmos DB database called "config" with a partition key of "/userId"
+* Add the "AZURE_KEY_VAULT_NAME" environment setting with the name of your Azure Key Vault
+* Add the "New Azure Services" settings below if you wish to use these features
+
+## New Azure Services
 
 1. **Azure OpenAI Service**: Create a new Azure OpenAI Service and deploy a DALL-E 3 model. DALL-E is available within the following [regions](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#dall-e-models-preview).
 
diff --git a/src/features/chat-home-page/chat-home.tsx b/src/features/chat-home-page/chat-home.tsx
index 3047326bb..07e97b779 100644
--- a/src/features/chat-home-page/chat-home.tsx
+++ b/src/features/chat-home-page/chat-home.tsx
@@ -37,32 +37,41 @@ export const ChatHome: FC<ChatPersonaProps> = (props) => {
           <div>
             <h2 className="text-2xl font-bold mb-3">Extensions</h2>
 
-            <div className="grid grid-cols-3 gap-3">
-              {props.extensions.map((extension) => {
-                return (
-                  <ExtensionCard
-                    extension={extension}
-                    key={extension.id}
-                    showContextMenu={false}
-                  />
-                );
-              })}
-            </div>
+            {props.extensions && props.extensions.length > 0 ? (
+              <div className="grid grid-cols-3 gap-3">
+                {props.extensions.map((extension) => {
+                  return (
+                    <ExtensionCard
+                      extension={extension}
+                      key={extension.id}
+                      showContextMenu={false}
+                    />
+                  );
+                })}
+              </div>
+            ) :
+              <p className="text-muted-foreground max-w-xl">No extentions created</p>
+            }
+
           </div>
           <div>
-            <h2 className="text-2xl font-bold mb-3">Persona</h2>
+            <h2 className="text-2xl font-bold mb-3">Personas</h2>
 
-            <div className="grid grid-cols-3 gap-3">
-              {props.personas.map((persona) => {
-                return (
-                  <PersonaCard
-                    persona={persona}
-                    key={persona.id}
-                    showContextMenu={false}
-                  />
-                );
-              })}
-            </div>
+            {props.personas && props.personas.length > 0 ? (
+              <div className="grid grid-cols-3 gap-3">
+                {props.personas.map((persona) => {
+                  return (
+                    <PersonaCard
+                      persona={persona}
+                      key={persona.id}
+                      showContextMenu={false}
+                    />
+                  );
+                })}
+              </div>
+            ) :
+              <p className="text-muted-foreground max-w-xl">No personas created</p>
+            }
           </div>
         </div>
         <AddExtension />