diff --git a/docs/boundary_diagram.md b/docs/boundary_diagram.md
index 9095c3b3ab..18e4b100e9 100644
--- a/docs/boundary_diagram.md
+++ b/docs/boundary_diagram.md
@@ -1,7 +1,7 @@
 System Boundary Diagram
 =======================
 
-![rendered boundary diagram](http://www.plantuml.com/plantuml/png/dLPHRnit37xFh-3oKAH04sDfNpOCGvtOJJCagvjpsvS2WQoZRIqwIHKfkyRG_pvHELzySJCKVKYiayIF7qNoaruJgyYfiGU_6ATjgX6Mp85-7moYMfyi32_JB156xHsZunFjcu6ger5kPLD8W_DNnnEh77-ulXfOnKYSfsxFlMDb7CQJ8DXis29CfqEe6XKPtgOPp7nojOeRM1bS7qmmadT7eVmuj2_Wy67h1y9uc6U63j3Lnq87_1nu-GZpyFaMfyOLMf_HUZYZxUnXRtgLGNs4peP0kHekfjSPxwnbUQJM90m-LN3XL-VMf_hmEVnx0D3jq3AvyAkyhGnFyhZT0r1jYB6v7NzbGRfLThQx3QnNzV5CMULqOLSS3Q_ECeE-TUVbLWNJWnXEBlzdT_I9osdyySog3KRw4nvCxnT9_9R8u8t453V0KStdHWDXN1cDBVx3cR2V2LUj8zQ65HllkjKkT82k6exMwtKc7dey-cNn2MSm3C4QNU24qz--nh-g5p3-6Y9IJiCDAisoCZ8KCinzmhIt5ZLJ0QmLgnEuJfPDi0Z64SlP4iJad76B7CeUDn_lCBRq7f4gIq_nEalMolS4uzp71cPAtosY70C8PY4dV214hv7e--wrLOsIudbZB09fLNYMj9Qyg6RuKKQNZZ4wPK4zi87izy6az4SAKbEqxsWqArcePyBO4oyYLk-lOAHOpHJXjlXkHfKCMpE2jl_RatPpiqYnyztFuPC-wMKBNhs4MT9to8VTH6b9zX49I2f9mrpEGH4XFns5r9tqvOtyxiKmjeeoajBBClK-OKBmyzq4_UDd1Epl4-LTw-ZRWVnzExZlfAEtrRZAzl9JQ1gti0YLMJXuvpwxwpT3M1a5KzFWyPaYhALIm4UON7u4hMBzEU-gV8gwkB-8oZ5YeRihCGjIjwGKIGrWVJEydXoh4A9VPS1AgQfqLA-z7QuZMgEb674DDpBUPisuv1F1jNU6VImrboFAMtR5SGVWMZcrG0ZtHIpD0i_0-iKYcmfckHRWOZmTJDvL-T-7wM0qlXfFnt3qwjNBvnbTiDi6xo5733uo0QF51Zbk18vrw1dkAF-3G3Q5KzVGFqR3UKQ8Ph5ay0wiSNS7Gsj12xgMYYMeCHZDM8EA2EXqt0JvMXjUmlIgWbzFJY4vYqJWUObnRGX1SEkJ0tHr6GhhhgftxwtQhvtqNbl0p4el6tHCFVgzuBk8z_KwHF_LY6xXbuJ4zEEfsCFgSlFpe3sHx1HBb8TAk3j8WW97lprXsxPKH8u6LzZrn5wQzwjhnrmbNgAJ5cUaedjY-swOfq_twwerMc4qymsOMYnvinzxv_BCz9nsiXbHrJHOHoDUXJ4XGqJjOqq25-YBxSoxg7yMeKz0gctVV2lFOhiA6j3LmHl7-on-5cQFo5PwqNqHNIMHKWWggWQtZucovIaA7K2DtmM0Pv129jLU2Ac7s6bcgsNINrljFBySd8zWOW9Qut1VDCkRLf9mOLXkAr7sjzMnX1wzjIZtMuqWgaM6lRna-W3QH6rH6_5LXkUNZqHNxkX5UprMtTjfJtqx9fCqiuQMnR50vGMW_7rqUjgMViTwrxbl6iEmzFvE5CdCfQMtZ80znEJW_ZH2Tne5x07aqNDoXC7wJUzfuHrGqXg9vicsS1au8rsfpUteaN3VpzwqLsQPU8skJetz3m00)
+![rendered boundary diagram](http://www.plantuml.com/plantuml/svg/dLP1Rnkz4RtxLqnz26JWiuKwkRGeYiYMuhYm6yMh99S01iKThLXpoGrdA4Kjyj_BeLPhhHH_27AmnIKvRzvmPXxvbbW5ZhKz-OjnsiOIOSdSqD-7mw3M5vNXPPn7mg2zOtHyeNqzL6KmogriREBm-itvr2h7d-xlXbOn4gUfnsllM1c7uQ8HR3Pi4MQp4HIr2WplunpcFhfIXGsi3AvFfXZ8kq6JVnpQF-3qUUidmd2QPaOEq9NdGWVy0dXvW7bwjiCfSONM9xGUpdWtUzgRNYLG7w2p8L2kX9lPVSAxQbaEr9g4mPS2RlpgslfOdfx1_qwWYtI0jJBsaJ2iijjHhVxh7HIcRYp2H1QXo8imA2R5cN2OBOEFrH9c8HB9X8GZbFBkBLGY0T3HqEAvygkqDmylqdXB102A3J7MZvFlB7GVbPtlRmFhLNa-LrOvdM3RQ4PtL-AXPzrvULIDwK6CfhT_iZluo3dsVxooQeE1_WdFfjl576K-FdWdCOKDS52BXT4vNAEnnNy-UFPpuQfrmDAmOkDTjzg53dk9MA_NYNZJuz6llIyuXr7JMACpd73wjo_nNyKVCFdU1AIKwmTKccLbRAX9CDkgqDvQr4mPi5IiBk0-MZQIO-E8vMm9GdJEk4f2EUJcmnE6bju1gRpq4g-hQAryJp4iVAXXhlHJ5UGOG325NEO3JV0QYNxkNbjLAocUTyOYa5QPPqvhpekgHvzbTEiOWrCMr3CRI7wVJN8JnaPgYeuTZUSv2-LS67lYAc3nyGx6YjLS4UwAxs5SoB0r8sX5fZrfjp1L39tlVWvVz4clM_3YDSoZVa8-xIPotxCFI41IIHeMSWwA2FdbAAJkfFaVvFSeXebLb92KNkQfZn4ZWb_i9-W_Vax0Vfiexrf7FqxaxyV9jfC6xvCe97lvoJIDgon2OIe77znNT_zk12kZO6PgFBzIXALK2lW0qzlFe5KelwPTXOz1P_StGJb6p7JtTQmYzKXAaTG0bW-Z--cvQfhWLmcmKAh87TLhRuVhWDPeAKPSmuECTrapBlf8SE-TOHzopQM8qfPz1Tu3k5TELGZDjeYbMU0LM5zLoLGmyzq3DvFPSFgXIFy-pORZoTraDe71cpUlpnAwOBSDtaCEsFZ018mMQ-Im4JZMJSzmxtfv5iWwS-eQ-jTeECy8mLHB1k_06lTqCh8MjA1hgLY24XkZ6KjG0G6T3fj6ljQ6a-3V5V3NYqk8pY8HU5vYM1j24DpouWHTcOV2kglg_Sknz6idlTSMCBFIoneTKuz-B_WkucEzReB_RaIty5j4OlhrL1nXTRdvVT2UI7QA9Sf3ETmz9461mTzUi6rRAY07WoliUk8epOVLrJDNaPVefCKPAUkUs7uOfUdBmxhgZ5OOp683fXHBtXp7thcyCZsddMm6L2KDry68Ls5Co11G-r2Im3NqpNRcNTI_Yz0d8DLsRBwJPx5TDHhGbOqtZWzP_3xC8P5EUj5z4rqbaL9eL50rxXuJUSi1XME04dyA0AyWDebKUo747cAdcQsMIN_jjFFwTdWzXgbfq1g7nwAP7ywIX1l3Sbk9ihylpYNquAr5kTzA154jCkpb9TC7q2PeYzg8hpoylZqGNRcZg_PwBBgtqv7wTaocSMuDBRDZWKeBGEbxS7dPbdx7Uj-vhsl3iFJ-IHJ9BAIbTuo0FOJeO7iQJNSQ6UmPvE0vESR6-atlQU4TKDGQYHRHRk44-B0a3fxO1Rgo1vC9jX_K6lTjkaxz5VCxjNaS7rmQszc7V5st4syJJgpj_m40)
 
 UML Source
 ----------
@@ -26,6 +26,7 @@ Boundary(aws, "AWS GovCloud") {
       ContainerDb(www_redis, "Redis Database", "AWS Elasticache", "Queue of background jobs to work on")
     }
   }
+ Container(email_server, "Amazon Simple Email Server (SES)", "Through Truss", "TTA Hub mail server")
 }
 System(HSES, "HSES", "Single Sign On\nMFA via Time-Based App or PIV card\n\nSource of Grantee Data")
 Boundary(gsa_saas, "FedRAMP-approved SaaS") {
@@ -57,6 +58,8 @@ Boundary(development_saas, "CI/CD Pipeline") {
 Rel(developer, github, "Publish code", "git ssh (22)")
 Rel(github, circleci, "Commit hook notifies CircleCI to run CI/CD pipeline")
 Rel(circleci, cloudgov_api, "Deploy application on successful CI/CD run")
+Rel(www_app, email_server, "Send application notifications")
+Rel(email_server, personnel, "Send application notifications")
 Lay_D(personnel, aws)
 Lay_R(HSES, aws)
 @enduml
@@ -65,7 +68,7 @@ Lay_R(HSES, aws)
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/dLPHRnit37xFh-3oKAH04sDfNpOCGvtOJJCagvjpsvS2WQoZRIqwIHKfkyRG_pvHELzySJCKVKYiayIF7qNoaruJgyYfiGU_6ATjgX6Mp85-7moYMfyi32_JB156xHsZunFjcu6ger5kPLD8W_DNnnEh77-ulXfOnKYSfsxFlMDb7CQJ8DXis29CfqEe6XKPtgOPp7nojOeRM1bS7qmmadT7eVmuj2_Wy67h1y9uc6U63j3Lnq87_1nu-GZpyFaMfyOLMf_HUZYZxUnXRtgLGNs4peP0kHekfjSPxwnbUQJM90m-LN3XL-VMf_hmEVnx0D3jq3AvyAkyhGnFyhZT0r1jYB6v7NzbGRfLThQx3QnNzV5CMULqOLSS3Q_ECeE-TUVbLWNJWnXEBlzdT_I9osdyySog3KRw4nvCxnT9_9R8u8t453V0KStdHWDXN1cDBVx3cR2V2LUj8zQ65HllkjKkT82k6exMwtKc7dey-cNn2MSm3C4QNU24qz--nh-g5p3-6Y9IJiCDAisoCZ8KCinzmhIt5ZLJ0QmLgnEuJfPDi0Z64SlP4iJad76B7CeUDn_lCBRq7f4gIq_nEalMolS4uzp71cPAtosY70C8PY4dV214hv7e--wrLOsIudbZB09fLNYMj9Qyg6RuKKQNZZ4wPK4zi87izy6az4SAKbEqxsWqArcePyBO4oyYLk-lOAHOpHJXjlXkHfKCMpE2jl_RatPpiqYnyztFuPC-wMKBNhs4MT9to8VTH6b9zX49I2f9mrpEGH4XFns5r9tqvOtyxiKmjeeoajBBClK-OKBmyzq4_UDd1Epl4-LTw-ZRWVnzExZlfAEtrRZAzl9JQ1gti0YLMJXuvpwxwpT3M1a5KzFWyPaYhALIm4UON7u4hMBzEU-gV8gwkB-8oZ5YeRihCGjIjwGKIGrWVJEydXoh4A9VPS1AgQfqLA-z7QuZMgEb674DDpBUPisuv1F1jNU6VImrboFAMtR5SGVWMZcrG0ZtHIpD0i_0-iKYcmfckHRWOZmTJDvL-T-7wM0qlXfFnt3qwjNBvnbTiDi6xo5733uo0QF51Zbk18vrw1dkAF-3G3Q5KzVGFqR3UKQ8Ph5ay0wiSNS7Gsj12xgMYYMeCHZDM8EA2EXqt0JvMXjUmlIgWbzFJY4vYqJWUObnRGX1SEkJ0tHr6GhhhgftxwtQhvtqNbl0p4el6tHCFVgzuBk8z_KwHF_LY6xXbuJ4zEEfsCFgSlFpe3sHx1HBb8TAk3j8WW97lprXsxPKH8u6LzZrn5wQzwjhnrmbNgAJ5cUaedjY-swOfq_twwerMc4qymsOMYnvinzxv_BCz9nsiXbHrJHOHoDUXJ4XGqJjOqq25-YBxSoxg7yMeKz0gctVV2lFOhiA6j3LmHl7-on-5cQFo5PwqNqHNIMHKWWggWQtZucovIaA7K2DtmM0Pv129jLU2Ac7s6bcgsNINrljFBySd8zWOW9Qut1VDCkRLf9mOLXkAr7sjzMnX1wzjIZtMuqWgaM6lRna-W3QH6rH6_5LXkUNZqHNxkX5UprMtTjfJtqx9fCqiuQMnR50vGMW_7rqUjgMViTwrxbl6iEmzFvE5CdCfQMtZ80znEJW_ZH2Tne5x07aqNDoXC7wJUzfuHrGqXg9vicsS1au8rsfpUteaN3VpzwqLsQPU8skJetz3m00)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/umla/dLRVRnk_3N_FNy7beN20Rs8ixSk6OQWJksc6P7LpRljI891rz5cBJhgAb5rlwFy-KJvVV7RpHL6WZNKI-U67uW_gBR4A76jxyXVZj8qbmfAveRyFXq6jBoh3opYFX45xn-ZuGljwgCfWb5lPsCJXzPlpgLMEFztV3QrY94vRZzT9MXc7uQ8HR3Pi4MQp4HIr2WplunpcFhfIXGsi3AvFfXZ8kq6JVnpQF-3qMVGJOJXDEoC7wCfpeGD-0Rmym3mzs-6Kk4Bh4reFPxpRFUrjhnAe3z3f42XNmitiFk5TjIm7Qat2u4i1DtvrRNqiJy_WVoS0dOIMpSglabXUNgHrAmDGR8YnVfnyPq5wL7Q-BmRMg_9yhgnoEhFBXaPtLub1NxkpygWQquCOJM__H3huoFas_l7AgWq6-YSygsuFIUncp-2T-1Gsm44j5aO3OLWPZIt-yvsmdmjNhGEMXXKRxxhJpdM0BXi6w_Kw4MzwFFffyGNdC6eQQtI64qx_zYN-g_W39j-RW9J2y81AivoC3JK9PXimxQr5pPG1IyNg0kwZPTDO1EE8vMu9GdJEk4fSEUJcmnE6bju1gNpq4g-hQAryJp4iVAXXhlHJ5UGQG30pEU43JV0QYNvkNbjLAqcUTyOYa5QPPmvhZekgHvzbTUiOWrCMr3CRI7QVLN9zn4PoYeuDZUSv2kLS67lYAc3nyGx6YjLS4UwIxs5SoB9L8sZhlxrfjp1L39tjVWnVj4clM_3YDSoZVa8-xJPoIR8FI42IIHeMSW-A2FbbBoJlf2uVvFV8XubLb92KNkQjZn4ZWb_i1-W_Vax0VXiexrf3Fqxa_rvmi5R6FaePO13mMltNEoXCBSaraKCeyY4CYabn9jPcosIXMi8iHABJDgKacRBq5YgP-t6oBTV1-wIOfEGdtuLnbSLaedBmmNrrz-z6i38APgR6yoj5M4ewWWymlVqCMeNoQv8gV0mw-tWJb6F4V2VxVQmYzKXAaIGQbW-Z--cvQfhWLmcmKAh8PTlh8GxN0QtHal6uXWTPxrB3kEWZmRrtXdr8bBD7IMI_0-y1t2kdAeHcMobIaV0AhA-gf2gOUVR0pMGsd7ueqfzFi-5uSZUPJM3mvithiuGks6qNwI47R7nW0aQBDNBO21phfgUuDrwUkt2TENLTuzTeECy8mLHB1k_06lTqCh8MjA1hAGk24XkZ6KjG0G6T3fj6ljQ6KrBS5V3NYqk8pY8HU5vYM1j24DpouWHTcPV2kYkT_U5O-hMJ0c-hX3abUOsEgKU_vtpdyV5GQ8B_RgGvuhU8nFJheJZ2wcBp-w2zJjorHMblbDtTGn8K6Fpj1Tssf09oCBZ2hYQEmdoONJrr5Nc9Jle88q5ito8VHcdxyZYlMgKL1hFOW2b5apV7ldSchqpFQDUR0wgIXkjWnAem9cG8g7qeIU0Q-cOxzSxhtqNe4v1iErRVpG3HNJKQq9MDDuwFMVmkp26Hhh-ZIpaKaQHVGwE2gd7tOiaYXnIE04hyAG2yWjWaKktKYJt4hcUslKpgQzSxhs-7rsEOcWQjSNZSDBSFvoHuOrX6edJszyMvk1wyjIX3j4IGhaM6lJoN-W3Q16rH6x6LbzUt1qrN7W9LEuEBxe5sr7qx9jCujuQMsR10fGEWz3sul6nJlsEzRzpNjM5OUlya7SaifAHtZ80zXEXWUnjDTniPx1dauCqwniRwJU_zalvHr1g95j6sS0duC2KEnd21hkp1P8Bj1xNAVPskKdz5_Kvj7iS7GsEx-z2EwxpnDk74sluV)
 1. Copy and paste the final UML into the UML Source section
 1. Update the img src and edit link target to the current values
 
