diff --git a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
index 6e663f40f67b482ac66e0dffd60728d5a3221257..ea4aee0c6cb79c6d5119f5c522670dcb55f475f6 100644
--- a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
@@ -17,104 +17,104 @@ ticket_activity:
     title: Ticket Activity
     content: >
         Select a date range to cause both the graph and the table (cf. <span
-        class='doc-desc-title'>Statistics</span>) below to focus on any
+        class="doc-desc-title">Statistics</span>) below to focus on any
         corresponding data for those dates. The graph below will always reflect  a
         broad overview of the whole system’s data (i.e., population). However, you
-        may navigate through the <span class='doc-desc-title'>Statistics
+        may navigate through the <span class="doc-desc-title">Statistics
         </span> table below to focus on a narrower subject of interest (e.g.,
         Department, Topics, or Staff. Additionally, you may export any data
-        currently displayed in the <span class='doc-desc-title'>Statistics
+        currently displayed in the <span class="doc-desc-title">Statistics
         </span> table.
-        
+
 report_timeframe:
     title: Report timeframe
     content: >
         Choose a start date for the desired data sample using the date picker.
         Then, choose the length of time from that date (i.e., the end date) to
-        define the end date for your data sample. 
-        
+        define the end date for your data sample.
+
 statistics:
     title: Statistics
     content: >
         Navigate to the subject of interest by clicking on the appropriate tab in
         order to view the specific sample of data. Within the table, the circles
         represent the size of the nominal data. Therefore, the larger the number in
-        a particular cell, the larger the adjacent circle will be. 
-        
+        a particular cell, the larger the adjacent circle will be.
+
 opened:
     title: Opened
     content: >
         This represents the tickets opened by Agents (i.e., internally opened) and
-        not by Clients. 
-        
+        not by Clients.
+
 assigned:
     title: Assigned
     content: >
         The system tracks every event whereby a ticket is automatically or manually
         assigned to a particular Department or Agent. Automatic assignments will
-        depend on established settings for <span class='doc-desc-title'>Help
-        Topics</span> and <span class='doc-desc-title'>Email Filters</span> in the
+        depend on established settings for <span class="doc-desc-title">Help
+        Topics</span> and <span class="doc-desc-title">Email Filters</span> in the
         Admin Panel.
-        
+
 overdue:
     title: Overdue
     content: >
         This is the amount of tickets that have violated the SLA Plan to which they
         belonged.
-        
+
 closed:
     title: Closed
     content: >
         This is the amount of tickets that were closed.
-        
+
 reopened:
     title: Reopened
     content: >
         This is the amount of tickets that were reopened either by an Agent or by a
         Client when he/she responded while the ticket was in a Closed status.
-        
+
 service_time:
     title: Service Time
     content: >
-        <span class='doc-desc-title'>Service time</span> is the duration of time
+        <span class="doc-desc-title">Service time</span> is the duration of time
         that begins at the opening of a ticket and ends when the ticket is closed.
-        The <span class='doc-desc-title'>Service Time</span> column here measures
+        The <span class="doc-desc-title">Service Time</span> column here measures
         the average Service Time per ticket, in hours, within the specified date
-        span.  
-        
+        span.
+
 response_time:
     title: Response Time
     content: >
-        <span class='doc-desc-title'>Response Time</span> is a duration of time
+        <span class="doc-desc-title">Response Time</span> is a duration of time
         that begins with any Client’s correspondence and ends when an Agent makes a
         response. This measurement of time is not exclusive to a Client’s
         correspondence of the initial Ticket opening. This refers to every act of
         discourse originating with a Client.
-        
+
 export:
     title: Export
     content: >
         You may export the data currently in view. Therefore,  the data that is
         exported will be a direct reflection of whatever date span and specific
         tabbed subject is currently specified when an <span
-        class='doc-desc-title'>Export</span> is requested. The file format is <span
-        class='doc-desc-title'>.csv</span>, which is compatible to any spreadsheet
+        class="doc-desc-title">Export</span> is requested. The file format is <span
+        class="doc-desc-title">.csv</span>, which is compatible to any spreadsheet
         application.
-        
+
 department:
     title: Department
     content: >
         Choose this tab if you would like to see the Data of each column that is
         specific to your Departments.
-        
+
 topics:
     title: Topics
     content: >
         Choose this tab if you would like to see the Data of each column that is
         specific to your Topics.
-        
-agents_staff_:
+
+agents_staff:
     title: Agents (Staff)
     content: >
         Choose this tab if you would like to see the Data of each column that is
-        specific to your individual Agents.        
\ No newline at end of file
+        specific to your individual Agents.
diff --git a/include/i18n/en_US/help/tips/dashboard.my_profile.yaml b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
index 06f50d50b6a012d10645c6caa07bf50f13eb71eb..8eab8b6127a047535cce2532d44ee91f2e33360f 100644
--- a/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
@@ -13,94 +13,66 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-my_account_profile_table_:
-    title: My Account Profile (Table)
-    content: >
-        
 contact_information:
     title: Contact Information
     content: >
-        
+
 username:
     title: Username
     content: >
         Only those Agents with Admin status may change a username. If you are an
         Agent with Admin privileges, you can accomplish this under the <span
-        class='doc-desc-title'>Agent</span> (Staff)<span class='doc-desc-title'>
+        class="doc-desc-title">Agent</span> (Staff)<span class="doc-desc-title">
        </span> tab in the Admin Panel. (To change a username, including your own,
         see, Admin Panel -> Agent (Staff) -> Agent (Staff) Members).
-        
-first_name:
-    title: First Name
-    content: >
-        
-last_name:
-    title: Last Name
-    content: >
-        
-email_address:
-    title: Email Address
-    content: >
-        
-phone_number:
-    title: Phone Number
-    content: >
-        
-mobile_number:
-    title: Mobile Number
-    content: >
-        
-preferences:
-    title: Preferences
-    content: >
-        
+
 time_zone:
     title: Time Zone
     content: >
-        
+
 daylight_saving:
     title: Daylight Saving
     content: >
-        
+
 maximum_page_size:
     title: Maximum Page Size
     content: >
-        
+
 auto_refresh_rate:
     title: Auto Refresh Rate
     content: >
-        
+
 default_signature:
     title: Default Signature
     content: >
-        
+
 default_paper_size:
     title: Default Paper Size
     content: >
-        
+
 show_assigned_tickets:
     title: Show Assigned Tickets
     content: >
         If enabled, your name will be hidden from the Open Tickets queue for those
         tickets which you have been assigned. Upon hiding, the Department name to
         which you belong will replace where your name is normally displayed.
-        
+
 password:
     title: Password
     content: >
-        
+
 current_password:
     title: Current Password
     content: >
-        
+
 new_password:
     title: New Password
     content: >
-        
+
 confirm_new_password:
     title: Confirm New Password
     content: >
-        
+
 signature:
     title: Signature
     content: >
@@ -108,16 +80,3 @@ signature:
         the end of your Ticket Responses. Whether this Signature appears, or not,
         depends on the Email Template that will be used in a Ticket Response. (To
         create Email Templates, see Admin Panel -> Emails -> Templates ).
-        
-save_changes_button_:
-    title: Save Changes (Button)
-    content: >
-        
-reset_changes_button_:
-    title: Reset Changes (Button)
-    content: >
-        
-cancel_changes_button_:
-    title: Cancel Changes (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
index b130045f7c10f678689d70f04e23f3248fd02ed5..769789feebb18ffa12da2254416c34cdaeee7fd8 100644
--- a/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
@@ -17,21 +17,21 @@ staff_members:
     title: Staff Members
     content: >
         The following table displays the results of the filter above it. If no filter
-        settings are chosen, then all <span class='doc-desc-title'>Agent</span> 
-        (Staff) <span class='doc-desc-title'>Members</span> are displayed, and
+        settings are chosen, then all <span class="doc-desc-title">Agent</span>
+        (Staff) <span class="doc-desc-title">Members</span> are displayed, and
         broken up by pages. See the pages section below to navigate through more
-        results.  
-        
+        results.
+
 apply_filtering_criteria:
     title: Apply Filtering Criteria
     content: >
         Choose a Department that is relevant to your current interests. You may
         also perform a search for a specific Agent.
-        
+
 showing:
     title: Showing…
     content: >
-        Be sure to check the <span class='doc-desc-title'>Page</span> section below
+        Be sure to check the <span class="doc-desc-title">Page</span> section below
         to ensure that there are not more pages displaying more <span
-        class='doc-desc-title'>Agent</span> (Staff)<span class='doc-desc-title'>
-        Members.</span>
\ No newline at end of file
+        class="doc-desc-title">Agent</span> (Staff)<span class="doc-desc-title">
+        Members.</span>
diff --git a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
index 3fbe875b0cceb3ee90fb9369b9f27578734f1607..85736e59ea5b45a97f5eaae23e7f3c5ad10d5a14 100644
--- a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
@@ -22,52 +22,52 @@ system_logs:
         see the <span class="doc-desc-title">Type</span> dropdown box.
         Additionally, the type of events that are included in the System Logs can
         be customized under <span class="doc-desc-title">System Settings</span>.
-        
+
 date_span:
     title: Date Span
     content: >
         Narrow your calendar range that you would like to view in the <span
         class="doc-desc-title">System Logs</span>.
-        
+
 type:
     title: Type
     content: >
         Select the System Log type of interest.
-        
+
 showing_logs:
-    title: Showing...Logs
+    title: Showing&hellip;Logs
     content: >
         Be sure to check the <span class="doc-desc-title">Page</span> section below
         to make sure that there are not more pages displaying available System
         Logs.
-        
+
 log_title:
     title: Log Title
     content: >
-        Click the <span class="doc-desc-title">Log Title</span> table header if 
-        you would like to sort the results according to the <span 
+        Click the <span class="doc-desc-title">Log Title</span> table header if
+        you would like to sort the results according to the <span
         class="doc-desc-title">Log Title</span>.
-        
+
 log_type:
     title: Log Type
     content: >
         Click the <span class="doc-desc-title">Log Type</span> table header if you
         would like to sort the results according to the <span
         class="doc-desc-title">Log Type</span>.
-        
+
 log_date:
     title: Log Date
     content: >
         This is the date the log was generated by the software. If you would like
         to sort the results according to the <span class="doc-desc-title">Log
-        Date</span>, simply click the <span class="doc-desc-title">Log 
+        Date</span>, simply click the <span class="doc-desc-title">Log
         Date</span> table header. (Use the <span
         class="doc-desc-title">Date Span</span> form above to narrow your calendar
         span of logs.)
-        
+
 ip_address:
     title: IP Address
     content: >
         This refers to the <span class="doc-desc-title">IP</span><span
         class="doc-desc-title"> Address</span> of either the agent or client that
-        was using osTicket at the time the log was generated.
\ No newline at end of file
+        was using osTicket at the time the log was generated.
diff --git a/include/i18n/en_US/help/tips/emails.addnew_email.yaml b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
index 1bdc990dccbf329e999f150c54ba1383507bb24f..2a98b9375859d45cd31bfa10b12d462b66d7c040 100644
--- a/include/i18n/en_US/help/tips/emails.addnew_email.yaml
+++ b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
@@ -16,106 +16,93 @@
 email_information_settings:
     title: Email Information &amp; Settings
     content: >
-        
+
 email_address:
     title: Email Address
     content: >
-        
+
 email_name:
     title: Email Name
     content: >
-        
+
 setting:
     title: Setting
     content: >
-        
+
 login_information:
     title: Login Information
     content: >
         While this is optional, it is required if IMAP/POP or SMTP (with
         authorization) are enabled.
-        
+
 username:
     title: Username
     content: >
-        
+
 password:
     title: Password
     content: >
-        
+
 mail_account:
     title: Mail Account
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 host:
     title: Host
     content: >
-        
+
 port:
     title: Port
     content: >
-        
+
 protocol:
     title: Protocol
     content: >
-        
+
 encryption:
     title: Encryption
     content: >
-        
+
 fetch_frequency:
     title: Fetch Frequency
     content: >
-        
+
 emails_per_fetch:
     title: Emails Per Fetch
     content: >
-        
+
 fetched_emails:
     title: Fetched Emails
     content: >
-        
+
 smtp_settings:
     title: SMTP Settings
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 smtp_host:
     title: SMTP Host
     content: >
-        
+
 smtp_port:
     title: SMTP Port
     content: >
-        
-authentication_required_:
-    title: Authentication Required?
+
+authentication_required:
+    title: Authentication Required
     content: >
-        
-allow_header_spoofing_:
-    title: Allow Header Spoofing?
+
+allow_header_spoofing:
+    title: Allow Header Spoofing
     content: >
-        
+
 internal_notes:
     title: Internal Notes
     content: >
-        
-submit_button_:
-    title: Submit (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/emails.banlist.yaml b/include/i18n/en_US/help/tips/emails.banlist.yaml
index d087e10ba19b23df1ef51967d60f914544b7f372..d651d01718e0fda532347300b57e2779bc3ac0eb 100644
--- a/include/i18n/en_US/help/tips/emails.banlist.yaml
+++ b/include/i18n/en_US/help/tips/emails.banlist.yaml
@@ -16,44 +16,32 @@
 ban_new_email:
     title: Ban New Email
     content: >
-        
-banned_email_addresses_table_:
-    title: Banned Email Addresses (Table)
+
+banned_email_addresses:
+    title: Banned Email Addresses
     content: >
-        
+        (Offer an intro to email address banning here.)
+
 query_search:
     title: Query Search
     content: >
-        
+
 showing_:
     title: Showing…
     content: >
-        
+
 email_address:
     title: Email Address
     content: >
-        
+
 ban_status:
     title: Ban Status
     content: >
-        
+
 date_added:
     title: Date Added
     content: >
-        
+
 last_updated:
     title: Last Updated
     content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/emails.diagnostic.yaml b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
index 2a69188db77103ab2fbab67c40375b9053e8015d..065f031ba6618fc09b69f7dd6c91fe43766b2365 100644
--- a/include/i18n/en_US/help/tips/emails.diagnostic.yaml
+++ b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
@@ -13,49 +13,24 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-test_outgoing_email_form_:
-    title: Test Outgoing Email (Form)
+test_outgoing_email:
+    title: Test Outgoing Email
     content: >
         The email’s delivery depends on your server settings (php.ini) and/or SMTP
         configuration.
-        
+
 from:
     title: From
     content: >
-        
+
 to:
     title: To
     content: >
-        
+
 subject:
     title: Subject
     content: >
-        
+
 message:
     title: Message
     content: >
-        
-draft_saved:
-    title: Draft Saved
-    content: >
-        
-trash_button_image_:
-    title: Trash (Button Image)
-    content: >
-        
-message_body_task_bar_:
-    title: Message Body (Task Bar)
-    content: >
-        
-send_message_button_:
-    title: Send Message (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/emails.email_template_form.yaml b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
index 00b65c52e119024aa8963dfe45eb54ab5b080549..3a119c9d915df2865c1c146ad99313d1a949bd99 100644
--- a/include/i18n/en_US/help/tips/emails.email_template_form.yaml
+++ b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
@@ -16,27 +16,27 @@
 add_new_template:
     title: Add New Template
     content: >
-        
+
 template_information:
     title: Template Information
     content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 status:
     title: Status
     content: >
         If disabled, the Template will not be visible as an option when
         creating/editing a Department.
-        
+
 language:
     title: Language
     content: >
         As our translation endeavors grow in development, more options will become
         available.
-        
+
 template_to_clone:
     title: Template to Clone
     content: >
@@ -46,21 +46,9 @@ template_to_clone:
         the relevant event that triggers them. By cloning Template Sets, you are
         able to create Templates that only differ minimally without having to
         recreate the details they have in common.
-        
+
 admin_notes:
     title: Admin Notes
     content: >
         These notes are only visible to those whose account type is <span
-        class='doc-desc-title'>Admin</span>.
-        
-add_template_button_:
-    title: Add Template (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
\ No newline at end of file
+        class="doc-desc-title">Admin</span>.
diff --git a/include/i18n/en_US/help/tips/emails.emails.yaml b/include/i18n/en_US/help/tips/emails.emails.yaml
index 8b64b14feeaa4e1fea0d2fbcb9b515c30f7e0019..8e982d172bd26a695df29d9e7fe1a2ba5f1f6c4f 100644
--- a/include/i18n/en_US/help/tips/emails.emails.yaml
+++ b/include/i18n/en_US/help/tips/emails.emails.yaml
@@ -17,35 +17,19 @@ add_new_email:
     title: Add New Email
     content: >
         Custom lists are used to provide drop-down lists for custom forms.
-        
-email_addresses_table_:
-    title: Email Addresses (Table)
+
+email_addresses:
+    title: Email Addresses
     content: >
-        
-showing_emails:
-    title: Showing…Emails
-    content: >
-        
+
 email:
     title: Email
     content: >
-        
+
 priority:
     title: Priority
     content: >
-        
+
 department:
     title: Department
     content: >
-        
-created:
-    title: Created
-    content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-delete_email_s_button_:
-    title: Delete Email(s) (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.manage_banlist.yaml b/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
index 729360c05bfb3ce4284300c411a8be518c2bf7f0..e4a4b7855933d6d3209f7db0475e1ce0e8bbcae1 100644
--- a/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
+++ b/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
@@ -13,36 +13,14 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-add_new_email_address_to_ban_list:
-    title: Add New Email Address to Ban List
-    content: >
-        This form is accessed by clicking Ban New Email in the Banlist Section (To
-        get to Banlist, Admin Panel -> Emails -> Banlist).
-        
 filter_name:
     title: Filter Name
     content: >
-        
+
 ban_status:
     title: Ban Status
     content: >
-        
+
 email_address:
     title: Email Address
     content: >
-        
-internal_notes:
-    title: Internal Notes
-    content: >
-        
-add_button_:
-    title: Add (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.templates.yaml b/include/i18n/en_US/help/tips/emails.templates.yaml
index b59e3fe5bf274f2aa6851ae7dc7ec0222c3c732e..57d0e063b5df6f96fece9c9ded0656cd866e1945 100644
--- a/include/i18n/en_US/help/tips/emails.templates.yaml
+++ b/include/i18n/en_US/help/tips/emails.templates.yaml
@@ -13,8 +13,8 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-email_templates_table_:
-    title: Email Templates (Table)
+email_templates:
+    title: Email Templates
     content: >
         Templates are used as auto-responses for various actions that can take
         place during a  Ticket’s lifetime. Alerts are sent to Agents as assigned by
@@ -22,45 +22,24 @@ email_templates_table_:
         for the customer or user who created the Ticket. You can create your own
         set of Templates for each Department and customize each message. We highly
         suggest you copy the Default Templates to create a new set for editing. To
-        do this, click <span class='doc-desc-title'>Add New Template</span>, then
+        do this, click <span class="doc-desc-title">Add New Template</span>, then
         select the Default Template from the drop-down list next to <span
-        class='doc-desc-title'>Template to Clone</span>.
-        
+        class="doc-desc-title">Template to Clone</span>.
+
 showing_templates:
     title: Showing…Templates
     content: >
         Be sure to check the Page section below to ensure that there are not more
         pages displaying more Agent (Staff) Members.
-        
+
 name:
     title: Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 in_use:
     title: In-Use
     content: >
-        
-date_added:
-    title: Date Added
-    content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml b/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
index e79db3179c4d0f37b561eab97924184ca5720d23..0a524811b8ec7ee92aa6a872e0e1110366f5fa1c 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
@@ -13,63 +13,34 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-canned_response_table_:
-    title: Canned Response (Table)
+canned_response:
+    title: Canned Response
     content: >
-        
+
 canned_response_settings:
     title: Canned Response Settings
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 department:
     title: Department
     content: >
-        
+
 canned_response:
     title: Canned Response
     content: >
-        
+
 title:
     title: Title
     content: >
-        
+
 canned_response:
     title: Canned Response
     content: >
-        
-canned_response_task_bar_:
-    title: Canned Response (Task Bar)
-    content: >
-        
-draft_saved:
-    title: Draft Saved
-    content: >
-        
-trash_button_:
-    title: Trash (Button)
-    content: >
-        
+
 canned_attachments:
     title: Canned Attachments
     content: >
-        
-internal_notes:
-    title: Internal Notes
-    content: >
-        
-add_response_button_:
-    title: Add Response (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml b/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
index 04a7832d8e3cbc2a6673a8783bdf1d655344cff9..1f22329bb4e20981e2ff94782093083283e03382 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
@@ -20,36 +20,15 @@ category_information:
         pertains to then select “Add New FAQ”.  Type in the Question that will be
         visible, if the FAQ will be Public or Internal and type the Answer in the
         text box. You can also attach a file to the FAQ.
-        
+
 category_type:
     title: Category Type
     content: >
-        
+
 category_name:
     title: Category Name
     content: >
-        
+
 category_description:
     title: Category Description
     content: >
-        
-category_description_task_bar_:
-    title: Category Description (Task Bar)
-    content: >
-        
-internal_notes:
-    title: Internal Notes
-    content: >
-        
-add_button_:
-    title: Add (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_him:
-    title: Cancel (Button) Him
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
index 92f151332790dcdcab1a3969a59cb24e5c3aeae3..13276a8cb230411242a2a2953473eddea66e6e03 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
@@ -16,42 +16,25 @@
 add_new_response:
     title: Add New Response
     content: >
-        
-canned_responses_table:
-    title: Canned Responses (Table)
+
+canned_responses:
+    title: Canned Responses
     content: >
         Create responses to your more frequently asked questions to expedite
         customer support. You can also upload attachments to Canned Responses.
-        
+
 showing_premade_responses:
     title: Showing… Premade Responses
     content: >
-        
+
 title:
     title: Title
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 department:
     title: Department
     content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
index 81102935fd966a3fff2e837ae11dd85405200ab3..5350f5ee18108a0acdbb044b133f8e4ffc4f9cd1 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
@@ -17,8 +17,7 @@ faq_categories:
     title: FAQ Categories
     content: >
         Categories must first be created before any FAQs can be published.
-        
+
 setting:
     title: Setting
     content: >
-        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
index d38517c82cba1af992b8a9c1fda15952d4c49714..d9649740b99b963b86ff843929b101829109746f 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
@@ -13,23 +13,19 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-_text_input_:
-    title: (Text Input)
+search_box:
+    title: Search for Articles
     content: >
-        
-categories_drop_down_:
-    title: Categories (Drop Down)
+
+category_select:
+    title: Category Filter
     content: >
-        
-help_topics_drop_down_:
-    title: Help Topics (Drop Down)
+
+help_topic_select:
+    title: Help Topic Filter
     content: >
-        
-search_button_:
-    title: Search (Button)
-    content: >
-        
+
 resulted_listings:
     title: Resulted Listings
     content: >
-        
+
diff --git a/include/i18n/en_US/help/tips/manage.addnew_api.yaml b/include/i18n/en_US/help/tips/manage.addnew_api.yaml
index b2204f43ec432cda17282831743516448c7ec3c6..668ea53db830447d57be8d5120414cc783d2e2f9 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_api.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_api.yaml
@@ -16,35 +16,25 @@
 status:
     title: Status
     content: >
-        
+
 ip_address:
     title: IP Address
     content: >
-        
+
 services:
     title: Services
     content: >
-        
+
 can_create_tickets:
     title: Can Create Tickets
     content: >
         Define various options (XML/JSON/Email) and how they will affect the user
         experience.
-        
+
 can_execute_cron:
     title: Can Execute Cron
     content: >
-        Define Cron.
-        
-add_key_button_:
-    title: Add Key (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
+        <span class="doc-tip-title">Cron</span> is a techincal reference to
+        scheduled tasks. Allowing cron execution via the API enables usage
+        of the <cron>rcron.php</cron> script packaged in the
+        <code>scripts/</code> folder with the system.
diff --git a/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml b/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
index 7b2c7e5be2c886b188472d4dabe691957ad57300..d017e91cac6c89f8248d2627b3d770eb034b6549 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
@@ -20,49 +20,32 @@ custom_lists:
         options from which a Client can select in your Custom Forms. If you would
         like to use this custom list as a target in your Ticket Filters, be sure to
         add this list to your Ticket Details form.
-        
+
 name:
     title: Name
     content: >
-        
+
 plural_name:
     title: Plural Name
     content: >
-        
+
 sort_order:
     title: Sort Order
     content: >
-        
+
 list_s_initial_items:
     title: List’s Initial Items
     content: >
-        
+
 value:
     title: Value
     content: >
-        
+
 extra:
     title: Extra
     content: >
-        Abbreviations and such.
-        
-delete:
-    title: Delete
-    content: >
-        
-internal_notes:
-    title: Internal Notes
-    content: >
-        
-add_form_button_:
-    title: Add Form (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
+        Abbreviations and such. If you happen to use internal codes for the
+        items in this list, those codes and abbreviations can be entered in
+        this column. If the custom list is rendered as a <span class="doc-desc-option">
+        TypeAhead</span>, these abbreviations can be used to search for the
+        custom list items.
diff --git a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml b/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
index c7162fa5b29f8af02b9ae28f1e140961c329acde..3097bb1c931e1871dedd466d950cb937baa54116 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
@@ -16,7 +16,7 @@
 filter_name:
     title: Filter Name
     content: >
-        
+
 execution_order:
     title: Execution Order
     content: >
@@ -25,65 +25,65 @@ execution_order:
         lower the number the closer a Ticket Filter is to being the first Filter
         executed. You want to keep your strict and narrow filters (very small
         matches) first and your broad filters (large amount of matches) last. If
-        you enable <span class='doc-desc-title'>Stop Processing Further on
+        you enable <span class="doc-desc-title">Stop Processing Further on
         Match</span>, then only the first matching Filter will be applied.
-        
+
 filter_status:
     title: Filter Status
     content: >
-        
+
 target:
     title: Target
     content: >
         The Target is the source from whom the Ticket was created. So, for example,
         if you choose Web Forms, you are saying that you want to apply  the Ticket
         Filters to those tickets which originated from the Client Interface.
-        
+
 filter_rules:
     title: Filter Rules
     content: >
-        
+
 rules_matching_criteria:
     title: Rules Matching Criteria
     content: >
         If you would like the filter to match any of the rules, and then stop,
         choose Match Any. If you would like all rules of the filter to be matched,
-        choose Match All. 
-        
+        choose Match All.
+
 basic_fields_criterion:
     title: Basic Fields Criterion
     content: >
         The selectable options below this header are those elements which can be
         found in any standard Ticket. Note: the Email option here indicates from
         whom the Email was sent.
-        
+
 custom_fields_criterion:
     title: Custom Fields Criterion
     content: >
         The selectable options below this header are the Custom Fields found in the
-        <span class='doc-desc-title'>Ticket Details</span> Form. If you would like
-        to use one of your <span class='doc-desc-title'>Custom Lists</span> as a
+        <span class="doc-desc-title">Ticket Details</span> Form. If you would like
+        to use one of your <span class="doc-desc-title">Custom Lists</span> as a
         Field Criterion in your Ticket Filter, then you want to edit the Ticket
-        Details Form by adding your Custom List to the Ticket Details Form Fields. 
+        Details Form by adding your Custom List to the Ticket Details Form Fields.
         (To edit the Ticket Details Form, see Admin Panel -> Manage -> Forms ->
         Ticket Details).
-        
+
 criterion_operator:
     title: Criterion Operator
     content: >
         Choose an operator to control what kind of test is performed against the
         chosen field on the left with the value entered in the text field on the
-        right. 
-        
+        right.
+
 filter_actions:
     title: Filter Actions
     content: >
-        
+
 reject_ticket:
     title: Reject Ticket
     content: >
         If this is enabled, all other choices of action below will be ignored.
-        
+
 reply_to_email:
     title: Reply-To Email
     content: >
@@ -93,57 +93,45 @@ reply_to_email:
         Outlook, etc.). This includes header information that informs the Inbound
         Email Client (i.e., recipient) that the Sender is requesting that the Reply
         be routed to a different Email Address from that which it was originally
-        sent. If the <span class='doc-desc-title'>Reply-To Email</span> feature is
+        sent. If the <span class="doc-desc-title">Reply-To Email</span> feature is
         enabled here, then osTicket will honor the Client’s request to respond to
         their noted alternative Email Address.
-        
+
 ticket_auto_response:
     title: Ticket Auto-Response
     content: >
-        
+
 canned_response:
     title: Canned Response
     content: >
         This will cause an email to go out from the Default Email Address (or
         Department’s default if setting is enabled) with the Canned Response chosen
-        here included in the Email. The <span class='doc-desc-title'>New Ticket
+        here included in the Email. The <span class="doc-desc-title">New Ticket
         Auto-Reply</span> Template in an Email Template Set will dictate how the
         Canned Response is included in that Email. What Email Template Set is used
         depends on what Template Set is assigned as Default, or to the relevant
         Department. (To edit Canned Responses, see Staff Panel -> Knowledgebase ->
-        Canned Responses). (To edit the <span class='doc-desc-title'>New Ticket
-        Auto-Reply</span> <span class='doc-desc-title'>Template</span>, see 
-        
+        Canned Responses). (To edit the <span class="doc-desc-title">New Ticket
+        Auto-Reply</span> <span class="doc-desc-title">Template</span>, see
+
 department:
     title: Department
     content: >
-        
+
 priority:
     title: Priority
     content: >
-        
+
 sla_plan:
     title: SLA Plan
     content: >
-        
-auto_assign_to_:
+
+auto_assign_to:
     title: Auto-Assign to…
     content: >
-        
+
 admin_notes:
     title: Admin Notes
     content: >
         These notes are only visible to those whose account type is ‘<span
-        class='doc-desc-title'>Admin</span>.’
-        
-add_filter_button_:
-    title: Add Filter (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
\ No newline at end of file
+        class="doc-desc-title">Admin</span>.’
diff --git a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
index 958ae0f72ad060262be13bf6a985fb81e3e7d4f3..a9da5fdad8b16c45c23e309f22c4d800e42b7924 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
@@ -18,54 +18,54 @@ help_topic_information:
     content: >
         Your Help Topics help guide what information is gathered from a Client and
         how that Client is handled by your Company. The Help Topics are specific to
-        a Department and can include Custom Forms. 
-        
+        a Department and can include Custom Forms.
+
 topic:
     title: Topic
     content: >
         Choose a Topic Label by which you want this Help Topic to be recognized.
-        
+
 status:
     title: Status
     content: >
         If disabled, this Help Topic will not be able to be selected by Clients in
         the Client Interface.
-        
+
 type:
     title: Type
     content: >
         If a Topic is labelled as Private, it will only be available for Agents to
         choose when an Agent opens a new Ticket under the Staff Panel.
-        
+
 parent_topic:
     title: Parent Topic
     content: >
         Do you want the New Topic to be treated as a subtopic? If so, then choose a
         Parent Topic under which your New Topic will belong.
-        
+
 new_ticket_options:
     title: New Ticket Options
     content: >
-        
+
 custom_form:
     title: Custom Form
     content: >
         Custom Forms will help you acquire more specific information from Client’s
         that are relevant to specific Departments and/or Help Topics. (To create a
         Custom Form, see Admin Panel -> Manage -> Forms).
-        
+
 priority:
     title: Priority
     content: >
         New Tickets created related to the New Topic will be labeled as having what
         priority level?
-        
+
 department:
     title: Department
     content: >
         If a Client chooses this New Topic as relevant to their situation, to what
         Department do you want their Ticket to be routed?
-        
+
 sla_plan:
     title: SLA Plan
     content: >
@@ -73,42 +73,34 @@ sla_plan:
         New Topic is a special case requiring different time constraints, you can
         override the Departments default SLA Plan by choosing an SLA Plan here. (To
         create/edit SLA Plans, see Admin Plans -> Manage -> SLA Plans).
-        
+
 thank_you_page:
     title: Thank-You Page
     content: >
         Choose the Thank-You Page to which a Client is directed after opening a
         Ticket. (To Create/Edit your Thank-You Pages, see Admin Panel -> Manage ->
         Pages).
-        
+
 auto_assign_to:
     title: Auto-assign to…
     content: >
         You may optionally choose to what Agent or Team the Tickets characterized
-        by this New Topic will be sent. (To manage Teams, see Admin Panel -> Agent 
+        by this New Topic will be sent. (To manage Teams, see Admin Panel -> Agent
         (Staff) Members -> Teams).
-        
+
 ticket_auto_response:
     title: Ticket Auto-response
     content: >
         If enabled, this will prevent any Alert sent out to notify any Agent of the
         New Ticket. Therefore, this overrides any setting of the Department to
         which the Ticket belongs.
-        
+
 admin_notes:
     title: Admin Notes
     content: >
         These notes are only visible to those whose account type is ‘<span
         class='doc-desc-title'>Admin</span>.’
-        
+
 add_topic:
     title: Add Topic
     content: >
-        
-reset:
-    title: Reset
-    content: >
-        
-cancel:
-    title: Cancel
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.addnew_page.yaml b/include/i18n/en_US/help/tips/manage.addnew_page.yaml
index c00f9289f28a21f7857d7cb3ef451eaed83867fb..245496351c965ff350f60da80c6ac1b47e64f4e7 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_page.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_page.yaml
@@ -16,43 +16,19 @@
 page_information:
     title: Page Information
     content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 type:
     title: Type
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 page_body:
     title: Page Body
     content: >
-        
-page_body_task_menu_:
-    title: Page Body (Task Menu)
-    content: >
-        Be sure to define what each icon’s function is.
-        
-admin_notes:
-    title: Admin Notes
-    content: >
-        These notes are only visible to those whose account type is ‘<span
-        class='doc-desc-title'>Admin</span>.’
-        
-add_page_button_:
-    title: Add Page (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
index 167b749f61392b0bbca4c68c10ccf5a30ecfcc92..1b9dd73953d649cf91978cea75ebe9098d768f75 100644
--- a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
+++ b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
@@ -18,36 +18,30 @@ name:
     content: >
         Choose a name for this SLA Plan that will reflect its purpose or
         specificity (e.g., exclusivity to a Department or Help Topic).
-        
+
 grace_period:
     title: Grace Period
     content: >
         This is the how many hours pass by before the status of tickets with this
         SLA Plan are rendered as Overdue.
-        
+
 status:
     title: Status
     content: >
-        
+
 priority_escalation:
     title: Priority Escalation
     content: >
         If enabled, the priority level of Tickets will increase as the duration of
         a Ticket’s status as Overdue increases. It is recommended to enable to help
         your Agents prioritize their tickets properly.
-        
+
 transient:
     title: Transient
     content: >
         If enabled, this will allow a SLA Plan’s restrictions to be overwritten
         when a Ticket is transferred or its Help Topic is changed.
-        
+
 ticket_overdue_alerts:
     title: Ticket Overdue Alerts
     content: >
-        
-admin_notes:
-    title: Admin Notes
-    content: >
-        These notes are only visible to those whose account type is ‘<span
-        class='doc-desc-title'>Admin</span>.’
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.api_keys.yaml b/include/i18n/en_US/help/tips/manage.api_keys.yaml
index 7c28f068404d416e69600b029ad167957fde1d88..6fe6e7c819a02b8e359fa6879b7781882c415438 100644
--- a/include/i18n/en_US/help/tips/manage.api_keys.yaml
+++ b/include/i18n/en_US/help/tips/manage.api_keys.yaml
@@ -16,27 +16,19 @@
 add_new_api_key:
     title: Add New API Key
     content: >
-        
-api_keys_table_:
-    title: API Keys (Table)
+
+api_keys_table:
+    title: API Keys
     content: >
-        
+
 api_key:
     title: API Key
     content: >
-        
-ip_addr_:
-    title: IP Addr.
+
+ip_addr:
+    title: IP Address
     content: >
-        
+
 status:
     title: Status
     content: >
-        
-date_added:
-    title: Date Added
-    content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.help_topics.yaml b/include/i18n/en_US/help/tips/manage.help_topics.yaml
index 5c9be069b560f1d237c79ae0d5e9005db93711ff..519a870091d62d1c4ad09038682a5de1ad4b0850 100644
--- a/include/i18n/en_US/help/tips/manage.help_topics.yaml
+++ b/include/i18n/en_US/help/tips/manage.help_topics.yaml
@@ -13,15 +13,9 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-help_topics_table_:
-    title: Help Topics (Table)
+help_topics:
+    title: Help Topics
     content: >
         Your Help Topics help guide what information is gathered from a Client and
         how that Client is handled by your Company. The Help Topics are specific to
-        a Department and can include Custom Forms. 
-        
-showing_help_topics:
-    title: Showing...Help Topics
-    content: >
-        Be sure to check the Page section below to ensure that there are not more
-        pages displaying existing Help Topics.
\ No newline at end of file
+        a Department and can include Custom Forms.
diff --git a/include/i18n/en_US/help/tips/manage.pages.yaml b/include/i18n/en_US/help/tips/manage.pages.yaml
index be991043532b64f41d494dd5ab05b8d2e9bb23af..3a21cb377663df34c3e58123c4066d4454aa1da4 100644
--- a/include/i18n/en_US/help/tips/manage.pages.yaml
+++ b/include/i18n/en_US/help/tips/manage.pages.yaml
@@ -16,43 +16,19 @@
 add_new_page:
     title: Add New Page
     content: >
-        
-site_pages_table_:
-    title: Site Pages (Table)
+
+site_pages:
+    title: Site Pages
     content: >
-        
-showing_:
-    title: Showing…
-    content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 type:
     title: Type
     content: >
-        
+
 status:
     title: Status
     content: >
-        
-date_added:
-    title: Date Added
-    content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
index 5a6ebb28d995be41884d4d778777155eac27570d..92bf291040388a744695bb2b35efd06fa033c28d 100644
--- a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
+++ b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
@@ -13,54 +13,26 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-ticket_filters_table_:
-    title: Ticket Filters (Table)
+ticket_filters:
+    title: Ticket Filters
     content: >
-        
-showing_filters:
-    title: Showing...Filters
-    content: >
-        Be sure to check the <span class='doc-desc-title'>Page</span> section below
-        to ensure that there are not more pages displaying more <span
-        class='doc-desc-title'>Agent</span> (Staff)<span class='doc-desc-title'>
-        Members.</span>
-        
+
 name:
     title: Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 order:
     title: Order
     content: >
-        
+
 rules:
     title: Rules
     content: >
-        
+
 target:
     title: Target
     content: >
-        
-date_added:
-    title: Date Added
-    content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml
index 6c7fedd9dae576ee178262196c40143ad1ff8b9a..1311710bd22faab6fd18f17a0bef951d531b1ae8 100644
--- a/include/i18n/en_US/help/tips/settings.alerts.yaml
+++ b/include/i18n/en_US/help/tips/settings.alerts.yaml
@@ -13,6 +13,15 @@
 # must match the HTML #ids put into the page template.
 #
 ---
+page_title:
+    title: Alerts and Notices
+    content: >
+        Alerts and Notices are automated messages sent to staff members
+        related to ticket events. The following table allows you to
+        configure which events should trigger automated notifications, and,
+        for those which are enabled, which staff members should be included
+        on the automated notifications.
+
 new_ticket_alert:
     title: New Ticket Alert
     content: >
diff --git a/include/i18n/en_US/help/tips/settings.autoresponder.yaml b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
index 9af653dbf04c69f9c57633326c137a3699e8679f..e67db2f5e1e3f48d3e1ddad28e0863577c8f24d0 100644
--- a/include/i18n/en_US/help/tips/settings.autoresponder.yaml
+++ b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
@@ -22,7 +22,7 @@ new_ticket:
     links:
       - title: Default New Ticket Autoresponse Template
         href: /scp/templates.php?default_for=ticket.autoresp
-        
+
 new_ticket_by_staff:
     title: New Ticket by Staff
     content: >
@@ -31,7 +31,7 @@ new_ticket_by_staff:
     links:
       - title: Default New Ticket by Staff Autoresponse Template
         href: /scp/templates.php?default_for=ticket.notice
-        
+
 new_message_for_submitter:
     title: New Message for Submitter
     content: >
@@ -40,13 +40,16 @@ new_message_for_submitter:
     links:
       - title: Default New Message Confirmation Template
         href: /scp/templates.php?default_for=message.autoresp
-        
+
 new_message_for_participants:
     title: New Message for Participants
     content: >
         Broadcast messages received from message submitter to all other
         participants on the ticket.
-        
+    links:
+      - title: Default New Activity Template
+        href: /scp/templates.php?default_for=ticket.activity.notice
+
 overlimit_notice:
     title: Overlimit Notice
     content: >
@@ -57,4 +60,4 @@ overlimit_notice:
         href: /scp/templates.php?default_for=ticket.overlimit
 
       - title: Set <em>Maximum Open Tickets</em>
-        href: /scp/settings?t=tickets
\ No newline at end of file
+        href: /scp/settings?t=tickets
diff --git a/include/i18n/en_US/help/tips/settings.kb.yaml b/include/i18n/en_US/help/tips/settings.kb.yaml
index 38390b52adf541a7152149b08399d58ddd4c70c0..fd0c3a91a51216cea73a2f90710f6de51bc90d2a 100644
--- a/include/i18n/en_US/help/tips/settings.kb.yaml
+++ b/include/i18n/en_US/help/tips/settings.kb.yaml
@@ -16,16 +16,22 @@
 knowledge_base_settings:
     title: Knowledge Base Settings
     content: >
-        
+
 knowledge_base_status:
     title: Knowledge Base Status
     content: >
-        To edit the content of your Knowledge Base, see Agent (Staff) Panel ->
-        Knowledgebase.
-        
+        Enable this setting to allow your clients self-service access to
+        your public knowledge base articles.
+    links:
+      - title: View and edit the content of your Knowledge Base
+        href: /scp/kb.php
+
 canned_responses:
     title: Canned Responses
     content: >
-        If enabled, this will permit the use of Canned Responses within Ticket
-        Replies. (To add or edit Canned Responses, see Agent (Staff) Panel ->
-        Knowledgebase).
\ No newline at end of file
+        Enable this setting to allow agents to configure and use <span
+        class="doc-desc-title">Canned Responses</span> when replying to
+        tickets.
+    links:
+      - title: Manage Canned Responses for Agents
+        href: /scp/canned.php
diff --git a/include/i18n/en_US/help/tips/settings.pages.yaml b/include/i18n/en_US/help/tips/settings.pages.yaml
index 6de3e6b148963f6f6a1971d93ec12026912518a9..45b2e60912b707ca8d7c5b20bf96a0612ff6b5a7 100644
--- a/include/i18n/en_US/help/tips/settings.pages.yaml
+++ b/include/i18n/en_US/help/tips/settings.pages.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Account Panel -> 
+# This is popup help messages for the Account Panel ->
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -20,23 +20,21 @@ company_information:
         osTicket’s software and its support staff. The information here will appear
         in email signatures (i.e., the footer) when tickets are responded to by
         agents.
-        
-phone_number:
-    title: Phone Number
-    content: >
-        Just ask, what number would the Yellow Pages give me?
-        
+    links:
+      - title: Company Information Form
+        href: /scp/forms.php?type=C
+
 site_pages:
     title: Site Pages
     content: >
         To manage your customize pages, see Admin Panel -> Manage -> Pages.
-        
+
 landing_page:
     title: Landing Page
     content: >
         What page would you like your clients to see when they first “land” on your
         support site (i.e., your installation of osTicket)?
-        
+
 offline_page:
     title: Offline Page
     content: >
@@ -44,24 +42,24 @@ offline_page:
         being updated or maintained? To activate the <span
         class="doc-desc-title">Offline Page</span>, see Admin Panel -> Setting ->
         System -> Helpdesk Status.
-        
+
 default_thank_you_page:
     title: Default Thank-You Page
     content: >
         The <span class="doc-desc-title">thank-you page</span> is displayed to the
         customer when a <span class="doc-desc-title">Client</span> submits a new
         ticket.
-        
+
 logos:
     title: Logos
     content: >
         You may customize the <span class="doc-desc-title">Logo</span> that will be
-        displayed to the Client in the Client Portal (i.e., your Support Site). 
-        
+        displayed to the Client in the Client Portal (i.e., your Support Site).
+
 upload_a_new_logo:
     title: Upload a new logo
     content: >
         Choose an image in the .gif, .jpg or .png formats. We will proportionally
         resize the display of your image. We will not however resize the image’s
         data. Therefore, to speed load times, it is recommended that you keep your
-        image close to the default image (817x170).
\ No newline at end of file
+        image close to the default image (817x170).
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index a2d2b7caddd6eaa9776e128c22a927d66b236029..2692e9921091341921296cbb2da27da4e71b813a 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -16,28 +16,28 @@
 global_ticket_settings_options:
     title: Global Ticket Settings &amp; Options
     content: >
-        These settings are <span class='doc-desc-title'>global,</span> in that they
+        These settings are <span class="doc-desc-title">global,</span> in that they
         apply until they are overridden by other possible system settings (e.g., a
         Department’s SLA Plan overrides the Global Default SLA Plan set below).
-        
+
 ticket_ids:
     title: Ticket IDs
     content: >
         Choose between Random (Recommended) or Sequential numbers for tickets.
-        
+
 default_sla:
     title: Default SLA
     content: >
         Default SLA Plan to dictate how long a Ticket can remain Open before it is
         rendered Overdue. (To create more SLA Plans, see Admin Panel -> Manage -⁠>
         SLA Plans).
-        
+
 default_priority:
     title: Default Priority
     content: >
         Choose between Low, Normal, High &amp; Emergency for all tickets not
-        auto-assigned to a Help Topic or Department 
-        
+        auto-assigned to a Help Topic or Department
+
 maximum_open_tickets:
     title: Maximum Open Tickets
     content: >
@@ -45,23 +45,23 @@ maximum_open_tickets:
         simultaneously. This will help protect against spam and enable email flood
         control. If you prefer to remove this limitation on Clients however,  enter
         0 for unlimited.
-        
+
 ticket_auto_lock_priority:
     title: Ticket Auto-lock Priority
     content: >
         Minutes to lock a ticket on activity - enter 0 to disable locking
-        
+
 email_ticket_priority:
     title: Email Ticket Priority
     content: >
         Use email priority assigned by addressee’s mail service
-        
+
 show_related_tickets:
     title: Show Related Tickets
     content: >
         Show all related tickets on user login - otherwise access is restricted to
         one ticket view per login
-        
+
 human_verification:
     title: Human Verification
     content: >
@@ -70,82 +70,75 @@ human_verification:
         inside of it so a bot/spider cannot readily read the text like a human can.
         When the Client enters the text, it will check whether the Client’s input
         matches  the text inside the image. GDLib is a software graphics library
-        that is required to run CAPTCHA. If you are using osTicket as a
-        SupportSystem.com customer, you do not need to worry about installing
-        GDLib. We have everything set up for you. Just enable CAPTCHA!  
-        
+        that is required to run CAPTCHA.
+
 claim_tickets:
     title: Claim Tickets
     content: >
         Not every ticket is immediately assigned to an Agent depending on System
         Settings. However, when an eligible Agent responds to the Client for the
         first time, that Agent will then be immediately assigned that Ticket if the
-        <span class='doc-desc-title'>Claim Tickets</span> feature is enabled.
-        
+        <span class="doc-desc-title">Claim Tickets</span> feature is enabled.
+
 assigned_tickets:
     title: Assigned Tickets
     content: >
         If enabled, this will permit any Agent to see tickets that are assigned to
-        another specific Agent other than himself/herself. 
-        
+        another specific Agent other than himself/herself.
+
 answered_tickets:
     title: Answered Tickets
     content: >
         Show tickets that have been answered by staff  in open queue. If not check,
         answered tickets will show up in a separate column until user responds,
-        thereby moving it to the opened queue. 
-        
+        thereby moving it to the opened queue.
+
 staff_identity_masking:
     title: Staff Identity Masking
     content: >
         If enabled, this will hide the Agent’s name from the Client during any
         communication.
-        
+
 enable_html_ticket_thread:
     title: Enable HTML Ticket Thread
     content: >
         If enabled, this will permit the use of rich text formatting between
-        Clients and Agents and Auto-Response emails. 
-        
+        Clients and Agents and Auto-Response emails.
+
 attachments:
     title: Attachments
     content: >
-        
+
 allow_attachments:
     title: Allow Attachments
     content: >
-        
+
 emailed_api_attachments:
     title: Emailed/API Attachments
     content: >
-        
+
 online_web_attachments:
     title: Online/Web Attachments
     content: >
-        
+
 max_user_file_uploads:
     title: Max. User File Uploads
     content: >
-        
+
 max_staff_file_uploads:
     title: Max. Staff File Uploads
     content: >
-        
+
 maximum_file_size:
     title: Maximum File Size
     content: >
-        
+
 ticket_response_files:
     title: Ticket Response Files
     content: >
         If enabled, any attachments an Agent may attach to a Ticket response will
         be also included in the Client’s email.
-        
+
 accepted_file_types:
     title: Accepted File Types
     content: >
-        
-_textarea_:
-    title: (Textarea)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_department.yaml b/include/i18n/en_US/help/tips/staff.addnew_department.yaml
index 572e4c050eab87c3a11469b179b9040cc60b2bd4..18f7d39d0a431985ac00afd0b4c8ac5e358a208e 100644
--- a/include/i18n/en_US/help/tips/staff.addnew_department.yaml
+++ b/include/i18n/en_US/help/tips/staff.addnew_department.yaml
@@ -16,83 +16,83 @@
 add_new_department:
     title: Add New Department
     content: >
-        
+
 department_information:
     title: Department Information
     content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 type:
     title: Type
     content: >
         Select Private if the Department will only be pertinent to matters among
         other Agents. Additionally, when labelled as Private, the Email Signature
         will not display in replies.
-        
+
 email:
     title: Email
     content: >
         Email Address assigned to this Department. When Tickets are assigned to
         this Department, for example, it is this Email Address from whom the Client
-        will receive an Auto-Response Email. 
-        
+        will receive an Auto-Response Email.
+
 template:
     title: Template
     content: >
         Template Set used for Auto-Responses, Alerts &amp; Notices for all Tickets
-        associated with this Department. 
-        
+        associated with this Department.
+
 sla:
     title: SLA
     content: >
         Service Level Agreement  for all tickets transferred to Department or
         auto-assigned by Help Topic. (To create or edit a SLA Plan, see Admin Panel
         -> Manage -> SLA Plans).
-        
+
 group_membership:
     title: Group Membership
     content: >
         You may optionally choose to extend membership access to Groups (to whom
         Alerts and Notices will be sent). (To edit Groups, see Admin Panel ->
         Agents (Staff) -> Groups).
-        
+
 auto_response_settings:
     title: Auto-Response Settings
     content: >
         This allows you to disable New Ticket Auto-Response to Clients and/or New
-        Message Auto-Response to users when creating a ticket in this department. 
-        
+        Message Auto-Response to users when creating a ticket in this department.
+
 new_ticket:
     title: New Ticket
     content: >
         Click the checkbox if do not want an Email automatically sent to the Client
         when a New Ticket is Opened.
-        
+
 new_message:
     title: New Message
     content: >
         Click the checkbox if do not want an Email automatically sent when a New
         Message is received.
-        
+
 auto_response_email:
     title: Auto Response Email
     content: >
         If you would like Department Email to send Auto-Responses from a different
         Address from that noted above, then choose the differing Email Address
-        here. 
-        
+        here.
+
 department_access:
     title: Department Access
     content: >
         Department Manager and Primary Members will always have access independent
         of group selection or assignment. To commission an Agent as a Department
         Manager, you must first add that Agent to the Department by editing that
-        Agent’s Account. (To edit an Agent’s Account, see Admin Panel -> Agent 
+        Agent’s Account. (To edit an Agent’s Account, see Admin Panel -> Agent
         (Staff) Members -> Choose the Agent to Edit).
-        
+
 department_signature:
     title: Department Signature
     content: >
@@ -102,16 +102,3 @@ department_signature:
         appears or not depends on the Email Template that will be used in a Ticket
         Response. (To create email templates, see Admin Panel -> Emails ->
         Templates ).
-        
-create_department_button_:
-    title: Create Department (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
index de52f2b8878e4f0204ad73fb9bc138d60c0b000e..d42727d734ce46cff43b23ae49d6a82498e339b7 100644
--- a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
+++ b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
@@ -16,90 +16,71 @@
 add_new_group:
     title: Add New Group
     content: >
-        
+
 group_information:
     title: Group Information
     content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 group_permissions:
     title: Group Permissions
     content: >
-        
+
 can_create_tickets:
     title: Can Create Tickets
     content: >
-        
+
 can_edit_tickets:
     title: Can Edit Tickets
     content: >
-        
+
 can_post_reply:
     title: Can Post Reply
     content: >
-        
+
 can_close_tickets:
     title: Can Close Tickets
     content: >
-        
+
 can_assign_tickets:
     title: Can Assign Tickets
     content: >
-        
+
 can_transfer_tickets:
     title: Can Transfer Tickets
     content: >
-        
+
 can_delete_tickets:
     title: Can Delete Tickets
     content: >
-        
+
 can_ban_emails:
     title: Can Ban Emails
     content: >
-        
+
 can_manage_premade:
     title: Can Manage Premade
     content: >
-        
+
 can_manage_faq:
     title: Can Manage FAQ
     content: >
-        
+
 can_view_staff_stats_:
     title: Can View Staff Stats.
     content: >
-        
+
 department_access:
     title: Department Access
     content: >
-        
+
 support:
     title: Support
     content: >
-        
-admin_notes:
-    title: Admin Notes
-    content: >
-        These notes are only visible to those whose account type is ‘<span
-        class='doc-desc-title'>Admin</span>.’
-        
-create_group_button_:
-    title: Create Group (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml b/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
index 759f4762064ca3ddad8753725aa7e93f9507a746..3cfcd066b2f695dfb3c04bb38d7b4acc929a348e 100644
--- a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
+++ b/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
@@ -18,196 +18,173 @@ add_new_agent:
     content: >
         This form is accessed from the Add New Staff hyperlink (To access this
         form, see Admin Panel -> Staff -> Staff Members).
-        
+
 agent_staff_information:
     title: Agent (Staff) Information
     content: >
-        <span class='doc-desc-title'>Username</span>, <span
-        class='doc-desc-title'>First</span> &amp; <span class='doc-desc-title'>Last
-        Name</span>, <span class='doc-desc-title'>Email Address</span> (Required).
-        Optionally, <span class='doc-desc-title'>phone numbers</span> can be set
+        <span class="doc-desc-title">Username</span>, <span
+        class="doc-desc-title">First</span> &amp; <span class="doc-desc-title">Last
+        Name</span>, <span class="doc-desc-title">Email Address</span> (Required).
+        Optionally, <span class="doc-desc-title">phone numbers</span> can be set
         here also.
-        
+
 username:
     title: Username
     content: >
-        Please choose an <span class='doc-desc-title'>agent</span> <span
-        class='doc-desc-title'>username</span> that is unique to your osTicket
+        Please choose an <span class="doc-desc-title">agent</span> <span
+        class="doc-desc-title">username</span> that is unique to your osTicket
         setup.
-        
+
 first_name:
     title: First Name
     content: >
         The full name will generally be visible to any <span
-        class='doc-desc-title'>agent</span>/<span
-        class='doc-desc-title'>administrator</span> you create on your osTicket
+        class="doc-desc-title">agent</span>/<span
+        class="doc-desc-title">administrator</span> you create on your osTicket
         setup. However, you can choose to hide all <span
-        class='doc-desc-title'>agent</span> names inside of ticket responses (Admin
+        class="doc-desc-title">agent</span> names inside of ticket responses (Admin
         Panel -> Settings -> Tickets -> Hide staff’s name on responses).
         Establishing a privacy policy is the responsibility of primary <span
-        class='doc-desc-title'>administrator</span> of an osTicket setup. To view
-        SupportSystem.com’s privacy policy, see here 
-        (http://supportsystem.com/privacy).
-        
+        class="doc-desc-title">administrator</span> of an osTicket setup.
+
 last_name:
     title: Last Name
     content: >
         The full name will generally be visible to any <span
-        class='doc-desc-title'>agent</span>/<span
-        class='doc-desc-title'>administrator</span> you create on your osTicket
+        class="doc-desc-title">agent</span>/<span
+        class="doc-desc-title">administrator</span> you create on your osTicket
         setup. However, you can choose to hide all <span
-        class='doc-desc-title'>agent</span> names inside of ticket responses (Admin
+        class="doc-desc-title">agent</span> names inside of ticket responses (Admin
         Panel -> Settings -> Tickets -> Hide staff’s name on responses).
         Establishing a privacy policy is the responsibility of the primary
-        administrator of an osTicket setup. To view  SupportSystem.com’s privacy
-        policy, see here (http://supportsystem.com/privacy).
-        
+        administrator of an osTicket setup.
+
 email_address:
     title: Email Address
     content: >
         This is the Agent’s email that will receive relevant notifications to that
         Agent.
-        
+
 phone_number_mobile_number:
     title: Phone Number/Mobile Number
     content: >
-        
+
 mobile_number:
     title: Mobile Number
     content: >
-        
+
 account_password:
     title: Account Password
     content: >
-        You, as an <span class='doc-desc-title'>administrator</span>, may change an
+        You, as an <span class="doc-desc-title">administrator</span>, may change an
         Agent’s Password. You may optionally require the Agent to set their own
         Password on next login.
-        
+
 password:
     title: Password
     content: >
-        
+
 confirm_password:
     title: Confirm Password
     content: >
-        
+
 forced_password_change:
     title: Forced Password Change
     content: >
         Enable this if you would like to force the new Agent to create their own
         password that would be more memorable to him/her (recommended).
-        
+
 agent_s_signature:
     title: Agent’s Signature
     content: >
         What you create here will be an optional signature that perhaps appears at
         the end of the agent’s ticket responses. Whether this signature appears or
-        not depends on the email template that will be used in a ticket response. 
+        not depends on the email template that will be used in a ticket response.
         (To create email templates, see Admin Panel -> Emails -> Templates ).
-        
+
 account_status_settings:
     title: Account Status &amp; Settings
     content: >
         Activate or lock an agent’s account, assign agent to a group and/or
         department, specify the agent’s time zone, limit agent’s access to only
         assigned tickets &amp; place on vacation when agent is out.
-        
+
 account_status:
     title: Account Status
     content: >
-        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        If you change the <span class="doc-desc-title">agent</span>’s status to
         Locked, then he/she will not be able to login. If you change the <span
-        class='doc-desc-title'>agent</span>’s status to Vacation Mode, the agent
+        class="doc-desc-title">agent</span>’s status to Vacation Mode, the agent
         will be able to login but will not receive any of his normal notifications.
-        Also, he will not be able to have tickets assigned to him.  
-        
+        Also, he will not be able to have tickets assigned to him.
+
 assigned_group:
     title: Assigned Group
     content: >
         The Group that you choose in which this <span
-        class='doc-desc-title'>agent</span> will belong will dictate what level of
+        class="doc-desc-title">agent</span> will belong will dictate what level of
         control the agent has within your osTicket setup. The difference between
         Teams and Groups is that Groups will dictate level of control and a Team is
         simply a collection of users with a common purpose (To add/edit groups and
         their controls,  see  Admin Panel -> Agents [Old: Staff] -> Groups).
-        
+
 primary_department:
     title: Primary Department
     content: >
         Choose the department in which you would like this Agent to be primarily
         active. This is necessary if you wish to commission this <span
-        class='doc-desc-title'>Agent</span> as the <span
-        class='doc-desc-title'>Department Manager</span>. (To commission an Agent
+        class="doc-desc-title">Agent</span> as the <span
+        class="doc-desc-title">Department Manager</span>. (To commission an Agent
         as Department Manager, see Admin Panel -> Staff -> Departments).
-        
+
 time_zone:
     title: Time Zone
     content: >
-        
+
 daylight_saving:
     title: Daylight Saving
     content: >
         Enable this feature if you would like Daylight Savings to automatically
         come into play for this Agent’s timestamp.
-        
+
 limited_access:
     title: Limited Access
     content: >
-        Would you like to limit this <span class='doc-desc-title'>Agent</span>’s
+        Would you like to limit this <span class="doc-desc-title">Agent</span>’s
         access to only those tickets which he/she is assigned?
-        
+
 directory_listing:
     title: Directory Listing
     content: >
-        Would you like this <span class='doc-desc-title'>Agent</span> to be listed
-        in the <span class='doc-desc-title'>Agent Directory</span>? (To visit the
-        <span class='doc-desc-title'>Agent Directory</span>, see Agent (Staff)
+        Would you like this <span class="doc-desc-title">Agent</span> to be listed
+        in the <span class="doc-desc-title">Agent Directory</span>? (To visit the
+        <span class="doc-desc-title">Agent Directory</span>, see Agent (Staff)
         Panel -> Dashboard -> Agent (Staff) Directory).
-        
+
 vacation_mode:
     title: Vacation Mode
     content: >
-        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        If you change the <span class="doc-desc-title">agent</span>’s status to
         Vacation Mode, the agent will be able to login but will not receive any of
         his normal notifications. Also, he will not be able to have tickets
-        assigned to him. 
-        
+        assigned to him.
+
 administrative_roles:
     title: Administrative Roles
     content: >
-        All active <span class='doc-desc-title'>agents</span> have access to the
-        <span class='doc-desc-title'>Staff Panel</span> by default.
-        
+        All active <span class="doc-desc-title">agents</span> have access to the
+        <span class="doc-desc-title">Staff Panel</span> by default.
+
 account_administrator:
     title: Account Administrator
     content: >
-        Will this <span class='doc-desc-title'>Agent</span> need to manage other
-        <span class='doc-desc-title'>agents</span>, <span
-        class='doc-desc-title'>account settings</span> and/or <span
-        class='doc-desc-title'>billing information</span>.
-        
+        Will this <span class="doc-desc-title">Agent</span> need to manage other
+        <span class="doc-desc-title">agents</span>, <span
+        class="doc-desc-title">account settings</span> and/or <span
+        class="doc-desc-title">billing information</span>.
+
 helpdesk_administrator:
     title: Helpdesk Administrator
     content: >
-        Ability to manage <span class='doc-desc-title'>helpdesk</span> settings and
+        Ability to manage <span class="doc-desc-title">helpdesk</span> settings and
         staff's access
-        
-admin_notes:
-    title: Admin Notes
-    content: >
-        These are notes about the agent whose account you are currently editing.
-        But, don’t worry! These notes are only visible to those whose account type
-        is ‘<span class='doc-desc-title'>Admin</span>.’
-        
-add_agent_button_:
-    title: Add Agent (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/staff.agents.yaml b/include/i18n/en_US/help/tips/staff.agents.yaml
index e53020c3ee0790244dcb8bdc95ff8762a28a28b4..e0dbf0e8c02fb632c40cfe3e64660ac7f68be446 100644
--- a/include/i18n/en_US/help/tips/staff.agents.yaml
+++ b/include/i18n/en_US/help/tips/staff.agents.yaml
@@ -16,36 +16,28 @@
 add_new_agent:
     title: Add New Agent
     content: >
-        
-agents_table_:
-    title: Agents (Table)
+
+agents:
+    title: Agents
     content: >
-        
-apply_filtering_criteria_dropdown_fields_apply_button_:
-    title: Apply Filtering Criteria (Dropdown Fields &amp; Apply Button)
-    content: >
-        
-showing_:
-    title: Showing…
-    content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 username:
     title: Username
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 created:
     title: Created
     content: >
-        
+
 last_login:
     title: Last Login
     content: >
-        
+
diff --git a/include/i18n/en_US/help/tips/staff.departments.yaml b/include/i18n/en_US/help/tips/staff.departments.yaml
index 39b76c12848dc4ebb2a06eb4451a7610e06acb14..ca5936104f23c00ac5b1547e0a600036c2aff9fc 100644
--- a/include/i18n/en_US/help/tips/staff.departments.yaml
+++ b/include/i18n/en_US/help/tips/staff.departments.yaml
@@ -13,35 +13,28 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-department_table_:
-    title: Department (Table)
+department:
+    title: Department
     content: >
-        
-showing_department:
-    title: Showing...department
-    content: >
-        Be sure to check the <span class='doc-desc-title'>Page</span> section below
-        to ensure that there are not more pages displaying more <span
-        class='doc-desc-title'>Departments.</span>
-        
+
 name:
     title: Name
     content: >
-        
+
 type:
     title: Type
     content: >
         If the Department’s Type is Private, then that Department only handles
         matters pertinent among other Agents.
-        
+
 users:
     title: Users
     content: >
-        
+
 email_address:
     title: Email Address
     content: >
-        
+
 dept_manager:
     title: Dept. Manager
     content: >
@@ -50,4 +43,4 @@ dept_manager:
         the Department. (To add an Agent to a Department, see Admin Panel -> Staff
         -> Staff Members; Select the Agent whose account you would like to edit. To
         commission an Agent as a Department Manager, simply click the Department
-        name below that you would like to edit). 
\ No newline at end of file
+        name below that you would like to edit).
diff --git a/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml b/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
index 3883559c8c7ed013d6925b5e443f2b89b0fce13d..83b5f1130588dab7997457223fe10324e2aae7b6 100644
--- a/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
+++ b/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
@@ -16,12 +16,12 @@
 update_staff:
     title: Update Staff
     content: >
-        This form is accessed by clicking the Username of an agent in the Agent 
+        This form is accessed by clicking the Username of an agent in the Agent
         (Staff) Members Table (To get here, see Admin Panel -> Staff -> Staff
         Members).
-        
+
 assigned_teams:
     title: Assigned Teams
     content: >
         Assign agent to as many teams as necessary.
-        
+
diff --git a/include/i18n/en_US/help/tips/staff.groups.yaml b/include/i18n/en_US/help/tips/staff.groups.yaml
index a7129facccfdbb071ccb734affe639056ba5401c..89c9018cfe0cad1d9edd45c39afcca094f026e12 100644
--- a/include/i18n/en_US/help/tips/staff.groups.yaml
+++ b/include/i18n/en_US/help/tips/staff.groups.yaml
@@ -16,48 +16,31 @@
 add_new_group:
     title: Add New Group
     content: >
-        
-user_groups_table_:
-    title: User Groups (Table)
+
+user_groups:
+    title: User Groups
     content: >
-        
-showing_groups:
-    title: Showing...groups
-    content: >
-        
+
 group_name:
     title: Group Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 members:
     title: Members
     content: >
-        
+
 departments:
     title: Departments
     content: >
-        
+
 created_on:
     title: Created On
     content: >
-        
+
 last_updated:
     title: Last Updated
     content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/staff.staff_members.yaml b/include/i18n/en_US/help/tips/staff.staff_members.yaml
index 41de4e09a93538052f1c502d737a27c418ad1203..5d7b8cbe8ded464b7d1c15c3615d193d4b3f98a8 100644
--- a/include/i18n/en_US/help/tips/staff.staff_members.yaml
+++ b/include/i18n/en_US/help/tips/staff.staff_members.yaml
@@ -16,83 +16,58 @@
 add_new_staff:
     title: Add New Staff
     content: >
-        
-staff_members_table_:
-    title: Staff Members (Table)
+
+staff_members:
+    title: Staff Members
     content: >
         The following table displays the results of the filter above. If not filter
-        settings are chosen, then all <span class='doc-desc-title'>Agent</span> 
-        (Staff) <span class='doc-desc-title'>Members</span> are displayed, and
+        settings are chosen, then all <span class="doc-desc-title">Agent</span>
+        (Staff) <span class="doc-desc-title">Members</span> are displayed, and
         broken up by pages. See the pages section below to navigate through more
-        results.  
-        
-apply_filtering_criteria_dropdown_fields_apply_button_:
-    title: Apply Filtering Criteria (Dropdown Fields &amp; Apply Button)
-    content: >
-        You may cause the <span class='doc-desc-title'>Agent (</span>Staff<span
-        class='doc-desc-title'>) Members</span> table to display only those <span
-        class='doc-desc-title'>Agents</span> that are relevant to your current
-        interests related to <span class='doc-desc-title'>Departments</span>, <span
-        class='doc-desc-title'>Groups</span>, or <span
-        class='doc-desc-title'>teams</span>.
-        
-showing_:
-    title: Showing…
-    content: >
-        Be sure to check the <span class='doc-desc-title'>Page</span> section below
-        to ensure that there are not more pages displaying more <span
-        class='doc-desc-title'>Agent</span> (Staff)<span class='doc-desc-title'>
-        Members.</span>
-        
-_checkbox_column_:
-    title: (Checkbox Column)
+        results.
+
+checkbox_column:
+    title: Manage Multiple Agents
     content: >
         By choosing a checkbox next to the name of the <span
-        class='doc-desc-title'>Agent</span>(s), you may alter the <span
-        class='doc-desc-title'>Account Status</span> to either Locked or Enabled.
-        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        class="doc-desc-title">Agent</span>(s), you may alter the <span
+        class="doc-desc-title">Account Status</span> to either Locked or Enabled.
+        If you change the <span class="doc-desc-title">agent</span>’s status to
+        Locked, then he/she will not be able to login.<br/>
+        <br/>
+        If you change the <span class="doc-desc-title">agent</span>’s status to
+        Enabled, then all normal account settings established for that <span
+        class="doc-desc-title">Agent</span> will resume.<br/>
+        <br/>
+        If you change the <span class="doc-desc-title">agent</span>’s status to
         Locked, then he/she will not be able to login.
-        
+
 name:
     title: Name
     content: >
-        
+
 username:
     title: Username
     content: >
-        
+
 status:
     title: Status
     content: >
-        This will display whether the <span class='doc-desc-title'>Agent</span> is
+        This will display whether the <span class="doc-desc-title">Agent</span> is
         Locked, Active, or Active (Vacation).
-        
+
 group:
     title: Group
     content: >
-        
+
 department:
     title: Department
     content: >
-        
+
 created:
     title: Created
     content: >
-        
+
 last_login:
     title: Last Login
     content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        If you change the <span class='doc-desc-title'>agent</span>’s status to
-        Enabled, then all normal account settings established for that <span
-        class='doc-desc-title'>Agent</span> will resume.
-        
-lock_button_:
-    title: Lock (Button)
-    content: >
-        If you change the <span class='doc-desc-title'>agent</span>’s status to
-        Locked, then he/she will not be able to login.
-        
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/staff.team_form.yaml b/include/i18n/en_US/help/tips/staff.team_form.yaml
index f129a96522131c3981deaef1005b69ae1d7dacdd..07b028eeef76e9c50eafcd9d065953f50fcbeba2 100644
--- a/include/i18n/en_US/help/tips/staff.team_form.yaml
+++ b/include/i18n/en_US/help/tips/staff.team_form.yaml
@@ -16,41 +16,23 @@
 add_new_team:
     title: Add New Team
     content: >
-        
+
 team_information:
     title: Team Information
     content: >
-        
+
 name:
     title: Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 team_lead:
     title: Team Lead
     content: >
-        
+
 assignment_alerts:
     title: Assignment Alerts
     content: >
-        
-admin_notes:
-    title: Admin Notes
-    content: >
-        These notes are only visible to those whose account type is ‘<span
-        class='doc-desc-title'>Admin</span>.’
-        
-create_team_button_:
-    title: Create Team (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/staff.teams.yaml b/include/i18n/en_US/help/tips/staff.teams.yaml
index 72202c7ca6b4037efd756694ccb0d1bd4f36009d..cd3b22675890c227c0c7b49737356a0bff8dfd54 100644
--- a/include/i18n/en_US/help/tips/staff.teams.yaml
+++ b/include/i18n/en_US/help/tips/staff.teams.yaml
@@ -16,47 +16,27 @@
 add_new_team:
     title: Add New Team
     content: >
-        
-teams_table_:
-    title: Teams (Table)
+
+teams:
+    title: Teams
     content: >
-        
-showing_teams:
-    title: Showing...teams
-    content: >
-        
+
 team_name:
     title: Team Name
     content: >
-        
+
 status:
     title: Status
     content: >
-        
+
 members:
     title: Members
     content: >
-        
+
 team_lead:
     title: Team Lead
     content: >
-        
+
 created:
     title: Created
     content: >
-        
-last_updated:
-    title: Last Updated
-    content: >
-        
-enable_button_:
-    title: Enable (Button)
-    content: >
-        
-disable_button_:
-    title: Disable (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.advanced_search.yaml b/include/i18n/en_US/help/tips/tickets.advanced_search.yaml
deleted file mode 100644
index 8524a136da0003c1b298ff84faa4dc3c1f60343f..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.advanced_search.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> Advanced Search Prompt
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-keyword:
-    title: Keyword
-    content: >
-        
-status:
-    title: Status
-    content: >
-        
-dept_:
-    title: Dept.
-    content: >
-        
-assigned_to_:
-    title: Assigned To...
-    content: >
-        
-closed_by_:
-    title: Closed By...
-    content: >
-        
-help_topic:
-    title: Help Topic
-    content: >
-        
-date_range:
-    title: Date Range
-    content: >
-        
-priority_level:
-    title: Priority Level
-    content: >
-        
-search_button_:
-    title: Search (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/tickets.closed.yaml b/include/i18n/en_US/help/tips/tickets.closed.yaml
deleted file mode 100644
index 7d9197624bf33e9b2aa044e826308b52585e2930..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.closed.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> Closed Tickets
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-search_field:
-    title: Search Field
-    content: >
-        
-advanced:
-    title: Advanced
-    content: >
-        
-refresh_button_:
-    title: Refresh (Button)
-    content: >
-        
-closed_tickets_table:
-    title: Closed Tickets Table
-    content: >
-        All tickets that have been set to closed.
-        
-ticket:
-    title: Ticket
-    content: >
-        
-date:
-    title: Date
-    content: >
-        
-subject:
-    title: Subject
-    content: >
-        
-from:
-    title: From
-    content: >
-        
-priority:
-    title: Priority
-    content: >
-        
-closed_by:
-    title: Closed By
-    content: >
-        
-reopen_button_:
-    title: Reopen (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/tickets.my_tickets.yaml b/include/i18n/en_US/help/tips/tickets.my_tickets.yaml
deleted file mode 100644
index 4a369ebf6b1c336e9d81eb970b81307e87d5ecaa..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.my_tickets.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> My Tickets
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-search_field:
-    title: Search Field
-    content: >
-        
-advanced:
-    title: Advanced
-    content: >
-        
-refresh_button_:
-    title: Refresh (Button)
-    content: >
-        
-assigned_tickets_table:
-    title: Assigned Tickets Table
-    content: >
-        Tickets that are currently assigned to you,  as the staff.
-        
-ticket:
-    title: Ticket
-    content: >
-        
-date:
-    title: Date
-    content: >
-        
-subject:
-    title: Subject
-    content: >
-        
-from:
-    title: From
-    content: >
-        
-priority:
-    title: Priority
-    content: >
-        
-department:
-    title: Department
-    content: >
-        
-export:
-    title: Export
-    content: >
-        
-overdue_button_:
-    title: Overdue (Button)
-    content: >
-        
-close_button_:
-    title: Close (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.new_ticket.yaml b/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
index 171396516d159f5a51bb93dbab876c4c7c5bced6..23457785d3fd41b197a173b2273fafd20bceff0d 100644
--- a/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
+++ b/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
@@ -13,151 +13,99 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-new_ticket_table_:
-    title: New Ticket (Table)
+new_ticket:
+    title: New Ticket
     content: >
-        
+
 user_information:
     title: User Information
     content: >
-        
+
 email_address:
     title: Email Address
     content: >
-        
+
 full_name:
     title: Full Name
     content: >
-        
+
 ticket_notice:
     title: Ticket Notice
     content: >
-        
+
 ticket_information_options:
     title: Ticket Information &amp; Options
     content: >
-        
+
 ticket_source:
     title: Ticket Source
     content: >
-        
+
 help_topic:
     title: Help Topic
     content: >
-        
+
 department:
     title: Department
     content: >
-        
+
 sla_plan:
     title: SLA Plan
     content: >
-        
+
 due_date:
     title: Due Date
     content: >
-        
+
 assign_to:
     title: Assign To
     content: >
-        
+
 ticket_details:
     title: Ticket Details
     content: >
-        
+
 issue_summary:
     title: Issue Summary
     content: >
-        
+
 issue_details:
     title: Issue Details
     content: >
-        
-issue_details_task_bar_:
-    title: Issue Details (Task Bar)
-    content: >
-        
-draft_saved:
-    title: Draft Saved
-    content: >
-        
-trash_button_image_:
-    title: Trash (Button Image)
-    content: >
-        
+
 priority_level:
     title: Priority Level
     content: >
-        
+
 response:
     title: Response
     content: >
-        
+
 canned_response:
     title: Canned Response
     content: >
-        
-append:
-    title: Append
-    content: >
-        
+        Include comments about the Append checkbox here too
+
 initial_response_for_the_ticket:
     title: Initial Response for the Ticket
     content: >
-        
-initial_response_task_bar_:
-    title: Initial Response (Task Bar)
-    content: >
-        
-draft_saved:
-    title: Draft Saved
-    content: >
-        
-trash_button_image_:
-    title: Trash (Button Image)
-    content: >
-        
+
 attachments:
     title: Attachments
     content: >
-        
+
 ticket_status:
     title: Ticket Status
     content: >
-        
+
 signature:
     title: Signature
     content: >
-        
+
 response:
     title: Response
     content: >
-        
+
 internal_note:
     title: Internal Note
     content: >
-        
-internal_note_task_bar_:
-    title: Internal Note (Task Bar)
-    content: >
-        
-draft_saved:
-    title: Draft Saved
-    content: >
-        
-trash_button_image_:
-    title: Trash (Button Image)
-    content: >
-        
-open_button_:
-    title: Open (Button)
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
diff --git a/include/i18n/en_US/help/tips/tickets.overdue.yaml b/include/i18n/en_US/help/tips/tickets.overdue.yaml
deleted file mode 100644
index 51091a082bab1ff25285d8071dfe47fa19055bdb..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/tickets.overdue.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Tickets -> Overdue
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-search_field:
-    title: Search Field
-    content: >
-        
-advanced:
-    title: Advanced
-    content: >
-        
-refresh_button_:
-    title: Refresh (Button)
-    content: >
-        
-overdue_tickets_table:
-    title: Overdue Tickets Table
-    content: >
-        Open Tickets that have exceeded the set SLA Plan for their assigned Help
-        Topic or Department. The department’s SLA Plan will trump the SLA Plan of
-        the Help Topic. 
-        
-ticket:
-    title: Ticket
-    content: >
-        
-date:
-    title: Date
-    content: >
-        
-subject:
-    title: Subject
-    content: >
-        
-from:
-    title: From
-    content: >
-        
-priority:
-    title: Priority
-    content: >
-        
-assigned_to:
-    title: Assigned To
-    content: >
-        
-export:
-    title: Export
-    content: >
-        
-close_button_:
-    title: Close (Button)
-    content: >
-        
-delete_button_:
-    title: Delete (Button)
-    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.open.yaml b/include/i18n/en_US/help/tips/tickets.queue.yaml
similarity index 79%
rename from include/i18n/en_US/help/tips/tickets.open.yaml
rename to include/i18n/en_US/help/tips/tickets.queue.yaml
index 9c445b6955011ab4939472215c0b4431ea326f84..2268790fab1faa608c9583417a4bf2d56c824475 100644
--- a/include/i18n/en_US/help/tips/tickets.open.yaml
+++ b/include/i18n/en_US/help/tips/tickets.queue.yaml
@@ -16,63 +16,67 @@
 search_field:
     title: Search Field
     content: >
-        
+
 advanced:
     title: Advanced
     content: >
         Will allow you to narrow down your search parameters. Once you have
         selected your advanced search criteria and run the search, you can export
         the data at the bottom of the tickets page.
-        
+
 refresh_button_:
     title: Refresh (Button)
     content: >
-        
+
 open_tickets_table:
     title: Open Tickets Table
     content: >
         All tickets currently opened and requiring attention
-        
+
 ticket:
     title: Ticket
     content: >
-        
+
 date:
     title: Date
     content: >
-        
+
 subject:
     title: Subject
     content: >
-        
+
 from:
     title: From
     content: >
-        
+
 priority:
     title: Priority
     content: >
-        
+
 assigned_to:
     title: Assigned To
     content: >
-        
+
 export:
     title: Export
     content: >
         This will export your data currently in view in a printable HTML format.
-        You may select, then copy and paste this into your favorite word processor 
+        You may select, then copy and paste this into your favorite word processor
         (e.g., Microsoft Word).
-        
-overdue_button_:
-    title: Overdue (Button)
+
+advanced_search_dialog:
+    title: Advanced Search
     content: >
-        
-close_button_:
-    title: Close (Button)
+
+
+adv_keyword:
+    title: Keyword Search
     content: >
-        
-delete_button_:
-    title: Delete (Button)
+        Find hits based on the subject and message bodies of the ticket
+        thread as well as all textual content associated with custom fields
+        for the users and the tickets.
+
+adv_date_range:
+    title: Search by Date Range
     content: >
-        
+        Definition here
diff --git a/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml b/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
index 347f3408dc887ea8045737720b18c30e180fe607..a028351f226c1c7410a2010182aaa537409634fb 100644
--- a/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
+++ b/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
@@ -16,36 +16,7 @@
 search_by_email_phone_or_name:
     title: Search by email, phone or name
     content: >
-        
+
 create_new_user:
     title: Create New User
     content: >
-        
-email_address:
-    title: Email Address
-    content: >
-        
-full_name:
-    title: Full Name
-    content: >
-        
-phone_number:
-    title: Phone Number
-    content: >
-        
-internal_notes:
-    title: Internal Notes
-    content: >
-        
-reset_button_:
-    title: Reset (Button)
-    content: >
-        
-cancel_button_:
-    title: Cancel (Button)
-    content: >
-        
-add_user_button_:
-    title: Add User (Button)
-    content: >
-