diff --git a/package.json b/package.json
index 7c94813f2..e1b9f5e13 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "plugin-helpers": "node ../../scripts/plugin_helpers",
     "test:jest": "../../node_modules/.bin/jest --config ./test/jest.config.js",
     "test:jest:dev": "../../node_modules/.bin/jest --watch --config ./test/jest.config.js",
+    "test:jest:update-snapshots": "yarn run test:jest -u",
     "build": "yarn plugin-helpers build",
     "postbuild": "echo Renaming build artifact to [$npm_package_config_zip_name-$npm_package_version.zip] && mv build/$npm_package_config_id*.zip build/$npm_package_config_zip_name-$npm_package_version.zip"
   },
diff --git a/public/app.scss b/public/app.scss
index 1682d852e..ffbc4e3a0 100644
--- a/public/app.scss
+++ b/public/app.scss
@@ -116,3 +116,7 @@ $euiTextColor: $euiColorDarkestShade !default;
     }
   }
 }
+
+.sa-overview-widget-empty tbody > .euiTableRow > .euiTableRowCell {
+  border-bottom: none;
+} 
diff --git a/public/pages/Overview/components/Widgets/DetectorsWidget.tsx b/public/pages/Overview/components/Widgets/DetectorsWidget.tsx
index 03c8f9ecc..262cfb448 100644
--- a/public/pages/Overview/components/Widgets/DetectorsWidget.tsx
+++ b/public/pages/Overview/components/Widgets/DetectorsWidget.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiBasicTableColumn, EuiButton, EuiLink } from '@elastic/eui';
+import { EuiBasicTableColumn, EuiButton, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import { ROUTES } from '../../../../utils/constants';
 import React, { useCallback } from 'react';
 import { DetectorItem } from '../../models/interfaces';
@@ -71,6 +71,23 @@ export const DetectorsWidget: React.FC<DetectorsWidgetProps> = ({
     });
   }, []);
 
