diff --git a/plugins/argo-workflows/README.md b/plugins/argo-workflows/README.md
index e544230..58a67ea 100644
--- a/plugins/argo-workflows/README.md
+++ b/plugins/argo-workflows/README.md
@@ -1,11 +1,14 @@
 # argo-workflows
 
-Welcome to the argo-workflows plugin!
+Welcome to the Argo Workflows plugin!
 
 This plugin displays your Argo Workflows in Backstage
 
 ## Getting started
 
+![GIF](doc/images/demo1.gif)
+
+
 ### Configuration
 
 Entities must be annotated with Kubernetes annotations. For example:
@@ -16,18 +19,51 @@ kind: Component
 metadata:
   name: backstage
   annotations:
-    backstage.io/kubernetes-id: backstage
     backstage.io/kubernetes-namespace: default
     backstage.io/kubernetes-label-selector: env=dev,my=label
 ```
 
-Configure your Argo Workflows' instance base URL
+Configure your Argo Workflows' instance base URL. Ths is optional. If defined, workflows will have links to Argo Workflows UI.
 
 ```yaml
 argoWorkflows:
   baseUrl: https://my-argo-workflows.url
 ```
 
+Update your Entity page. For example: 
+```typescript
+// in packages/app/src/components/catalog/EntityPage.tsx
+import {
+    EntityArgoWorkflowsOverviewCard,
+    isArgoWorkflowsAvailable,
+} from '@internal/plugin-argo-workflows';
+
+
+const overviewContent = (
+<Grid container spacing={3} alignItems="stretch">
+    {entityWarningContent}
+    <Grid item md={6}>
+        <EntityAboutCard variant="gridItem" />
+    </Grid>
+    <EntitySwitch>
+        <EntitySwitch.Case if={e => isArgoWorkflowsAvailable(e)}>
+        <Grid item md={6}>
+            <EntityArgoWorkflowsOverviewCard />
+        </Grid>
+        </EntitySwitch.Case>
+    </EntitySwitch>
+        ...
+</Grid>
+);
+```
+
+
+#### Annotations
+- `backstage.io/kubernetes-namespace`: Optional. Defaults to the `default` namespace.
+- `backstage.io/kubernetes-label-selector`: Conditionally required. One of label selectors must be defined.
+- `argo-workflows/label-selector`: Conditionally required. One of label selectors must be defined. This value takes precedent over the one above. 
+- `argo-workflows/cluster-name`: Optional. Specifies the name of Kubernetes cluster to retrieve information from.
+
 ### Authentication
 
 This plugin supports two methods of authentication.
@@ -105,7 +141,7 @@ See [this documentation](https://argoproj.github.io/argo-workflows/access-token/
 The plugin can use configured Kubernetes clusters to fetch resources instead of going through the Argo Workflows API
 The entity must be annotated correctly for it to work.
 
-For example, for a Kubernetes cluster given in your `ap-config.yaml`
+For example, for a Kubernetes cluster given in your `app-config.yaml`
 
 ```yaml
 kubernetes:
@@ -129,7 +165,6 @@ kind: Component
 metadata:
   name: backstage
   annotations:
-    backstage.io/kubernetes-id: backstage
     backstage.io/kubernetes-namespace: default
     backstage.io/kubernetes-label-selector: env=dev,my=label
     argo-workflows/cluster-name: my-cluster-1
diff --git a/plugins/argo-workflows/doc/images/demo1.gif b/plugins/argo-workflows/doc/images/demo1.gif
new file mode 100644
index 0000000..ef97091
Binary files /dev/null and b/plugins/argo-workflows/doc/images/demo1.gif differ
diff --git a/plugins/argo-workflows/src/components/Overview/Overview.tsx b/plugins/argo-workflows/src/components/Overview/Overview.tsx
index 5fcb8f1..927b0c1 100644
--- a/plugins/argo-workflows/src/components/Overview/Overview.tsx
+++ b/plugins/argo-workflows/src/components/Overview/Overview.tsx
@@ -30,9 +30,10 @@ export const ArgoWorkflowsOverviewPage = () => (
 );
 
 export const ArgoWorkflowsOverviewCard = () => {
-  if (isArgoWorkflowsAvailable(useEntity().entity)) {
+  const { entity } = useEntity();
+  if (isArgoWorkflowsAvailable(entity)) {
     return (
-      <InfoCard>
+      <InfoCard {...{ title: "Argo Workflows" }}>
         <OverviewTable />
       </InfoCard>
     );
diff --git a/plugins/argo-workflows/src/components/WorkflowOverview/WorkflowOverview.tsx b/plugins/argo-workflows/src/components/WorkflowOverview/WorkflowOverview.tsx
index c499c80..d208cdd 100644
--- a/plugins/argo-workflows/src/components/WorkflowOverview/WorkflowOverview.tsx
+++ b/plugins/argo-workflows/src/components/WorkflowOverview/WorkflowOverview.tsx
@@ -113,7 +113,7 @@ export const OverviewTable = () => {
     } as TableData;
   });
 
-  if (data && data.length !== 0) {
+  if (data && data.length > 0) {
     return (
       <Table
         options={{
@@ -126,6 +126,7 @@ export const OverviewTable = () => {
       />
     );
   }
-
-  return null;
+  return (
+    <Alert severity="info">"No workflows found with provided labels"</Alert>
+  );
 };
diff --git a/plugins/argo-workflows/src/index.ts b/plugins/argo-workflows/src/index.ts
index eb1e402..1edc6d4 100644
--- a/plugins/argo-workflows/src/index.ts
+++ b/plugins/argo-workflows/src/index.ts
@@ -2,4 +2,5 @@ export {
   argoWorkflowsPlugin,
   ArgoWorkflowsPage,
   EntityArgoWorkflowsOverviewCard,
+  isArgoWorkflowsAvailable,
 } from "./plugin";