From 34ae71716b738c68dac3b0144f7605e3cbaf836a Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 23 Jul 2024 12:16:09 -0700
Subject: [PATCH 01/23] added organizing content to features page

---
 app/templates/views/features.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index bcf060933..1ee9d92b0 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -24,6 +24,10 @@
 <p class="usa-body">To send a text with Notify, you need to create a reusable message template first.</p>
 <p class="usa-body">Templates let you send the same thing to lots of people, as often as you need to, without writing a new message each time.</p>
 
+<h2 class="heading-medium" id="organizing-content">Organizing your content</h2>
+<p class="usa-body">You can organize your content by grouping templates, and putting them into folders.</p>
+<p class="usa-body">Set up folders within the Send message section of Notify, where you find templates. You can choose to create a Folder before or after a template is made. If you want to change a user’s ability to view or edit folders, you may control this through their individual team member permissions.</p>
+
 <h2 class="heading-medium" id="personalised-messages">Personalized content</h2>
 <p class="usa-body">Notify makes it easy to send personalized messages from a single template.</p>
 <p class="usa-body">See <a class="usa-link" href="{{ url_for('.guidance_index', _anchor='personalized-content') }}">how to personalize your content</a>.</p>

From b8c1373dde1f2092c0b92dc1b6d2f780f85bfa89 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 23 Jul 2024 12:57:02 -0700
Subject: [PATCH 02/23] add accordion to invite page

---
 app/templates/views/features.html    |  1 -
 app/templates/views/invite-user.html | 96 +++++++++++++++++++++++++++-
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index bcf060933..8a947584a 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -44,7 +44,6 @@
 <p class="usa-body">Notify lets you:</p>
 <ul class="list list-bullet">
   <li>set different permission levels for each team member</li>
-  <li>invite team members who do not have a government email address</li>
   <li>choose who else can manage team members</li>
 </ul>
 
diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html
index 90ff36aa2..b4f6789b2 100644
--- a/app/templates/views/invite-user.html
+++ b/app/templates/views/invite-user.html
@@ -15,7 +15,7 @@
 {% block maincolumn_content %}
 
   {{ page_header('Invite {}'.format(user_to_invite.name if user_to_invite else 'a team member')) }}
-
+  <a href="#permissions">Learn more about user permissions.</a>
   {% call form_wrapper() %}
 
     {% if user_to_invite %}
@@ -36,5 +36,99 @@
     {{ page_footer('Send invitation email') }}
 
   {% endcall %}
+  <h2 id="permissions">Set up user permissions</h2>
+  <p>Setting the right digital control is one of many aspects to keep content and information on a need to know basis. Permissions allow you to do this. Give team members access to important views related to their responsibilities.</p>
+  <h3 class="site-preview-heading">Permission</h3>
 
+  <div class="usa-accordion usa-accordion--bordered">
+    <h4 class="usa-accordion__heading">
+      <button
+        type="button"
+        class="usa-accordion__button"
+        aria-expanded="true"
+        aria-controls="b-a1"
+      >
+      See dashboard
+      </button>
+    </h4>
+    <div id="b-a1" class="usa-accordion__content usa-prose">
+      <p>Allows users to view the dashboard but not have access to any other functions on the site.
+        Dashboard viewers can see: Weekly message quantity</p>
+        <ul>
+          <li>Message templates used</li>
+          <li>Recent batches of sent messages</li>
+        </ul>
+        <p>This also gives access to:</p>
+        <ul>
+          <li>List of templates used by month</li>
+          <li>Batch details with message status</li>
+        </ul>
+    </div>
+    <h4 class="usa-accordion__heading">
+      <button
+        type="button"
+        class="usa-accordion__button"
+        aria-expanded="false"
+        aria-controls="b-a2"
+      >
+      Send messages
+      </button>
+    </h4>
+    <div id="b-a2" class="usa-accordion__content usa-prose">
+      <p>
+        Allows users to view, select and send approved messages, but restricts users from editing templates
+        and/or folders. Team members responsible for sending message batches can use templates to prepare
+        and schedule texts. Actions they take in this section:
+      </p>
+      <ul>
+        <li>View and use templates</li>
+        <li>Enter personalized message field content</li>
+        <li>Schedule messages for sending</li>
+        <li>Send messages</li>
+      </ul>
+    </div>
+    <h4 class="usa-accordion__heading">
+      <button
+        type="button"
+        class="usa-accordion__button"
+        aria-expanded="false"
+        aria-controls="b-a3"
+      >
+      Add and edit templates
+      </button>
+    </h4>
+    <div id="b-a3" class="usa-accordion__content usa-prose">
+      <p>
+        Allows users to view, create or edit, and more or delete templates and folders. They will set up real
+        messages, but are restricted from uploading data or sending or seeing previous versions. Some actions
+        they can take:
+      </p>
+      <ul>
+        <li>Create a new template</li>
+        <li>Create a new folder</li>
+        <li>Move (or organize) folders and templates</li>
+        <li>Delete templates and/or folders</li>
+      </ul>
+    </div>
+    <h4 class="usa-accordion__heading">
+      <button
+        type="button"
+        class="usa-accordion__button"
+        aria-expanded="false"
+        aria-controls="b-a4"
+      >
+      Manage settings and team
+      </button>
+    </h4>
+    <div id="b-a4" class="usa-accordion__content usa-prose">
+      <p>Leads with service management responsibility may do so in Settings. Managed within Settings:</p>
+      <ul>
+        <li>Change service name</li>
+        <li>Invite team members</li>
+        <li>Remove unnecessary team members</li>
+        <li>Turn off the ability to send text messages</li>
+        <li>Turn off the ability to send service name with text message</li>
+      </ul>
+    </div>
+  </div>
 {% endblock %}

From 1bdb2913975a255941681ad0a5577b9d7560478b Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 24 Jul 2024 07:13:34 -0700
Subject: [PATCH 03/23] debug

---
 .ds.baseline              | 12 +-----------
 app/main/views/sign_in.py | 18 +++++++++++-------
 app/main/views/verify.py  |  6 ++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.ds.baseline b/.ds.baseline
index b84a53351..6d2034588 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -407,16 +407,6 @@
         "is_secret": false
       }
     ],
-    "app/main/views/sign_in.py": [
-      {
-        "type": "Private Key",
-        "filename": "app/main/views/sign_in.py",
-        "hashed_secret": "1348b145fa1a555461c1b790a2f66614781091e9",
-        "is_verified": false,
-        "line_number": 27,
-        "is_secret": false
-      }
-    ],
     "app/templates/new/components/head.html": [
       {
         "type": "Base64 High Entropy String",
@@ -702,5 +692,5 @@
       }
     ]
   },
-  "generated_at": "2024-07-11T16:37:23Z"
+  "generated_at": "2024-07-24T14:13:02Z"
 }
diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 9f089fe42..4b57a0ed4 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -29,12 +29,14 @@ from notifications_utils.url_safe_token import generate_token
 
 
 def _reformat_keystring(orig):
-    new_keystring = orig.replace("-----BEGIN PRIVATE KEY-----", "")
-    new_keystring = new_keystring.replace("-----END PRIVATE KEY-----", "")
+    private_key = "PRIVATE "  # pragma: allowlist secret
+    private_key = f"{private_key} KEY"
+    new_keystring = orig.replace(f"-----BEGIN {private_key}-----", "")
+    new_keystring = new_keystring.replace(f"-----END {private_key}-----", "")
     new_keystring = new_keystring.strip()
     new_keystring = new_keystring.replace(" ", "\n")
     new_keystring = "\n".join(
-        ["-----BEGIN PRIVATE KEY-----", new_keystring, "-----END PRIVATE KEY-----"]
+        [f"-----BEGIN {private_key}-----", new_keystring, f"-----END {private_key}-----"]
     )
     new_keystring = f"{new_keystring}\n"
     return new_keystring
@@ -65,7 +67,7 @@ def _get_access_token(code, state):
     response = requests.post(url, headers=headers)
     if response.json().get("access_token") is None:
         # Capture the response json here so it hopefully shows up in error reports
-        current_app.logger.error(f"Error when getting access token {response.json()}")
+        current_app.logger.error(f"Error when getting access token {response.json()} #notify-admin-1505")
         raise KeyError(f"'access_token' {response.json()}")
     access_token = response.json()["access_token"]
     return access_token
@@ -90,7 +92,7 @@ def _do_login_dot_gov():
     login_gov_error = request.args.get("error")
 
     if login_gov_error:
-        current_app.logger.error(f"login.gov error: {login_gov_error}")
+        current_app.logger.error(f"login.gov error: {login_gov_error} #notify-admin-1505")
         raise Exception(f"Could not login with login.gov {login_gov_error}")
     elif code and state:
 
@@ -100,12 +102,13 @@ def _do_login_dot_gov():
             user_email, user_uuid = _get_user_email_and_uuid(access_token)
             if not is_gov_user(user_email):
                 current_app.logger.error(
-                    "invited user has a non-government email address."
+                    "invited user has a non-government email address. #notify-admin-1505"
                 )
                 flash("You must use a government email address.")
                 abort(403)
             redirect_url = request.args.get("next")
             user = user_api_client.get_user_by_uuid_or_email(user_uuid, user_email)
+            current_app.logger.info(f"Retrieved user {user['id']} from db #notify-admin-1505")
 
             # Check if the email needs to be revalidated
             is_fresh_email = is_less_than_days_ago(
@@ -115,9 +118,10 @@ def _do_login_dot_gov():
                 return verify_email(user, redirect_url)
 
             usr = User.from_email_address(user["email_address"])
+            current_app.logger.info(f"activating user {usr.id} #notify-admin-1505")
             activate_user(usr.id)
         except BaseException as be:  # noqa B036
-            current_app.logger.error(be)
+            current_app.logger.error(f"Error signing in: {be} #notify-admin-1505 ")
             error(401)
         return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
 
diff --git a/app/main/views/verify.py b/app/main/views/verify.py
index fbe510643..99257d3a4 100644
--- a/app/main/views/verify.py
+++ b/app/main/views/verify.py
@@ -38,6 +38,7 @@ def verify_email(token):
             current_app.config["EMAIL_EXPIRY_SECONDS"],
         )
     except SignatureExpired:
+        current_app.logger.error(f"Email link expired #notify-admin-1505")
         flash(
             "The link in the email we sent you has expired. We've sent you a new one."
         )
@@ -50,6 +51,8 @@ def verify_email(token):
         abort(404)
 
     if user.is_active:
+        current_app.logger.error(
+            f"User is using an invite link but is already logged in {user.id} #notify-admin-1505")
         flash("That verification link has expired.")
         return redirect(url_for("main.sign_in"))
 
@@ -59,6 +62,7 @@ def verify_email(token):
 
     user.send_verify_code()
     session["user_details"] = {"email": user.email_address, "id": user.id}
+    current_app.logger.info(f"Email verified for user {user.id} #notify-admin-1505")
     return redirect(url_for("main.verify"))
 
 
@@ -78,5 +82,7 @@ def activate_user(user_id):
         return redirect(url_for("main.organization_dashboard", org_id=organization_id))
     else:
         activated_user = user.activate()
+        current_app.logger.info(f"Activated user {user.id} #notify-admin-1505")
         activated_user.login()
+        current_app.logger.info(f"Logged in user {user.id} #notify-admin-1505")
         return redirect(url_for("main.add_service", first="first"))

From 42fb5ad3777d9aa3e84101b3f74faf45e1204e82 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Wed, 24 Jul 2024 10:48:00 -0400
Subject: [PATCH 04/23] Update Python runtime version for cloud.gov

This changeset modifies the Python version specified in the runtime.txt file for cloud.gov.  The buildpack was recently updated, and the older version we had pinned is no longer supported.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 runtime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime.txt b/runtime.txt
index 4ddc7cd66..64f28603a 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-python-3.12.3
+python-3.12.x

From 08fec7e111c0f73d434cfa12f5588c92fb01676a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 24 Jul 2024 07:59:05 -0700
Subject: [PATCH 05/23] add another url for compliance #46

---
 app/notify_client/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/notify_client/__init__.py b/app/notify_client/__init__.py
index f78573090..5f65e85c6 100644
--- a/app/notify_client/__init__.py
+++ b/app/notify_client/__init__.py
@@ -58,6 +58,10 @@ class NotifyAdminAPIClient(BaseAPIClient):
 
     def check_inactive_user(self, *args):
         still_signing_in = False
+
+        # TODO clean up and add testing etc.
+        # We really should be checking for exact matches
+        # and we only want to check the first arg
         for arg in args:
             arg = str(arg)
             if (
@@ -66,6 +70,7 @@ class NotifyAdminAPIClient(BaseAPIClient):
                 or "/activate" in arg
                 or "/email-code" in arg
                 or "/verify/code" in arg
+                or "/user" in arg
             ):
                 still_signing_in = True
 

From 1036cec1e09c466b4289599a08f47bcc16a704a7 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 24 Jul 2024 10:26:37 -0700
Subject: [PATCH 06/23] fixed image

---
 app/assets/img/phone-text.png      | Bin 0 -> 21090 bytes
 app/templates/views/signedout.html |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 app/assets/img/phone-text.png

diff --git a/app/assets/img/phone-text.png b/app/assets/img/phone-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2318f1eb35ad9ea3f4d14baf4d739e607bbc32a
GIT binary patch
literal 21090
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

literal 0
HcmV?d00001

diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index fab9fbb30..a18fd8921 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -28,7 +28,7 @@ Notify.gov
               <p class="font-sans-md">Currently we are only working with select pilot partners. If you are interested in using Notify.gov in the future, please contact <br><a href="mailto:tts-benefits-studio@gsa.gov">tts-benefits-studio@gsa.gov</a> to learn more.</p>
             </div>
             <div class="desktop:grid-col-4 grid-offset-1 desktop:display-block display-none margin-x-5">
-              <img src="{{ asset_url('images/product/phone-text.png') }}"
+              <img src="/static/img/phone-text.png"
                 alt="An illustration of notifications to a phone.">
             </div>
           </div>

From 05611cfab6c0dd722682ac39cfc6dd11bb3ea864 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 24 Jul 2024 10:55:51 -0700
Subject: [PATCH 07/23] converted png to svg

---
 app/assets/images/product/phone-text.svg | 712 +++++++++++++++++++++++
 app/assets/img/phone-text.png            | Bin 21090 -> 0 bytes
 app/templates/views/signedout.html       |   4 +-
 3 files changed, 714 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/images/product/phone-text.svg
 delete mode 100644 app/assets/img/phone-text.png