diff --git a/docs/openapi/paths/index.yaml b/docs/openapi/paths/index.yaml
index 52709c553c..544f4cc5cd 100644
--- a/docs/openapi/paths/index.yaml
+++ b/docs/openapi/paths/index.yaml
@@ -48,8 +48,6 @@
   $ref: './files.yaml'
 '/grantee/{granteeId}':
   $ref: './grantee/grantee-id.yaml'
-'/widgets/dashboardOverview':
-  $ref: './widgets/dashboardOverview.yaml'
 '/widgets/overview':
   $ref: './widgets/overview.yaml'
 '/widgets/reasonList':
diff --git a/docs/openapi/paths/widgets/dashboardOverview.yaml b/docs/openapi/paths/widgets/dashboardOverview.yaml
deleted file mode 100644
index 5053333528..0000000000
--- a/docs/openapi/paths/widgets/dashboardOverview.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-get:
-  tags:
-    - widgets
-  operationId: dashboardOverview
-  description: Gets widget data for the dashboard statistics widget
-  responses:
-    200:
-      description: widget data for the dashboard statistics widget
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              nonGrantees: 
-                type: string
-              numReports: 
-                type: string
-              numGrants: 
-                type: string
-              numTotalGrants: 
-                type: string
-              sumDuration: 
-                type: string
-              inPerson: 
-                type: string
\ No newline at end of file
diff --git a/frontend/src/components/MultiSelect.js b/frontend/src/components/MultiSelect.js
index a75abd12c0..8b62fd6797 100644
--- a/frontend/src/components/MultiSelect.js
+++ b/frontend/src/components/MultiSelect.js
@@ -20,13 +20,13 @@
   through to react-select. If the selected value is not in the options prop the multiselect box will
   display an empty tag.
 */
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Select, { components } from 'react-select';
 import Creatable from 'react-select/creatable';
 import { Controller } from 'react-hook-form/dist/index.ie11';
 import _ from 'lodash';
