diff --git a/public/pages/Correlations/components/FilterGroup.tsx b/public/pages/Correlations/components/FilterGroup.tsx
index 889a0b8a1..661525e81 100644
--- a/public/pages/Correlations/components/FilterGroup.tsx
+++ b/public/pages/Correlations/components/FilterGroup.tsx
@@ -13,7 +13,7 @@ import {
   EuiFieldSearch,
   FilterChecked,
   EuiPopoverFooter,
-  EuiButtonEmpty,
+  EuiButtonGroup,
 } from '@elastic/eui';
 
 export type FilterItem = {
@@ -31,6 +31,19 @@ export interface LogTypeFilterGroupProps {
   setItems: (items: FilterItem[]) => void;
 }
 
+type SelectionToggleOptionIds = 'select_all' | 'deselect_all';
+
+const selectionToggleButtons = [
+  {
+    id: 'select_all',
+    label: 'Select all',
+  },
+  {
+    id: 'deselect_all',
+    label: 'Deselect all',
+  },
+];
+
 export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
   groupName,
   items,
@@ -39,7 +52,10 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
   setItems,
 }) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-  const [showActiveFilters, setShowActiveFilters] = useState(false);
+  const [filterUpdated, setFilterUpdated] = useState(false);
+  const [selectionToggleSelectedId, setSelectionToggleSelectedId] = useState<
+    SelectionToggleOptionIds
+  >('select_all');
 
   const onButtonClick = () => {
     setIsPopoverOpen(!isPopoverOpen);
@@ -62,6 +78,18 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
           ...newItems[index],
           checked: undefined,
         };
+
+        // This means, it is not a grouping label,
+        // so we need to switch off the grouping label too if it exists
+        if (!newItems[index].childOptionIds) {
+          for (let i = index - 1; i >= 0; i--) {
+            // Found the parent grouping label
+            if (newItems[i].childOptionIds) {
+              newItems[i].checked = undefined;
+              break;
+            }
+          }
+        }
         break;
 
       default:
@@ -69,7 +97,29 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
           ...newItems[index],
           checked: 'on',
         };
+
+        // This means, it is not a grouping label,
+        // so we need to switch ON the grouping label if all children are checked
+        if (!newItems[index].childOptionIds) {
+          let i: number;
+          for (i = index - 1; i >= 0; i--) {
+            const childIds = newItems[i].childOptionIds;
+            // Found the parent grouping label
+            if (childIds) {
+              let allChecked = true;
+              newItems.forEach((item) => {
+                if (childIds.has(item.id)) {
+                  allChecked = allChecked && !!item.checked;
+                }
+              });
+              newItems[i].checked = allChecked ? 'on' : undefined;
+              break;
+            }
+          }
+        }
     }
+
+    // If a grouping label is toggled, toggle all its children
     const childIds = newItems[index].childOptionIds;
     if (childIds) {
       newItems.forEach((item) => {
@@ -80,7 +130,12 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
     }
 
     setItems(newItems);
-    setShowActiveFilters(true);
+    setFilterUpdated(!newItems.every((item) => item.checked));
+  }
+
+  function onSelectionToggleChange(optionId: string) {
+    setSelectionToggleSelectedId(optionId as SelectionToggleOptionIds);
+    toggleAll(optionId === 'select_all' ? 'on' : undefined);
   }
 
   function toggleAll(state: 'on' | undefined) {
@@ -90,7 +145,7 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
     }));
 
     setItems(newItems);
-    setShowActiveFilters(!!state);
+    setFilterUpdated(!state);
   }
 
   function search(term: string) {
@@ -100,18 +155,18 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
       item.visible = item.id.toLowerCase().includes(term);
     });
     setItems(newItems);
-    setShowActiveFilters(true);
+    setFilterUpdated(true);
   }
 