diff --git a/app/assets/images/product/phone-text.svg b/app/assets/images/product/phone-text.svg
new file mode 100644
index 000000000..0fb85dcb0
--- /dev/null
+++ b/app/assets/images/product/phone-text.svg
@@ -0,0 +1,712 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100%" viewBox="0 0 1129 1483" enable-background="new 0 0 1129 1483" xml:space="preserve">
+<path fill="#000000" opacity="1.000000" stroke="none"
+	d="
+M539.000000,1484.000000
+	C359.711578,1484.000000 180.423172,1484.000000 1.000000,1484.000000
+	C1.000000,1105.639771 1.000000,727.279602 1.410214,348.316467
+	C4.569818,348.140381 7.319019,348.939209 10.068629,348.940613
+	C131.539047,349.002533 253.009537,349.019958 374.479858,348.902496
+	C379.495209,348.897644 382.964447,350.180725 385.438477,354.685120
+	C387.083405,357.679993 389.360779,360.359558 391.555206,363.014832
+	C400.272888,373.563141 409.100433,384.020660 417.827881,394.560944
+	C426.754944,405.342346 435.596100,416.194855 444.505066,426.991333
+	C453.315704,437.668549 462.350189,448.169037 470.874084,459.069550
+	C473.211273,462.058380 475.868622,462.668365 478.552521,461.668732
+	C479.870514,461.177765 480.891022,458.075714 480.899139,456.150421
+	C481.039185,422.992401 480.992554,389.833649 481.006348,356.675049
+	C481.009247,349.746185 481.792328,348.996246 488.738434,348.995605
+	C524.063171,348.992462 559.387878,348.997498 594.712646,348.991364
+	C602.408508,348.990021 602.999207,348.399902 602.999329,340.867279
+	C603.000366,227.578186 603.000000,114.289093 603.000000,1.000000
+	C778.587646,1.000000 954.175293,1.000000 1130.000000,1.000000
+	C1130.000000,136.026779 1130.000000,271.053680 1129.661621,406.458130
+	C1128.681885,406.105896 1127.790039,405.480469 1127.435913,404.630920
+	C1120.489746,387.961334 1107.422241,381.006897 1090.001465,381.005951
+	C910.382629,380.996246 730.763794,380.970703 551.145081,381.139465
+	C545.655090,381.144623 539.914307,382.532288 534.729980,384.458374
+	C523.458130,388.646179 512.165527,404.262543 512.742798,416.804962
+	C513.691650,437.422455 513.000000,458.115448 513.000000,478.776611
+	C513.000000,802.357117 512.996948,1125.937622 513.047546,1449.518188
+	C513.047974,1452.454102 513.316040,1455.538330 514.227844,1458.299561
+	C517.778442,1469.052002 525.487427,1476.064087 535.397400,1481.004028
+	C536.757935,1481.682251 537.806824,1482.985840 539.000000,1484.000000
+z"/>
+<path fill="#005EA2" opacity="1.000000" stroke="none"
+	d="
+M602.531372,1.000000
+	C603.000000,114.289093 603.000366,227.578186 602.999329,340.867279
+	C602.999207,348.399902 602.408508,348.990021 594.712646,348.991364
+	C559.387878,348.997498 524.063171,348.992462 488.738434,348.995605
+	C481.792328,348.996246 481.009247,349.746185 481.006348,356.675049
+	C480.992554,389.833649 481.039185,422.992401 480.899139,456.150421
+	C480.891022,458.075714 479.870514,461.177765 478.552521,461.668732
+	C475.868622,462.668365 473.211273,462.058380 470.874084,459.069550
+	C462.350189,448.169037 453.315704,437.668549 444.505066,426.991333
+	C435.596100,416.194855 426.754944,405.342346 417.827881,394.560944
+	C409.100433,384.020660 400.272888,373.563141 391.555206,363.014832
+	C389.360779,360.359558 387.083405,357.679993 385.438477,354.685120
+	C382.964447,350.180725 379.495209,348.897644 374.479858,348.902496
+	C253.009537,349.019958 131.539047,349.002533 10.068629,348.940613
+	C7.319019,348.939209 4.569818,348.140381 1.410214,347.856750
+	C1.000000,232.386658 1.000000,116.773323 1.000000,1.000000
+	C201.354202,1.000000 401.708435,1.000000 602.531372,1.000000
+z"/>
+<path fill="#1B1B1B" opacity="1.000000" stroke="none"
+	d="
+M539.468689,1484.000000
+	C537.806824,1482.985840 536.757935,1481.682251 535.397400,1481.004028
+	C525.487427,1476.064087 517.778442,1469.052002 514.227844,1458.299561
+	C513.316040,1455.538330 513.047974,1452.454102 513.047546,1449.518188
+	C512.996948,1125.937622 513.000000,802.357117 513.000000,478.776611
+	C513.000000,458.115448 513.691650,437.422455 512.742798,416.804962
+	C512.165527,404.262543 523.458130,388.646179 534.729980,384.458374
+	C539.914307,382.532288 545.655090,381.144623 551.145081,381.139465
+	C730.763794,380.970703 910.382629,380.996246 1090.001465,381.005951
+	C1107.422241,381.006897 1120.489746,387.961334 1127.435913,404.630920
+	C1127.790039,405.480469 1128.681885,406.105896 1129.661621,406.917847
+	C1130.000000,756.687561 1130.000000,1106.375122 1129.663086,1456.612671
+	C1128.761597,1457.741333 1127.970459,1458.220581 1127.666382,1458.913574
+	C1123.083496,1469.360596 1116.098755,1477.361450 1105.191040,1481.552490
+	C1104.281616,1481.901978 1103.722046,1483.162598 1103.000000,1484.000000
+	C915.312439,1484.000000 727.624878,1484.000000 539.468689,1484.000000
+M715.500000,1342.999756
+	C840.560608,1342.999756 965.621216,1342.999756 1090.580322,1342.999756
+	C1090.580322,1053.180908 1090.580322,764.298523 1090.580322,475.379303
+	C910.605164,475.379303 731.049866,475.379303 551.330566,475.379303
+	C551.330566,764.641113 551.330566,1053.523560 551.330566,1342.999756
+	C605.939392,1342.999756 660.219727,1342.999756 715.500000,1342.999756
+M848.995056,1439.501953
+	C861.071411,1426.778076 864.464417,1411.987305 857.870850,1395.782471
+	C851.682190,1380.572754 839.614075,1372.216919 823.238037,1371.120239
+	C804.724487,1369.880737 788.393555,1381.497681 782.851562,1399.040405
+	C777.381104,1416.357056 784.187378,1434.929688 799.618713,1444.794189
+	C814.984253,1454.616455 834.419617,1452.711060 848.995056,1439.501953
+M827.500000,439.001709
+	C837.987183,439.001678 848.474426,439.019501 858.961548,438.995575
+	C866.404968,438.978607 871.095825,434.951721 870.987549,428.742432
+	C870.884216,422.809875 866.245544,419.012268 858.947205,419.006348
+	C833.644836,418.985809 808.342407,418.987823 783.040039,419.004883
+	C775.608643,419.009918 770.903564,423.058716 771.012451,429.256409
+	C771.116821,435.194092 775.748901,438.980286 783.053101,438.993744
+	C797.535339,439.020386 812.017700,439.001678 827.500000,439.001709
+M725.402283,419.003754
+	C716.655090,419.947510 712.145569,427.803436 716.640198,434.366302
+	C719.365906,438.346191 723.255737,439.998871 727.861145,438.552002
+	C732.381165,437.131927 734.912048,433.752899 734.979553,428.883942
+	C735.046692,424.037842 732.110413,420.836304 725.402283,419.003754
+z"/>
+<path fill="#000000" opacity="1.000000" stroke="none"
+	d="
+M1103.468628,1484.000000
+	C1103.722046,1483.162598 1104.281616,1481.901978 1105.191040,1481.552490
+	C1116.098755,1477.361450 1123.083496,1469.360596 1127.666382,1458.913574
+	C1127.970459,1458.220581 1128.761597,1457.741333 1129.663086,1457.081299
+	C1130.000000,1465.926392 1130.000000,1474.852905 1130.000000,1484.000000
+	C1121.313721,1484.000000 1112.625488,1484.000000 1103.468628,1484.000000
+z"/>
+<path fill="#005EA2" opacity="1.000000" stroke="none"
+	d="
+M715.000000,1342.999756
+	C660.219727,1342.999756 605.939392,1342.999756 551.330566,1342.999756
+	C551.330566,1053.523560 551.330566,764.641113 551.330566,475.379303
+	C731.049866,475.379303 910.605164,475.379303 1090.580322,475.379303
+	C1090.580322,764.298523 1090.580322,1053.180908 1090.580322,1342.999756
+	C965.621216,1342.999756 840.560608,1342.999756 715.000000,1342.999756
+M757.917419,532.016174
+	C757.710449,531.842957 757.503540,531.669800 757.225159,530.601135
+	C756.969604,527.453918 758.218384,526.051575 761.558044,526.301270
+	C763.955505,526.480469 766.398010,526.057617 768.820374,525.903442
+	C768.792847,525.411682 768.765259,524.919922 768.737732,524.428162
+	C764.196594,524.428162 759.655518,524.428162 755.034241,524.428162
+	C754.709106,527.381104 754.389282,530.187317 754.093750,532.996155
+	C753.744568,536.314331 754.919922,537.421631 758.021118,535.657959
+	C761.182068,533.860352 764.437500,533.753479 766.141663,537.173096
+	C766.929382,538.753906 766.444580,542.116272 765.214417,543.323975
+	C762.385193,546.101440 759.204468,545.085571 756.479553,542.327881
+	C755.735840,541.575317 754.459167,541.349365 752.383667,540.408936
+	C755.843872,546.609497 760.206726,548.611938 765.034119,546.895874
+	C769.052124,545.467529 770.526672,542.303223 770.059326,538.198303
+	C769.479248,533.103760 765.369141,531.126282 757.917419,532.016174
+M716.917419,532.016174
+	C716.710449,531.842957 716.503540,531.669800 716.225159,530.601135
+	C715.969604,527.453918 717.218384,526.051575 720.558044,526.301270
+	C722.955505,526.480469 725.398010,526.057617 727.820374,525.903442
+	C727.792847,525.411682 727.765259,524.919922 727.737732,524.428162
+	C723.196594,524.428162 718.655518,524.428162 714.034180,524.428162
+	C713.709106,527.381104 713.389282,530.187317 713.093689,532.996155
+	C712.744568,536.314331 713.919922,537.421631 717.021118,535.657959
+	C720.182068,533.860352 723.437500,533.753479 725.141663,537.173096
+	C725.929443,538.753906 725.444580,542.116272 724.214417,543.323975
+	C721.385193,546.101440 718.204468,545.085571 715.479553,542.327942
+	C714.735840,541.575317 713.459167,541.349426 711.383728,540.408997
+	C714.843872,546.609497 719.206787,548.612000 724.034119,546.895996
+	C728.052124,545.467590 729.526733,542.303223 729.059387,538.198303
+	C728.479309,533.103760 724.369141,531.126282 716.917419,532.016174
+M1058.999390,737.500000
+	C1058.999390,697.505127 1058.999512,657.510193 1058.999268,617.515320
+	C1058.999268,605.743347 1056.299927,603.000366 1044.711548,603.000366
+	C895.564270,603.000061 746.416931,603.000061 597.269653,603.000305
+	C585.816956,603.000305 583.000000,605.768921 582.999939,617.030762
+	C582.999451,736.348633 582.999512,855.666443 582.999878,974.984314
+	C582.999939,986.054382 585.894104,988.999268 596.785095,988.999329
+	C746.265686,989.000183 895.746216,989.000061 1045.226807,988.999451
+	C1056.137695,988.999451 1058.998901,986.083923 1058.998901,974.969299
+	C1058.999512,896.146179 1058.999390,817.323120 1058.999390,737.500000
+M838.417786,528.949585
+	C839.083923,531.005493 839.750061,533.061462 840.461304,535.256653
+	C836.744202,539.386841 836.324524,542.075928 839.096497,544.925293
+	C842.052917,547.964355 849.674805,548.159302 852.937805,545.279297
+	C856.009766,542.567871 855.691833,539.842896 851.688904,534.575378
+	C855.016052,530.149902 854.543030,526.284058 850.432739,524.310608
+	C846.111816,522.236023 841.257324,523.850464 838.417786,528.949585
+M745.891296,542.169128
+	C741.158203,548.675415 737.081299,541.854736 732.290100,540.637451
+	C734.869629,546.392883 739.339478,548.482056 744.370422,546.980408
+	C748.078552,545.873596 750.549316,541.850952 749.525513,537.959473
+	C749.089172,536.301086 748.107056,533.978394 746.814453,533.514832
+	C743.774109,532.424500 740.397705,532.271240 736.826416,531.684448
+	C736.926086,530.342651 737.066406,528.453491 737.205750,526.577209
+	C741.252563,526.391479 744.746399,526.231140 748.240173,526.070740
+	C748.184937,525.482117 748.129761,524.893555 748.074524,524.304932
+	C743.625916,524.304932 739.177307,524.304932 734.787659,524.304932
+	C734.573547,524.763489 734.342285,525.046631 734.316650,525.347290
+	C734.105042,527.827087 734.009277,530.318909 733.728027,532.790039
+	C733.313477,536.432983 734.160034,537.418396 737.825989,535.580933
+	C743.170105,532.902283 746.194824,535.156616 745.891296,542.169128
+M788.188293,525.759277
+	C784.717834,530.639099 784.656189,536.005798 786.150879,541.487305
+	C787.114197,545.020081 789.453247,547.159302 793.298828,547.331177
+	C797.185181,547.504883 799.986816,545.518921 800.774292,542.027039
+	C801.591003,538.405762 801.956604,534.410889 801.318115,530.791321
+	C800.091431,523.837769 795.222107,521.941406 788.188293,525.759277
+M834.572815,535.487549
+	C834.175781,533.219666 834.462341,530.423096 833.216309,528.811829
+	C831.489075,526.578247 828.606445,523.883728 826.225281,523.890198
+	C823.831055,523.896729 821.012573,526.617676 819.209534,528.826233
+	C818.030273,530.270691 818.069946,532.913330 818.009949,535.031982
+	C817.791504,542.747192 820.623962,547.034851 825.870239,547.300293
+	C831.111328,547.565491 833.492676,544.553772 834.572815,535.487549
+M652.416321,544.217712
+	C650.345642,544.217712 648.274963,544.217712 646.204285,544.217712
+	C646.838684,541.790405 647.850464,540.372437 649.179138,539.377747
+	C651.032532,537.990356 653.289185,537.123291 655.073914,535.666748
+	C657.983093,533.292542 658.921265,530.116333 656.902344,526.778687
+	C654.763794,523.243286 651.190308,523.025208 647.608765,523.892029
+	C644.105835,524.739807 641.985535,526.860413 642.362366,532.300232
+	C644.056702,530.415955 644.736145,529.185913 645.777466,528.608765
+	C647.529846,527.637512 649.488220,526.639526 651.407715,526.535706
+	C652.368835,526.483582 654.366333,528.494934 654.258118,529.370850
+	C654.041260,531.125488 652.986816,533.012512 651.738647,534.336182
+	C650.537842,535.609619 648.631958,536.201843 647.078308,537.162109
+	C643.543457,539.346802 641.603027,542.293274 642.488464,546.431335
+	C647.810059,546.431335 652.869995,546.431335 657.929993,546.431335
+	C657.979187,545.915588 658.028320,545.399841 658.077515,544.884094
+	C656.491455,544.661987 654.905396,544.439941 652.416321,544.217712
+M665.208252,524.673828
+	C659.711121,529.704834 660.278503,535.904724 662.117737,542.152100
+	C663.162598,545.701355 666.081421,548.122620 669.655273,547.114319
+	C672.280884,546.373535 675.324280,544.121033 676.420227,541.733643
+	C677.700012,538.945862 677.519348,535.229553 677.167480,532.003906
+	C676.408447,525.045532 672.824646,522.786072 665.208252,524.673828
+M695.703430,526.824768
+	C692.833130,522.926819 688.881653,522.862183 684.933228,524.308411
+	C682.220398,525.302063 680.293274,527.395935 681.342651,532.130493
+	C682.861084,530.217041 683.638184,529.015991 684.630371,528.031738
+	C686.979187,525.701782 690.038818,525.102783 691.995117,527.725464
+	C692.869385,528.897522 691.875488,532.247437 690.726807,533.920532
+	C689.607971,535.549927 687.186890,536.266479 685.376343,537.443420
+	C682.032959,539.616821 680.202637,542.473877 681.275574,546.447998
+	C686.507141,546.447998 691.585876,546.447998 696.664612,546.447998
+	C696.714172,545.888977 696.763733,545.330017 696.813293,544.770996
+	C692.817261,544.451782 688.821289,544.132629 684.825256,543.813416
+	C684.609619,543.347107 684.393982,542.880859 684.178345,542.414551
+	C686.441528,540.805054 688.587158,538.986511 690.994141,537.632751
+	C695.067871,535.341797 697.437561,532.409607 695.703430,526.824768
+M609.871765,543.254517
+	C612.920166,547.243774 616.962830,548.425964 620.513733,546.366577
+	C623.687622,544.525879 625.242493,539.522339 623.739685,535.243408
+	C622.335327,531.244812 619.265869,529.413025 615.161682,530.213440
+	C610.440857,531.134216 608.941650,534.718079 609.006042,539.121460
+	C609.022644,540.259460 609.365845,541.392761 609.871765,543.254517
+M598.632568,523.897034
+	C596.280212,523.897034 593.927795,523.897034 591.575439,523.897034
+	C591.513794,524.568726 591.452087,525.240417 591.390442,525.912109
+	C593.818359,526.360107 596.246277,526.808167 598.972595,527.311218
+	C598.972595,532.780090 598.878113,538.252136 599.051880,543.715759
+	C599.086853,544.816223 600.139099,545.884399 600.722351,546.967468
+	C601.157043,545.901306 601.943298,544.843018 601.967590,543.767578
+	C602.093994,538.164673 602.026550,532.557373 602.026550,527.238770
+	C604.818420,526.726013 606.992249,526.326721 609.166077,525.927429
+	C609.066711,525.250671 608.967407,524.573853 608.868042,523.897095
+	C605.769836,523.897095 602.671631,523.897095 598.632568,523.897034
+M809.033569,530.003784
+	C809.069824,534.804382 809.030823,539.607727 809.209595,544.403015
+	C809.242981,545.298035 810.150146,546.160522 810.653992,547.037964
+	C811.315491,546.497864 812.542786,545.968018 812.552734,545.416138
+	C812.682129,538.262817 812.638428,531.106323 812.638428,523.351135
+	C809.349365,525.146240 807.111572,526.367615 803.909729,528.115112
+	C806.222290,528.648987 807.433777,528.928711 809.033569,530.003784
+z"/>
+<path fill="#A8ADB0" opacity="1.000000" stroke="none"
+	d="
+M848.743774,1439.752197
+	C834.419617,1452.711060 814.984253,1454.616455 799.618713,1444.794189
+	C784.187378,1434.929688 777.381104,1416.357056 782.851562,1399.040405
+	C788.393555,1381.497681 804.724487,1369.880737 823.238037,1371.120239
+	C839.614075,1372.216919 851.682190,1380.572754 857.870850,1395.782471
+	C864.464417,1411.987305 861.071411,1426.778076 848.743774,1439.752197
+z"/>
+<path fill="#A8ADB0" opacity="1.000000" stroke="none"
+	d="
+M827.000000,439.001709
+	C812.017700,439.001678 797.535339,439.020386 783.053101,438.993744
+	C775.748901,438.980286 771.116821,435.194092 771.012451,429.256409
+	C770.903564,423.058716 775.608643,419.009918 783.040039,419.004883
+	C808.342407,418.987823 833.644836,418.985809 858.947205,419.006348
+	C866.245544,419.012268 870.884216,422.809875 870.987549,428.742432
+	C871.095825,434.951721 866.404968,438.978607 858.961548,438.995575
+	C848.474426,439.019501 837.987183,439.001678 827.000000,439.001709
+z"/>
+<path fill="#A5AAAD" opacity="1.000000" stroke="none"
+	d="
+M725.800537,419.037415
+	C732.110413,420.836304 735.046692,424.037842 734.979553,428.883942
+	C734.912048,433.752899 732.381165,437.131927 727.861145,438.552002
+	C723.255737,439.998871 719.365906,438.346191 716.640198,434.366302
+	C712.145569,427.803436 716.655090,419.947510 725.800537,419.037415
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none"
+	d="
+M1058.999390,738.000000
+	C1058.999390,817.323120 1058.999512,896.146179 1058.998901,974.969299
+	C1058.998901,986.083923 1056.137695,988.999451 1045.226807,988.999451
+	C895.746216,989.000061 746.265686,989.000183 596.785095,988.999329
+	C585.894104,988.999268 582.999939,986.054382 582.999878,974.984314
+	C582.999512,855.666443 582.999451,736.348633 582.999939,617.030762
+	C583.000000,605.768921 585.816956,603.000305 597.269653,603.000305
+	C746.416931,603.000061 895.564270,603.000061 1044.711548,603.000366
+	C1056.299927,603.000366 1058.999268,605.743347 1058.999268,617.515320
+	C1058.999512,657.510193 1058.999390,697.505127 1058.999390,738.000000
+M624.634521,807.000000
+	C615.001221,807.007446 615.001099,807.007446 615.000061,816.777527
+	C614.999695,819.943726 614.998230,823.109863 615.000366,826.276062
+	C615.005981,834.757751 615.240906,834.999023 623.686462,834.999146
+	C737.835449,835.000488 851.984436,835.000000 966.133423,834.999634
+	C967.299866,834.999634 968.467224,834.963196 969.632629,834.996582
+	C973.453491,835.105896 975.055786,833.147644 975.007446,829.455505
+	C974.948547,824.957031 975.000732,820.457092 974.999451,815.957825
+	C974.996887,807.148193 974.851746,807.000610 966.046509,807.000549
+	C852.564087,806.999634 739.081665,807.000000 624.634521,807.000000
+M615.000000,768.513550
+	C615.000000,769.846680 614.999939,771.179749 615.000000,772.512878
+	C615.000366,782.999634 615.000366,782.999939 625.422424,782.999939
+	C738.569519,783.000000 851.716614,783.000000 964.863708,782.999756
+	C966.363464,782.999756 967.865662,782.939331 969.362427,783.004944
+	C973.425171,783.182983 975.099243,781.165955 975.017639,777.225525
+	C974.924561,772.728271 975.001587,768.227478 974.999268,763.728271
+	C974.994873,755.243896 974.757751,755.000977 966.317139,755.000854
+	C853.336670,754.999512 740.356262,755.007507 627.375793,754.989807
+	C614.303772,754.987732 614.895813,754.115295 615.000000,768.513550
+M972.647156,703.511108
+	C970.337830,703.340759 968.028564,703.021851 965.719177,703.021362
+	C851.890991,702.997009 738.062744,702.999939 624.234558,703.000366
+	C622.901306,703.000427 621.567627,703.030029 620.234863,703.006165
+	C616.713013,702.943176 615.004211,704.679993 615.009033,708.179688
+	C615.015320,712.679443 615.000549,717.179260 615.000732,721.679016
+	C615.001160,730.936829 615.060547,730.999451 624.091064,730.999512
+	C738.085938,731.000305 852.080811,731.000000 966.075684,730.999634
+	C967.242310,730.999634 968.409973,730.960449 969.575317,730.997681
+	C973.368164,731.118652 975.041687,729.232483 975.006409,725.511902
+	C974.952698,719.846008 975.103638,714.175598 974.918640,708.515320
+	C974.868958,706.995239 973.917297,705.504639 972.647156,703.511108
+M790.500000,941.000000
+	C807.829590,941.000000 825.159180,941.000122 842.488770,941.000000
+	C874.981750,940.999878 907.474670,941.007996 939.967651,940.992310
+	C946.113892,940.989380 946.948303,940.146790 946.993530,934.122131
+	C947.024719,929.956604 947.002380,925.790649 946.999512,921.624878
+	C946.993591,913.216492 946.777954,913.000916 938.214478,913.000793
+	C833.403870,912.999634 728.593201,913.000000 623.782593,913.000183
+	C622.782837,913.000183 621.780640,913.048218 620.783691,912.996277
+	C616.810974,912.789429 614.915833,914.601990 614.985718,918.629822
+	C615.069580,923.460571 614.993530,928.294006 615.002014,933.126282
+	C615.015015,940.507080 615.506409,940.997253 623.036072,940.997803
+	C678.524048,941.001953 734.012024,941.000000 790.500000,941.000000
+M905.500000,887.000000
+	C917.330811,886.999023 929.162292,886.922363 940.992004,887.037537
+	C945.216736,887.078613 947.143860,885.357971 947.025330,881.096191
+	C946.900269,876.600708 947.002197,872.098938 946.999268,867.599915
+	C946.993896,859.222290 946.770264,859.000916 938.189453,859.000793
+	C833.378845,858.999634 728.568237,859.000000 623.757629,859.000122
+	C622.757874,859.000122 621.755798,859.047729 620.758728,858.996765
+	C616.771606,858.792786 614.911072,860.640869 614.985229,864.654785
+	C615.071411,869.318848 614.997009,873.985718 615.001099,878.651367
+	C615.008179,886.674133 615.336792,886.998840 623.560913,886.998962
+	C717.207275,887.000610 810.853638,887.000000 905.500000,887.000000
+M649.500000,679.000000
+	C670.492798,679.000000 691.485596,679.000122 712.478394,679.000061
+	C744.300781,678.999939 776.123230,679.007507 807.945618,678.992737
+	C813.972412,678.989929 814.922363,678.130737 814.986023,672.645508
+	C815.044006,667.647888 815.030090,662.648865 814.990784,657.650879
+	C814.945740,651.925720 814.056030,651.023560 808.241089,651.011108
+	C793.412903,650.979370 778.584595,650.999939 763.756348,650.999939
+	C716.605896,651.000000 669.455383,650.995667 622.304932,651.005432
+	C615.932983,651.006775 615.060730,651.799377 615.010559,657.605591
+	C614.965881,662.770142 615.112000,667.938354 614.969238,673.099304
+	C614.850403,677.398254 616.822083,679.083801 621.009888,679.032410
+	C630.171997,678.919861 639.336487,678.999084 649.500000,679.000000
+z"/>
+<path fill="#E9F1F7" opacity="1.000000" stroke="none"
+	d="
+M838.538879,528.587646
+	C841.257324,523.850464 846.111816,522.236023 850.432739,524.310608
+	C854.543030,526.284058 855.016052,530.149902 851.688904,534.575378
+	C855.691833,539.842896 856.009766,542.567871 852.937805,545.279297
+	C849.674805,548.159302 842.052917,547.964355 839.096497,544.925293
+	C836.324524,542.075928 836.744202,539.386841 840.461304,535.256653
+	C839.750061,533.061462 839.083923,531.005493 838.538879,528.587646
+M851.140991,542.700439
+	C850.508850,540.809998 850.249084,537.611389 849.166565,537.303345
+	C846.959412,536.675110 844.192810,537.277588 841.911621,538.089417
+	C841.221252,538.335144 840.763123,542.005554 841.238403,542.275269
+	C843.326233,543.460266 845.761108,544.134338 848.145447,544.635925
+	C848.876526,544.789795 849.847229,543.804626 851.140991,542.700439
+M847.170837,525.929871
+	C845.322998,527.067627 843.475159,528.205322 841.627319,529.343018
+	C842.556335,530.688049 843.409424,533.080505 844.430603,533.154541
+	C846.401917,533.297424 848.468018,532.131409 850.494812,531.508057
+	C849.658997,529.686768 848.823120,527.865540 847.170837,525.929871
+z"/>
+<path fill="#E7F0F6" opacity="1.000000" stroke="none"
+	d="
+M746.012695,541.742188
+	C746.194824,535.156616 743.170105,532.902283 737.825989,535.580933
+	C734.160034,537.418396 733.313477,536.432983 733.728027,532.790039
+	C734.009277,530.318909 734.105042,527.827087 734.316650,525.347290
+	C734.342285,525.046631 734.573547,524.763489 734.787659,524.304932
+	C739.177307,524.304932 743.625916,524.304932 748.074524,524.304932
+	C748.129761,524.893555 748.184937,525.482117 748.240173,526.070740
+	C744.746399,526.231140 741.252563,526.391479 737.205750,526.577209
+	C737.066406,528.453491 736.926086,530.342651 736.826416,531.684448
+	C740.397705,532.271240 743.774109,532.424500 746.814453,533.514832
+	C748.107056,533.978394 749.089172,536.301086 749.525513,537.959473
+	C750.549316,541.850952 748.078552,545.873596 744.370422,546.980408
+	C739.339478,548.482056 734.869629,546.392883 732.290100,540.637451
+	C737.081299,541.854736 741.158203,548.675415 746.012695,541.742188
+z"/>
+<path fill="#E3EDF5" opacity="1.000000" stroke="none"
+	d="
+M788.456909,525.501526
+	C795.222107,521.941406 800.091431,523.837769 801.318115,530.791321
+	C801.956604,534.410889 801.591003,538.405762 800.774292,542.027039
+	C799.986816,545.518921 797.185181,547.504883 793.298828,547.331177
+	C789.453247,547.159302 787.114197,545.020081 786.150879,541.487305
+	C784.656189,536.005798 784.717834,530.639099 788.456909,525.501526
+M788.678162,534.592041
+	C788.826111,536.579346 788.469177,538.804993 789.263428,540.487183
+	C790.065125,542.185181 791.953003,544.362366 793.467834,544.445007
+	C794.903198,544.523438 797.529236,542.330444 797.772949,540.833740
+	C798.372437,537.151489 798.224121,533.249084 797.689026,529.534241
+	C797.503540,528.246399 795.248535,526.301636 794.018555,526.359314
+	C792.454895,526.432556 790.637146,527.979858 789.565552,529.379211
+	C788.767761,530.420837 788.981445,532.236938 788.678162,534.592041
+z"/>
+<path fill="#EBF2F8" opacity="1.000000" stroke="none"
+	d="
+M717.505798,532.572144
+	C724.369141,531.126282 728.479309,533.103760 729.059387,538.198303
+	C729.526733,542.303223 728.052124,545.467590 724.034119,546.895996
+	C719.206787,548.612000 714.843872,546.609497 711.383728,540.408997
+	C713.459167,541.349426 714.735840,541.575317 715.479553,542.327942
+	C718.204468,545.085571 721.385193,546.101440 724.214417,543.323975
+	C725.444580,542.116272 725.929443,538.753906 725.141663,537.173096
+	C723.437500,533.753479 720.182068,533.860352 717.021118,535.657959
+	C713.919922,537.421631 712.744568,536.314331 713.093689,532.996155
+	C713.389282,530.187317 713.709106,527.381104 714.034180,524.428162
+	C718.655518,524.428162 723.196594,524.428162 727.737732,524.428162
+	C727.765259,524.919922 727.792847,525.411682 727.820374,525.903442
+	C725.398010,526.057617 722.955505,526.480469 720.558044,526.301270
+	C717.218384,526.051575 715.969604,527.453918 716.169006,531.322876
+	C716.577148,532.220520 717.041504,532.396301 717.505798,532.572144
+z"/>
+<path fill="#EBF2F8" opacity="1.000000" stroke="none"
+	d="
+M758.505798,532.572144
+	C765.369141,531.126282 769.479248,533.103760 770.059326,538.198303
+	C770.526672,542.303223 769.052124,545.467529 765.034119,546.895874
+	C760.206726,548.611938 755.843872,546.609497 752.383667,540.408936
+	C754.459167,541.349365 755.735840,541.575317 756.479553,542.327881
+	C759.204468,545.085571 762.385193,546.101440 765.214417,543.323975
+	C766.444580,542.116272 766.929382,538.753906 766.141663,537.173096
+	C764.437500,533.753479 761.182068,533.860352 758.021118,535.657959
+	C754.919922,537.421631 753.744568,536.314331 754.093750,532.996155
+	C754.389282,530.187317 754.709106,527.381104 755.034241,524.428162
+	C759.655518,524.428162 764.196594,524.428162 768.737732,524.428162
+	C768.765259,524.919922 768.792847,525.411682 768.820374,525.903442
+	C766.398010,526.057617 763.955505,526.480469 761.558044,526.301270
+	C758.218384,526.051575 756.969604,527.453918 757.169006,531.322876
+	C757.577148,532.220459 758.041504,532.396301 758.505798,532.572144
+z"/>
+<path fill="#EBF2F8" opacity="1.000000" stroke="none"
+	d="
+M834.566406,535.899048
+	C833.492676,544.553772 831.111328,547.565491 825.870239,547.300293
+	C820.623962,547.034851 817.791504,542.747192 818.009949,535.031982
+	C818.069946,532.913330 818.030273,530.270691 819.209534,528.826233
+	C821.012573,526.617676 823.831055,523.896729 826.225281,523.890198
+	C828.606445,523.883728 831.489075,526.578247 833.216309,528.811829
+	C834.462341,530.423096 834.175781,533.219666 834.566406,535.899048
+M821.967712,541.145508
+	C823.533264,542.343506 824.987488,544.210571 826.704895,544.496399
+	C827.789429,544.676880 830.234314,542.612671 830.387878,541.350769
+	C830.857849,537.488831 830.876343,533.473267 830.294739,529.635010
+	C830.088257,528.272278 827.649902,526.321838 826.236816,526.327271
+	C824.812927,526.332703 822.430786,528.252625 822.168091,529.652649
+	C821.515991,533.128479 821.832886,536.786072 821.967712,541.145508
+z"/>
+<path fill="#E4EEF5" opacity="1.000000" stroke="none"
+	d="
+M652.867798,544.217773
+	C654.905396,544.439941 656.491455,544.661987 658.077515,544.884094
+	C658.028320,545.399841 657.979187,545.915588 657.929993,546.431335
+	C652.869995,546.431335 647.810059,546.431335 642.488464,546.431335
+	C641.603027,542.293274 643.543457,539.346802 647.078308,537.162109
+	C648.631958,536.201843 650.537842,535.609619 651.738647,534.336182
+	C652.986816,533.012512 654.041260,531.125488 654.258118,529.370850
+	C654.366333,528.494934 652.368835,526.483582 651.407715,526.535706
+	C649.488220,526.639526 647.529846,527.637512 645.777466,528.608765
+	C644.736145,529.185913 644.056702,530.415955 642.362366,532.300232
+	C641.985535,526.860413 644.105835,524.739807 647.608765,523.892029
+	C651.190308,523.025208 654.763794,523.243286 656.902344,526.778687
+	C658.921265,530.116333 657.983093,533.292542 655.073914,535.666748
+	C653.289185,537.123291 651.032532,537.990356 649.179138,539.377747
+	C647.850464,540.372437 646.838684,541.790405 646.204285,544.217712
+	C648.274963,544.217712 650.345642,544.217712 652.867798,544.217773
+z"/>
+<path fill="#E8F1F7" opacity="1.000000" stroke="none"
+	d="
+M665.513367,524.462524
+	C672.824646,522.786072 676.408447,525.045532 677.167480,532.003906
+	C677.519348,535.229553 677.700012,538.945862 676.420227,541.733643
+	C675.324280,544.121033 672.280884,546.373535 669.655273,547.114319
+	C666.081421,548.122620 663.162598,545.701355 662.117737,542.152100
+	C660.278503,535.904724 659.711121,529.704834 665.513367,524.462524
+M664.593872,531.367371
+	C664.728821,534.630981 664.454895,537.989563 665.180420,541.116089
+	C665.516235,542.562927 667.937683,544.644775 669.168518,544.489990
+	C670.818054,544.282593 673.140625,542.421326 673.547791,540.848938
+	C674.311768,537.898865 674.443481,534.531616 673.804932,531.559937
+	C673.371338,529.542358 671.176147,527.903442 669.768799,526.095154
+	C668.109924,527.587708 666.451050,529.080261 664.593872,531.367371
+z"/>
+<path fill="#E7F0F6" opacity="1.000000" stroke="none"
+	d="
+M695.860229,527.158691
+	C697.437561,532.409607 695.067871,535.341797 690.994141,537.632751
+	C688.587158,538.986511 686.441528,540.805054 684.178345,542.414551
+	C684.393982,542.880859 684.609619,543.347107 684.825256,543.813416
+	C688.821289,544.132629 692.817261,544.451782 696.813293,544.770996
+	C696.763733,545.330017 696.714172,545.888977 696.664612,546.447998
+	C691.585876,546.447998 686.507141,546.447998 681.275574,546.447998
+	C680.202637,542.473877 682.032959,539.616821 685.376343,537.443420
+	C687.186890,536.266479 689.607971,535.549927 690.726807,533.920532
+	C691.875488,532.247437 692.869385,528.897522 691.995117,527.725464
+	C690.038818,525.102783 686.979187,525.701782 684.630371,528.031738
+	C683.638184,529.015991 682.861084,530.217041 681.342651,532.130493
+	C680.293274,527.395935 682.220398,525.302063 684.933228,524.308411
+	C688.881653,522.862183 692.833130,522.926819 695.860229,527.158691
+z"/>
+<path fill="#E8F1F7" opacity="1.000000" stroke="none"
+	d="
+M609.715454,542.891357
+	C609.365845,541.392761 609.022644,540.259460 609.006042,539.121460
+	C608.941650,534.718079 610.440857,531.134216 615.161682,530.213440
+	C619.265869,529.413025 622.335327,531.244812 623.739685,535.243408
+	C625.242493,539.522339 623.687622,544.525879 620.513733,546.366577
+	C616.962830,548.425964 612.920166,547.243774 609.715454,542.891357
+M612.838501,542.412964
+	C614.474487,543.208008 616.369873,544.919189 617.675903,544.549316
+	C619.078918,544.151855 620.587524,541.917725 620.880493,540.276306
+	C621.466370,536.994324 621.517395,533.000000 616.877258,532.743835
+	C612.226257,532.487183 612.023071,536.286316 612.082947,539.765015
+	C612.094055,540.410278 612.346252,541.051453 612.838501,542.412964
+z"/>
+<path fill="#F1F6FA" opacity="1.000000" stroke="none"
+	d="
+M599.103027,523.897095
+	C602.671631,523.897095 605.769836,523.897095 608.868042,523.897095
+	C608.967407,524.573853 609.066711,525.250671 609.166077,525.927429
+	C606.992249,526.326721 604.818420,526.726013 602.026550,527.238770
+	C602.026550,532.557373 602.093994,538.164673 601.967590,543.767578
+	C601.943298,544.843018 601.157043,545.901306 600.722351,546.967468
+	C600.139099,545.884399 599.086853,544.816223 599.051880,543.715759
+	C598.878113,538.252136 598.972595,532.780090 598.972595,527.311218
+	C596.246277,526.808167 593.818359,526.360107 591.390442,525.912109
+	C591.452087,525.240417 591.513794,524.568726 591.575439,523.897034
+	C593.927795,523.897034 596.280212,523.897034 599.103027,523.897095
+z"/>
+<path fill="#CADDEB" opacity="1.000000" stroke="none"
+	d="
+M808.839417,529.606079
+	C807.433777,528.928711 806.222290,528.648987 803.909729,528.115112
+	C807.111572,526.367615 809.349365,525.146240 812.638428,523.351135
+	C812.638428,531.106323 812.682129,538.262817 812.552734,545.416138
+	C812.542786,545.968018 811.315491,546.497864 810.654053,547.037964
+	C810.150146,546.160522 809.242981,545.298035 809.209595,544.403015
+	C809.030823,539.607727 809.069824,534.804382 808.839417,529.606079
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M625.116882,807.000000
+	C739.081665,807.000000 852.564087,806.999634 966.046509,807.000549
+	C974.851746,807.000610 974.996887,807.148193 974.999451,815.957825
+	C975.000732,820.457092 974.948547,824.957031 975.007446,829.455505
+	C975.055786,833.147644 973.453491,835.105896 969.632629,834.996582
+	C968.467224,834.963196 967.299866,834.999634 966.133423,834.999634
+	C851.984436,835.000000 737.835449,835.000488 623.686462,834.999146
+	C615.240906,834.999023 615.005981,834.757751 615.000366,826.276062
+	C614.998230,823.109863 614.999695,819.943726 615.000061,816.777527
+	C615.001099,807.007446 615.001221,807.007446 625.116882,807.000000
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M615.000000,768.024231
+	C614.895813,754.115295 614.303772,754.987732 627.375793,754.989807
+	C740.356262,755.007507 853.336670,754.999512 966.317139,755.000854
+	C974.757751,755.000977 974.994873,755.243896 974.999268,763.728271
+	C975.001587,768.227478 974.924561,772.728271 975.017639,777.225525
+	C975.099243,781.165955 973.425171,783.182983 969.362427,783.004944
+	C967.865662,782.939331 966.363464,782.999756 964.863708,782.999756
+	C851.716614,783.000000 738.569519,783.000000 625.422424,782.999939
+	C615.000366,782.999939 615.000366,782.999634 615.000000,772.512878
+	C614.999939,771.179749 615.000000,769.846680 615.000000,768.024231
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M973.013428,703.755859
+	C973.917297,705.504639 974.868958,706.995239 974.918640,708.515320
+	C975.103638,714.175598 974.952698,719.846008 975.006409,725.511902
+	C975.041687,729.232483 973.368164,731.118652 969.575317,730.997681
+	C968.409973,730.960449 967.242310,730.999634 966.075684,730.999634
+	C852.080811,731.000000 738.085938,731.000305 624.091064,730.999512
+	C615.060547,730.999451 615.001160,730.936829 615.000732,721.679016
+	C615.000549,717.179260 615.015320,712.679443 615.009033,708.179688
+	C615.004211,704.679993 616.713013,702.943176 620.234863,703.006165
+	C621.567627,703.030029 622.901306,703.000427 624.234558,703.000366
+	C738.062744,702.999939 851.890991,702.997009 965.719177,703.021362
+	C968.028564,703.021851 970.337830,703.340759 973.013428,703.755859
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M790.000000,941.000000
+	C734.012024,941.000000 678.524048,941.001953 623.036072,940.997803
+	C615.506409,940.997253 615.015015,940.507080 615.002014,933.126282
+	C614.993530,928.294006 615.069580,923.460571 614.985718,918.629822
+	C614.915833,914.601990 616.810974,912.789429 620.783691,912.996277
+	C621.780640,913.048218 622.782837,913.000183 623.782593,913.000183
+	C728.593201,913.000000 833.403870,912.999634 938.214478,913.000793
+	C946.777954,913.000916 946.993591,913.216492 946.999512,921.624878
+	C947.002380,925.790649 947.024719,929.956604 946.993530,934.122131
+	C946.948303,940.146790 946.113892,940.989380 939.967651,940.992310
+	C907.474670,941.007996 874.981750,940.999878 842.488770,941.000000
+	C825.159180,941.000122 807.829590,941.000000 790.000000,941.000000
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M905.000000,887.000000
+	C810.853638,887.000000 717.207275,887.000610 623.560913,886.998962
+	C615.336792,886.998840 615.008179,886.674133 615.001099,878.651367
+	C614.997009,873.985718 615.071411,869.318848 614.985229,864.654785
+	C614.911072,860.640869 616.771606,858.792786 620.758728,858.996765
+	C621.755798,859.047729 622.757874,859.000122 623.757629,859.000122
+	C728.568237,859.000000 833.378845,858.999634 938.189453,859.000793
+	C946.770264,859.000916 946.993896,859.222290 946.999268,867.599915
+	C947.002197,872.098938 946.900269,876.600708 947.025330,881.096191
+	C947.143860,885.357971 945.216736,887.078613 940.992004,887.037537
+	C929.162292,886.922363 917.330811,886.999023 905.000000,887.000000
+z"/>
+<path fill="#A9AEB1" opacity="1.000000" stroke="none"
+	d="
+M649.000000,679.000000
+	C639.336487,678.999084 630.171997,678.919861 621.009888,679.032410
+	C616.822083,679.083801 614.850403,677.398254 614.969238,673.099304
+	C615.112000,667.938354 614.965881,662.770142 615.010559,657.605591
+	C615.060730,651.799377 615.932983,651.006775 622.304932,651.005432
+	C669.455383,650.995667 716.605896,651.000000 763.756348,650.999939
+	C778.584595,650.999939 793.412903,650.979370 808.241089,651.011108
+	C814.056030,651.023560 814.945740,651.925720 814.990784,657.650879
+	C815.030090,662.648865 815.044006,667.647888 814.986023,672.645508
+	C814.922363,678.130737 813.972412,678.989929 807.945618,678.992737
+	C776.123230,679.007507 744.300781,678.999939 712.478394,679.000061
+	C691.485596,679.000122 670.492798,679.000000 649.000000,679.000000
+z"/>
+<path fill="#1068A8" opacity="1.000000" stroke="none"
+	d="
+M850.924561,543.020752
+	C849.847229,543.804626 848.876526,544.789795 848.145447,544.635925
+	C845.761108,544.134338 843.326233,543.460266 841.238403,542.275269
+	C840.763123,542.005554 841.221252,538.335144 841.911621,538.089417
+	C844.192810,537.277588 846.959412,536.675110 849.166565,537.303345
+	C850.249084,537.611389 850.508850,540.809998 850.924561,543.020752
+z"/>
+<path fill="#1068A8" opacity="1.000000" stroke="none"
+	d="
+M847.579102,525.987061
+	C848.823120,527.865540 849.658997,529.686768 850.494812,531.508057
+	C848.468018,532.131409 846.401917,533.297424 844.430603,533.154541
+	C843.409424,533.080505 842.556335,530.688049 841.627319,529.343018
+	C843.475159,528.205322 845.322998,527.067627 847.579102,525.987061
+z"/>
+<path fill="#0964A5" opacity="1.000000" stroke="none"
+	d="
+M788.711426,534.150085
+	C788.981445,532.236938 788.767761,530.420837 789.565552,529.379211
+	C790.637146,527.979858 792.454895,526.432556 794.018555,526.359314
+	C795.248535,526.301636 797.503540,528.246399 797.689026,529.534241
+	C798.224121,533.249084 798.372437,537.151489 797.772949,540.833740
+	C797.529236,542.330444 794.903198,544.523438 793.467834,544.445007
+	C791.953003,544.362366 790.065125,542.185181 789.263428,540.487183
+	C788.469177,538.804993 788.826111,536.579346 788.711426,534.150085
+z"/>
+<path fill="#005EA2" opacity="1.000000" stroke="none"
+	d="
+M717.211609,532.294189
+	C717.041504,532.396301 716.577148,532.220520 716.204712,531.770691
+	C716.503540,531.669800 716.710449,531.842957 717.211609,532.294189
+z"/>
+<path fill="#005EA2" opacity="1.000000" stroke="none"
+	d="
+M758.211609,532.294189
+	C758.041504,532.396301 757.577148,532.220459 757.204712,531.770691
+	C757.503540,531.669800 757.710449,531.842957 758.211609,532.294189
+z"/>
+<path fill="#0964A5" opacity="1.000000" stroke="none"
+	d="
+M821.864136,540.758057
+	C821.832886,536.786072 821.515991,533.128479 822.168091,529.652649
+	C822.430786,528.252625 824.812927,526.332703 826.236816,526.327271
+	C827.649902,526.321838 830.088257,528.272278 830.294739,529.635010
+	C830.876343,533.473267 830.857849,537.488831 830.387878,541.350769
+	C830.234314,542.612671 827.789429,544.676880 826.704895,544.496399
+	C824.987488,544.210571 823.533264,542.343506 821.864136,540.758057
+z"/>
+<path fill="#0964A5" opacity="1.000000" stroke="none"
+	d="
+M664.693054,530.970093
+	C666.451050,529.080261 668.109924,527.587708 669.768799,526.095154
+	C671.176147,527.903442 673.371338,529.542358 673.804932,531.559937
+	C674.443481,534.531616 674.311768,537.898865 673.547791,540.848938
+	C673.140625,542.421326 670.818054,544.282593 669.168518,544.489990
+	C667.937683,544.644775 665.516235,542.562927 665.180420,541.116089
+	C664.454895,537.989563 664.728821,534.630981 664.693054,530.970093
+z"/>
+<path fill="#0964A5" opacity="1.000000" stroke="none"
+	d="
+M612.662842,542.053711
+	C612.346252,541.051453 612.094055,540.410278 612.082947,539.765015
+	C612.023071,536.286316 612.226257,532.487183 616.877258,532.743835
+	C621.517395,533.000000 621.466370,536.994324 620.880493,540.276306
+	C620.587524,541.917725 619.078918,544.151855 617.675903,544.549316
+	C616.369873,544.919189 614.474487,543.208008 612.662842,542.053711
+z"/>
+</svg>
diff --git a/app/assets/img/phone-text.png b/app/assets/img/phone-text.png
deleted file mode 100644
index a2318f1eb35ad9ea3f4d14baf4d739e607bbc32a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21090
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

diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index a18fd8921..bb082700a 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -28,8 +28,8 @@ Notify.gov
               <p class="font-sans-md">Currently we are only working with select pilot partners. If you are interested in using Notify.gov in the future, please contact <br><a href="mailto:tts-benefits-studio@gsa.gov">tts-benefits-studio@gsa.gov</a> to learn more.</p>
             </div>
             <div class="desktop:grid-col-4 grid-offset-1 desktop:display-block display-none margin-x-5">
-              <img src="/static/img/phone-text.png"
-                alt="An illustration of notifications to a phone.">
+              <img src="{{ asset_url('images/product/phone-text.svg') }}"
+              alt="An illustration of notifications to a phone.">
             </div>
           </div>
         </div>

From 6fc428363a5a5fdad6fb379478debdbe4deb2f05 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Wed, 24 Jul 2024 12:39:04 -0600
Subject: [PATCH 08/23] Added line to allow encoding which prevent png

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index f80eee6e0..3e7dee06e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -149,7 +149,7 @@ const images = () => {
     paths.govuk_frontend + 'assets/images/**/*',
     paths.src + 'images/**/*',
     paths.src + 'img/**/*',
-  ])
+  ], {encoding: false})
     .pipe(dest(paths.dist + 'images/'))
 };
 

From 1f9cccede69dd953bc34fffd3175747396591eb7 Mon Sep 17 00:00:00 2001
From: Carlo Costino <ccostino@users.noreply.github.com>
Date: Wed, 24 Jul 2024 14:58:15 -0400
Subject: [PATCH 09/23] Revert "fixed image"