-
+import { v4 as uuidv4 } from 'uuid';
 import arrowBoth from '../images/arrow-both.svg';
 
 export const DropdownIndicator = (props) => (
@@ -57,6 +57,21 @@ function MultiSelect({
   onCreateOption,
   components: componentReplacements,
 }) {
+  const inputId = `select-${uuidv4()}`;
+
+  useEffect(() => {
+    /**
+     * unfortunately, given our support for ie11, we can't
+     * upgrade to react-select v5, which support a spellcheck
+     * attribute. Here is an awkward solution I've concocted
+     * in it's stead.
+     */
+    const input = document.querySelector(`#${inputId}`);
+    if (input) {
+      input.setAttribute('spellcheck', 'true');
+    }
+  });
+
   const styles = {
     container: (provided, state) => {
       // To match the focus indicator provided by uswds
@@ -142,42 +157,14 @@ function MultiSelect({
     }
   };
 
+  const Selector = canCreate ? Creatable : Select;
+
   return (
     <Controller
       render={({ onChange: controllerOnChange, value }) => {
         const values = value ? getValues(value) : value;
-        if (canCreate) {
-          return (
-            <Creatable
-              className="margin-top-1"
-              id={name}
-              value={values}
-              onChange={(event) => {
-                if (onItemSelected) {
-                  onItemSelected(event);
-                } else if (event) {
-                  onChange(event, controllerOnChange);
-                } else {
-                  controllerOnChange([]);
-                }
-              }}
-              styles={styles}
-              components={{ ...componentReplacements, DropdownIndicator }}
-              options={options}
-              isDisabled={disabled}
-              tabSelectsValue={false}
-              isClearable={multiSelectOptions.isClearable}
-              closeMenuOnSelect={multiSelectOptions.closeMenuOnSelect || false}
-              controlShouldRenderValue={multiSelectOptions.controlShouldRenderValue}
-              hideSelectedOptions={multiSelectOptions.hideSelectedOptions}
-              placeholder=""
-              onCreateOption={onCreateOption}
-              isMulti
-            />
-          );
-        }
         return (
-          <Select
+          <Selector
             className="margin-top-1"
             id={name}
             value={values}
@@ -190,6 +177,7 @@ function MultiSelect({
                 controllerOnChange([]);
               }
             }}
+            inputId={inputId}
             styles={styles}
             components={{ ...componentReplacements, DropdownIndicator }}
             options={options}
@@ -200,6 +188,7 @@ function MultiSelect({
             controlShouldRenderValue={multiSelectOptions.controlShouldRenderValue}
             hideSelectedOptions={multiSelectOptions.hideSelectedOptions}
             placeholder=""
+            onCreateOption={onCreateOption}
             isMulti
           />
         );
diff --git a/frontend/src/pages/ActivityReport/Pages/components/Objective.css b/frontend/src/pages/ActivityReport/Pages/components/Objective.css
index 8dc3347c4e..5db3a945ef 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/Objective.css
+++ b/frontend/src/pages/ActivityReport/Pages/components/Objective.css
@@ -1,8 +1,13 @@
 .smart-hub--objective {
   background-color: #f8f8f8;
+  max-width: 470px;
   padding: 22px;
 }
 
+.smart-hub--objective-title {
+  overflow-wrap: break-word;
+}
+
 .smart-hub--objective-tag {
   text-transform: none;
   background-color: #e2eff7;
diff --git a/frontend/src/pages/ActivityReport/Pages/components/Objective.js b/frontend/src/pages/ActivityReport/Pages/components/Objective.js
index 4da7e07a02..a6cb8c9b8c 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/Objective.js
+++ b/frontend/src/pages/ActivityReport/Pages/components/Objective.js
@@ -103,6 +103,7 @@ const Objective = ({
               onChange={onChange}
               inputRef={firstInput}
               value={title}
+              spellcheck="true"
             />
           </ObjectiveFormItem>
           <ObjectiveFormItem
@@ -164,7 +165,7 @@ const Objective = ({
               />
             </div>
           </div>
-          <p className="margin-top-0">
+          <p className="smart-hub--objective-title margin-top-0">
             <span className="text-bold">Objective: </span>
             {title}
           </p>
diff --git a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
index de6ca7e168..df4e23e612 100644
--- a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
+++ b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
@@ -60,7 +60,7 @@ const GoalsObjectives = () => {
         )}
       <Fieldset className="smart-hub--report-legend margin-top-4" legend="Context">
         <Label htmlFor="context">OPTIONAL: Provide background or context for this activity</Label>
-        <div className="margin-top-1">
+        <div className="smart-hub--text-area__resize-vertical margin-top-1">
           <HookFormRichEditor ariaLabel="Context" name="context" id="context" />
         </div>
       </Fieldset>
diff --git a/frontend/src/pages/ActivityReport/Pages/nextSteps.js b/frontend/src/pages/ActivityReport/Pages/nextSteps.js
index f878b256fc..1634b5872f 100644
--- a/frontend/src/pages/ActivityReport/Pages/nextSteps.js
+++ b/frontend/src/pages/ActivityReport/Pages/nextSteps.js
@@ -32,7 +32,7 @@ const NoteEntry = ({
       name={name}
       label={label}
     >
-      <TextInput name={name} onChange={onUpdate} data-testid={`${name}-input`} defaultValue={input} />
+      <TextInput name={name} onChange={onUpdate} data-testid={`${name}-input`} defaultValue={input} spellcheck="true" />
       <Button outline disabled={!(input && input.trim())} onClick={onSubmit} data-testid={`${name}-button`} type="button">Save Next Step</Button>
       {!isRequired && <Button secondary onClick={onCancel} type="button" data-testid={`${name}-cancel-button`}>Cancel</Button>}
     </FormItem>
diff --git a/frontend/src/pages/ActivityReport/__tests__/index.js b/frontend/src/pages/ActivityReport/__tests__/index.js
index ce9fa12159..24b1cbf877 100644
--- a/frontend/src/pages/ActivityReport/__tests__/index.js
+++ b/frontend/src/pages/ActivityReport/__tests__/index.js
@@ -175,6 +175,12 @@ describe('ActivityReport', () => {
       });
     });
 
+    it('displays the creator name', async () => {
+      fetchMock.get('/api/activity-reports/1', formData());
+      renderActivityReport(1);
+      expect(await screen.findByText(/creator:/i)).toBeVisible();
+    });
+
     it('calls "report update"', async () => {
       fetchMock.get('/api/activity-reports/1', formData());
       fetchMock.put('/api/activity-reports/1', {});
diff --git a/frontend/src/pages/ActivityReport/index.css b/frontend/src/pages/ActivityReport/index.css
index ad55c723cd..bc4645b386 100644
--- a/frontend/src/pages/ActivityReport/index.css
+++ b/frontend/src/pages/ActivityReport/index.css
@@ -83,4 +83,8 @@
 
 .smart-hub--text-area__resize-vertical {
   resize: vertical;
+}
+
+.smart-hub--text-area__resize-vertical .rdw-editor-main {
+  resize: vertical;
 }
\ No newline at end of file
diff --git a/frontend/src/pages/ActivityReport/index.js b/frontend/src/pages/ActivityReport/index.js
index 7370200a8d..140458dcef 100644
--- a/frontend/src/pages/ActivityReport/index.js
+++ b/frontend/src/pages/ActivityReport/index.js
@@ -293,16 +293,31 @@ function ActivityReport({
   const reportCreator = { name: user.name, role: user.role };
   const tagClass = formData.calculatedStatus === REPORT_STATUSES.APPROVED ? 'smart-hub--tag-approved' : '';
 
+  const author = formData.author ? (
+    <>
+      <hr />
+      <p>
+        <strong>Creator:</strong>
+        {' '}
+        {formData.author.fullName}
+      </p>
+
+    </>
+  ) : null;
+
   return (
     <div className="smart-hub-activity-report">
       <Helmet titleTemplate="%s - Activity Report - TTA Hub" defaultTitle="TTA Hub - Activity Report" />
       <Grid row className="flex-justify">
         <Grid col="auto">
-          <h1 className="font-serif-2xl text-bold line-height-serif-2 margin-top-3 margin-bottom-5">
-            Activity report for Region
-            {' '}
-            {formData.regionId}
-          </h1>
+          <div className="margin-top-3 margin-bottom-5">
+            <h1 className="font-serif-2xl text-bold line-height-serif-2 margin-0">
+              Activity report for Region
+              {' '}
+              {formData.regionId}
+            </h1>
+            {author}
+          </div>
         </Grid>
         <Grid col="auto" className="flex-align-self-center">
           {formData.calculatedStatus && (
diff --git a/frontend/src/pages/GranteeRecord/__tests__/index.js b/frontend/src/pages/GranteeRecord/__tests__/index.js
index d15ba4839a..0c7c15a3e3 100644
--- a/frontend/src/pages/GranteeRecord/__tests__/index.js
+++ b/frontend/src/pages/GranteeRecord/__tests__/index.js
@@ -84,8 +84,8 @@ describe('grantee record page', () => {
 
   beforeEach(() => {
     fetchMock.get('/api/user', user);
-    fetchMock.get('/api/widgets/dashboardOverview', overview);
-    fetchMock.get('/api/widgets/dashboardOverview?region.in[]=45&granteeId.in[]=1', overview);
+    fetchMock.get('/api/widgets/overview', overview);
+    fetchMock.get('/api/widgets/overview?region.in[]=45&granteeId.in[]=1', overview);
   });
   afterEach(() => {
     fetchMock.restore();
diff --git a/frontend/src/pages/GranteeRecord/pages/__tests__/TTAHistory.js b/frontend/src/pages/GranteeRecord/pages/__tests__/TTAHistory.js
index 1da8d640c9..88a67dda7a 100644
--- a/frontend/src/pages/GranteeRecord/pages/__tests__/TTAHistory.js
+++ b/frontend/src/pages/GranteeRecord/pages/__tests__/TTAHistory.js
@@ -35,7 +35,7 @@ describe('Grantee Record - TTA History', () => {
   };
 
   beforeEach(async () => {
-    const url = '/api/widgets/dashboardOverview?region.in[]=400&granteeId.in[]=100&modelType.is=grant';
+    const url = '/api/widgets/overview?region.in[]=400&granteeId.in[]=100&modelType.is=grant';
     fetchMock.get(url, response);
   });
 
diff --git a/frontend/src/pages/Landing/ReportMenu.css b/frontend/src/pages/Landing/ReportMenu.css
new file mode 100644
index 0000000000..e7d2a8ee8e
--- /dev/null
+++ b/frontend/src/pages/Landing/ReportMenu.css
@@ -0,0 +1,4 @@
+.tta-report-menu .smart-hub--reports-button {
+    display: inline;
+    width: auto;    
+}
\ No newline at end of file
diff --git a/frontend/src/pages/Landing/ReportMenu.js b/frontend/src/pages/Landing/ReportMenu.js
index df0ca134f8..1b8b40f441 100644
--- a/frontend/src/pages/Landing/ReportMenu.js
+++ b/frontend/src/pages/Landing/ReportMenu.js
@@ -2,14 +2,18 @@ import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { faSortDown } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
 import Container from '../../components/Container';
 
+import './ReportMenu.css';
+
+const MAXIMUM_EXPORTED_REPORTS = 5000;
+
 function ReportMenu({
   onExportAll,
   onExportSelected,
   hasSelectedReports,
   label,
+  count,
 }) {
   const [open, updateOpen] = useState(false);
 
@@ -63,16 +67,58 @@ function ReportMenu({
         />
       </button>
       {open && (
-        <div role="menu" tabIndex={-1} onBlur={onMenuBlur} onKeyDown={onMenuKeyDown} ref={menuRef} className="z-400 position-absolute left-0 width-card-lg">
+        <div role="menu" tabIndex={-1} onBlur={onMenuBlur} onKeyDown={onMenuKeyDown} ref={menuRef} className="tta-report-menu z-400 position-absolute left-0 width-mobile">
           <Container padding={2} className="margin-bottom-0">
-            <button
-              role="menuitem"
-              onClick={onExportAll}
-              type="button"
-              className="usa-button usa-button--unstyled smart-hub--reports-button smart-hub--button__no-margin"
-            >
-              Export Table Data...
-            </button>
+            {count > MAXIMUM_EXPORTED_REPORTS ? (
+              <>
+                <div className="display-flex">
+                  <button
+                    role="menuitem"
+                    onClick={onExportAll}
+                    type="button"
+                    disabled
+                    className="usa-button usa-button--unstyled smart-hub--reports-button margin-bottom-1"
+                    aria-labelledby="no-exports-please"
+                  >
+                    Export table data
+                  </button>
+                </div>
+                <div className="usa-hint" id="no-exports-please">
+                  <p>
+                    This export has
+                    {' '}
+                    {count.toLocaleString('en-US')}
+                    {' '}
+                    reports. You can only export
+                    {' '}
+                    {MAXIMUM_EXPORTED_REPORTS.toLocaleString('en-us')}
+                    {' '}
+                    reports at a time.
+                  </p>
+                  <p>
+                    To export more than
+                    {' '}
+                    {MAXIMUM_EXPORTED_REPORTS.toLocaleString('en-us')}
+                    {' '}
+                    reports, please
+                    {' '}
+                    <a href="https://app.smartsheetgov.com/b/form/f0b4725683f04f349a939bd2e3f5425a">contact support</a>
+                    {' '}
+                    and specify the filters you need.
+                  </p>
+                </div>
+              </>
+            )
+              : (
+                <button
+                  role="menuitem"
+                  onClick={onExportAll}
+                  type="button"
+                  className="usa-button usa-button--unstyled smart-hub--reports-button smart-hub--button__no-margin"
+                >
+                  Export table data...
+                </button>
+              ) }
             {hasSelectedReports && onExportSelected && (
               <button
                 role="menuitem"
@@ -80,7 +126,7 @@ function ReportMenu({
                 type="button"
                 className="usa-button usa-button--unstyled smart-hub--reports-button smart-hub--button__no-margin margin-top-2"
               >
-                Export Selected Reports...
+                Export selected reports...
               </button>
             )}
           </Container>
@@ -95,9 +141,11 @@ ReportMenu.propTypes = {
   onExportSelected: PropTypes.func,
   hasSelectedReports: PropTypes.bool.isRequired,
   label: PropTypes.string,
+  count: PropTypes.number,
 };
 
 ReportMenu.defaultProps = {
+  count: 0,
   label: 'Reports menu',
   onExportSelected: null,
 };
diff --git a/frontend/src/pages/Landing/__tests__/ReportMenu.js b/frontend/src/pages/Landing/__tests__/ReportMenu.js
index a1c9f34fc1..57f8b1d6a0 100644
--- a/frontend/src/pages/Landing/__tests__/ReportMenu.js
+++ b/frontend/src/pages/Landing/__tests__/ReportMenu.js
@@ -10,8 +10,10 @@ const RenderReportMenu = ({
   onExportAll = () => {},
   onExportSelected = () => {},
   hasSelectedReports = true,
+  count = 12,
 }) => (
   <ReportMenu
+    count={count}
     onExportAll={onExportAll}
     onExportSelected={onExportSelected}
     hasSelectedReports={hasSelectedReports}
@@ -32,7 +34,7 @@ describe('ReportMenu', () => {
     render(<RenderReportMenu onExportAll={onExport} />);
     const button = await screen.findByRole('button');
     userEvent.click(button);
-    const exportButton = await screen.findByRole('menuitem', { name: 'Export Table Data...' });
+    const exportButton = await screen.findByRole('menuitem', { name: 'Export table data...' });
     userEvent.click(exportButton);
     expect(onExport).toHaveBeenCalled();
   });
@@ -43,7 +45,7 @@ describe('ReportMenu', () => {
       render(<RenderReportMenu onExportSelected={onExport} hasSelectedReports />);
       const button = await screen.findByRole('button');
       userEvent.click(button);
-      const exportButton = await screen.findByRole('menuitem', { name: 'Export Selected Reports...' });
+      const exportButton = await screen.findByRole('menuitem', { name: 'Export selected reports...' });
       userEvent.click(exportButton);
       expect(onExport).toHaveBeenCalled();
     });
@@ -70,6 +72,15 @@ describe('ReportMenu', () => {
     expect(menu).not.toBeInTheDocument();
   });
 
+  it('disables the button and shows the error message when there are too many reports', async () => {
+    render(<RenderReportMenu count={5001} hasSelectedReports={false} />);
+    const button = await screen.findByRole('button');
+    userEvent.click(button);
+    const label = /this export has 5,001 reports\. you can only export 5,000 reports at a time\./i;
+    const exportButton = await screen.findByRole('menuitem', { name: label });
+    expect(exportButton).toBeDisabled();
+  });
+
   it('closes when the Escape key is pressed', async () => {
     let report;
     let menu;
diff --git a/frontend/src/pages/Landing/index.js b/frontend/src/pages/Landing/index.js
index 2e24960b1b..b7f1dc78e9 100644
--- a/frontend/src/pages/Landing/index.js
+++ b/frontend/src/pages/Landing/index.js
@@ -434,6 +434,19 @@ function Landing({ user }) {
     );
   }
 
+  const overviewFilters = [
+    {
+      topic: 'region',
+      condition: 'Contains',
+      query: appliedRegion,
+    },
+    {
+      topic: 'startDate',
+      condition: 'Is after',
+      query: '2020/08/31',
+    },
+  ];
+
   return (
     <>
       <Helmet>
@@ -487,10 +500,7 @@ function Landing({ user }) {
         <Grid row gap className="smart-hub--overview">
           <Grid col={10}>
             <Overview
-              filters={filters}
-              region={appliedRegion}
-              allRegions={regions}
-              skipLoading
+              filters={overviewFilters}
               regionLabel={regionLabel}
             />
           </Grid>
@@ -549,6 +559,7 @@ function Landing({ user }) {
               hasSelectedReports={numberOfSelectedReports > 0}
               onExportAll={handleDownloadAllReports}
               onExportSelected={handleDownloadClick}
+              count={reportsCount}
             />
           </span>
           <span className="smart-hub--table-nav">
diff --git a/frontend/src/widgets/DashboardOverview.js b/frontend/src/widgets/DashboardOverview.js
index 1b7fcbec34..1b68435dc9 100644
--- a/frontend/src/widgets/DashboardOverview.js
+++ b/frontend/src/widgets/DashboardOverview.js
@@ -131,4 +131,4 @@ DashboardOverviewWidget.defaultProps = {
   ],
 };
 
-export default withWidgetData(DashboardOverviewWidget, 'dashboardOverview');
+export default withWidgetData(DashboardOverviewWidget, 'overview');
diff --git a/src/middleware/newRelicMiddleware.js b/src/middleware/newRelicMiddleware.js
index 5267f8b16c..000d7be809 100644
--- a/src/middleware/newRelicMiddleware.js
+++ b/src/middleware/newRelicMiddleware.js
@@ -22,7 +22,7 @@ export function nameTransactionByBase(req, res, next) {
  * Set transaction name by request method, baseUrl, and path.
  * Suitable for routes with params in path that you do NOT want
  * to be grouped. Example: api/widgets/:widgetId
- * will be named api/widgets/dashboardOverview
+ * will be named api/widgets/overview
  *
  * @param {*} req - request
  * @param {*} res - response
diff --git a/src/services/activityReports.js b/src/services/activityReports.js
index 45dbf99313..2cf928afbf 100644
--- a/src/services/activityReports.js
+++ b/src/services/activityReports.js
@@ -316,7 +316,7 @@ export function activityReports(
   const where = {
     calculatedStatus: REPORT_STATUSES.APPROVED,
     [Op.and]: scopes,
-    startDate: { [Op.gte]: '2020-09-01', [Op.lte]: endDte },
+    startDate: { [Op.gte]: '2020-08-31', [Op.lte]: endDte },
   };
 
   if (excludeLegacy) {
diff --git a/src/services/goals.js b/src/services/goals.js
index 186709dbb1..847d68bbd9 100644
--- a/src/services/goals.js
+++ b/src/services/goals.js
@@ -1,3 +1,4 @@
+import { Op } from 'sequelize';
 import {
   Goal,
   Grant,
@@ -18,16 +19,28 @@ export async function goalsForGrants(grantIds) {
   });
 
   /**
-   *  we need one big array that includes the old grantee id as well
+   * we need one big array that includes the old grantee id as well,
+   * removing all the nulls along the way
    */
-  const ids = grants.reduce((previous, current) => [...previous, current.id, current.oldGrantId],
-    []);
+  const ids = grants
+    .reduce((previous, current) => [...previous, current.id, current.oldGrantId], [])
+    .filter((g) => g != null);
 
   /*
   * finally, return all matching goals
   */
 
   return Goal.findAll({
+    where: {
+      [Op.or]: [
+        {
+          status: 'Not Started',
+        },
+        {
+          status: 'In Progress',
+        },
+      ],
+    },
     include: [
       {
         model: Grant,
diff --git a/src/services/goals.test.js b/src/services/goals.test.js
index 965a468edd..7ebfc7d4df 100644
--- a/src/services/goals.test.js
+++ b/src/services/goals.test.js
@@ -1,3 +1,4 @@
+import { Op } from 'sequelize';
 import {
   copyGoalsToGrants, saveGoalsForReport, goalsForGrants,
 } from './goals';
@@ -204,6 +205,16 @@ describe('goalsForGrants', () => {
     await goalsForGrants([506]);
 
     expect(Goal.findAll).toHaveBeenCalledWith({
+      where: {
+        [Op.or]: [
+          {
+            status: 'Not Started',
+          },
+          {
+            status: 'In Progress',
+          },
+        ],
+      },
       include: [
         {
           model: Grant,
diff --git a/src/widgets/dashboardOverview.js b/src/widgets/dashboardOverview.js
index d2dd5ee315..bb33af9d23 100644
--- a/src/widgets/dashboardOverview.js
+++ b/src/widgets/dashboardOverview.js
@@ -1,78 +1,3 @@
-import { Op } from 'sequelize';
+import overview from './overview';
 
-import {
-  ActivityReport, ActivityRecipient, Grant, NonGrantee, sequelize,
-} from '../models';
-import { REPORT_STATUSES } from '../constants';
-
-export default async function dashboardOverview(scopes) {
-  const duration = await ActivityReport.findAll({
-    attributes: [
-      'duration',
-      'deliveryMethod',
-      'numberOfParticipants',
-    ],
-    where: {
-      [Op.and]: [scopes],
-      calculatedStatus: REPORT_STATUSES.APPROVED,
-    },
-    raw: true,
-    includeIgnoreAttributes: false,
-  });
-
-  // eslint-disable-next-line max-len
-  const sumDuration = duration.reduce((acc, report) => acc + (report.duration ? parseFloat(report.duration) : 0), 0)
-    .toFixed(1)
-    .toString();
-
-  const inPerson = duration.filter((report) => report.deliveryMethod.toLowerCase() === 'in-person').length
-    .toString();
-
-  // eslint-disable-next-line max-len
-  const numParticipants = duration.reduce((prev, ar) => prev + (ar.numberOfParticipants ? parseInt(ar.numberOfParticipants, 10) : 0), 0)
-    .toString();
-
-  const res = await ActivityReport.findAll({
-    attributes: [
-      // This is a literal because it needs to *not* respect the scopes passed in
-      // [sequelize.literal(`(SELECT COUNT(*) from "Grants" ${grantsWhere})`), 'numTotalGrants'],
-      [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"ActivityReport".id'))), 'numReports'],
-      [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"activityRecipients->grant"."id"'))), 'numGrants'],
-    ],
-    where: {
-      [Op.and]: [scopes],
-      calculatedStatus: REPORT_STATUSES.APPROVED,
-    },
-    raw: true,
-    includeIgnoreAttributes: false,
-    include: [
-      {
-        model: ActivityRecipient,
-        as: 'activityRecipients',
-        attributes: [],
-        required: false,
-        include: [
-          {
-            model: Grant,
-            as: 'grant',
-            attributes: [],
-            required: false,
-          },
-          {
-            model: NonGrantee,
-            attributes: [],
-            as: 'nonGrantee',
-            required: false,
-          },
-        ],
-      },
-    ],
-  });
-
-  return {
-    ...res[0],
-    inPerson,
-    sumDuration,
-    numParticipants,
-  };
-}
+export default overview;
diff --git a/src/widgets/dashboardOverview.test.js b/src/widgets/dashboardOverview.test.js
deleted file mode 100644
index 6a759cbda6..0000000000
--- a/src/widgets/dashboardOverview.test.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import db, {
-  ActivityReport, ActivityRecipient, User, Grantee, Grant, Region,
-} from '../models';
-import filtersToScopes from '../scopes';
-import dashboardOverview from './dashboardOverview';
-import { REPORT_STATUSES } from '../constants';
-import { createOrUpdate } from '../services/activityReports';
-import { formatQuery } from '../routes/widgets/utils';
-
-const GRANTEE_ID = 84036;
-const GRANT_ID_ONE = 109730;
-const GRANT_ID_TWO = 276030;
-
-const mockUser = {
-  id: 11818461,
-  homeRegionId: 1,
-  name: 'user11818461',
-  hsesUsername: 'user11818461',
-  hsesUserId: 'user11818461',
-};
-
-const reportObject = {
-  activityRecipientType: 'grantee',
-  submissionStatus: REPORT_STATUSES.SUBMITTED,
-  calculatedStatus: REPORT_STATUSES.APPROVED,
-  userId: mockUser.id,
-  lastUpdatedById: mockUser.id,
-  ECLKCResourcesUsed: ['test'],
-  activityRecipients: [
-    { activityRecipientId: GRANT_ID_ONE },
-    { activityRecipientId: GRANT_ID_TWO },
-  ],
-  approvingManagerId: 1,
-  numberOfParticipants: 11,
-  deliveryMethod: 'in-person',
-  duration: 1,
-  endDate: '2021-01-01T12:00:00Z',
-  startDate: '2021-01-01T12:00:00Z',
-  requester: 'requester',
-  programTypes: ['type'],
-  targetPopulations: ['pop'],
-  reason: ['reason'],
-  participants: ['participants'],
-  topics: ['topics'],
-  ttaType: ['technical-assistance'],
-};
-
-const regionOneReport = {
-  ...reportObject,
-  regionId: 1717,
-};
-
-const regionTwoReport = {
-  ...reportObject,
-  numberOfParticipants: 8,
-  regionId: 1818,
-  activityRecipients: [
-    { activityRecipientId: GRANT_ID_TWO },
-  ],
-};
-
-const reportWithNewDate = {
-  ...reportObject,
-  startDate: '2021-06-01T12:00:00Z',
-  endDate: '2021-06-02T12:00:00Z',
-  regionId: 1717,
-  deliveryMethod: 'method',
-};
-
-describe('Dashboard overview widget', () => {
-  beforeAll(async () => {
-    await User.create(mockUser);
-    await Grantee.create({ name: 'grantee', id: GRANTEE_ID });
-    await Region.create({ name: 'office 1717', id: 1717 });
-    await Region.create({ name: 'office 1818', id: 1818 });
-    await Grant.bulkCreate([{
-      id: GRANT_ID_ONE,
-      number: GRANT_ID_ONE,
-      granteeId: GRANTEE_ID,
-      regionId: 1717,
-      status: 'Active',
-      startDate: new Date('2021/01/01'),
-      endDate: new Date('2021/01/02'),
-    }, {
-      id: GRANT_ID_TWO,
-      number: GRANT_ID_TWO,
-      granteeId: GRANTEE_ID,
-      regionId: 1717,
-      status: 'Active',
-      startDate: new Date('2021/01/01'),
-      endDate: new Date('2021/01/02'),
-    }]);
-
-    await createOrUpdate({ ...regionOneReport, duration: 1 });
-    await createOrUpdate({ ...regionOneReport, duration: 2, deliveryMethod: 'In-person' });
-    await createOrUpdate({ ...regionOneReport, duration: 4 });
-    await createOrUpdate({ ...regionOneReport, duration: 5 });
-    await createOrUpdate({ ...regionTwoReport, duration: 1.5 });
-    await createOrUpdate({ ...reportWithNewDate, duration: 6 });
-  });
-
-  afterAll(async () => {
-    const reports = await ActivityReport.findAll({ where: { userId: mockUser.id } });
-    const ids = reports.map((report) => report.id);
-    await ActivityRecipient.destroy({ where: { activityReportId: ids } });
-    await ActivityReport.destroy({ where: { id: ids } });
-    await User.destroy({ where: { id: mockUser.id } });
-    await Grant.destroy({
-      where:
-      { id: [GRANT_ID_ONE, GRANT_ID_TWO] },
-    });
-    await Grantee.destroy({ where: { id: GRANTEE_ID } });
-    await Region.destroy({ where: { id: [1717, 1818] } });
-    await db.sequelize.close();
-  });
-
-  it('retrieves data', async () => {
-    const query = { 'region.in': [1717], 'startDate.win': '2021/01/01-2021/01/01' };
-    const scopes = filtersToScopes(query);
-    const data = await dashboardOverview(scopes, formatQuery(query));
-
-    expect(data.numReports).toBe('4');
-    expect(data.numGrants).toBe('2');
-    expect(data.inPerson).toBe('4');
-    expect(data.sumDuration).toBe('12.0');
-    expect(data.numParticipants).toBe('44');
-  });
-
-  it('accounts for different date ranges', async () => {
-    const query = { 'region.in': [1717], 'startDate.win': '2021/06/01-2021/06/02' };
-    const scopes = filtersToScopes(query);
-    const data = await dashboardOverview(scopes, formatQuery(query));
-
-    expect(data.numReports).toBe('1');
-    expect(data.numGrants).toBe('2');
-    expect(data.inPerson).toBe('0');
-    expect(data.sumDuration).toBe('6.0');
-    expect(data.numParticipants).toBe('11');
-  });
-
-  it('accounts for different regions', async () => {
-    const query = { 'region.in': [1818], 'startDate.win': '2021/01/01-2021/01/01' };
-    const scopes = filtersToScopes(query);
-    const data = await dashboardOverview(scopes, formatQuery(query));
-
-    expect(data.numReports).toBe('1');
-    expect(data.numGrants).toBe('1');
-    expect(data.inPerson).toBe('1');
-    expect(data.numParticipants).toBe('8');
-    expect(data.sumDuration).toBe('1.5');
-  });
-});
diff --git a/src/widgets/index.js b/src/widgets/index.js
index 1f21e83864..c7a9f42243 100644
--- a/src/widgets/index.js
+++ b/src/widgets/index.js
@@ -1,8 +1,8 @@
 import example from './example';
 import overview from './overview';
+import dashboardOverview from './dashboardOverview';
 import totalHrsAndGranteeGraph from './totalHrsAndGranteeGraph';
 import reasonList from './reasonList';
-import dashboardOverview from './dashboardOverview';
 import topicFrequencyGraph from './topicFrequencyGraph';
 
 /*
@@ -11,8 +11,8 @@ import topicFrequencyGraph from './topicFrequencyGraph';
 export default {
   example,
   overview,
+  dashboardOverview,
   totalHrsAndGranteeGraph,
   reasonList,
-  dashboardOverview,
   topicFrequencyGraph,
 };
diff --git a/src/widgets/overview.js b/src/widgets/overview.js
index 88711139e7..17bf56d75f 100644
--- a/src/widgets/overview.js
+++ b/src/widgets/overview.js
@@ -1,74 +1,83 @@
 import { Op } from 'sequelize';
-import moment from 'moment';
+
 import {
   ActivityReport, ActivityRecipient, Grant, NonGrantee, sequelize,
 } from '../models';
 import { REPORT_STATUSES } from '../constants';
 
-/*
-  Widgets on the backend should only have to worry about fetching data in the format required
-  by the widget. In this case we return a single object but other widgets my require an array
-  (say for a time series). All widgets will need to honor the scopes that are passed in. All
-  that is required is that the scopes parameter is used as value for the `where` parameter (or
-  combined with [op.and] if the widget needs to add additional conditions to the query).
+export default async function overview(scopes) {
+  /**
+   * this looks a little strange... why create two SQL queries?
+   *
+   * The answer - the includes/required: false on the second query
+   * causes the joins to be left outer joins, which will give us duplicated
+   * activity reports, and incorrect numbers
+   */
+  const duration = await ActivityReport.findAll({
+    attributes: [
+      'duration',
+      'deliveryMethod',
+      'numberOfParticipants',
+    ],
+    where: {
+      [Op.and]: [scopes],
+      calculatedStatus: REPORT_STATUSES.APPROVED,
+    },
+    raw: true,
+  });
+
+  // eslint-disable-next-line max-len
+  const sumDuration = duration.reduce((acc, report) => acc + (report.duration ? parseFloat(report.duration) : 0), 0)
+    .toFixed(1)
+    .toString();
+
+  const inPerson = duration.filter((report) => report.deliveryMethod.toLowerCase() === 'in-person').length
+    .toString();
 
-  If adding a new widget be sure to add the widget to ./index.js
-*/
-export default async function overview(scopes, query) {
-  const region = query['region.in'];
-  const startDte = '2020-09-01';
-  const endDte = moment().format('MM/DD/yyyy');
-  const grantsWhere = `WHERE "regionId" in (${region !== undefined ? region : '0'}) and "endDate" >= '${startDte}'`;
-  const baseWhere = `${grantsWhere} AND "calculatedStatus" = '${REPORT_STATUSES.APPROVED}' AND "startDate" >= '${startDte}' AND "startDate" <= '${endDte}'`;
-  // There could be a better way, but using sequelize.literal was the only way I could get correct
-  // numbers for SUM
-  // FIXME: see if there is a better way to get totals using SUM
-  const res = await ActivityReport.findAll(
-    {
-      attributes: [
-        [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"ActivityReport".id'))), 'numReports'],
-        [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"activityRecipients->grant"."id"'))), 'numGrants'],
-        [sequelize.literal(`(SELECT COUNT(*) from "Grants" ${grantsWhere})`), 'numTotalGrants'],
-        [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"activityRecipients"."nonGranteeId"'))), 'numNonGrantees'],
-        [sequelize.literal(`(SELECT COALESCE(SUM("numberOfParticipants"), 0) FROM "ActivityReports" ${baseWhere})`), 'numParticipants'],
-        [sequelize.literal(`(SELECT COALESCE(SUM(duration), 0) FROM "ActivityReports" ${baseWhere})`), 'sumDuration']],
-      where:
+  // eslint-disable-next-line max-len
+  const numParticipants = duration.reduce((prev, ar) => prev + (ar.numberOfParticipants ? parseInt(ar.numberOfParticipants, 10) : 0), 0)
+    .toString();
+
+  const res = await ActivityReport.findAll({
+    attributes: [
+      [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"ActivityReport".id'))), 'numReports'],
+      [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"activityRecipients->grant"."id"'))), 'numGrants'],
+      [sequelize.fn('COUNT', sequelize.fn('DISTINCT', sequelize.col('"activityRecipients"."nonGranteeId"'))), 'numNonGrantees'],
+    ],
+    where: {
+      [Op.and]: [scopes],
+      calculatedStatus: REPORT_STATUSES.APPROVED,
+    },
+    raw: true,
+    includeIgnoreAttributes: false,
+    include: [
       {
-        [Op.and]:
-        [scopes,
-          { calculatedStatus: REPORT_STATUSES.APPROVED },
-          { startDate: { [Op.gte]: startDte, [Op.lte]: endDte } },
+        model: ActivityRecipient,
+        as: 'activityRecipients',
+        attributes: [],
+        required: false,
+        include: [
+          {
+            model: Grant,
+            as: 'grant',
+            attributes: [],
+            required: false,
+          },
+          {
+            model: NonGrantee,
+            attributes: [],
+            as: 'nonGrantee',
+            required: false,
+          },
         ],
       },
-      raw: true,
-      // without 'includeIgnoreAttributes' the attributes from the join table
-      // "activityReportObjectives" are included which causes postgres to error when
-      // those attributes are not aggregated or used in a group by (since all the
-      // other DB fields are aggregated)
-      includeIgnoreAttributes: false,
-      include: [
-        {
-          model: ActivityRecipient,
-          as: 'activityRecipients',
-          attributes: [],
-          required: false,
-          include: [
-            {
-              model: Grant,
-              as: 'grant',
-              attributes: [],
-              required: false,
-            },
-            {
-              model: NonGrantee,
-              attributes: [],
-              as: 'nonGrantee',
-              required: false,
-            },
-          ],
-        },
-      ],
-    },
-  );
-  return res[0];
+    ],
+  });
+
+  return {
+    ...res[0],
+    inPerson,
+    sumDuration,
+    numParticipants,
+  };
 }
diff --git a/src/widgets/overview.test.js b/src/widgets/overview.test.js
index b19088486c..c4b2dc93bb 100644
--- a/src/widgets/overview.test.js
+++ b/src/widgets/overview.test.js
@@ -2,21 +2,21 @@ import db, {
   ActivityReport, ActivityRecipient, User, Grantee, Grant, Region,
 } from '../models';
 import filtersToScopes from '../scopes';
-import { formatQuery } from '../routes/widgets/utils';
 import overview from './overview';
 import { REPORT_STATUSES } from '../constants';
 import { createOrUpdate } from '../services/activityReports';
+import { formatQuery } from '../routes/widgets/utils';
 
-const GRANTEE_ID = 109762;
-const GRANT_ID_ONE = 1195306;
-const GRANT_ID_TWO = 2295306;
+const GRANTEE_ID = 84036;
+const GRANT_ID_ONE = 109730;
+const GRANT_ID_TWO = 276030;
 
 const mockUser = {
-  id: 71646940,
-  homeRegionId: 170,
-  name: 'user71646940',
-  hsesUsername: 'user71646940',
-  hsesUserId: '71646940',
+  id: 11818461,
+  homeRegionId: 1,
+  name: 'user11818461',
+  hsesUsername: 'user11818461',
+  hsesUserId: 'user11818461',
 };
 
 const reportObject = {
@@ -30,11 +30,12 @@ const reportObject = {
     { activityRecipientId: GRANT_ID_ONE },
     { activityRecipientId: GRANT_ID_TWO },
   ],
+  approvingManagerId: 1,
   numberOfParticipants: 11,
-  deliveryMethod: 'method',
+  deliveryMethod: 'in-person',
   duration: 1,
-  endDate: '2020-09-16T12:00:00Z',
-  startDate: '2020-09-15T12:00:00Z',
+  endDate: '2021-01-01T12:00:00Z',
+  startDate: '2021-01-01T12:00:00Z',
   requester: 'requester',
   programTypes: ['type'],
   targetPopulations: ['pop'],
@@ -46,24 +47,37 @@ const reportObject = {
 
 const regionOneReport = {
   ...reportObject,
-  regionId: 170,
+  regionId: 1717,
 };
 
 const regionTwoReport = {
   ...reportObject,
-  regionId: 2,
+  numberOfParticipants: 8,
+  regionId: 1818,
+  activityRecipients: [
+    { activityRecipientId: GRANT_ID_TWO },
+  ],
 };
 
-describe('Overview widget', () => {
+const reportWithNewDate = {
+  ...reportObject,
+  startDate: '2021-06-01T12:00:00Z',
+  endDate: '2021-06-02T12:00:00Z',
+  regionId: 1717,
+  deliveryMethod: 'method',
+};
+
+describe('Dashboard overview widget', () => {
   beforeAll(async () => {
-    await Region.create({ name: 'office 170', id: 170 });
     await User.create(mockUser);
     await Grantee.create({ name: 'grantee', id: GRANTEE_ID });
+    await Region.create({ name: 'office 1717', id: 1717 });
+    await Region.create({ name: 'office 1818', id: 1818 });
     await Grant.bulkCreate([{
       id: GRANT_ID_ONE,
       number: GRANT_ID_ONE,
       granteeId: GRANTEE_ID,
-      regionId: 170,
+      regionId: 1717,
       status: 'Active',
       startDate: new Date('2021/01/01'),
       endDate: new Date('2021/01/02'),
@@ -71,48 +85,68 @@ describe('Overview widget', () => {
       id: GRANT_ID_TWO,
       number: GRANT_ID_TWO,
       granteeId: GRANTEE_ID,
-      regionId: 170,
+      regionId: 1717,
       status: 'Active',
       startDate: new Date('2021/01/01'),
       endDate: new Date('2021/01/02'),
     }]);
+
+    await createOrUpdate({ ...regionOneReport, duration: 1 });
+    await createOrUpdate({ ...regionOneReport, duration: 2, deliveryMethod: 'In-person' });
+    await createOrUpdate({ ...regionOneReport, duration: 4 });
+    await createOrUpdate({ ...regionOneReport, duration: 5 });
+    await createOrUpdate({ ...regionTwoReport, duration: 1.5 });
+    await createOrUpdate({ ...reportWithNewDate, duration: 6 });
   });
 
   afterAll(async () => {
-    const reports = await ActivityReport.findAll({ where: { userId: [mockUser.id] } });
+    const reports = await ActivityReport.findAll({ where: { userId: mockUser.id } });
     const ids = reports.map((report) => report.id);
     await ActivityRecipient.destroy({ where: { activityReportId: ids } });
     await ActivityReport.destroy({ where: { id: ids } });
-    await User.destroy({ where: { id: [mockUser.id] } });
-    await Grant.destroy({ where: { id: [GRANT_ID_ONE, GRANT_ID_TWO] } });
-    await Grantee.destroy({ where: { id: [GRANTEE_ID] } });
-    await Region.destroy({ where: { id: 170 } });
+    await User.destroy({ where: { id: mockUser.id } });
+    await Grant.destroy({
+      where:
+      { id: [GRANT_ID_ONE, GRANT_ID_TWO] },
+    });
+    await Grantee.destroy({ where: { id: GRANTEE_ID } });
+    await Region.destroy({ where: { id: [1717, 1818] } });
     await db.sequelize.close();
   });
 
-  it('retrieves data by region', async () => {
-    await createOrUpdate({ ...regionOneReport, duration: 1 });
-    await createOrUpdate({ ...regionOneReport, duration: 2 });
-    await createOrUpdate({ ...regionOneReport, duration: 4, ttaType: ['training'] });
-    await createOrUpdate({ ...regionOneReport, duration: 5, ttaType: ['training', 'technical-assistance'] });
-    // Region two report that should not be returned
-    await createOrUpdate({ ...regionTwoReport, duration: 1.5 });
-    const query = { 'region.in': ['170'] };
+  it('retrieves data', async () => {
+    const query = { 'region.in': [1717], 'startDate.win': '2021/01/01-2021/01/01' };
+    const scopes = filtersToScopes(query);
+    const data = await overview(scopes, formatQuery(query));
+
+    expect(data.numReports).toBe('4');
+    expect(data.numGrants).toBe('2');
+    expect(data.inPerson).toBe('4');
+    expect(data.sumDuration).toBe('12.0');
+    expect(data.numParticipants).toBe('44');
+  });
+
+  it('accounts for different date ranges', async () => {
+    const query = { 'region.in': [1717], 'startDate.win': '2021/06/01-2021/06/02' };
     const scopes = filtersToScopes(query);
     const data = await overview(scopes, formatQuery(query));
-    const {
-      numReports,
-      numGrants,
-      numTotalGrants,
-      numNonGrantees,
-      numParticipants,
-      sumDuration,
-    } = data;
-    expect(numReports).toBe('4');
-    expect(numGrants).toBe('2');
-    expect(numTotalGrants).toBe('2');
-    expect(numNonGrantees).toBe('0');
-    expect(numParticipants).toBe('44');
-    expect(sumDuration).toBe('12.0');
+
+    expect(data.numReports).toBe('1');
+    expect(data.numGrants).toBe('2');
+    expect(data.inPerson).toBe('0');
+    expect(data.sumDuration).toBe('6.0');
+    expect(data.numParticipants).toBe('11');
+  });
+
+  it('accounts for different regions', async () => {
+    const query = { 'region.in': [1818], 'startDate.win': '2021/01/01-2021/01/01' };
+    const scopes = filtersToScopes(query);
+    const data = await overview(scopes, formatQuery(query));
+
+    expect(data.numReports).toBe('1');
+    expect(data.numGrants).toBe('1');
+    expect(data.inPerson).toBe('1');
+    expect(data.numParticipants).toBe('8');
+    expect(data.sumDuration).toBe('1.5');
   });
 });
diff --git a/yarn-audit-known-issues b/yarn-audit-known-issues
index b3b91e9dd7..f19a107a4a 100644
--- a/yarn-audit-known-issues
+++ b/yarn-audit-known-issues
@@ -1,3 +1,5 @@
 {"type":"auditAdvisory","data":{"resolution":{"id":1002401,"path":"sequelize-cli>yargs>string-width>strip-ansi>ansi-regex","dev":false,"optional":false,"bundled":false},"advisory":{"findings":[{"version":"4.1.0","paths":["sequelize-cli>yargs>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex"]}],"metadata":null,"vulnerable_versions":">2.1.1 <5.0.1","module_name":"ansi-regex","severity":"moderate","github_advisory_id":"GHSA-93q8-gq69-wqmw","cves":["CVE-2021-3807"],"access":"public","patched_versions":">=5.0.1","updated":"2021-09-23T15:45:50.000Z","recommendation":"Upgrade to version 5.0.1 or later","cwe":"CWE-918","found_by":null,"deleted":null,"id":1002401,"references":"- https://nvd.nist.gov/vuln/detail/CVE-2021-3807\n- https://github.com/advisories/GHSA-93q8-gq69-wqmw","created":"2021-10-07T07:31:50.502Z","reported_by":null,"title":" Inefficient Regular Expression Complexity in chalk/ansi-regex","npm_advisory_id":null,"overview":"ansi-regex is vulnerable to Inefficient Regular Expression Complexity","url":"https://github.com/advisories/GHSA-93q8-gq69-wqmw"}}}
 {"type":"auditAdvisory","data":{"resolution":{"id":1002401,"path":"sequelize-cli>yargs>cliui>string-width>strip-ansi>ansi-regex","dev":false,"optional":false,"bundled":false},"advisory":{"findings":[{"version":"4.1.0","paths":["sequelize-cli>yargs>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex"]}],"metadata":null,"vulnerable_versions":">2.1.1 <5.0.1","module_name":"ansi-regex","severity":"moderate","github_advisory_id":"GHSA-93q8-gq69-wqmw","cves":["CVE-2021-3807"],"access":"public","patched_versions":">=5.0.1","updated":"2021-09-23T15:45:50.000Z","recommendation":"Upgrade to version 5.0.1 or later","cwe":"CWE-918","found_by":null,"deleted":null,"id":1002401,"references":"- https://nvd.nist.gov/vuln/detail/CVE-2021-3807\n- https://github.com/advisories/GHSA-93q8-gq69-wqmw","created":"2021-10-07T07:31:50.502Z","reported_by":null,"title":" Inefficient Regular Expression Complexity in chalk/ansi-regex","npm_advisory_id":null,"overview":"ansi-regex is vulnerable to Inefficient Regular Expression Complexity","url":"https://github.com/advisories/GHSA-93q8-gq69-wqmw"}}}
 {"type":"auditAdvisory","data":{"resolution":{"id":1002401,"path":"sequelize-cli>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex","dev":false,"optional":false,"bundled":false},"advisory":{"findings":[{"version":"4.1.0","paths":["sequelize-cli>yargs>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>string-width>strip-ansi>ansi-regex","sequelize-cli>yargs>cliui>wrap-ansi>string-width>strip-ansi>ansi-regex"]}],"metadata":null,"vulnerable_versions":">2.1.1 <5.0.1","module_name":"ansi-regex","severity":"moderate","github_advisory_id":"GHSA-93q8-gq69-wqmw","cves":["CVE-2021-3807"],"access":"public","patched_versions":">=5.0.1","updated":"2021-09-23T15:45:50.000Z","recommendation":"Upgrade to version 5.0.1 or later","cwe":"CWE-918","found_by":null,"deleted":null,"id":1002401,"references":"- https://nvd.nist.gov/vuln/detail/CVE-2021-3807\n- https://github.com/advisories/GHSA-93q8-gq69-wqmw","created":"2021-10-07T07:31:50.502Z","reported_by":null,"title":" Inefficient Regular Expression Complexity in chalk/ansi-regex","npm_advisory_id":null,"overview":"ansi-regex is vulnerable to Inefficient Regular Expression Complexity","url":"https://github.com/advisories/GHSA-93q8-gq69-wqmw"}}}
+{"type":"auditAdvisory","data":{"resolution":{"id":1004784,"path":"sequelize>validator","dev":false,"optional":false,"bundled":false},"advisory":{"findings":[{"version":"10.11.0","paths":["sequelize>validator"]},{"version":"13.6.0","paths":["validator"]}],"metadata":null,"vulnerable_versions":"<13.7.0","module_name":"validator","severity":"moderate","github_advisory_id":"GHSA-qgmg-gppg-76g5","cves":["CVE-2021-3765"],"access":"public","patched_versions":">=13.7.0","updated":"2021-11-03T14:46:01.000Z","recommendation":"Upgrade to version 13.7.0 or later","cwe":"CWE-1333","found_by":null,"deleted":null,"id":1004784,"references":"- https://nvd.nist.gov/vuln/detail/CVE-2021-3765\n- https://github.com/advisories/GHSA-qgmg-gppg-76g5","created":"2021-11-03T18:00:36.336Z","reported_by":null,"title":"Inefficient Regular Expression Complexity in validator.js","npm_advisory_id":null,"overview":"validator.js prior to 13.7.0 is vulnerable to Inefficient Regular Expression Complexity","url":"https://github.com/advisories/GHSA-qgmg-gppg-76g5"}}}
+{"type":"auditAdvisory","data":{"resolution":{"id":1004784,"path":"validator","dev":false,"optional":false,"bundled":false},"advisory":{"findings":[{"version":"10.11.0","paths":["sequelize>validator"]},{"version":"13.6.0","paths":["validator"]}],"metadata":null,"vulnerable_versions":"<13.7.0","module_name":"validator","severity":"moderate","github_advisory_id":"GHSA-qgmg-gppg-76g5","cves":["CVE-2021-3765"],"access":"public","patched_versions":">=13.7.0","updated":"2021-11-03T14:46:01.000Z","recommendation":"Upgrade to version 13.7.0 or later","cwe":"CWE-1333","found_by":null,"deleted":null,"id":1004784,"references":"- https://nvd.nist.gov/vuln/detail/CVE-2021-3765\n- https://github.com/advisories/GHSA-qgmg-gppg-76g5","created":"2021-11-03T18:00:36.336Z","reported_by":null,"title":"Inefficient Regular Expression Complexity in validator.js","npm_advisory_id":null,"overview":"validator.js prior to 13.7.0 is vulnerable to Inefficient Regular Expression Complexity","url":"https://github.com/advisories/GHSA-qgmg-gppg-76g5"}}}