+  const widgetEmptyMessage =
+    detectors.length === 0 ? (
+      <EuiEmptyPrompt
+        body={
+          <p>
+            <span style={{ display: 'block' }}>No security detectors.</span>Create a detector to
+            generate findings.
+          </p>
+        }
+        actions={[
+          <EuiButton fill={false} href={`#${ROUTES.DETECTORS_CREATE}`}>
+            Create detector
+          </EuiButton>,
+        ]}
+      />
+    ) : undefined;
+
   const actions = React.useMemo(
     () => [
       <EuiButton href={`#${ROUTES.DETECTORS}`}>View all detectors</EuiButton>,
@@ -85,6 +102,8 @@ export const DetectorsWidget: React.FC<DetectorsWidgetProps> = ({
         columns={getColumns(detectorIdToHit, showDetectorDetails)}
         items={detectors}
         loading={loading}
+        message={widgetEmptyMessage}
+        className={widgetEmptyMessage ? 'sa-overview-widget-empty' : undefined}
       />
     </WidgetContainer>
   );
diff --git a/public/pages/Overview/components/Widgets/RecentAlertsWidget.tsx b/public/pages/Overview/components/Widgets/RecentAlertsWidget.tsx
index 398291a3c..62979c10a 100644
--- a/public/pages/Overview/components/Widgets/RecentAlertsWidget.tsx
+++ b/public/pages/Overview/components/Widgets/RecentAlertsWidget.tsx
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiBasicTableColumn, EuiButton } from '@elastic/eui';
-import { DEFAULT_EMPTY_DATA, ROUTES } from '../../../../utils/constants';
+import { EuiBasicTableColumn, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
+import { DEFAULT_EMPTY_DATA, ROUTES, SortDirection } from '../../../../utils/constants';
 import React, { useEffect, useState } from 'react';
 import { AlertItem } from '../../models/interfaces';
 import { TableWidget } from './TableWidget';
@@ -45,6 +45,9 @@ export const RecentAlertsWidget: React.FC<RecentAlertsWidgetProps> = ({
   loading = false,
 }) => {
   const [alertItems, setAlertItems] = useState<AlertItem[]>([]);
+  const [widgetEmptyMessage, setwidgetEmptyMessage] = useState<React.ReactNode | undefined>(
+    undefined
+  );
 
   useEffect(() => {
     items.sort((a, b) => {
@@ -53,6 +56,18 @@ export const RecentAlertsWidget: React.FC<RecentAlertsWidgetProps> = ({
       return timeA - timeB;
     });
     setAlertItems(items.slice(0, 20));
+    setwidgetEmptyMessage(
+      items.length > 0 ? undefined : (
+        <EuiEmptyPrompt
+          body={
+            <p>
+              <span style={{ display: 'block' }}>No recent alerts.</span>Adjust the time range to
+              see more results.
+            </p>
+          }
+        />
+      )
+    );
   }, [items]);
 
   const actions = React.useMemo(
@@ -62,7 +77,14 @@ export const RecentAlertsWidget: React.FC<RecentAlertsWidgetProps> = ({
 
   return (
     <WidgetContainer title={'Recent alerts'} actions={actions}>
-      <TableWidget columns={columns} items={alertItems} loading={loading} />
+      <TableWidget
+        columns={columns}
+        items={alertItems}
+        sorting={{ sort: { field: 'time', direction: SortDirection.DESC } }}
+        loading={loading}
+        message={widgetEmptyMessage}
+        className={widgetEmptyMessage ? 'sa-overview-widget-empty' : undefined}
+      />
     </WidgetContainer>
   );
 };
diff --git a/public/pages/Overview/components/Widgets/RecentFindingsWidget.tsx b/public/pages/Overview/components/Widgets/RecentFindingsWidget.tsx
index 2e0bbe1df..aa9d658e5 100644
--- a/public/pages/Overview/components/Widgets/RecentFindingsWidget.tsx
+++ b/public/pages/Overview/components/Widgets/RecentFindingsWidget.tsx
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiBasicTableColumn, EuiButton } from '@elastic/eui';
-import { ROUTES } from '../../../../utils/constants';
+import { EuiBasicTableColumn, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
+import { ROUTES, SortDirection } from '../../../../utils/constants';
 import React, { useEffect, useState } from 'react';
 import { FindingItem } from '../../models/interfaces';
 import { TableWidget } from './TableWidget';
@@ -52,12 +52,27 @@ export const RecentFindingsWidget: React.FC<RecentFindingsWidgetProps> = ({
   loading = false,
 }) => {
   const [findingItems, setFindingItems] = useState<FindingItem[]>([]);
+  const [widgetEmptyMessage, setWidgetEmptyMessage] = useState<React.ReactNode | undefined>(
+    undefined
+  );
 
   useEffect(() => {
     items.sort((a, b) => {
       return a.time - b.time;
     });
     setFindingItems(items.slice(0, 20));
+    setWidgetEmptyMessage(
+      items.length > 0 ? undefined : (
+        <EuiEmptyPrompt
+          body={
+            <p>
+              <span style={{ display: 'block' }}>No recent findings.</span>Adjust the time range to
+              see more results.
+            </p>
+          }
+        />
+      )
+    );
   }, [items]);
 
   const actions = React.useMemo(
@@ -67,7 +82,14 @@ export const RecentFindingsWidget: React.FC<RecentFindingsWidgetProps> = ({
 
   return (
     <WidgetContainer title={'Recent findings'} actions={actions}>
-      <TableWidget columns={columns} items={findingItems} loading={loading} />
+      <TableWidget
+        columns={columns}
+        items={findingItems}
+        sorting={{ sort: { field: 'time', direction: SortDirection.DESC } }}
+        loading={loading}
+        message={widgetEmptyMessage}
+        className={widgetEmptyMessage ? 'sa-overview-widget-empty' : undefined}
+      />
     </WidgetContainer>
   );
 };
diff --git a/public/pages/Overview/components/Widgets/Summary.tsx b/public/pages/Overview/components/Widgets/Summary.tsx
index 91d96d26e..56ae1e54d 100644
--- a/public/pages/Overview/components/Widgets/Summary.tsx
+++ b/public/pages/Overview/components/Widgets/Summary.tsx
@@ -3,13 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiStat } from '@elastic/eui';
-import { euiPaletteColorBlind } from '@elastic/eui';
+import {
+  EuiEmptyPrompt,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiLinkColor,
+  EuiStat,
+} from '@elastic/eui';
 import React, { useCallback, useEffect, useState } from 'react';
 import { WidgetContainer } from './WidgetContainer';
 import { summaryGroupByOptions } from '../../utils/constants';
 import {
-  alertsDefaultColor,
   getChartTimeUnit,
   getDomainRange,
   getOverviewVisualizationSpec,
@@ -46,8 +51,8 @@ export const Summary: React.FC<SummaryProps> = ({
 }) => {
   const [groupBy, setGroupBy] = useState('');
   const [summaryData, setSummaryData] = useState<SummaryData[]>([]);
-  const [activeAlerts, setActiveAlerts] = useState(0);
-  const [totalFindings, setTotalFindings] = useState(0);
+  const [activeAlerts, setActiveAlerts] = useState<undefined | number>(undefined);
+  const [totalFindings, setTotalFindings] = useState<undefined | number>(undefined);
 
   const onGroupByChange = useCallback((event) => {
     setGroupBy(event.target.value);
@@ -113,44 +118,62 @@ export const Summary: React.FC<SummaryProps> = ({
     renderVisualization(generateVisualizationSpec(summaryData, groupBy), 'summary-view');
   }, [summaryData, groupBy]);
 
+  const createStatComponent = useCallback(
+    (description: string, urlData: { url: string; color: EuiLinkColor }, stat?: number) => (
+      <EuiFlexItem grow={false}>
+        <EuiStat
+          title={
+            stat === 0 ? (
+              0
+            ) : (
+              <EuiLink href={`#${urlData.url}`} color={urlData.color}>
+                {stat}
+              </EuiLink>
+            )
+          }
+          description={description}
+          textAlign="left"
+          titleSize="l"
+          titleColor="subdued"
+          isLoading={stat === undefined}
+        />
+      </EuiFlexItem>
+    ),
+    []
+  );
+
   return (
     <WidgetContainer title="Findings and alert count" actions={createVisualizationActions(groupBy)}>
       <EuiFlexGroup gutterSize="s" direction="column">
         <EuiFlexItem>
           <EuiFlexGroup gutterSize="xl">
-            <EuiFlexItem grow={false}>
-              <EuiStat
-                title={
-                  <EuiLink href={`#${ROUTES.ALERTS}`} style={{ color: alertsDefaultColor }}>
-                    {activeAlerts}
-                  </EuiLink>
-                }
-                description="Total active alerts"
-                textAlign="left"
-                titleColor="primary"
-                isLoading={!activeAlerts}
-              />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiStat
-                title={
-                  <EuiLink
-                    href={`#${ROUTES.FINDINGS}`}
-                    style={{ color: euiPaletteColorBlind()[1] }}
-                  >
-                    {totalFindings}
-                  </EuiLink>
-                }
-                description="Total findings"
-                textAlign="left"
-                titleColor="primary"
-                isLoading={!totalFindings}
-              />
-            </EuiFlexItem>
+            {createStatComponent(
+              'Total active alerts',
+              { url: ROUTES.ALERTS, color: 'danger' },
+              activeAlerts
+            )}
+            {createStatComponent(
+              'Total findings',
+              { url: ROUTES.FINDINGS, color: 'primary' },
+              totalFindings
+            )}
           </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem>
-          <ChartContainer chartViewId={'summary-view'} loading={loading} />
+          {activeAlerts === 0 && totalFindings === 0 ? (
+            <EuiEmptyPrompt
+              title={<h2>No alerts and findings found</h2>}
+              body={
+                <p>
+                  Adjust the time range to see more results or{' '}
+                  <EuiLink href={`#${ROUTES.DETECTORS_CREATE}`}>create a detector</EuiLink> to
+                  generate findings.{' '}
+                </p>
+              }
+            />
+          ) : (
+            <ChartContainer chartViewId={'summary-view'} loading={loading} />
+          )}
         </EuiFlexItem>
       </EuiFlexGroup>
     </WidgetContainer>
diff --git a/public/pages/Overview/components/Widgets/TableWidget.tsx b/public/pages/Overview/components/Widgets/TableWidget.tsx
index f59bd4da9..1d9915258 100644
--- a/public/pages/Overview/components/Widgets/TableWidget.tsx
+++ b/public/pages/Overview/components/Widgets/TableWidget.tsx
@@ -9,16 +9,19 @@ import { TableWidgetItem, TableWidgetProps } from '../../models/types';
 
 export class TableWidget<T extends TableWidgetItem> extends React.Component<TableWidgetProps<T>> {
   render() {
-    const { columns, items, loading = false } = this.props;
+    const { columns, items, sorting, message, className, loading = false } = this.props;
 
     return (
       <EuiInMemoryTable<T>
+        className={className}
         compressed
         columns={columns}
         items={items}
         itemId={(item: T) => `${item.id}`}
         pagination={{ pageSize: 10, pageSizeOptions: [10] }}
+        sorting={sorting}
         loading={loading}
+        message={message}
       />
     );
   }
diff --git a/public/pages/Overview/components/Widgets/TopRulesWidget.tsx b/public/pages/Overview/components/Widgets/TopRulesWidget.tsx
index 40de1f699..0404f3086 100644
--- a/public/pages/Overview/components/Widgets/TopRulesWidget.tsx
+++ b/public/pages/Overview/components/Widgets/TopRulesWidget.tsx
@@ -9,6 +9,7 @@ import { FindingItem } from '../../models/interfaces';
 import { WidgetContainer } from './WidgetContainer';
 import { getTopRulesVisualizationSpec } from '../../utils/helpers';
 import { ChartContainer } from '../../../../components/Charts/ChartContainer';
+import { EuiEmptyPrompt } from '@elastic/eui';
 
 export interface TopRulesWidgetProps {
   findings: FindingItem[];
@@ -35,7 +36,21 @@ export const TopRulesWidget: React.FC<TopRulesWidgetProps> = ({ findings, loadin
 
   return (
     <WidgetContainer title="Most frequent detection rules">
-      <ChartContainer chartViewId={'top-rules-view'} loading={loading} />
+      {findings.length === 0 ? (
+        <EuiEmptyPrompt
+          style={{ position: 'relative' }}
+          body={
+            <div style={{ display: 'flex', justifyContent: 'center' }}>
+              <p style={{ position: 'absolute', top: 'calc(50% - 20px)' }}>
+                <span style={{ display: 'block' }}>No findings with detection rules.</span>Adjust
+                the time range to see more results.
+              </p>
+            </div>
+          }
+        />
+      ) : (
+        <ChartContainer chartViewId={'top-rules-view'} loading={loading} />
+      )}
     </WidgetContainer>
   );
 };
diff --git a/public/pages/Overview/models/types.ts b/public/pages/Overview/models/types.ts
index d5d6b7786..83ed06681 100644
--- a/public/pages/Overview/models/types.ts
+++ b/public/pages/Overview/models/types.ts
@@ -4,6 +4,7 @@
  */
 
 import { EuiBasicTableColumn } from '@elastic/eui';
+import { SortDirection } from '../../../utils/constants';
 import { AlertItem, DetectorItem, FindingItem } from './interfaces';
 
 export type TableWidgetItem = FindingItem | AlertItem | DetectorItem;
@@ -11,5 +12,13 @@ export type TableWidgetItem = FindingItem | AlertItem | DetectorItem;
 export type TableWidgetProps<T extends TableWidgetItem> = {
   columns: EuiBasicTableColumn<T>[];
   items: T[];
+  sorting?: {
+    sort: {
+      field: string;
+      direction: SortDirection;
+    };
+  };
+  className?: string;
   loading?: boolean;
+  message?: React.ReactNode;
 };