---
 app/assets/images/product/phone-text.svg | 712 -----------------------
 app/templates/views/signedout.html       |   4 +-
 2 files changed, 2 insertions(+), 714 deletions(-)
 delete mode 100644 app/assets/images/product/phone-text.svg

diff --git a/app/assets/images/product/phone-text.svg b/app/assets/images/product/phone-text.svg
deleted file mode 100644
index 0fb85dcb0..000000000
--- a/app/assets/images/product/phone-text.svg
+++ /dev/null
@@ -1,712 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="100%" viewBox="0 0 1129 1483" enable-background="new 0 0 1129 1483" xml:space="preserve">
-<path fill="#000000" opacity="1.000000" stroke="none"
-	d="
-M539.000000,1484.000000
-	C359.711578,1484.000000 180.423172,1484.000000 1.000000,1484.000000
-	C1.000000,1105.639771 1.000000,727.279602 1.410214,348.316467
-	C4.569818,348.140381 7.319019,348.939209 10.068629,348.940613
-	C131.539047,349.002533 253.009537,349.019958 374.479858,348.902496
-	C379.495209,348.897644 382.964447,350.180725 385.438477,354.685120
-	C387.083405,357.679993 389.360779,360.359558 391.555206,363.014832
-	C400.272888,373.563141 409.100433,384.020660 417.827881,394.560944
-	C426.754944,405.342346 435.596100,416.194855 444.505066,426.991333
-	C453.315704,437.668549 462.350189,448.169037 470.874084,459.069550
-	C473.211273,462.058380 475.868622,462.668365 478.552521,461.668732
-	C479.870514,461.177765 480.891022,458.075714 480.899139,456.150421
-	C481.039185,422.992401 480.992554,389.833649 481.006348,356.675049
-	C481.009247,349.746185 481.792328,348.996246 488.738434,348.995605
-	C524.063171,348.992462 559.387878,348.997498 594.712646,348.991364
-	C602.408508,348.990021 602.999207,348.399902 602.999329,340.867279
-	C603.000366,227.578186 603.000000,114.289093 603.000000,1.000000
-	C778.587646,1.000000 954.175293,1.000000 1130.000000,1.000000
-	C1130.000000,136.026779 1130.000000,271.053680 1129.661621,406.458130
-	C1128.681885,406.105896 1127.790039,405.480469 1127.435913,404.630920
-	C1120.489746,387.961334 1107.422241,381.006897 1090.001465,381.005951
-	C910.382629,380.996246 730.763794,380.970703 551.145081,381.139465
-	C545.655090,381.144623 539.914307,382.532288 534.729980,384.458374
-	C523.458130,388.646179 512.165527,404.262543 512.742798,416.804962
-	C513.691650,437.422455 513.000000,458.115448 513.000000,478.776611
-	C513.000000,802.357117 512.996948,1125.937622 513.047546,1449.518188
-	C513.047974,1452.454102 513.316040,1455.538330 514.227844,1458.299561
-	C517.778442,1469.052002 525.487427,1476.064087 535.397400,1481.004028
-	C536.757935,1481.682251 537.806824,1482.985840 539.000000,1484.000000
-z"/>
-<path fill="#005EA2" opacity="1.000000" stroke="none"
-	d="
-M602.531372,1.000000
-	C603.000000,114.289093 603.000366,227.578186 602.999329,340.867279
-	C602.999207,348.399902 602.408508,348.990021 594.712646,348.991364
-	C559.387878,348.997498 524.063171,348.992462 488.738434,348.995605
-	C481.792328,348.996246 481.009247,349.746185 481.006348,356.675049
-	C480.992554,389.833649 481.039185,422.992401 480.899139,456.150421
-	C480.891022,458.075714 479.870514,461.177765 478.552521,461.668732
-	C475.868622,462.668365 473.211273,462.058380 470.874084,459.069550
-	C462.350189,448.169037 453.315704,437.668549 444.505066,426.991333
-	C435.596100,416.194855 426.754944,405.342346 417.827881,394.560944
-	C409.100433,384.020660 400.272888,373.563141 391.555206,363.014832
-	C389.360779,360.359558 387.083405,357.679993 385.438477,354.685120
-	C382.964447,350.180725 379.495209,348.897644 374.479858,348.902496
-	C253.009537,349.019958 131.539047,349.002533 10.068629,348.940613
-	C7.319019,348.939209 4.569818,348.140381 1.410214,347.856750
-	C1.000000,232.386658 1.000000,116.773323 1.000000,1.000000
-	C201.354202,1.000000 401.708435,1.000000 602.531372,1.000000
-z"/>
-<path fill="#1B1B1B" opacity="1.000000" stroke="none"
-	d="
-M539.468689,1484.000000
-	C537.806824,1482.985840 536.757935,1481.682251 535.397400,1481.004028
-	C525.487427,1476.064087 517.778442,1469.052002 514.227844,1458.299561
-	C513.316040,1455.538330 513.047974,1452.454102 513.047546,1449.518188
-	C512.996948,1125.937622 513.000000,802.357117 513.000000,478.776611
-	C513.000000,458.115448 513.691650,437.422455 512.742798,416.804962
-	C512.165527,404.262543 523.458130,388.646179 534.729980,384.458374
-	C539.914307,382.532288 545.655090,381.144623 551.145081,381.139465
-	C730.763794,380.970703 910.382629,380.996246 1090.001465,381.005951
-	C1107.422241,381.006897 1120.489746,387.961334 1127.435913,404.630920
-	C1127.790039,405.480469 1128.681885,406.105896 1129.661621,406.917847
-	C1130.000000,756.687561 1130.000000,1106.375122 1129.663086,1456.612671
-	C1128.761597,1457.741333 1127.970459,1458.220581 1127.666382,1458.913574
-	C1123.083496,1469.360596 1116.098755,1477.361450 1105.191040,1481.552490
-	C1104.281616,1481.901978 1103.722046,1483.162598 1103.000000,1484.000000
-	C915.312439,1484.000000 727.624878,1484.000000 539.468689,1484.000000
-M715.500000,1342.999756
-	C840.560608,1342.999756 965.621216,1342.999756 1090.580322,1342.999756
-	C1090.580322,1053.180908 1090.580322,764.298523 1090.580322,475.379303
-	C910.605164,475.379303 731.049866,475.379303 551.330566,475.379303
-	C551.330566,764.641113 551.330566,1053.523560 551.330566,1342.999756
-	C605.939392,1342.999756 660.219727,1342.999756 715.500000,1342.999756
-M848.995056,1439.501953
-	C861.071411,1426.778076 864.464417,1411.987305 857.870850,1395.782471
-	C851.682190,1380.572754 839.614075,1372.216919 823.238037,1371.120239
-	C804.724487,1369.880737 788.393555,1381.497681 782.851562,1399.040405
-	C777.381104,1416.357056 784.187378,1434.929688 799.618713,1444.794189
-	C814.984253,1454.616455 834.419617,1452.711060 848.995056,1439.501953
-M827.500000,439.001709
-	C837.987183,439.001678 848.474426,439.019501 858.961548,438.995575
-	C866.404968,438.978607 871.095825,434.951721 870.987549,428.742432
-	C870.884216,422.809875 866.245544,419.012268 858.947205,419.006348
-	C833.644836,418.985809 808.342407,418.987823 783.040039,419.004883
-	C775.608643,419.009918 770.903564,423.058716 771.012451,429.256409
-	C771.116821,435.194092 775.748901,438.980286 783.053101,438.993744
-	C797.535339,439.020386 812.017700,439.001678 827.500000,439.001709
-M725.402283,419.003754
-	C716.655090,419.947510 712.145569,427.803436 716.640198,434.366302
-	C719.365906,438.346191 723.255737,439.998871 727.861145,438.552002
-	C732.381165,437.131927 734.912048,433.752899 734.979553,428.883942
-	C735.046692,424.037842 732.110413,420.836304 725.402283,419.003754
-z"/>
-<path fill="#000000" opacity="1.000000" stroke="none"
-	d="
-M1103.468628,1484.000000
-	C1103.722046,1483.162598 1104.281616,1481.901978 1105.191040,1481.552490
-	C1116.098755,1477.361450 1123.083496,1469.360596 1127.666382,1458.913574
-	C1127.970459,1458.220581 1128.761597,1457.741333 1129.663086,1457.081299
-	C1130.000000,1465.926392 1130.000000,1474.852905 1130.000000,1484.000000
-	C1121.313721,1484.000000 1112.625488,1484.000000 1103.468628,1484.000000
-z"/>
-<path fill="#005EA2" opacity="1.000000" stroke="none"
-	d="
-M715.000000,1342.999756
-	C660.219727,1342.999756 605.939392,1342.999756 551.330566,1342.999756
-	C551.330566,1053.523560 551.330566,764.641113 551.330566,475.379303
-	C731.049866,475.379303 910.605164,475.379303 1090.580322,475.379303
-	C1090.580322,764.298523 1090.580322,1053.180908 1090.580322,1342.999756
-	C965.621216,1342.999756 840.560608,1342.999756 715.000000,1342.999756
-M757.917419,532.016174
-	C757.710449,531.842957 757.503540,531.669800 757.225159,530.601135
-	C756.969604,527.453918 758.218384,526.051575 761.558044,526.301270
-	C763.955505,526.480469 766.398010,526.057617 768.820374,525.903442
-	C768.792847,525.411682 768.765259,524.919922 768.737732,524.428162
-	C764.196594,524.428162 759.655518,524.428162 755.034241,524.428162
-	C754.709106,527.381104 754.389282,530.187317 754.093750,532.996155
-	C753.744568,536.314331 754.919922,537.421631 758.021118,535.657959
-	C761.182068,533.860352 764.437500,533.753479 766.141663,537.173096
-	C766.929382,538.753906 766.444580,542.116272 765.214417,543.323975
-	C762.385193,546.101440 759.204468,545.085571 756.479553,542.327881
-	C755.735840,541.575317 754.459167,541.349365 752.383667,540.408936
-	C755.843872,546.609497 760.206726,548.611938 765.034119,546.895874
-	C769.052124,545.467529 770.526672,542.303223 770.059326,538.198303
-	C769.479248,533.103760 765.369141,531.126282 757.917419,532.016174
-M716.917419,532.016174
-	C716.710449,531.842957 716.503540,531.669800 716.225159,530.601135
-	C715.969604,527.453918 717.218384,526.051575 720.558044,526.301270
-	C722.955505,526.480469 725.398010,526.057617 727.820374,525.903442
-	C727.792847,525.411682 727.765259,524.919922 727.737732,524.428162
-	C723.196594,524.428162 718.655518,524.428162 714.034180,524.428162
-	C713.709106,527.381104 713.389282,530.187317 713.093689,532.996155
-	C712.744568,536.314331 713.919922,537.421631 717.021118,535.657959
-	C720.182068,533.860352 723.437500,533.753479 725.141663,537.173096
-	C725.929443,538.753906 725.444580,542.116272 724.214417,543.323975
-	C721.385193,546.101440 718.204468,545.085571 715.479553,542.327942
-	C714.735840,541.575317 713.459167,541.349426 711.383728,540.408997
-	C714.843872,546.609497 719.206787,548.612000 724.034119,546.895996
-	C728.052124,545.467590 729.526733,542.303223 729.059387,538.198303
-	C728.479309,533.103760 724.369141,531.126282 716.917419,532.016174
-M1058.999390,737.500000
-	C1058.999390,697.505127 1058.999512,657.510193 1058.999268,617.515320
-	C1058.999268,605.743347 1056.299927,603.000366 1044.711548,603.000366
-	C895.564270,603.000061 746.416931,603.000061 597.269653,603.000305
-	C585.816956,603.000305 583.000000,605.768921 582.999939,617.030762
-	C582.999451,736.348633 582.999512,855.666443 582.999878,974.984314
-	C582.999939,986.054382 585.894104,988.999268 596.785095,988.999329
-	C746.265686,989.000183 895.746216,989.000061 1045.226807,988.999451
-	C1056.137695,988.999451 1058.998901,986.083923 1058.998901,974.969299
-	C1058.999512,896.146179 1058.999390,817.323120 1058.999390,737.500000
-M838.417786,528.949585
-	C839.083923,531.005493 839.750061,533.061462 840.461304,535.256653
-	C836.744202,539.386841 836.324524,542.075928 839.096497,544.925293
-	C842.052917,547.964355 849.674805,548.159302 852.937805,545.279297
-	C856.009766,542.567871 855.691833,539.842896 851.688904,534.575378
-	C855.016052,530.149902 854.543030,526.284058 850.432739,524.310608
-	C846.111816,522.236023 841.257324,523.850464 838.417786,528.949585
-M745.891296,542.169128
-	C741.158203,548.675415 737.081299,541.854736 732.290100,540.637451
-	C734.869629,546.392883 739.339478,548.482056 744.370422,546.980408
-	C748.078552,545.873596 750.549316,541.850952 749.525513,537.959473
-	C749.089172,536.301086 748.107056,533.978394 746.814453,533.514832
-	C743.774109,532.424500 740.397705,532.271240 736.826416,531.684448
-	C736.926086,530.342651 737.066406,528.453491 737.205750,526.577209
-	C741.252563,526.391479 744.746399,526.231140 748.240173,526.070740
-	C748.184937,525.482117 748.129761,524.893555 748.074524,524.304932
-	C743.625916,524.304932 739.177307,524.304932 734.787659,524.304932
-	C734.573547,524.763489 734.342285,525.046631 734.316650,525.347290
-	C734.105042,527.827087 734.009277,530.318909 733.728027,532.790039
-	C733.313477,536.432983 734.160034,537.418396 737.825989,535.580933
-	C743.170105,532.902283 746.194824,535.156616 745.891296,542.169128
-M788.188293,525.759277
-	C784.717834,530.639099 784.656189,536.005798 786.150879,541.487305
-	C787.114197,545.020081 789.453247,547.159302 793.298828,547.331177
-	C797.185181,547.504883 799.986816,545.518921 800.774292,542.027039
-	C801.591003,538.405762 801.956604,534.410889 801.318115,530.791321
-	C800.091431,523.837769 795.222107,521.941406 788.188293,525.759277
-M834.572815,535.487549
-	C834.175781,533.219666 834.462341,530.423096 833.216309,528.811829
-	C831.489075,526.578247 828.606445,523.883728 826.225281,523.890198
-	C823.831055,523.896729 821.012573,526.617676 819.209534,528.826233
-	C818.030273,530.270691 818.069946,532.913330 818.009949,535.031982
-	C817.791504,542.747192 820.623962,547.034851 825.870239,547.300293
-	C831.111328,547.565491 833.492676,544.553772 834.572815,535.487549
-M652.416321,544.217712
-	C650.345642,544.217712 648.274963,544.217712 646.204285,544.217712
-	C646.838684,541.790405 647.850464,540.372437 649.179138,539.377747
-	C651.032532,537.990356 653.289185,537.123291 655.073914,535.666748
-	C657.983093,533.292542 658.921265,530.116333 656.902344,526.778687
-	C654.763794,523.243286 651.190308,523.025208 647.608765,523.892029
-	C644.105835,524.739807 641.985535,526.860413 642.362366,532.300232
-	C644.056702,530.415955 644.736145,529.185913 645.777466,528.608765
-	C647.529846,527.637512 649.488220,526.639526 651.407715,526.535706
-	C652.368835,526.483582 654.366333,528.494934 654.258118,529.370850
-	C654.041260,531.125488 652.986816,533.012512 651.738647,534.336182
-	C650.537842,535.609619 648.631958,536.201843 647.078308,537.162109
-	C643.543457,539.346802 641.603027,542.293274 642.488464,546.431335
-	C647.810059,546.431335 652.869995,546.431335 657.929993,546.431335
-	C657.979187,545.915588 658.028320,545.399841 658.077515,544.884094
-	C656.491455,544.661987 654.905396,544.439941 652.416321,544.217712
-M665.208252,524.673828
-	C659.711121,529.704834 660.278503,535.904724 662.117737,542.152100
-	C663.162598,545.701355 666.081421,548.122620 669.655273,547.114319
-	C672.280884,546.373535 675.324280,544.121033 676.420227,541.733643
-	C677.700012,538.945862 677.519348,535.229553 677.167480,532.003906
-	C676.408447,525.045532 672.824646,522.786072 665.208252,524.673828
-M695.703430,526.824768
-	C692.833130,522.926819 688.881653,522.862183 684.933228,524.308411
-	C682.220398,525.302063 680.293274,527.395935 681.342651,532.130493
-	C682.861084,530.217041 683.638184,529.015991 684.630371,528.031738
-	C686.979187,525.701782 690.038818,525.102783 691.995117,527.725464
-	C692.869385,528.897522 691.875488,532.247437 690.726807,533.920532
-	C689.607971,535.549927 687.186890,536.266479 685.376343,537.443420
-	C682.032959,539.616821 680.202637,542.473877 681.275574,546.447998
-	C686.507141,546.447998 691.585876,546.447998 696.664612,546.447998
-	C696.714172,545.888977 696.763733,545.330017 696.813293,544.770996
-	C692.817261,544.451782 688.821289,544.132629 684.825256,543.813416
-	C684.609619,543.347107 684.393982,542.880859 684.178345,542.414551
-	C686.441528,540.805054 688.587158,538.986511 690.994141,537.632751
-	C695.067871,535.341797 697.437561,532.409607 695.703430,526.824768
-M609.871765,543.254517
-	C612.920166,547.243774 616.962830,548.425964 620.513733,546.366577
-	C623.687622,544.525879 625.242493,539.522339 623.739685,535.243408
-	C622.335327,531.244812 619.265869,529.413025 615.161682,530.213440
-	C610.440857,531.134216 608.941650,534.718079 609.006042,539.121460
-	C609.022644,540.259460 609.365845,541.392761 609.871765,543.254517
-M598.632568,523.897034
-	C596.280212,523.897034 593.927795,523.897034 591.575439,523.897034
-	C591.513794,524.568726 591.452087,525.240417 591.390442,525.912109
-	C593.818359,526.360107 596.246277,526.808167 598.972595,527.311218
-	C598.972595,532.780090 598.878113,538.252136 599.051880,543.715759
-	C599.086853,544.816223 600.139099,545.884399 600.722351,546.967468
-	C601.157043,545.901306 601.943298,544.843018 601.967590,543.767578
-	C602.093994,538.164673 602.026550,532.557373 602.026550,527.238770
-	C604.818420,526.726013 606.992249,526.326721 609.166077,525.927429
-	C609.066711,525.250671 608.967407,524.573853 608.868042,523.897095
-	C605.769836,523.897095 602.671631,523.897095 598.632568,523.897034
-M809.033569,530.003784
-	C809.069824,534.804382 809.030823,539.607727 809.209595,544.403015
-	C809.242981,545.298035 810.150146,546.160522 810.653992,547.037964
-	C811.315491,546.497864 812.542786,545.968018 812.552734,545.416138
-	C812.682129,538.262817 812.638428,531.106323 812.638428,523.351135
-	C809.349365,525.146240 807.111572,526.367615 803.909729,528.115112
-	C806.222290,528.648987 807.433777,528.928711 809.033569,530.003784
-z"/>
-<path fill="#A8ADB0" opacity="1.000000" stroke="none"
-	d="
-M848.743774,1439.752197
-	C834.419617,1452.711060 814.984253,1454.616455 799.618713,1444.794189
-	C784.187378,1434.929688 777.381104,1416.357056 782.851562,1399.040405
-	C788.393555,1381.497681 804.724487,1369.880737 823.238037,1371.120239
-	C839.614075,1372.216919 851.682190,1380.572754 857.870850,1395.782471
-	C864.464417,1411.987305 861.071411,1426.778076 848.743774,1439.752197
-z"/>
-<path fill="#A8ADB0" opacity="1.000000" stroke="none"
-	d="
-M827.000000,439.001709
-	C812.017700,439.001678 797.535339,439.020386 783.053101,438.993744
-	C775.748901,438.980286 771.116821,435.194092 771.012451,429.256409
-	C770.903564,423.058716 775.608643,419.009918 783.040039,419.004883
-	C808.342407,418.987823 833.644836,418.985809 858.947205,419.006348
-	C866.245544,419.012268 870.884216,422.809875 870.987549,428.742432
-	C871.095825,434.951721 866.404968,438.978607 858.961548,438.995575
-	C848.474426,439.019501 837.987183,439.001678 827.000000,439.001709
-z"/>
-<path fill="#A5AAAD" opacity="1.000000" stroke="none"
-	d="
-M725.800537,419.037415
-	C732.110413,420.836304 735.046692,424.037842 734.979553,428.883942
-	C734.912048,433.752899 732.381165,437.131927 727.861145,438.552002
-	C723.255737,439.998871 719.365906,438.346191 716.640198,434.366302
-	C712.145569,427.803436 716.655090,419.947510 725.800537,419.037415
-z"/>
-<path fill="#FFFFFF" opacity="1.000000" stroke="none"
-	d="
-M1058.999390,738.000000
-	C1058.999390,817.323120 1058.999512,896.146179 1058.998901,974.969299
-	C1058.998901,986.083923 1056.137695,988.999451 1045.226807,988.999451
-	C895.746216,989.000061 746.265686,989.000183 596.785095,988.999329
-	C585.894104,988.999268 582.999939,986.054382 582.999878,974.984314
-	C582.999512,855.666443 582.999451,736.348633 582.999939,617.030762
-	C583.000000,605.768921 585.816956,603.000305 597.269653,603.000305
-	C746.416931,603.000061 895.564270,603.000061 1044.711548,603.000366
-	C1056.299927,603.000366 1058.999268,605.743347 1058.999268,617.515320
-	C1058.999512,657.510193 1058.999390,697.505127 1058.999390,738.000000
-M624.634521,807.000000
-	C615.001221,807.007446 615.001099,807.007446 615.000061,816.777527
-	C614.999695,819.943726 614.998230,823.109863 615.000366,826.276062
-	C615.005981,834.757751 615.240906,834.999023 623.686462,834.999146
-	C737.835449,835.000488 851.984436,835.000000 966.133423,834.999634
-	C967.299866,834.999634 968.467224,834.963196 969.632629,834.996582
-	C973.453491,835.105896 975.055786,833.147644 975.007446,829.455505
-	C974.948547,824.957031 975.000732,820.457092 974.999451,815.957825
-	C974.996887,807.148193 974.851746,807.000610 966.046509,807.000549
-	C852.564087,806.999634 739.081665,807.000000 624.634521,807.000000
-M615.000000,768.513550
-	C615.000000,769.846680 614.999939,771.179749 615.000000,772.512878
-	C615.000366,782.999634 615.000366,782.999939 625.422424,782.999939
-	C738.569519,783.000000 851.716614,783.000000 964.863708,782.999756
-	C966.363464,782.999756 967.865662,782.939331 969.362427,783.004944
-	C973.425171,783.182983 975.099243,781.165955 975.017639,777.225525
-	C974.924561,772.728271 975.001587,768.227478 974.999268,763.728271
-	C974.994873,755.243896 974.757751,755.000977 966.317139,755.000854
-	C853.336670,754.999512 740.356262,755.007507 627.375793,754.989807
-	C614.303772,754.987732 614.895813,754.115295 615.000000,768.513550
-M972.647156,703.511108
-	C970.337830,703.340759 968.028564,703.021851 965.719177,703.021362
-	C851.890991,702.997009 738.062744,702.999939 624.234558,703.000366
-	C622.901306,703.000427 621.567627,703.030029 620.234863,703.006165
-	C616.713013,702.943176 615.004211,704.679993 615.009033,708.179688
-	C615.015320,712.679443 615.000549,717.179260 615.000732,721.679016
-	C615.001160,730.936829 615.060547,730.999451 624.091064,730.999512
-	C738.085938,731.000305 852.080811,731.000000 966.075684,730.999634
-	C967.242310,730.999634 968.409973,730.960449 969.575317,730.997681
-	C973.368164,731.118652 975.041687,729.232483 975.006409,725.511902
-	C974.952698,719.846008 975.103638,714.175598 974.918640,708.515320
-	C974.868958,706.995239 973.917297,705.504639 972.647156,703.511108
-M790.500000,941.000000
-	C807.829590,941.000000 825.159180,941.000122 842.488770,941.000000
-	C874.981750,940.999878 907.474670,941.007996 939.967651,940.992310
-	C946.113892,940.989380 946.948303,940.146790 946.993530,934.122131
-	C947.024719,929.956604 947.002380,925.790649 946.999512,921.624878
-	C946.993591,913.216492 946.777954,913.000916 938.214478,913.000793
-	C833.403870,912.999634 728.593201,913.000000 623.782593,913.000183
-	C622.782837,913.000183 621.780640,913.048218 620.783691,912.996277
-	C616.810974,912.789429 614.915833,914.601990 614.985718,918.629822
-	C615.069580,923.460571 614.993530,928.294006 615.002014,933.126282
-	C615.015015,940.507080 615.506409,940.997253 623.036072,940.997803
-	C678.524048,941.001953 734.012024,941.000000 790.500000,941.000000
-M905.500000,887.000000
-	C917.330811,886.999023 929.162292,886.922363 940.992004,887.037537
-	C945.216736,887.078613 947.143860,885.357971 947.025330,881.096191
-	C946.900269,876.600708 947.002197,872.098938 946.999268,867.599915
-	C946.993896,859.222290 946.770264,859.000916 938.189453,859.000793
-	C833.378845,858.999634 728.568237,859.000000 623.757629,859.000122
-	C622.757874,859.000122 621.755798,859.047729 620.758728,858.996765
-	C616.771606,858.792786 614.911072,860.640869 614.985229,864.654785
-	C615.071411,869.318848 614.997009,873.985718 615.001099,878.651367
-	C615.008179,886.674133 615.336792,886.998840 623.560913,886.998962
-	C717.207275,887.000610 810.853638,887.000000 905.500000,887.000000
-M649.500000,679.000000
-	C670.492798,679.000000 691.485596,679.000122 712.478394,679.000061
-	C744.300781,678.999939 776.123230,679.007507 807.945618,678.992737
-	C813.972412,678.989929 814.922363,678.130737 814.986023,672.645508
-	C815.044006,667.647888 815.030090,662.648865 814.990784,657.650879
-	C814.945740,651.925720 814.056030,651.023560 808.241089,651.011108
-	C793.412903,650.979370 778.584595,650.999939 763.756348,650.999939
-	C716.605896,651.000000 669.455383,650.995667 622.304932,651.005432
-	C615.932983,651.006775 615.060730,651.799377 615.010559,657.605591
-	C614.965881,662.770142 615.112000,667.938354 614.969238,673.099304
-	C614.850403,677.398254 616.822083,679.083801 621.009888,679.032410
-	C630.171997,678.919861 639.336487,678.999084 649.500000,679.000000
-z"/>
-<path fill="#E9F1F7" opacity="1.000000" stroke="none"
-	d="
-M838.538879,528.587646
-	C841.257324,523.850464 846.111816,522.236023 850.432739,524.310608
-	C854.543030,526.284058 855.016052,530.149902 851.688904,534.575378
-	C855.691833,539.842896 856.009766,542.567871 852.937805,545.279297
-	C849.674805,548.159302 842.052917,547.964355 839.096497,544.925293
-	C836.324524,542.075928 836.744202,539.386841 840.461304,535.256653
-	C839.750061,533.061462 839.083923,531.005493 838.538879,528.587646
-M851.140991,542.700439
-	C850.508850,540.809998 850.249084,537.611389 849.166565,537.303345
-	C846.959412,536.675110 844.192810,537.277588 841.911621,538.089417
-	C841.221252,538.335144 840.763123,542.005554 841.238403,542.275269
-	C843.326233,543.460266 845.761108,544.134338 848.145447,544.635925
-	C848.876526,544.789795 849.847229,543.804626 851.140991,542.700439
-M847.170837,525.929871
-	C845.322998,527.067627 843.475159,528.205322 841.627319,529.343018
-	C842.556335,530.688049 843.409424,533.080505 844.430603,533.154541
-	C846.401917,533.297424 848.468018,532.131409 850.494812,531.508057
-	C849.658997,529.686768 848.823120,527.865540 847.170837,525.929871
-z"/>
-<path fill="#E7F0F6" opacity="1.000000" stroke="none"
-	d="
-M746.012695,541.742188
-	C746.194824,535.156616 743.170105,532.902283 737.825989,535.580933
-	C734.160034,537.418396 733.313477,536.432983 733.728027,532.790039
-	C734.009277,530.318909 734.105042,527.827087 734.316650,525.347290
-	C734.342285,525.046631 734.573547,524.763489 734.787659,524.304932
-	C739.177307,524.304932 743.625916,524.304932 748.074524,524.304932
-	C748.129761,524.893555 748.184937,525.482117 748.240173,526.070740
-	C744.746399,526.231140 741.252563,526.391479 737.205750,526.577209
-	C737.066406,528.453491 736.926086,530.342651 736.826416,531.684448
-	C740.397705,532.271240 743.774109,532.424500 746.814453,533.514832
-	C748.107056,533.978394 749.089172,536.301086 749.525513,537.959473
-	C750.549316,541.850952 748.078552,545.873596 744.370422,546.980408
-	C739.339478,548.482056 734.869629,546.392883 732.290100,540.637451
-	C737.081299,541.854736 741.158203,548.675415 746.012695,541.742188
-z"/>
-<path fill="#E3EDF5" opacity="1.000000" stroke="none"
-	d="
-M788.456909,525.501526
-	C795.222107,521.941406 800.091431,523.837769 801.318115,530.791321
-	C801.956604,534.410889 801.591003,538.405762 800.774292,542.027039
-	C799.986816,545.518921 797.185181,547.504883 793.298828,547.331177
-	C789.453247,547.159302 787.114197,545.020081 786.150879,541.487305
-	C784.656189,536.005798 784.717834,530.639099 788.456909,525.501526
-M788.678162,534.592041
-	C788.826111,536.579346 788.469177,538.804993 789.263428,540.487183
-	C790.065125,542.185181 791.953003,544.362366 793.467834,544.445007
-	C794.903198,544.523438 797.529236,542.330444 797.772949,540.833740
-	C798.372437,537.151489 798.224121,533.249084 797.689026,529.534241
-	C797.503540,528.246399 795.248535,526.301636 794.018555,526.359314
-	C792.454895,526.432556 790.637146,527.979858 789.565552,529.379211
-	C788.767761,530.420837 788.981445,532.236938 788.678162,534.592041
-z"/>
-<path fill="#EBF2F8" opacity="1.000000" stroke="none"
-	d="
-M717.505798,532.572144
-	C724.369141,531.126282 728.479309,533.103760 729.059387,538.198303
-	C729.526733,542.303223 728.052124,545.467590 724.034119,546.895996
-	C719.206787,548.612000 714.843872,546.609497 711.383728,540.408997
-	C713.459167,541.349426 714.735840,541.575317 715.479553,542.327942
-	C718.204468,545.085571 721.385193,546.101440 724.214417,543.323975
-	C725.444580,542.116272 725.929443,538.753906 725.141663,537.173096
-	C723.437500,533.753479 720.182068,533.860352 717.021118,535.657959
-	C713.919922,537.421631 712.744568,536.314331 713.093689,532.996155
-	C713.389282,530.187317 713.709106,527.381104 714.034180,524.428162
-	C718.655518,524.428162 723.196594,524.428162 727.737732,524.428162
-	C727.765259,524.919922 727.792847,525.411682 727.820374,525.903442
-	C725.398010,526.057617 722.955505,526.480469 720.558044,526.301270
-	C717.218384,526.051575 715.969604,527.453918 716.169006,531.322876
-	C716.577148,532.220520 717.041504,532.396301 717.505798,532.572144
-z"/>
-<path fill="#EBF2F8" opacity="1.000000" stroke="none"
-	d="
-M758.505798,532.572144
-	C765.369141,531.126282 769.479248,533.103760 770.059326,538.198303
-	C770.526672,542.303223 769.052124,545.467529 765.034119,546.895874
-	C760.206726,548.611938 755.843872,546.609497 752.383667,540.408936
-	C754.459167,541.349365 755.735840,541.575317 756.479553,542.327881
-	C759.204468,545.085571 762.385193,546.101440 765.214417,543.323975
-	C766.444580,542.116272 766.929382,538.753906 766.141663,537.173096
-	C764.437500,533.753479 761.182068,533.860352 758.021118,535.657959
-	C754.919922,537.421631 753.744568,536.314331 754.093750,532.996155
-	C754.389282,530.187317 754.709106,527.381104 755.034241,524.428162
-	C759.655518,524.428162 764.196594,524.428162 768.737732,524.428162
-	C768.765259,524.919922 768.792847,525.411682 768.820374,525.903442
-	C766.398010,526.057617 763.955505,526.480469 761.558044,526.301270
-	C758.218384,526.051575 756.969604,527.453918 757.169006,531.322876
-	C757.577148,532.220459 758.041504,532.396301 758.505798,532.572144
-z"/>
-<path fill="#EBF2F8" opacity="1.000000" stroke="none"
-	d="
-M834.566406,535.899048
-	C833.492676,544.553772 831.111328,547.565491 825.870239,547.300293
-	C820.623962,547.034851 817.791504,542.747192 818.009949,535.031982
-	C818.069946,532.913330 818.030273,530.270691 819.209534,528.826233
-	C821.012573,526.617676 823.831055,523.896729 826.225281,523.890198
-	C828.606445,523.883728 831.489075,526.578247 833.216309,528.811829
-	C834.462341,530.423096 834.175781,533.219666 834.566406,535.899048
-M821.967712,541.145508
-	C823.533264,542.343506 824.987488,544.210571 826.704895,544.496399
-	C827.789429,544.676880 830.234314,542.612671 830.387878,541.350769
-	C830.857849,537.488831 830.876343,533.473267 830.294739,529.635010
-	C830.088257,528.272278 827.649902,526.321838 826.236816,526.327271
-	C824.812927,526.332703 822.430786,528.252625 822.168091,529.652649
-	C821.515991,533.128479 821.832886,536.786072 821.967712,541.145508
-z"/>
-<path fill="#E4EEF5" opacity="1.000000" stroke="none"
-	d="
-M652.867798,544.217773
-	C654.905396,544.439941 656.491455,544.661987 658.077515,544.884094
-	C658.028320,545.399841 657.979187,545.915588 657.929993,546.431335
-	C652.869995,546.431335 647.810059,546.431335 642.488464,546.431335
-	C641.603027,542.293274 643.543457,539.346802 647.078308,537.162109
-	C648.631958,536.201843 650.537842,535.609619 651.738647,534.336182
-	C652.986816,533.012512 654.041260,531.125488 654.258118,529.370850
-	C654.366333,528.494934 652.368835,526.483582 651.407715,526.535706
-	C649.488220,526.639526 647.529846,527.637512 645.777466,528.608765
-	C644.736145,529.185913 644.056702,530.415955 642.362366,532.300232
-	C641.985535,526.860413 644.105835,524.739807 647.608765,523.892029
-	C651.190308,523.025208 654.763794,523.243286 656.902344,526.778687
-	C658.921265,530.116333 657.983093,533.292542 655.073914,535.666748
-	C653.289185,537.123291 651.032532,537.990356 649.179138,539.377747
-	C647.850464,540.372437 646.838684,541.790405 646.204285,544.217712
-	C648.274963,544.217712 650.345642,544.217712 652.867798,544.217773
-z"/>
-<path fill="#E8F1F7" opacity="1.000000" stroke="none"
-	d="
-M665.513367,524.462524
-	C672.824646,522.786072 676.408447,525.045532 677.167480,532.003906
-	C677.519348,535.229553 677.700012,538.945862 676.420227,541.733643
-	C675.324280,544.121033 672.280884,546.373535 669.655273,547.114319
-	C666.081421,548.122620 663.162598,545.701355 662.117737,542.152100
-	C660.278503,535.904724 659.711121,529.704834 665.513367,524.462524
-M664.593872,531.367371
-	C664.728821,534.630981 664.454895,537.989563 665.180420,541.116089
-	C665.516235,542.562927 667.937683,544.644775 669.168518,544.489990
-	C670.818054,544.282593 673.140625,542.421326 673.547791,540.848938
-	C674.311768,537.898865 674.443481,534.531616 673.804932,531.559937
-	C673.371338,529.542358 671.176147,527.903442 669.768799,526.095154
-	C668.109924,527.587708 666.451050,529.080261 664.593872,531.367371
-z"/>
-<path fill="#E7F0F6" opacity="1.000000" stroke="none"
-	d="
-M695.860229,527.158691
-	C697.437561,532.409607 695.067871,535.341797 690.994141,537.632751
-	C688.587158,538.986511 686.441528,540.805054 684.178345,542.414551
-	C684.393982,542.880859 684.609619,543.347107 684.825256,543.813416
-	C688.821289,544.132629 692.817261,544.451782 696.813293,544.770996
-	C696.763733,545.330017 696.714172,545.888977 696.664612,546.447998
-	C691.585876,546.447998 686.507141,546.447998 681.275574,546.447998
-	C680.202637,542.473877 682.032959,539.616821 685.376343,537.443420
-	C687.186890,536.266479 689.607971,535.549927 690.726807,533.920532
-	C691.875488,532.247437 692.869385,528.897522 691.995117,527.725464
-	C690.038818,525.102783 686.979187,525.701782 684.630371,528.031738
-	C683.638184,529.015991 682.861084,530.217041 681.342651,532.130493
-	C680.293274,527.395935 682.220398,525.302063 684.933228,524.308411
-	C688.881653,522.862183 692.833130,522.926819 695.860229,527.158691
-z"/>
-<path fill="#E8F1F7" opacity="1.000000" stroke="none"
-	d="
-M609.715454,542.891357
-	C609.365845,541.392761 609.022644,540.259460 609.006042,539.121460
-	C608.941650,534.718079 610.440857,531.134216 615.161682,530.213440
-	C619.265869,529.413025 622.335327,531.244812 623.739685,535.243408
-	C625.242493,539.522339 623.687622,544.525879 620.513733,546.366577
-	C616.962830,548.425964 612.920166,547.243774 609.715454,542.891357
-M612.838501,542.412964
-	C614.474487,543.208008 616.369873,544.919189 617.675903,544.549316
-	C619.078918,544.151855 620.587524,541.917725 620.880493,540.276306
-	C621.466370,536.994324 621.517395,533.000000 616.877258,532.743835
-	C612.226257,532.487183 612.023071,536.286316 612.082947,539.765015
-	C612.094055,540.410278 612.346252,541.051453 612.838501,542.412964
-z"/>
-<path fill="#F1F6FA" opacity="1.000000" stroke="none"
-	d="
-M599.103027,523.897095
-	C602.671631,523.897095 605.769836,523.897095 608.868042,523.897095
-	C608.967407,524.573853 609.066711,525.250671 609.166077,525.927429
-	C606.992249,526.326721 604.818420,526.726013 602.026550,527.238770
-	C602.026550,532.557373 602.093994,538.164673 601.967590,543.767578
-	C601.943298,544.843018 601.157043,545.901306 600.722351,546.967468
-	C600.139099,545.884399 599.086853,544.816223 599.051880,543.715759
-	C598.878113,538.252136 598.972595,532.780090 598.972595,527.311218
-	C596.246277,526.808167 593.818359,526.360107 591.390442,525.912109
-	C591.452087,525.240417 591.513794,524.568726 591.575439,523.897034
-	C593.927795,523.897034 596.280212,523.897034 599.103027,523.897095
-z"/>
-<path fill="#CADDEB" opacity="1.000000" stroke="none"
-	d="
-M808.839417,529.606079
-	C807.433777,528.928711 806.222290,528.648987 803.909729,528.115112
-	C807.111572,526.367615 809.349365,525.146240 812.638428,523.351135
-	C812.638428,531.106323 812.682129,538.262817 812.552734,545.416138
-	C812.542786,545.968018 811.315491,546.497864 810.654053,547.037964
-	C810.150146,546.160522 809.242981,545.298035 809.209595,544.403015
-	C809.030823,539.607727 809.069824,534.804382 808.839417,529.606079
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M625.116882,807.000000
-	C739.081665,807.000000 852.564087,806.999634 966.046509,807.000549
-	C974.851746,807.000610 974.996887,807.148193 974.999451,815.957825
-	C975.000732,820.457092 974.948547,824.957031 975.007446,829.455505
-	C975.055786,833.147644 973.453491,835.105896 969.632629,834.996582
-	C968.467224,834.963196 967.299866,834.999634 966.133423,834.999634
-	C851.984436,835.000000 737.835449,835.000488 623.686462,834.999146
-	C615.240906,834.999023 615.005981,834.757751 615.000366,826.276062
-	C614.998230,823.109863 614.999695,819.943726 615.000061,816.777527
-	C615.001099,807.007446 615.001221,807.007446 625.116882,807.000000
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M615.000000,768.024231
-	C614.895813,754.115295 614.303772,754.987732 627.375793,754.989807
-	C740.356262,755.007507 853.336670,754.999512 966.317139,755.000854
-	C974.757751,755.000977 974.994873,755.243896 974.999268,763.728271
-	C975.001587,768.227478 974.924561,772.728271 975.017639,777.225525
-	C975.099243,781.165955 973.425171,783.182983 969.362427,783.004944
-	C967.865662,782.939331 966.363464,782.999756 964.863708,782.999756
-	C851.716614,783.000000 738.569519,783.000000 625.422424,782.999939
-	C615.000366,782.999939 615.000366,782.999634 615.000000,772.512878
-	C614.999939,771.179749 615.000000,769.846680 615.000000,768.024231
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M973.013428,703.755859
-	C973.917297,705.504639 974.868958,706.995239 974.918640,708.515320
-	C975.103638,714.175598 974.952698,719.846008 975.006409,725.511902
-	C975.041687,729.232483 973.368164,731.118652 969.575317,730.997681
-	C968.409973,730.960449 967.242310,730.999634 966.075684,730.999634
-	C852.080811,731.000000 738.085938,731.000305 624.091064,730.999512
-	C615.060547,730.999451 615.001160,730.936829 615.000732,721.679016
-	C615.000549,717.179260 615.015320,712.679443 615.009033,708.179688
-	C615.004211,704.679993 616.713013,702.943176 620.234863,703.006165
-	C621.567627,703.030029 622.901306,703.000427 624.234558,703.000366
-	C738.062744,702.999939 851.890991,702.997009 965.719177,703.021362
-	C968.028564,703.021851 970.337830,703.340759 973.013428,703.755859
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M790.000000,941.000000
-	C734.012024,941.000000 678.524048,941.001953 623.036072,940.997803
-	C615.506409,940.997253 615.015015,940.507080 615.002014,933.126282
-	C614.993530,928.294006 615.069580,923.460571 614.985718,918.629822
-	C614.915833,914.601990 616.810974,912.789429 620.783691,912.996277
-	C621.780640,913.048218 622.782837,913.000183 623.782593,913.000183
-	C728.593201,913.000000 833.403870,912.999634 938.214478,913.000793
-	C946.777954,913.000916 946.993591,913.216492 946.999512,921.624878
-	C947.002380,925.790649 947.024719,929.956604 946.993530,934.122131
-	C946.948303,940.146790 946.113892,940.989380 939.967651,940.992310
-	C907.474670,941.007996 874.981750,940.999878 842.488770,941.000000
-	C825.159180,941.000122 807.829590,941.000000 790.000000,941.000000
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M905.000000,887.000000
-	C810.853638,887.000000 717.207275,887.000610 623.560913,886.998962
-	C615.336792,886.998840 615.008179,886.674133 615.001099,878.651367
-	C614.997009,873.985718 615.071411,869.318848 614.985229,864.654785
-	C614.911072,860.640869 616.771606,858.792786 620.758728,858.996765
-	C621.755798,859.047729 622.757874,859.000122 623.757629,859.000122
-	C728.568237,859.000000 833.378845,858.999634 938.189453,859.000793
-	C946.770264,859.000916 946.993896,859.222290 946.999268,867.599915
-	C947.002197,872.098938 946.900269,876.600708 947.025330,881.096191
-	C947.143860,885.357971 945.216736,887.078613 940.992004,887.037537
-	C929.162292,886.922363 917.330811,886.999023 905.000000,887.000000
-z"/>
-<path fill="#A9AEB1" opacity="1.000000" stroke="none"
-	d="
-M649.000000,679.000000
-	C639.336487,678.999084 630.171997,678.919861 621.009888,679.032410
-	C616.822083,679.083801 614.850403,677.398254 614.969238,673.099304
-	C615.112000,667.938354 614.965881,662.770142 615.010559,657.605591
-	C615.060730,651.799377 615.932983,651.006775 622.304932,651.005432
-	C669.455383,650.995667 716.605896,651.000000 763.756348,650.999939
-	C778.584595,650.999939 793.412903,650.979370 808.241089,651.011108
-	C814.056030,651.023560 814.945740,651.925720 814.990784,657.650879
-	C815.030090,662.648865 815.044006,667.647888 814.986023,672.645508
-	C814.922363,678.130737 813.972412,678.989929 807.945618,678.992737
-	C776.123230,679.007507 744.300781,678.999939 712.478394,679.000061
-	C691.485596,679.000122 670.492798,679.000000 649.000000,679.000000
-z"/>
-<path fill="#1068A8" opacity="1.000000" stroke="none"
-	d="
-M850.924561,543.020752
-	C849.847229,543.804626 848.876526,544.789795 848.145447,544.635925
-	C845.761108,544.134338 843.326233,543.460266 841.238403,542.275269
-	C840.763123,542.005554 841.221252,538.335144 841.911621,538.089417
-	C844.192810,537.277588 846.959412,536.675110 849.166565,537.303345
-	C850.249084,537.611389 850.508850,540.809998 850.924561,543.020752
-z"/>
-<path fill="#1068A8" opacity="1.000000" stroke="none"
-	d="
-M847.579102,525.987061
-	C848.823120,527.865540 849.658997,529.686768 850.494812,531.508057
-	C848.468018,532.131409 846.401917,533.297424 844.430603,533.154541
-	C843.409424,533.080505 842.556335,530.688049 841.627319,529.343018
-	C843.475159,528.205322 845.322998,527.067627 847.579102,525.987061
-z"/>
-<path fill="#0964A5" opacity="1.000000" stroke="none"
-	d="
-M788.711426,534.150085
-	C788.981445,532.236938 788.767761,530.420837 789.565552,529.379211
-	C790.637146,527.979858 792.454895,526.432556 794.018555,526.359314
-	C795.248535,526.301636 797.503540,528.246399 797.689026,529.534241
-	C798.224121,533.249084 798.372437,537.151489 797.772949,540.833740
-	C797.529236,542.330444 794.903198,544.523438 793.467834,544.445007
-	C791.953003,544.362366 790.065125,542.185181 789.263428,540.487183
-	C788.469177,538.804993 788.826111,536.579346 788.711426,534.150085
-z"/>
-<path fill="#005EA2" opacity="1.000000" stroke="none"
-	d="
-M717.211609,532.294189
-	C717.041504,532.396301 716.577148,532.220520 716.204712,531.770691
-	C716.503540,531.669800 716.710449,531.842957 717.211609,532.294189
-z"/>
-<path fill="#005EA2" opacity="1.000000" stroke="none"
-	d="
-M758.211609,532.294189
-	C758.041504,532.396301 757.577148,532.220459 757.204712,531.770691
-	C757.503540,531.669800 757.710449,531.842957 758.211609,532.294189
-z"/>
-<path fill="#0964A5" opacity="1.000000" stroke="none"
-	d="
-M821.864136,540.758057
-	C821.832886,536.786072 821.515991,533.128479 822.168091,529.652649
-	C822.430786,528.252625 824.812927,526.332703 826.236816,526.327271
-	C827.649902,526.321838 830.088257,528.272278 830.294739,529.635010
-	C830.876343,533.473267 830.857849,537.488831 830.387878,541.350769
-	C830.234314,542.612671 827.789429,544.676880 826.704895,544.496399
-	C824.987488,544.210571 823.533264,542.343506 821.864136,540.758057
-z"/>
-<path fill="#0964A5" opacity="1.000000" stroke="none"
-	d="
-M664.693054,530.970093
-	C666.451050,529.080261 668.109924,527.587708 669.768799,526.095154
-	C671.176147,527.903442 673.371338,529.542358 673.804932,531.559937
-	C674.443481,534.531616 674.311768,537.898865 673.547791,540.848938
-	C673.140625,542.421326 670.818054,544.282593 669.168518,544.489990
-	C667.937683,544.644775 665.516235,542.562927 665.180420,541.116089
-	C664.454895,537.989563 664.728821,534.630981 664.693054,530.970093
-z"/>
-<path fill="#0964A5" opacity="1.000000" stroke="none"
-	d="
-M612.662842,542.053711
-	C612.346252,541.051453 612.094055,540.410278 612.082947,539.765015
-	C612.023071,536.286316 612.226257,532.487183 616.877258,532.743835
-	C621.517395,533.000000 621.466370,536.994324 620.880493,540.276306
-	C620.587524,541.917725 619.078918,544.151855 617.675903,544.549316
-	C616.369873,544.919189 614.474487,543.208008 612.662842,542.053711
-z"/>
-</svg>
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index bb082700a..fab9fbb30 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -28,8 +28,8 @@ Notify.gov
               <p class="font-sans-md">Currently we are only working with select pilot partners. If you are interested in using Notify.gov in the future, please contact <br><a href="mailto:tts-benefits-studio@gsa.gov">tts-benefits-studio@gsa.gov</a> to learn more.</p>
             </div>
             <div class="desktop:grid-col-4 grid-offset-1 desktop:display-block display-none margin-x-5">