+  const numActiveFilters = items.filter((item) => !item.childOptionIds && item.checked === 'on')
+    .length;
   const button = (
     <EuiFilterButton
       iconType="arrowDown"
       onClick={onButtonClick}
       isSelected={isPopoverOpen}
-      hasActiveFilters={showActiveFilters && !!items.find((item) => item.checked === 'on')}
-      numActiveFilters={
-        showActiveFilters ? items.filter((item) => item.checked === 'on').length : undefined
-      }
+      hasActiveFilters={filterUpdated}
+      numActiveFilters={numActiveFilters > 0 ? numActiveFilters : undefined}
     >
       {groupName}
     </EuiFilterButton>
@@ -127,7 +182,7 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
         panelPaddingSize="none"
       >
         <EuiPopoverTitle paddingSize="s">
-          <EuiFieldSearch compressed onSearch={search} />
+          <EuiFieldSearch compressed onSearch={search} isClearable={true} />
         </EuiPopoverTitle>
         <div
           className="ouiFilterSelect__items"
@@ -154,10 +209,12 @@ export const FilterGroup: React.FC<LogTypeFilterGroupProps> = ({
         </div>
         {hasFooter && (
           <EuiPopoverFooter>
-            <div>
-              <EuiButtonEmpty onClick={() => toggleAll('on')}>Select all</EuiButtonEmpty>
-              <EuiButtonEmpty onClick={() => toggleAll(undefined)}>Deselect all</EuiButtonEmpty>
-            </div>
+            <EuiButtonGroup
+              legend="All toptions selection toggle group"
+              options={selectionToggleButtons}
+              idSelected={selectionToggleSelectedId}
+              onChange={onSelectionToggleChange}
+            />
           </EuiPopoverFooter>
         )}
       </EuiPopover>
diff --git a/public/pages/Correlations/components/FindingCard.tsx b/public/pages/Correlations/components/FindingCard.tsx
index 2305c1de8..69358544f 100644
--- a/public/pages/Correlations/components/FindingCard.tsx
+++ b/public/pages/Correlations/components/FindingCard.tsx
@@ -14,6 +14,8 @@ import {
   EuiHorizontalRule,
   EuiToolTip,
   EuiDescriptionList,
+  EuiText,
+  EuiIcon,
 } from '@elastic/eui';
 import { getSeverityLabel, getSeverityColor, getLabelFromLogType } from '../utils/constants';
 import { DataStore } from '../../../store/DataStore';
@@ -43,19 +45,19 @@ export const FindingCard: React.FC<FindingCardProps> = ({
 }) => {
   const list = [
     {
-      title: 'Detection rule',
-      description: detectionRule.name,
+      title: <b>Detection rule</b>,
+      description: <EuiText size="s">{detectionRule.name}</EuiText>,
     },
   ];
 
   if (finding.correlationRule) {
     list.unshift({
-      title: 'Correlation score',
-      description: finding.correlationRule.name,
+      title: <b>Correlation rule</b>,
+      description: <EuiText size="s">{finding.correlationRule.name}</EuiText>,
     });
   }
 
-  const badgePadding = '2px 7px';
+  const badgePadding = '0px 4px';
   const { text: severityText, background } = getSeverityColor(detectionRule.severity);
 
   const header = (
@@ -65,7 +67,7 @@ export const FindingCard: React.FC<FindingCardProps> = ({
           <EuiBadge color={background} style={{ padding: badgePadding, color: severityText }}>
             {getSeverityLabel(detectionRule.severity)}
           </EuiBadge>
-          <EuiBadge color="hollow" style={{ padding: '3px 10px' }}>
+          <EuiBadge color="hollow" style={{ padding: '0px 4px' }}>
             {getLabelFromLogType(logType)}
           </EuiBadge>
         </div>
@@ -90,7 +92,9 @@ export const FindingCard: React.FC<FindingCardProps> = ({
     </EuiFlexGroup>
   );
 
-  const attrList = <EuiDescriptionList type="column" textStyle="reverse" listItems={list} />;
+  const attrList = (
+    <EuiDescriptionList type="column" textStyle="reverse" listItems={list} compressed />
+  );
 
   const relatedFindingCard = (
     <EuiPanel>
@@ -98,13 +102,25 @@ export const FindingCard: React.FC<FindingCardProps> = ({
       <EuiSpacer size="s" />
       <EuiFlexGroup justifyContent="spaceBetween" gutterSize="xs" alignItems="center">
         <EuiFlexItem grow={false}>
-          <p>Correlation score</p>
+          <EuiText size="s">
+            Correlation score{' '}
+            <EuiToolTip
+              content={`The score (0-1) is based on the proximity of relevant findings in the threat scenario defined by the 
+            correlation rule. The greater the score, the stronger the correlation.`}
+            >
+              <EuiIcon type={'iInCircle'} color="primary" />
+            </EuiToolTip>
+          </EuiText>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <b>{correlationData?.score}</b>
+          <EuiText size="s">
+            <b>{correlationData?.score}</b>
+          </EuiText>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <span>{timestamp}</span>
+          <EuiText size="s" color="subdued">
+            {timestamp}
+          </EuiText>
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiHorizontalRule margin="s" />
diff --git a/public/pages/Correlations/containers/CorrelationsContainer.tsx b/public/pages/Correlations/containers/CorrelationsContainer.tsx
index aa052930c..ea2966f6f 100644
--- a/public/pages/Correlations/containers/CorrelationsContainer.tsx
+++ b/public/pages/Correlations/containers/CorrelationsContainer.tsx
@@ -444,7 +444,7 @@ export class Correlations extends React.Component<CorrelationsProps, Correlation
             maxWidth="400px"
             key={findingCardsData.finding.id}
           >
-            <EuiFlyoutHeader hasBorder>
+            <EuiFlyoutHeader>
               <EuiFlexGroup>
                 <EuiFlexItem>
                   <EuiTitle size="m">
@@ -462,11 +462,11 @@ export class Correlations extends React.Component<CorrelationsProps, Correlation
                   />
                 </EuiFlexItem>
               </EuiFlexGroup>
-            </EuiFlyoutHeader>
-            <EuiFlyoutBody>
+              <EuiHorizontalRule margin="xs" />
               <EuiTitle size="xs">
                 <p>Finding</p>
               </EuiTitle>
+              <EuiSpacer size="xs" />
               <FindingCard
                 id={findingCardsData.finding.id}
                 logType={findingCardsData.finding.logType}
@@ -475,7 +475,8 @@ export class Correlations extends React.Component<CorrelationsProps, Correlation
                 finding={findingCardsData.finding}
                 findings={findingCardsData.correlatedFindings}
               />
-              <EuiSpacer />
+            </EuiFlyoutHeader>
+            <EuiFlyoutBody>
               <EuiTitle size="xs">
                 <p>Correlated Findings ({findingCardsData.correlatedFindings.length})</p>
               </EuiTitle>
@@ -508,45 +509,45 @@ export class Correlations extends React.Component<CorrelationsProps, Correlation
         ) : null}
         <EuiFlexGroup direction="column">
           <EuiFlexItem>
-            <EuiTitle size="m">
-              <h1>Correlations</h1>
-            </EuiTitle>
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiTitle size="m">
+                  <h1>Correlations</h1>
+                </EuiTitle>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiSuperDatePicker
+                  start={this.startTime}
+                  end={this.endTime}
+                  recentlyUsedRanges={this.state.recentlyUsedRanges}
+                  onTimeChange={this.onTimeChange}
+                  onRefresh={this.onRefresh}
+                  updateButtonProps={{ fill: false }}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiPanel>
-              <EuiFlexGroup wrap={true} justifyContent="spaceBetween">
-                <EuiFlexItem>
-                  <EuiFlexGroup gutterSize="xs" wrap={false}>
-                    <EuiFlexItem grow={false}>
-                      <EuiFilterGroup>
-                        <FilterGroup
-                          groupName="Severity"
-                          items={this.state.severityFilterOptions}
-                          setItems={this.onSeverityFilterChange}
-                        />
-                        <FilterGroup
-                          groupName="Log types"
-                          items={this.state.logTypeFilterOptions}
-                          hasGroupOptions={true}
-                          hasFooter={true}
-                          setItems={this.onLogTypeFilterChange}
-                        />
-                      </EuiFilterGroup>
-                    </EuiFlexItem>
-                    <EuiFlexItem grow={false}>
-                      <EuiButtonEmpty onClick={this.resetFilters}>Reset filters</EuiButtonEmpty>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
+              <EuiFlexGroup gutterSize="xs" wrap={false} justifyContent="flexEnd">
+                <EuiFlexItem grow={false}>
+                  <EuiFilterGroup>
+                    <FilterGroup
+                      groupName="Log types"
+                      items={this.state.logTypeFilterOptions}
+                      hasGroupOptions={true}
+                      hasFooter={true}
+                      setItems={this.onLogTypeFilterChange}
+                    />
+                    <FilterGroup
+                      groupName="Severity"
+                      items={this.state.severityFilterOptions}
+                      setItems={this.onSeverityFilterChange}
+                    />
+                  </EuiFilterGroup>
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
-                  <EuiSuperDatePicker
-                    start={this.startTime}
-                    end={this.endTime}
-                    recentlyUsedRanges={this.state.recentlyUsedRanges}
-                    onTimeChange={this.onTimeChange}
-                    onRefresh={this.onRefresh}
-                    updateButtonProps={{ fill: false }}
-                  />
+                  <EuiButtonEmpty onClick={this.resetFilters}>Reset filters</EuiButtonEmpty>
                 </EuiFlexItem>
               </EuiFlexGroup>
               <EuiSpacer />