-              <img src="{{ asset_url('images/product/phone-text.svg') }}"
-              alt="An illustration of notifications to a phone.">
+              <img src="{{ asset_url('images/product/phone-text.png') }}"
+                alt="An illustration of notifications to a phone.">
             </div>
           </div>
         </div>

From 3c30a14c53fdfe9dc98b956f2b4122acf2bb0ebb Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Wed, 24 Jul 2024 12:26:41 -0700
Subject: [PATCH 10/23] Hard-code recursive_delete to false

---
 terraform/production/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 771558ce2..c0bcdc556 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -65,7 +65,7 @@ module "domain" {
   cf_space_name    = local.cf_space_name
   app_name_or_id   = "${local.app_name}-${local.env}"
   name             = "${local.app_name}-domain-${local.env}"
-  recursive_delete = local.recursive_delete
+  recursive_delete = false
   cdn_plan_name    = "domain"
   domain_name      = "beta.notify.gov"
 }

From 55f1939fd514f19f27b57cc8bf424f07c71dfd88 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 24 Jul 2024 13:56:32 -0700
Subject: [PATCH 11/23] don't allow commas in placeholder fields

---
 app/main/forms.py      | 7 ++++++-
 app/main/validators.py | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index afec80f9f..90a4409fc 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -50,6 +50,7 @@ from app.main.validators import (
     CommonlyUsedPassword,
     CsvFileValidator,
     DoesNotStartWithDoubleZero,
+    FieldCannotContainComma,
     LettersNumbersSingleQuotesFullStopsAndUnderscoresOnly,
     MustContainAlphanumericCharacters,
     NoCommasInPlaceHolders,
@@ -1650,7 +1651,11 @@ def get_placeholder_form_instance(
             )  # TODO: replace with us_mobile_number
     else:
         field = GovukTextInputField(
-            placeholder_name, validators=[DataRequired(message="Cannot be empty")]
+            placeholder_name,
+            validators=[
+                DataRequired(message="Cannot be empty"),
+                FieldCannotContainComma(),
+            ],
         )
 
     PlaceholderForm.placeholder_value = field
diff --git a/app/main/validators.py b/app/main/validators.py
index 4dd04017b..1dfc97c48 100644
--- a/app/main/validators.py
+++ b/app/main/validators.py
@@ -161,6 +161,15 @@ class DoesNotStartWithDoubleZero:
             raise ValidationError(self.message)
 
 
+class FieldCannotContainComma:
+    def __init__(self, message="Cannot contain a comma"):
+        self.message = message
+
+    def __call__(self, form, field):
+        if field.data and "," in field.data:
+            raise ValidationError(self.message)
+
+
 class MustContainAlphanumericCharacters:
     regex = re.compile(r".*[a-zA-Z0-9].*[a-zA-Z0-9].*")
 

From 2daaa6dd380d05c7d45c4843494c96fe844dcb81 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 24 Jul 2024 15:03:51 -0700
Subject: [PATCH 12/23] Fixed KeyError on processing_finished and removed
 notification api call

---
 app/main/views/dashboard.py                  | 23 +++++---------------
 app/templates/views/dashboard/dashboard.html | 14 +++++-------
 tests/app/main/views/test_dashboard.py       | 20 -----------------
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 4c70b85fd..4966c0300 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -1,5 +1,4 @@
 import calendar
-from collections import defaultdict
 from datetime import datetime
 from functools import partial
 from itertools import groupby
@@ -13,7 +12,6 @@ from app import (
     billing_api_client,
     current_service,
     job_api_client,
-    notification_api_client,
     service_api_client,
     socketio,
     template_statistics_client,
@@ -83,18 +81,9 @@ def service_dashboard(service_id):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
     job_response = job_api_client.get_jobs(service_id)["data"]
-    notifications_response = notification_api_client.get_notifications_for_service(
-        service_id
-    )["notifications"]
     service_data_retention_days = 7
 
-    aggregate_notifications_by_job = defaultdict(list)
-    for notification in notifications_response:
-        job_id = notification.get("job", {}).get("id", None)
-        if job_id:
-            aggregate_notifications_by_job[job_id].append(notification)
-
-    job_and_notifications = [
+    jobs = [
         {
             "job_id": job["id"],
             "time_left": get_time_left(job["created_at"]),
@@ -105,20 +94,20 @@ def service_dashboard(service_id):
                 ".view_job", service_id=current_service.id, job_id=job["id"]
             ),
             "created_at": job["created_at"],
-            "processing_finished": job["processing_finished"],
-            "processing_started": job["processing_started"],
+            "processing_finished": job.get("processing_finished"),
+            "processing_started": job.get("processing_started"),
             "notification_count": job["notification_count"],
             "created_by": job["created_by"],
-            "notifications": aggregate_notifications_by_job.get(job["id"], []),
+            "template_name": job["template_name"],
+            "original_file_name": job["original_file_name"],
         }
         for job in job_response
-        if aggregate_notifications_by_job.get(job["id"], [])
     ]
     return render_template(
         "views/dashboard/dashboard.html",
         updates_url=url_for(".service_dashboard_updates", service_id=service_id),
         partials=get_dashboard_partials(service_id),
-        job_and_notifications=job_and_notifications,
+        jobs=jobs,
         service_data_retention_days=service_data_retention_days,
     )
 
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index aba7d2ac6..e8e5ec633 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -55,31 +55,30 @@
           </tr>
         </thead>
         <tbody>
-          {% if job_and_notifications %}
-            {% for job in job_and_notifications[:5] %}
-              {% if job.job_id and job.notifications %}
+          {% if jobs %}
+            {% for job in jobs[:5] %}
                 {% set notification = job.notifications[0] %}
                 <tr class="table-row" id="{{ job.job_id }}">
                   <td class="table-field file-name">
-                    {{ notification.job.original_file_name[:12] if notification.job.original_file_name else 'Manually entered number'}}
+                    {{ job.original_file_name[:12] if job.original_file_name else 'Manually entered number'}}
                     <br>
                     <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
                   </td>
                   <td class="table-field template">
-                    {{ notification.template.name }}
+                    {{ job.template_name }}
                   </td>
                   <td class="table-field time-sent">
                     {{ (job.processing_finished if job.processing_finished else job.processing_started
                       if job.processing_started else job.created_at)|format_datetime_table }}
                   </td>
                   <td class="table-field sender">
-                    {{ notification.created_by.name }}
+                    {{ job.created_by.name }}
                   </td>
                   <td class="table-field count-of-recipients">
                     {{ job.notification_count}}
                   </td>
                   <td class="table-field report">
-                    {% if notification and job.time_left != "Data no longer available" %}
+                    {% if job.time_left != "Data no longer available" %}
                       <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
                       <span class="usa-hint">{{ job.time_left }}</span>
                     {% elif job %}
@@ -87,7 +86,6 @@
                     {% endif %}
                   </td>
                 </tr>
-              {% endif %}
             {% endfor %}
           {% else %}
             <tr class="table-row">
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index d0d48bffc..bccfa27b4 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -305,10 +305,6 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_messages(
     mock_get_inbound_sms_summary,
 ):
     service_one["permissions"] = ["inbound_sms"]
-    mocker.patch(
-        "app.notification_api_client.get_notifications_for_service",
-        return_value=FAKE_ONE_OFF_NOTIFICATION,
-    )
     page = client_request.get(
         "main.service_dashboard",
         service_id=SERVICE_ONE_ID,
@@ -337,10 +333,6 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_no_messages(
     mock_get_inbound_sms_summary_with_no_messages,
 ):
     service_one["permissions"] = ["inbound_sms"]
-    mocker.patch(
-        "app.notification_api_client.get_notifications_for_service",
-        return_value=FAKE_ONE_OFF_NOTIFICATION,
-    )
     page = client_request.get(
         "main.service_dashboard",
         service_id=SERVICE_ONE_ID,
@@ -839,10 +831,6 @@ def test_should_not_show_upcoming_jobs_on_dashboard_if_count_is_0(
         },
     )
     mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
-    mocker.patch(
-        "app.notification_api_client.get_notifications_for_service",
-        return_value=FAKE_ONE_OFF_NOTIFICATION,
-    )
     page = client_request.get(
         "main.service_dashboard",
         service_id=SERVICE_ONE_ID,
@@ -919,10 +907,6 @@ def test_correct_font_size_for_big_numbers(
 
     mocker.patch("app.main.views.dashboard.get_dashboard_totals", return_value=totals)
     mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
-    mocker.patch(
-        "app.notification_api_client.get_notifications_for_service",
-        return_value=FAKE_ONE_OFF_NOTIFICATION,
-    )
     page = client_request.get(
         "main.service_dashboard",
         service_id=service_one["id"],
@@ -952,10 +936,6 @@ def test_should_not_show_jobs_on_dashboard_for_users_with_uploads_page(
     mock_get_free_sms_fragment_limit,
     mock_get_inbound_sms_summary,
 ):
-    mocker.patch(
-        "app.notification_api_client.get_notifications_for_service",
-        return_value=FAKE_ONE_OFF_NOTIFICATION,
-    )
     page = client_request.get(
         "main.service_dashboard",
         service_id=SERVICE_ONE_ID,

From 37c5f84ee1875c42846df706d9d995e534944ce2 Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Thu, 25 Jul 2024 11:55:50 -0400
Subject: [PATCH 13/23] Adjust production manifest settings

This changeset adjusts our production manifest settings to strike a balance with memory usage and app instances.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 deploy-config/production.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy-config/production.yml b/deploy-config/production.yml
index c114a65bf..b99c4dd54 100644
--- a/deploy-config/production.yml
+++ b/deploy-config/production.yml
@@ -1,6 +1,6 @@
 env: production
 instances: 2
-memory: 4G
+memory: 1.5G
 public_admin_route: beta.notify.gov
 cloud_dot_gov_route: notify.app.cloud.gov
 redis_enabled: 1

From e900a7c81f6b69278b2fc4f57ecaaa1c11e97a70 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 25 Jul 2024 09:10:25 -0700
Subject: [PATCH 14/23] redirect new users to templates section

---
 app/main/views/register.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/main/views/register.py b/app/main/views/register.py
index 761582b3d..19187a47c 100644
--- a/app/main/views/register.py
+++ b/app/main/views/register.py
@@ -230,7 +230,12 @@ def set_up_your_profile():
         debug_msg(
             f"Added user {usr.email_address} to service {invite_data['service_id']}"
         )
-        return redirect(url_for("main.show_accounts_or_dashboard"))
+        # notify-admin-1766
+        # redirect new users to templates area of new service instead of dashboard
+        service_id = invite_data["service_id"]
+        url = url_for(".service_dashboard", service_id=service_id)
+        url = f"{url}/templates"
+        return redirect(url)
 
     elif login_gov_error:
         current_app.logger.error(f"login.gov error: {login_gov_error}")

From dfcd71a6d367f1568ffb7c8bc2f9a91a4d82f8ba Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 25 Jul 2024 15:36:31 -0400
Subject: [PATCH 15/23] Updates to table wrappers across the application Grid
 update to dashboard Small style updates

---
 .../uswds/_uswds-theme-custom-styles.scss     |  3 -
 .../partials/jobs/notifications.html          |  2 +-
 .../partials/notifications/notifications.html |  4 +-
 .../views/activity/notifications.html         |  2 +-
 app/templates/views/api/callbacks.html        |  4 +-
 app/templates/views/check/preview.html        |  2 +-
 app/templates/views/dashboard/_jobs.html      |  2 +-
 .../dashboard/all-template-statistics.html    |  2 +-
 app/templates/views/dashboard/dashboard.html  |  2 +-
 .../views/dashboard/template-statistics.html  |  2 +-
 app/templates/views/inbound-sms-admin.html    | 58 +++++++++----------
 app/templates/views/message-status.html       |  2 +-
 app/templates/views/performance.html          | 54 +++++++++--------
 .../views/platform-admin/_base_template.html  |  4 +-
 .../views/platform-admin/complaints.html      | 30 +++++-----
 .../views/platform-admin/services.html        |  2 +
 app/templates/views/pricing/index.html        |  6 +-
 app/templates/views/service-settings.html     |  2 +-
 app/templates/views/signedout.html            |  2 +-
 app/templates/views/usage.html                |  2 +-
 app/templates/withnav_template.html           |  4 +-
 poetry.lock                                   |  6 +-
 22 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index efe86c763..897726453 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -376,9 +376,6 @@ td.table-empty-message {
          background-image: url(../img/material-icons/description.svg);
       }
    }
-   .table-wrapper {
-      overflow-x: scroll;
-   }
 }
 
 .dashboard-table {
diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html
index 2b5cd8f77..916414756 100644
--- a/app/templates/partials/jobs/notifications.html
+++ b/app/templates/partials/jobs/notifications.html
@@ -22,7 +22,7 @@
   {% else %}
 
     {% if notifications %}
-      <div class="dashboard-table bottom-gutter-3-2">
+      <div class="dashboard-table overflow-x-auto">
     {% endif %}
       {% if job.still_processing %}
         <p class="bottom-gutter hint">
diff --git a/app/templates/partials/notifications/notifications.html b/app/templates/partials/notifications/notifications.html
index aae3e214f..686683038 100644
--- a/app/templates/partials/notifications/notifications.html
+++ b/app/templates/partials/notifications/notifications.html
@@ -1,8 +1,8 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, notification_status_field %}
 {% from "components/page-footer.html" import page_footer %}
 
-<div class="ajax-block-container table-wrapper" aria-labelledby='pill-selected-item'>
-  <div class="dashboard-table bottom-gutter-3-2">
+<div class="ajax-block-container" aria-labelledby='pill-selected-item'>
+  <div class="dashboard-table overflow-x-auto">
 
   {% call(item, row_number) list_table(
     [notification],
diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html
index 9ea9b3f81..a58fa7a27 100644
--- a/app/templates/views/activity/notifications.html
+++ b/app/templates/views/activity/notifications.html
@@ -5,7 +5,7 @@
 <div class="ajax-block-container" id='pill-selected-item'>
 
   {% if notifications %}
-  <div class="table-wrapper">
+  <div class="overflow-x-auto">
     <div class='dashboard-table'>
   {% endif %}
     {% call(item, row_number) list_table(
diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html
index 2f8cfbf2a..cb8b329ea 100644
--- a/app/templates/views/api/callbacks.html
+++ b/app/templates/views/api/callbacks.html
@@ -14,8 +14,8 @@
 
 {% block maincolumn_content %}
   {{ page_header('Callbacks') }}
-	<div class="table-wrapper">
-		<div class="bottom-gutter-3-2 dashboard-table body-copy-table">
+	<div class="overflow-x-auto">
+		<div class="bottom-gutter-3-2 dashboard-table body-copy-table overflow-x-auto">
 				{% call mapping_table(
 				caption='General',
 				field_headings=['Label', 'Value', 'Action'],
diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html
index 32b158013..c35876571 100644
--- a/app/templates/views/check/preview.html
+++ b/app/templates/views/check/preview.html
@@ -41,7 +41,7 @@
       </li>
     </ul>
   </div>
-  <div class="usa-table-container--scrollable" tabindex="0">
+  <div class="usa-table-container--scrollable overflow-x-auto" tabindex="0">
     <table class="usa-table usa-table--borderless width-full">
       <caption class="font-body-lg table-heading">
         Note: Only the first 5 rows are displayed here.
diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index 62b092daa..4bd521186 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -1,6 +1,6 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
 
-<div class="table-wrapper">
+<div class="overflow-x-auto">
   <div class='dashboard-table ajax-block-container'>
     {% call(item, row_number) list_table(
       jobs,
diff --git a/app/templates/views/dashboard/all-template-statistics.html b/app/templates/views/dashboard/all-template-statistics.html
index 7e58b478a..8a07c33a2 100644
--- a/app/templates/views/dashboard/all-template-statistics.html
+++ b/app/templates/views/dashboard/all-template-statistics.html
@@ -28,7 +28,7 @@
           No messages sent
         </p>
       {% else %}
-        <div class='template-statistics-table'>
+        <div class='template-statistics-table overflow-x-auto'>
           {% call(item, row_number) list_table(
             month.templates_used,
             caption=month.name,
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index aba7d2ac6..6c382100d 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -30,7 +30,7 @@
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
-    <div class="table-wrapper">
+    <div class="overflow-x-auto">
       <table class="usa-table usa-table--borderless job-table">
         <thead class="table-field-headings">
           <tr>
diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html
index 86192d421..110550ab3 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -2,7 +2,7 @@
 
 <div class="ajax-block-container">
   {% if template_statistics|length > 1 %}
-    <div class='template-statistics-table'>
+    <div class='template-statistics-table overflow-x-auto'>
       {% call(item, row_number) list_table(
         template_statistics,
         caption="Messages sent by template",
diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html
index 2687feb79..f16130405 100644
--- a/app/templates/views/inbound-sms-admin.html
+++ b/app/templates/views/inbound-sms-admin.html
@@ -23,36 +23,34 @@ Inbound SMS
   <h1 class="font-body-2xl">
     Inbound SMS
   </h1>
-
-  <table class="usa-table usa-table--borderless inbound">
-          <thread>
-              <tr>
-                <th>{{table_headings.field_headings[0]}}</th>
-                <th>{{table_headings.field_headings[1]}}</th>
-                <th>{{table_headings.field_headings[2]}}</th>
-              </tr>
-          </thread>
-          <tbody>
-
-          {% for value in inbound_num_list.data: %}
+  <div class="overflow-x-auto">
+    <table class="usa-table usa-table--borderless inbound width-full">
+      <thead>
           <tr>
-              <td>{{value.number}}</td>
-              <td>
-
-              {% if value.active %}
-                Active
-              {% elif not value.service.name  %}
-                  Not used
-              {% else %}
-                Inactive
-              {% endif %}
-              </td>
-              <td>
-                  <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link bold">{{ value.service.name }}</a>
-              </td>
+            <th>{{table_headings.field_headings[0]}}</th>
+            <th>{{table_headings.field_headings[1]}}</th>
+            <th>{{table_headings.field_headings[2]}}</th>
           </tr>
-          {% endfor %}
-          </tbody>
-  </table>
-
+      </thead>
+      <tbody>
+      {% for value in inbound_num_list.data: %}
+      <tr>
+          <td>{{value.number}}</td>
+          <td>
+          {% if value.active %}
+            Active
+          {% elif not value.service.name  %}
+              Not used
+          {% else %}
+            Inactive
+          {% endif %}
+          </td>
+          <td>
+              <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link bold">{{ value.service.name }}</a>
+          </td>
+      </tr>
+      {% endfor %}
+      </tbody>
+    </table>
+  </div>
 {% endblock %}
diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index d9dae439f..df8b7c287 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -49,7 +49,7 @@
   <p>Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p> -->
 
   <h2 id="text-message-statuses" class="heading-medium">Text messages</h2>
-  <div class="margin-bottom-8">
+  <div class="margin-bottom-8 overflow-x-auto">
     {% call mapping_table(
       caption='Message statuses – text messages',
       field_headings=['Status', 'Description'],
diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html
index f57d98311..c330c9129 100644
--- a/app/templates/views/performance.html
+++ b/app/templates/views/performance.html
@@ -44,33 +44,31 @@
     </div>
   </div>
 
-  <div class="table-wrapper">
-    <div class="dashboard-table">
-      {% call(item, row_number) list_table(
-        notifications_by_type|reverse,
-        caption='Messages sent since May 2023',
-        caption_visible=False,
-        field_headings=[
-          'Date',
-          99|message_count_noun('email')|capitalize,
-          99|message_count_noun('sms')|capitalize,
-        ],
-        empty_message='No data to show'
-      ) %}
-        {% call field() %}
-          {{ item.date | format_date_normal }}
-        {% endcall %}
-        {% call field() %}
-          {{ item.emails|format_thousands }}
-        {% endcall %}
-        {% call field() %}
-          {{ item.sms|format_thousands }}
-        {% endcall %}
+  <div class="dashboard-table overflow-x-auto">
+    {% call(item, row_number) list_table(
+      notifications_by_type|reverse,
+      caption='Messages sent since May 2023',
+      caption_visible=False,
+      field_headings=[
+        'Date',
+        99|message_count_noun('email')|capitalize,
+        99|message_count_noun('sms')|capitalize,
+      ],
+      empty_message='No data to show'
+    ) %}
+      {% call field() %}
+        {{ item.date | format_date_normal }}
       {% endcall %}
-      <p class="table-show-more-link">
-        Only showing the last {{ notifications_by_type|length }} days
-      </p>
-    </div>
+      {% call field() %}
+        {{ item.emails|format_thousands }}
+      {% endcall %}
+      {% call field() %}
+        {{ item.sms|format_thousands }}
+      {% endcall %}
+    {% endcall %}
+    <p class="table-show-more-link">
+      Only showing the last {{ notifications_by_type|length }} days
+    </p>
   </div>
 
   <h2 class="govuk-heading-m">
@@ -84,7 +82,7 @@
       ) }}
     </div>
   </div>
-  <div class="table-wrapper">
+  <div class="overflow-x-auto">
     <div class="dashboard-table">
       {% call(item, row_number) list_table(
         processing_time | reverse,
@@ -124,7 +122,7 @@
       <span class="usa-sr-only">using Notify.</span>
     </div>
   </div>
-  <div class="table-wrapper">
+  <div class="overflow-x-auto">
     <div class="dashboard-table">
       {% call(item, row_number) list_table(
         organizations_using_notify,
diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index c6d0628b5..d4c35eca6 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -16,7 +16,7 @@
       </ol>
     </nav>
     <div class="grid-row margin-bottom-10">
-      <div class="tablet:grid-col-3 margin-top-4">
+      <div class="tablet:grid-col-2 margin-top-4">
         <nav class="navigation">
           <ul class="usa-sidenav">
 
@@ -41,7 +41,7 @@
           </ul>
         </nav>
       </div>
-      <div class="grid-col-9 tablet:grid-col-9 padding-left-4 sub-content">
+      <div class="grid-col-10 tablet:grid-col-10 padding-left-4 sub-content">
       {% block backLink %}{% endblock %}
         <main id="main-content" role="main">
           {% block content %}
diff --git a/app/templates/views/platform-admin/complaints.html b/app/templates/views/platform-admin/complaints.html
index 378d3b876..9b4e0b10f 100644
--- a/app/templates/views/platform-admin/complaints.html
+++ b/app/templates/views/platform-admin/complaints.html
@@ -13,26 +13,26 @@
     Email complaints
   </h1>
 
+  <div class="overflow-x-auto">
+    {% call(item, row_number) list_table(
+        complaints,
+        caption="Complaints",
+        caption_visible=False,
+        empty_message='No complaints',
+        field_headings=['Notification Id', 'Service', 'Complaint type', 'Complaint Date'],
+        field_headings_visible=True
+    ) %}
 
-  {% call(item, row_number) list_table(
-      complaints,
-      caption="Complaints",
-      caption_visible=False,
-      empty_message='No complaints',
-      field_headings=['Notification Id', 'Service', 'Complaint type', 'Complaint Date'],
-      field_headings_visible=True
-  ) %}
+        {{ link_field(item.notification_id, url_for('main.view_notification', service_id=item.service_id, notification_id=item.notification_id)) }}
 
-      {{ link_field(item.notification_id, url_for('main.view_notification', service_id=item.service_id, notification_id=item.notification_id)) }}
+        {{ link_field(item.service_name, url_for('main.service_dashboard', service_id=item.service_id)) }}
 
-      {{ link_field(item.service_name, url_for('main.service_dashboard', service_id=item.service_id)) }}
+        {{ text_field(item.complaint_type) }}
 
-      {{ text_field(item.complaint_type) }}
-
-      {{ text_field(item.complaint_date|format_datetime_table if item.complaint_date else None) }}
-
-  {% endcall %}
+        {{ text_field(item.complaint_date|format_datetime_table if item.complaint_date else None) }}
 
+    {% endcall %}
+  </div>
   {{ previous_next_navigation(prev_page, next_page) }}
 
 {% endblock %}
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html
index d56e3390e..10acbce31 100644
--- a/app/templates/views/platform-admin/services.html
+++ b/app/templates/views/platform-admin/services.html
@@ -7,6 +7,7 @@
 {% from "components/components/details/macro.njk" import usaDetails %}
 
 {% macro services_table(services, caption) %}
+<div class="overflow-x-auto">
   {% call(item, row_number) mapping_table(
     caption=caption,
     caption_visible=False,
@@ -48,6 +49,7 @@
     {% endfor %}
 
   {% endcall %}
+</div>
 {% endmacro %}
 
 
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 46a7c2666..a65f363de 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -35,7 +35,7 @@ part.</p>
 
 <h4>Calculation of message parts without special characters</h4>
 
-<div class="bottom-gutter-3-2">
+<div class="overflow-x-auto">
   {% call mapping_table(
   caption='Text message pricing',
   field_headings=['Message length', 'Charge'],
@@ -86,7 +86,7 @@ recipient’s preferred language, but we are aware that, rarely, a phone carrier
 to be calculated as detailed below.<p>
 <h4>Calculation of message parts with special characters or non-romanized scripts</h4>
   {% set accentedChars %}
-<div class="bottom-gutter-3-2">
+<div class="overflow-x-auto">
   {% call mapping_table(
   caption='Accented characters that affect text message charges',
   field_headings=['Character', 'Description'],
@@ -151,7 +151,7 @@ to be calculated as detailed below.<p>
 "html": accentedChars
 }) }}
 
-<div class="bottom-gutter-3-2">
+<div class="overflow-x-auto">
   {% call mapping_table(
   caption='Pricing for text messages containing accented characters that affect the charges',
   field_headings=['Message length', 'Charge'],
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 1745bd528..70b40b382 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -16,7 +16,7 @@
 
     <h1 class="font-body-lg">Settings</h1>
 
-    <div class="bottom-gutter-3-2 settings-table body-copy-table">
+    <div class="bottom-gutter-3-2 settings-table body-copy-table overflow-x-auto">
 
       {% call mapping_table(
         caption='General',
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index fab9fbb30..9a458a10c 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -20,7 +20,7 @@ Notify.gov
             <div class="desktop:grid-col-7 tablet:grid-col-12">
               <h1 class="font-serif-2xl usa-hero__heading">Reach people where they are with government-powered text messages</h1>
               <p class="font-sans-lg">Notify.gov is a text message service that helps federal, state, local, tribal and territorial governments more effectively communicate with the people they serve.</p>
-              <div class="usa-button-group margin-bottom-5">
+              <div class="usa-button-group margin-bottom-5 flex-align-center">
                 <a class="usa-button usa-button login-button login-button--primary margin-right-2" href="{{ initial_signin_url }}">Sign in with <img src="{{ asset_url('images/logo-login.svg') }}" alt="Login.gov logo">
                 </a>
                 if you are an existing pilot partner
diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html
index f964982ee..03fb0a5ce 100644
--- a/app/templates/views/usage.html
+++ b/app/templates/views/usage.html
@@ -70,7 +70,7 @@
       </div> #}
 
       {% if months %}
-      <div class="table-wrapper">
+      <div class="overflow-x-auto">
         <div class="dashboard-table usage-table body-copy-table margin-top-4">
           {% call(item, row_index) list_table(
             months,
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index ce4b5d9b3..93b7d973e 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -30,7 +30,7 @@
       {% block orgNavBreadcrumb %}{% include "/new/components/org_nav_breadcrumb.html" %}{% endblock %}
     {% endif %}
     <div class="grid-row margin-top-5">
-      <div class="tablet:grid-col-3">
+      <div class="tablet:grid-col-2">
         {% block sideNavigation %}
           {% if current_org.name %}
             {% include "/new/components/org_nav.html" %}
@@ -44,7 +44,7 @@
           #}
         {% endblock %}
       </div>
-      <div class="tablet:grid-col-9 tablet:padding-left-4">
+      <div class="tablet:grid-col-10 tablet:padding-left-4">
         {% block beforeContent %}
           {% block backLink %}{% endblock %}
         {% endblock %}
diff --git a/poetry.lock b/poetry.lock
index adcd85c60..6c80bb40f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1344,9 +1344,13 @@ files = [
     {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"},
     {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"},
     {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"},
+    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"},
     {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"},
+    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"},
     {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"},
+    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"},
     {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"},
+    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"},
     {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"},
     {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"},
     {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"},
@@ -1681,7 +1685,6 @@ files = [
     {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"},
     {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"},
     {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"},
-    {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"},
     {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"},
 ]
 
@@ -2528,6 +2531,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},

From 8fb019b93dadd8331de1f7e6375d96de7567a2e1 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 25 Jul 2024 17:36:13 -0700
Subject: [PATCH 16/23] added margin

---
 app/templates/views/invite-user.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html
index b4f6789b2..bfeef5db5 100644
--- a/app/templates/views/invite-user.html
+++ b/app/templates/views/invite-user.html
@@ -38,9 +38,9 @@
   {% endcall %}
   <h2 id="permissions">Set up user permissions</h2>
   <p>Setting the right digital control is one of many aspects to keep content and information on a need to know basis. Permissions allow you to do this. Give team members access to important views related to their responsibilities.</p>
-  <h3 class="site-preview-heading">Permission</h3>
+  <h3 class="site-preview-heading">Permissions</h3>
 
-  <div class="usa-accordion usa-accordion--bordered">
+  <div class="usa-accordion usa-accordion--bordered margin-top-1">
     <h4 class="usa-accordion__heading">
       <button
         type="button"

From 2933ded5092ed6a3f27570310ca10c2f6f535d86 Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Thu, 25 Jul 2024 17:46:19 -0700
Subject: [PATCH 17/23] Experiment with uncommenting use of api_network_route
 module

---
 terraform/sandbox/main.tf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index ad0748199..f49560c62 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -40,11 +40,11 @@ module "logo_upload_bucket" {
 # 1) the api app has first been deployed
 # 2) the admin app has first been deployed
 ###########################################################################
-# module "api_network_route" {
-#   source = "../shared/container_networking"
+module "api_network_route" { # experiment with uncommenting
+  source = "../shared/container_networking"
 
-#   cf_org_name          = local.cf_org_name
-#   cf_space_name        = local.cf_space_name
-#   source_app_name      = "${local.app_name}-${local.env}"
-#   destination_app_name = "notify-api-${local.env}"
-# }
+  cf_org_name          = local.cf_org_name
+  cf_space_name        = local.cf_space_name
+  source_app_name      = "${local.app_name}-${local.env}"
+  destination_app_name = "notify-api-${local.env}"
+}

From 883b39cd932db3350fb9af34e5c2817bffd8d8a2 Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Thu, 25 Jul 2024 18:59:23 -0700
Subject: [PATCH 18/23] Update comment

---
 terraform/sandbox/main.tf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index f49560c62..838d86aa8 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -35,12 +35,12 @@ module "logo_upload_bucket" {
 }
 
 # ##########################################################################
-# The following lines need to be commented out for the initial `terraform apply`
-# It can be re-enabled after:
-# 1) the api app has first been deployed
-# 2) the admin app has first been deployed
+# Connection the allows notify-admin-sandbox and notify-api-sandbox to talk.
+# https://cloud.gov/docs/management/container-to-container/
+# Terraform block will fail to apply unless both apps exist in Cloud.gov.
+# See also: /docs/all.md#api-request-failed
 ###########################################################################
-module "api_network_route" { # experiment with uncommenting
+module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name

From 0c1f824ca3715c1dca68bdde994a9200d18a505c Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Thu, 25 Jul 2024 19:21:20 -0700
Subject: [PATCH 19/23] Remove outdated comments

---
 terraform/demo/main.tf       | 6 ------
 terraform/production/main.tf | 6 ------
 terraform/sandbox/main.tf    | 8 +-------
 terraform/staging/main.tf    | 6 ------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index 4223e29e4..d0b8ef92c 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -34,12 +34,6 @@ module "logo_upload_bucket" {
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
-# ##########################################################################
-# The following lines need to be commented out for the initial `terraform apply`
-# It can be re-enabled after:
-# 1) the api app has first been deployed
-# 2) the admin app has first been deployed
-###########################################################################
 module "api_network_route" {
   source = "../shared/container_networking"
 
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 771558ce2..9e02b3272 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -34,12 +34,6 @@ module "logo_upload_bucket" {
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
-# ##########################################################################
-# The following lines need to be commented out for the initial `terraform apply`
-# It can be re-enabled after:
-# 1) the api app has first been deployed
-# 2) the admin app has first been deployed
-###########################################################################
 module "api_network_route" {
   source = "../shared/container_networking"
 
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 838d86aa8..76495b4c9 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -34,13 +34,7 @@ module "logo_upload_bucket" {
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
-# ##########################################################################
-# Connection the allows notify-admin-sandbox and notify-api-sandbox to talk.
-# https://cloud.gov/docs/management/container-to-container/
-# Terraform block will fail to apply unless both apps exist in Cloud.gov.
-# See also: /docs/all.md#api-request-failed
-###########################################################################
-module "api_network_route" {
+module "api_network_route" { # API and Admin apps must both exist in Cloud
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 99ef28590..87c1e64dd 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -34,12 +34,6 @@ module "logo_upload_bucket" {
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
-# ##########################################################################
-# The following lines need to be commented out for the initial `terraform apply`
-# It can be re-enabled after:
-# 1) the api app has first been deployed
-# 2) the admin app has first been deployed
-###########################################################################
 module "api_network_route" {
   source = "../shared/container_networking"
 

From 765920ef0aeec1d7ebb09328e0ee883a36f3f4ec Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Fri, 26 Jul 2024 10:38:00 -0400
Subject: [PATCH 20/23] Change to the table width on overflow to have less
 wrapping text

---
 .../uswds/_uswds-theme-custom-styles.scss     |  10 ++
 .../partials/jobs/notifications.html          |   2 +-
 .../partials/notifications/notifications.html |   2 +-
 .../views/activity/notifications.html         |   2 +-
 app/templates/views/api/callbacks.html        |   4 +-
 app/templates/views/check/preview.html        |   2 +-
 app/templates/views/dashboard/_jobs.html      |   2 +-
 .../dashboard/all-template-statistics.html    |   2 +-
 app/templates/views/dashboard/dashboard.html  |   2 +-
 .../views/dashboard/template-statistics.html  |   2 +-
 app/templates/views/guidance/index.html       | 100 +++++++++---------
 app/templates/views/inbound-sms-admin.html    |   2 +-
 app/templates/views/message-status.html       |   2 +-
 app/templates/views/performance.html          |   6 +-
 .../views/platform-admin/complaints.html      |   2 +-
 .../views/platform-admin/services.html        |   2 +-
 app/templates/views/pricing/index.html        |   6 +-
 app/templates/views/service-settings.html     |   2 +-
 app/templates/views/usage.html                |   4 +-
 19 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 897726453..d01270d02 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -327,6 +327,16 @@ td.table-empty-message {
    bottom: 0;
 }
 
+@media (max-width: units('desktop-lg')) {
+   .table-overflow-x-auto {
+      overflow-x: auto;
+      table {
+         min-width: 768px;
+      }
+   }
+}
+
+
 // Dashboard
 
 .dashboard {
diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html
index 916414756..22173e6bd 100644
--- a/app/templates/partials/jobs/notifications.html
+++ b/app/templates/partials/jobs/notifications.html
@@ -22,7 +22,7 @@
   {% else %}
 
     {% if notifications %}
-      <div class="dashboard-table overflow-x-auto">
+      <div class="dashboard-table table-overflow-x-auto">
     {% endif %}
       {% if job.still_processing %}
         <p class="bottom-gutter hint">
diff --git a/app/templates/partials/notifications/notifications.html b/app/templates/partials/notifications/notifications.html
index 686683038..e155fdb1a 100644
--- a/app/templates/partials/notifications/notifications.html
+++ b/app/templates/partials/notifications/notifications.html
@@ -2,7 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 
 <div class="ajax-block-container" aria-labelledby='pill-selected-item'>
-  <div class="dashboard-table overflow-x-auto">
+  <div class="dashboard-table table-overflow-x-auto">
 
   {% call(item, row_number) list_table(
     [notification],
diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html
index a58fa7a27..f099e7f53 100644
--- a/app/templates/views/activity/notifications.html
+++ b/app/templates/views/activity/notifications.html
@@ -5,7 +5,7 @@
 <div class="ajax-block-container" id='pill-selected-item'>
 
   {% if notifications %}
-  <div class="overflow-x-auto">
+  <div class="table-overflow-x-auto">
     <div class='dashboard-table'>
   {% endif %}
     {% call(item, row_number) list_table(
diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html
index cb8b329ea..e0c83cc19 100644
--- a/app/templates/views/api/callbacks.html
+++ b/app/templates/views/api/callbacks.html
@@ -14,8 +14,8 @@
 
 {% block maincolumn_content %}
   {{ page_header('Callbacks') }}
-	<div class="overflow-x-auto">
-		<div class="bottom-gutter-3-2 dashboard-table body-copy-table overflow-x-auto">
+	<div class="table-overflow-x-auto">
+		<div class="bottom-gutter-3-2 dashboard-table body-copy-table table-overflow-x-auto">
 				{% call mapping_table(
 				caption='General',
 				field_headings=['Label', 'Value', 'Action'],
diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html
index c35876571..2664cbe27 100644
--- a/app/templates/views/check/preview.html
+++ b/app/templates/views/check/preview.html
@@ -41,7 +41,7 @@
       </li>
     </ul>
   </div>
-  <div class="usa-table-container--scrollable overflow-x-auto" tabindex="0">
+  <div class="usa-table-container--scrollable table-overflow-x-auto" tabindex="0">
     <table class="usa-table usa-table--borderless width-full">
       <caption class="font-body-lg table-heading">
         Note: Only the first 5 rows are displayed here.
diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index 4bd521186..41e43d977 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -1,6 +1,6 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
 
-<div class="overflow-x-auto">
+<div class="table-overflow-x-auto">
   <div class='dashboard-table ajax-block-container'>
     {% call(item, row_number) list_table(
       jobs,
diff --git a/app/templates/views/dashboard/all-template-statistics.html b/app/templates/views/dashboard/all-template-statistics.html
index 8a07c33a2..a61587e57 100644
--- a/app/templates/views/dashboard/all-template-statistics.html
+++ b/app/templates/views/dashboard/all-template-statistics.html
@@ -28,7 +28,7 @@
           No messages sent
         </p>
       {% else %}
-        <div class='template-statistics-table overflow-x-auto'>
+        <div class='template-statistics-table table-overflow-x-auto'>
           {% call(item, row_number) list_table(
             month.templates_used,
             caption=month.name,
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 5e8c69530..04c1f3b0d 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -30,7 +30,7 @@
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
-    <div class="overflow-x-auto">
+    <div class="table-overflow-x-auto">
       <table class="usa-table usa-table--borderless job-table">
         <thead class="table-field-headings">
           <tr>
diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html
index 110550ab3..c70cfac19 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -2,7 +2,7 @@
 
 <div class="ajax-block-container">
   {% if template_statistics|length > 1 %}
-    <div class='template-statistics-table overflow-x-auto'>
+    <div class='template-statistics-table table-overflow-x-auto'>
       {% call(item, row_number) list_table(
         template_statistics,
         caption="Messages sent by template",
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index e212adfe5..a7e4d496f 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -162,55 +162,57 @@
   location, the flag to receive the content needs to be captured in its own column with a Yes or No (Y/N) flag.</p>
 
   <h3>Example</h3>
-  <table class="usa-table">
-    <caption class="usa-sr-only">
-      Example
-    </caption>
-    <thead>
-      <tr>
-        <th scope="col">Phone number</th>
-        <th scope="col">First name</th>
-        <th scope="col">Last name</th>
-        <th scope="col">Spanish</th>
-        <th scope="col">English</th>
-        <th scope="col">Date</th>
-        <th scope="col">Time</th>
-        <th scope="col">Location</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>123-456-7890</td>
-        <td>Lulu</td>
-        <td>Praether</td>
-        <td>N</td>
-        <td>Y</td>
-        <td>November 2, 2023</td>
-        <td>3:25</td>
-        <td>123 Ford Rd.</td>
-      </tr>
-      <tr>
-        <td>234-567-8901</td>
-        <td>Sela</td>
-        <td>Appel</td>
-        <td>Y</td>
-        <td>N</td>
-        <td>November 2, 2023</td>
-        <td>4:00</td>
-        <td>123 Ford Rd.</td>
-      </tr>
-      <tr>
-        <td>123-456-7890</td>
-        <td>Dexter</td>
-        <td>Moseley</td>
-        <td>N</td>
-        <td>Y</td>
-        <td>November 2, 2023</td>
-        <td>2:00</td>
-        <td>123 Ford Rd.</td>
-      </tr>
-    </tbody>
-  </table>
+  <div class="table-overflow-x-auto">
+    <table class="usa-table">
+      <caption class="usa-sr-only">
+        Example
+      </caption>
+      <thead>
+        <tr>
+          <th scope="col">Phone number</th>
+          <th scope="col">First name</th>
+          <th scope="col">Last name</th>
+          <th scope="col">Spanish</th>
+          <th scope="col">English</th>
+          <th scope="col">Date</th>
+          <th scope="col">Time</th>
+          <th scope="col">Location</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>123-456-7890</td>
+          <td>Lulu</td>
+          <td>Praether</td>
+          <td>N</td>
+          <td>Y</td>
+          <td>November 2, 2023</td>
+          <td>3:25</td>
+          <td>123 Ford Rd.</td>
+        </tr>
+        <tr>
+          <td>234-567-8901</td>
+          <td>Sela</td>
+          <td>Appel</td>
+          <td>Y</td>
+          <td>N</td>
+          <td>November 2, 2023</td>
+          <td>4:00</td>
+          <td>123 Ford Rd.</td>
+        </tr>
+        <tr>
+          <td>123-456-7890</td>
+          <td>Dexter</td>
+          <td>Moseley</td>
+          <td>N</td>
+          <td>Y</td>
+          <td>November 2, 2023</td>
+          <td>2:00</td>
+          <td>123 Ford Rd.</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 
   {# Preventing fraud #}
   <h2 class="padding-top-1" id="prevent-fraud">Preventing fraud</h2>
diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html
index f16130405..95e35e369 100644
--- a/app/templates/views/inbound-sms-admin.html
+++ b/app/templates/views/inbound-sms-admin.html
@@ -23,7 +23,7 @@ Inbound SMS
   <h1 class="font-body-2xl">
     Inbound SMS
   </h1>
-  <div class="overflow-x-auto">
+  <div class="table-overflow-x-auto">
     <table class="usa-table usa-table--borderless inbound width-full">
       <thead>
           <tr>
diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html
index df8b7c287..76ac9bb6a 100644
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -49,7 +49,7 @@
   <p>Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p> -->
 
   <h2 id="text-message-statuses" class="heading-medium">Text messages</h2>
-  <div class="margin-bottom-8 overflow-x-auto">
+  <div class="margin-bottom-8 table-overflow-x-auto">
     {% call mapping_table(
       caption='Message statuses – text messages',
       field_headings=['Status', 'Description'],
diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html
index c330c9129..0752cc997 100644
--- a/app/templates/views/performance.html
+++ b/app/templates/views/performance.html
@@ -44,7 +44,7 @@
     </div>
   </div>
 
-  <div class="dashboard-table overflow-x-auto">
+  <div class="dashboard-table table-overflow-x-auto">
     {% call(item, row_number) list_table(
       notifications_by_type|reverse,
       caption='Messages sent since May 2023',
@@ -82,7 +82,7 @@
       ) }}
     </div>
   </div>
-  <div class="overflow-x-auto">
+  <div class="table-overflow-x-auto">
     <div class="dashboard-table">
       {% call(item, row_number) list_table(
         processing_time | reverse,
@@ -122,7 +122,7 @@
       <span class="usa-sr-only">using Notify.</span>
     </div>
   </div>
-  <div class="overflow-x-auto">
+  <div class="table-overflow-x-auto">
     <div class="dashboard-table">
       {% call(item, row_number) list_table(
         organizations_using_notify,
diff --git a/app/templates/views/platform-admin/complaints.html b/app/templates/views/platform-admin/complaints.html
index 9b4e0b10f..a6955dd90 100644
--- a/app/templates/views/platform-admin/complaints.html
+++ b/app/templates/views/platform-admin/complaints.html
@@ -13,7 +13,7 @@
     Email complaints
   </h1>
 
-  <div class="overflow-x-auto">
+  <div class="table-overflow-x-auto">
     {% call(item, row_number) list_table(
         complaints,
         caption="Complaints",
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html
index 10acbce31..65f10e281 100644
--- a/app/templates/views/platform-admin/services.html
+++ b/app/templates/views/platform-admin/services.html
@@ -7,7 +7,7 @@
 {% from "components/components/details/macro.njk" import usaDetails %}
 
 {% macro services_table(services, caption) %}
-<div class="overflow-x-auto">
+<div class="table-overflow-x-auto">
   {% call(item, row_number) mapping_table(
     caption=caption,
     caption_visible=False,
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index a65f363de..060b19032 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -35,7 +35,7 @@ part.</p>
 
 <h4>Calculation of message parts without special characters</h4>
 
-<div class="overflow-x-auto">
+<div class="table-overflow-x-auto">
   {% call mapping_table(
   caption='Text message pricing',
   field_headings=['Message length', 'Charge'],
@@ -86,7 +86,7 @@ recipient’s preferred language, but we are aware that, rarely, a phone carrier
 to be calculated as detailed below.<p>
 <h4>Calculation of message parts with special characters or non-romanized scripts</h4>
   {% set accentedChars %}
-<div class="overflow-x-auto">
+<div class="table-overflow-x-auto">
   {% call mapping_table(
   caption='Accented characters that affect text message charges',
   field_headings=['Character', 'Description'],
@@ -151,7 +151,7 @@ to be calculated as detailed below.<p>
 "html": accentedChars
 }) }}
 
-<div class="overflow-x-auto">
+<div class="table-overflow-x-auto">
   {% call mapping_table(
   caption='Pricing for text messages containing accented characters that affect the charges',
   field_headings=['Message length', 'Charge'],
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 70b40b382..560998685 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -16,7 +16,7 @@
 
     <h1 class="font-body-lg">Settings</h1>
 
-    <div class="bottom-gutter-3-2 settings-table body-copy-table overflow-x-auto">
+    <div class="bottom-gutter-3-2 settings-table body-copy-table table-overflow-x-auto">
 
       {% call mapping_table(
         caption='General',
diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html
index 03fb0a5ce..065bdaa2a 100644
--- a/app/templates/views/usage.html
+++ b/app/templates/views/usage.html
@@ -70,8 +70,7 @@
       </div> #}
 
       {% if months %}
-      <div class="overflow-x-auto">
-        <div class="dashboard-table usage-table body-copy-table margin-top-4">
+        <div class="dashboard-table usage-table body-copy-table table-overflow-x-auto margin-top-4">
           {% call(item, row_index) list_table(
             months,
             caption="Total spend",
@@ -122,7 +121,6 @@
 
           {% endcall %}
         </div>
-      </div>
       {% endif %}
     </div>
 

From e637a8177cd42fc87a71e6d33f334b566e104404 Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Fri, 26 Jul 2024 11:18:26 -0700
Subject: [PATCH 21/23] Upgrade terraform-cloudgov in the block for our domain
 name

---
 terraform/production/main.tf | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index c0bcdc556..9a224363b 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -50,16 +50,20 @@ module "api_network_route" {
 }
 
 # ##########################################################################
-# The following lines need to be commented out for the initial `terraform apply`
-# It can be re-enabled after:
-# 1) the app has first been deployed
-# 2) the route has been manually created by an OrgManager:
+# This governs the name of our main website. Because domain names are unique,
+# it only lives here in this one location in production. Resulting problem:
+# it is hard to test. Create a temporary, similar code block (with a different
+# subdomain) in Sandbox, test your changes there, and bring them here.
+#
+# Dependencies:
+# 1) an app named notify-admin-production in Cloud.gov
+# 2) this route, manually created by an OrgManager:
 #     `cf create-domain gsa-tts-benefits-studio beta.notify.gov`
-# 3) the acme-challenge CNAME record must be created
+# 3) the acme-challenge CNAME record
 #       https://cloud.gov/docs/services/external-domain-service/#how-to-create-an-instance-of-this-service
 ###########################################################################
 module "domain" {
-  source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.1" # TODO: upgrade this
+  source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v1.0.0"
 
   cf_org_name      = local.cf_org_name
   cf_space_name    = local.cf_space_name

From 3833533b5c7b0ca3bf169a0b51a5f2bfd9680af6 Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Fri, 26 Jul 2024 11:25:16 -0700
Subject: [PATCH 22/23] Nix a stray recursive_delete local var

---
 terraform/development/main.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 939b5a3fb..eec66d260 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -1,7 +1,6 @@
 locals {
   cf_org_name      = "gsa-tts-benefits-studio"
   cf_space_name    = "notify-local-dev"
-  recursive_delete = true
   key_name         = "${var.username}-admin-dev-key"
 }
 

From 4982452becec60b0f3c70717ecb9f61d3e0bb9a7 Mon Sep 17 00:00:00 2001
From: John Skiles Skinner <john.skinner@gsa.gov>
Date: Fri, 26 Jul 2024 11:28:03 -0700
Subject: [PATCH 23/23] Remove the deprecated arg from the domain code

---
 terraform/production/main.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 9a224363b..727ecacfb 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -69,7 +69,6 @@ module "domain" {
   cf_space_name    = local.cf_space_name
   app_name_or_id   = "${local.app_name}-${local.env}"
   name             = "${local.app_name}-domain-${local.env}"
-  recursive_delete = false
   cdn_plan_name    = "domain"
   domain_name      = "beta.notify.gov"
 }