diff --git a/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po b/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po
index 76a5a61bc..247472cd5 100644
--- a/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po
+++ b/app/plugins/TermsAgreer/resources/locales/en_US/terms_agreer.po
@@ -37,12 +37,21 @@ msgstr "Ignore"
 msgid "enumeration.TAndCEnrollmentModeEnum.IC"
 msgstr "Implied Consent"
 
+msgid "error.TAndCAgreementMissing"
+msgstr "Did not receive agreement for \"{0}\" (T&C {1})"
+
 msgid "field.AgreementCollectors.t_and_c_mode"
 msgstr "Terms and Conditions Mode"
 
+msgid "information.AgreementCollectors.external"
+msgstr "These Terms and Conditions will be loaded in an external browser window. After review, you must return to this window and click \"I Agree\" to continue."
+
 msgid "information.AgreementCollectors.review"
 msgstr "You must review and agree to these Terms and Conditions before continuing."
 
+msgid "information.AgreementCollectors.review.tc"
+msgstr "Review Terms & Conditions"
+
 msgid "result.AgreementCollectors.ignored"
 msgstr "Terms and Conditions collection disabled"
 
diff --git a/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php b/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php
index 751918faa..167b9088c 100644
--- a/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php
+++ b/app/plugins/TermsAgreer/src/Controller/AgreementCollectorsController.php
@@ -75,8 +75,8 @@ public function dispatch(string $id) {
     $TermsAndConditions = TableRegistry::getTableLocator()->get('TermsAndConditions');
 
     $whereClause = [
-      'co_id' => $coId,
-      'status' => SuspendableStatusEnum::Active
+      'TermsAndConditions.co_id' => $coId,
+      'TermsAndConditions.status' => SuspendableStatusEnum::Active
     ];
 
     if(!empty($petition->cou_id)) {
@@ -89,6 +89,7 @@ public function dispatch(string $id) {
     }
 
     $tandc = $TermsAndConditions->find()
+                                ->contain(['MostlyStaticPages'])
                                 ->where($whereClause)
                                 ->order('ordr ASC')
                                 ->all();
@@ -118,7 +119,7 @@ public function dispatch(string $id) {
         if(!isset($data[$key]) || $data[$key] != "1") {
           $ok = false;
 
-          $this->Flash->error("Did not find agreement for T&C " . $tc->id);  // XXX I18n
+          $this->Flash->error(__d('terms_agreer','error.TAndCAgreementMissing', [$tc->description, $tc->id]));
         }
       }
 
diff --git a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
index e5bdfeb61..159fe00ee 100644
--- a/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
+++ b/app/plugins/TermsAgreer/templates/AgreementCollectors/dispatch.inc
@@ -35,40 +35,159 @@ print $this->element('flash', []);
 $this->Field->enableFormEditMode();
 ?>
 
-<p><?= __d('terms_agreer', 'information.AgreementCollectors.review'); ?></p>
+<p><?= __d('terms_agreer', 'information.AgreementCollectors.review') ?></p>
 
 <?php
 
-// Disable submit (Continue) button until all T&C are agreed to
-if($vv_tandc_mode == TAndCEnrollmentModeEnum::ExplicitConsent) {
-  // XXX T&C must be opened and scrolled before checkbox is enabled
-} else {
-  // XXX Checkboxes are all enabled, but must be clicked before Continue button is enabled
-}
-
 // Begin the form
 print $this->Form->create(null, [
   'id'   => 'agreement-form',
   'type' => 'post'
 ]);
 
-print "
-  <table>
-    <tr>
-      <th>Terms and Conditions</th>
-      <th>I Agree</th>
-    </tr>
-";
 
-foreach($vv_tandc as $tc) {
-  print "
-    <tr>
-      <td>" . $tc['description'] . "</td>
-      <td>" . $this->Form->checkbox("tc".$tc['id']) . "</td>
+?>
+  
+<table>
+  <tr>
+    <th><?= __d('controller','TermsAndConditions',[99]) ?></th>
+    <th class="center"><?= __d('operation','review')  ?></th>
+    <th><?= __d('operation','agreement') ?></th>
+  </tr>
+  
+  <?php foreach($vv_tandc as $tc): ?>
+    <tr class="<?= !empty($tc->url) ? 'tc-url' : 'tc-msp' ?>">
+      <td>
+        <?= $tc['description'] ?>
+      </td>
+      <td class="center">
+        <button 
+          data-tc-id="tc<?= $tc['id'] ?>"
+          class="btn btn-primary btn-sm tc-review-button" 
+          type="button">
+          <?= __d('operation','review') ?>
+        </button>
+        <?php if(!empty($tc->url)): // We have a URL based T&C ?>
+          <button
+            data-tc-id="tc<?= $tc['id'] ?>"
+            id="tc<?= $tc['id'] ?>-window-launcher"
+            class="tc-window-launcher invisible"
+            data-tc-url="<?= $tc->url ?>"
+            type="button">
+            <?= __d('operation','review') . ' tc' . $tc['id'] ?>
+          </button>
+        <?php else: // We have a Mostly Static Page based T&C ?>
+          <?= $this->element('TermsAgreer.agreeDialog', ['vv_tc' => $tc]); ?>
+        <?php endif; ?>
+      </td>
+      <td>
+        <div class="form-check tc-agree">
+          <?= 
+            $this->Form->checkbox(
+              'tc'.$tc['id'], 
+              ['id' => 'tc'.$tc['id'], 'class' => 'form-check-input tc-agree-checkbox']
+            ) . 
+            $this->Form->label(
+              'tc'.$tc['id'], 
+              __d('operation','agree'),
+              ['class' => 'form-check-label']
+            ) 
+          ?>
+        </div>
+      </td>
     </tr>
-  ";
-}
+  <?php endforeach; ?>
+  
+</table>
+
+
+<script>
+  // Iterate over our T&Cs to see if they're all checked.
+  function checkAgreements(mode) {
+    let allAgreed = true;
+    $('.tc-agree-checkbox').each(function() {
+      if(!$(this).prop('checked')) {
+        allAgreed = false;
+        if(mode == 'EC') {
+          // We're in Explicit Consent mode, so disable 
+          // the current checkbox; its T&C must be reviewed.
+          $(this).prop('disabled', true);
+        }
+      }
+    });
+    
+    // Enable / disable the "Continue" button.
+    if(allAgreed) {
+      $('.submit input[type="submit"]').prop('disabled', false);
+    } else {
+      $('.submit input[type="submit"]').prop('disabled', true);
+    }
+  }
+
+  // On page load: check agreement states and attach event handlers.
+  $(function() {
+    // Explicit Consent mode ("EC") will disable "I Agree" checkboxes until review.
+    const tcmode = '<?= $vv_tandc_mode ?>';
+    
+    // Run on first load.
+    checkAgreements(tcmode);
+    
+    // Handle "Review" button for URL-based terms and conditions.
+    $('tr.tc-url button.tc-review-button').click(function(e) {
+      e.preventDefault();
+      jsConfirmGeneric(
+        '<?= __d('terms_agreer', 'information.AgreementCollectors.external') ?>', 
+        '', 
+        $(this).attr('data-tc-id')+'-window-launcher', 
+        '<?= __d('operation','continue') ?>', 
+        '<?= __d('operation','cancel') ?>',
+        '<?= __d('terms_agreer','information.AgreementCollectors.review.tc') ?>'
+      );
+    });
+
+    // Launch the external window for URL-based terms and conditions
+    $('tr.tc-url button.tc-window-launcher').click(function(e) {
+      e.preventDefault();
+      
+      // Calculate window size based on screen size so that we 
+      // can handle mobile and to center the window.
+      const winWidth = window.outerWidth / 1.5;
+      const winHeight = window.outerHeight / 1.5;
+      const left = window.screenLeft + ((window.outerWidth - winWidth) / 2);
+      const top = window.screenTop + ((window.outerHeight - winHeight) / 2);
+      
+      // Launch the T&C window with the external URL
+      let tandcExternalWindow = window.open(
+        $(this).attr('data-tc-url'),
+        'tandcExternalWindow',
+        'width=' + winWidth + ',height=' + winHeight + ',left=' + left + ',top=' + top + 
+        ',resizable=yes,scrollbars=yes,toolbar=no,menubar=no,location=no,status=no'
+      );
+      
+      // Enable the T&C checkbox
+      $('#'+$(this).attr('data-tc-id')).prop('disabled', false);
+    });
+
+    // Handle "Review" button for Mostly Static Page-based terms and conditions.
+    // Clicking this will reveal the T&C agree dialog.
+    $('tr.tc-msp button.tc-review-button').click(function(e) {
+      e.preventDefault();
+      $('#'+$(this).attr('data-tc-id')+'-agree-dialog').modal('show');
+    });
+
+    // Handle "Agree" button click from MSP Dialog
+    $('.tc-agree-button').click(function(e) {
+      // Enable and check the T&C checkbox
+      $('#'+$(this).attr('data-tc-id'))
+        .prop('checked', true)
+        .prop('disabled', false)
+        .trigger('change');
+    });
 
-print "
-  </table>
-";
\ No newline at end of file
+    // Check agreements when a checkbox is clicked. 
+    // If all are checked, we'll enable "Continue".
+    $('.tc-agree-checkbox').change(function() {
+      checkAgreements(tcmode);
+    });
+  });
+</script>
\ No newline at end of file
diff --git a/app/plugins/TermsAgreer/templates/element/agreeDialog.php b/app/plugins/TermsAgreer/templates/element/agreeDialog.php
new file mode 100644
index 000000000..0d710126d
--- /dev/null
+++ b/app/plugins/TermsAgreer/templates/element/agreeDialog.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * COmanage Registry T&C Agreement Confirmation Dialog Element
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.2.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ * 
+ * This is the Terms and Conditions Agree dialog - a more specialized dialog intended to be
+ * rendered for each T&C that uses a Mostly Static Page. 
+ * 
+ */
+
+declare(strict_types = 1);
+
+use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
+
+// Mostly Static Pages allow HTML input in the page body.
+// Set up the Symfony HTML Sanitizer to disallow dom elements like <script> and <style>,
+// and run the field through the sanitizer before display.  
+$htmlSanitizer = new HtmlSanitizer(
+  (new HtmlSanitizerConfig())->allowStaticElements()
+);
+
+?>
+
+<?php if(!empty($vv_tc)): ?>
+<div class="modal fade co-dialog tc-agree-dialog" 
+  id="tc<?= $vv_tc->id ?>-agree-dialog" 
+  tabindex="-1" 
+  aria-labelledby="tc<?= $vv_tc->id ?>-dialog-title" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h2 class="modal-title" id="tc<?= $vv_tc->id ?>-dialog-title">
+          <?= __d('terms_agreer','information.AgreementCollectors.review.tc') ?>
+        </h2>
+        <button type="button" class="btn-close nospin" data-bs-dismiss="modal" aria-label="<?= __d('operation', 'close'); ?>"></button>
+      </div>
+      <div class="modal-body">
+        <h1 class="tc-agree-dialog-title"><?= $vv_tc->mostly_static_page->title ?></h1>
+        <div class="tc-content">
+          <?= $htmlSanitizer->sanitize($vv_tc->mostly_static_page->body) ?>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn nospin" data-bs-dismiss="modal">
+          <?= __d('operation', 'cancel'); ?>
+        </button>
+        <button data-tc-id="tc<?= $vv_tc['id'] ?>" type="button" class="btn btn-primary tc-agree-button" data-bs-dismiss="modal">
+          <?= __d('operation', 'agree'); ?>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/resources/locales/en_US/field.po b/app/resources/locales/en_US/field.po
index 386338c05..d1b57220f 100644
--- a/app/resources/locales/en_US/field.po
+++ b/app/resources/locales/en_US/field.po
@@ -1003,7 +1003,7 @@ msgid "TermsAndConditions.mostly_static_page_id"
 msgstr "T&C via Mostly Static Page"
 
 msgid "TermsAndConditions.mostly_static_page_id.desc"
-msgstr "Content of Terms and Conditions, as defined in a Mostly Static Page (this or URL must be specified)"
+msgstr "Content of Terms and Conditions, as defined in a Mostly Static Page<br/>(this or URL must be specified)"
 
 msgid "TermsAndConditions.cou_id.desc"
 msgstr "If set, these Terms and Conditions only apply to People with a Person Role in the specified COU"
@@ -1012,7 +1012,7 @@ msgid "TermsAndConditions.url"
 msgstr "T&C via URL"
 
 msgid "TermsAndConditions.url.desc"
-msgstr "URL to web page holding Terms and Conditions (this or Mostly Static Page must be specified)"
+msgstr "URL to web page holding Terms and Conditions<br/>(this or Mostly Static Page must be specified)"
 
 msgid "Types.case_insensitive"
 msgstr "Case Insensitive"
diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
index 810994840..5243d7b0e 100644
--- a/app/resources/locales/en_US/operation.po
+++ b/app/resources/locales/en_US/operation.po
@@ -54,6 +54,12 @@ msgstr "Add member: "
 msgid "adopt"
 msgstr "Adopt"
 
+msgid "agree"
+msgstr "I Agree"
+
+msgid "agreement"
+msgstr "Agreement"
+
 msgid "apply"
 msgstr "Apply"
 
@@ -258,6 +264,9 @@ msgstr "Login"
 msgid "logout"
 msgstr "Logout"
 
+msgid "manage.a"
+msgstr "Manage {0}"
+
 msgid "next"
 msgstr "Next"
 
@@ -330,6 +339,9 @@ msgstr "Resend"
 msgid "resume"
 msgstr "Resume"
 
+msgid "review"
+msgstr "Review"
+
 msgid "save"
 msgstr "Save"
 
@@ -384,9 +396,15 @@ msgstr "View"
 msgid "view.a"
 msgstr "View {0}"
 
+msgid "visit.msp"
+msgstr "Visit Page"
+
 msgid "visit.link"
 msgstr "Visit link"
 
+msgid "visit.tandc"
+msgstr "Visit Terms and Conditions URL"
+
 msgid "view.PersonRoles.a"
 msgstr "View Role {0}"
 
diff --git a/app/src/Controller/TermsAndConditionsController.php b/app/src/Controller/TermsAndConditionsController.php
index de1fe5ac0..b06349087 100644
--- a/app/src/Controller/TermsAndConditionsController.php
+++ b/app/src/Controller/TermsAndConditionsController.php
@@ -41,6 +41,23 @@ class TermsAndConditionsController extends StandardController {
     ]
   ];
 
+  /**
+   * Callback run prior to the request render.
+   *
+   * @since  COmanage Registry v5.1.0
+   * @param  EventInterface $event Cake Event
+   * @return \Cake\Http\Response   HTTP Response
+   */
+
+  public function beforeRender(\Cake\Event\EventInterface $event) {
+    $this->set('vv_base_url', \Cake\Routing\Router::url(
+      url: "/" . $this->getCOID(),
+      full: true
+    ));
+
+    return parent::beforeRender($event);
+  }
+
   /**
    * Proxy an Agreement on behalf of a Person.
    * 
@@ -148,6 +165,6 @@ public function status() {
     $this->set('vv_tandc_statuses', $this->TermsAndConditions->status((int)$personId));
     $this->set('vv_person_id', (int)$personId);
     
-    $this->set('vv_title', __d('controller', 'TermsAndConditions'));
+    $this->set('vv_title', __d('controller', 'TermsAndConditions', 99));
   }
 }
\ No newline at end of file
diff --git a/app/src/Model/Table/TermsAndConditionsTable.php b/app/src/Model/Table/TermsAndConditionsTable.php
index a9627ec99..199d85224 100644
--- a/app/src/Model/Table/TermsAndConditionsTable.php
+++ b/app/src/Model/Table/TermsAndConditionsTable.php
@@ -45,6 +45,7 @@ class TermsAndConditionsTable extends Table {
   use \App\Lib\Traits\CoLinkTrait;
   use \App\Lib\Traits\PermissionsTrait;
   use \App\Lib\Traits\PrimaryLinkTrait;
+  use \App\Lib\Traits\QueryModificationTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
   
@@ -77,6 +78,10 @@ public function initialize(array $config): void {
     $this->setAllowLookupPrimaryLink(['proxy', 'revoke']);
     $this->setAllowLookupRelatedPrimaryLink(['status' => ['person_id']]);
 
+    $this->setIndexContains([
+      'MostlyStaticPages'
+    ]);
+
     $this->setAutoViewVars([
       'cous' => [
         'type' => 'select',
diff --git a/app/templates/MostlyStaticPages/columns.inc b/app/templates/MostlyStaticPages/columns.inc
index 86f962bac..df58f745b 100644
--- a/app/templates/MostlyStaticPages/columns.inc
+++ b/app/templates/MostlyStaticPages/columns.inc
@@ -45,3 +45,13 @@ $indexColumns = [
     'sortable' => true
   ]
 ];
+
+$rowActions = [
+  [
+    'icon'  => 'arrow_outward',
+    'label' => __d('operation', 'visit.msp'),
+    'callbackUrl' => function($entity) use ($vv_base_url) {
+      return $vv_base_url . '/' . $entity->name;
+    }
+  ]
+];
diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php
index 21c1cbd13..895744215 100644
--- a/app/templates/Standard/add-edit-view.php
+++ b/app/templates/Standard/add-edit-view.php
@@ -272,7 +272,7 @@
 
 /** MVEA Canvas output **/
 if($vv_action != 'add' && !empty($mveas)) {
-  // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields-nav.inc config. 
+  // Pass along the $mveas and any $addMenuLinks defined in templates/.../fields.inc config. 
   print $this->element('mveaCanvas',
     [
       'vv_mveas' => $mveas,
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index bb72c437c..52b6264b6 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -284,12 +284,18 @@
           $actionOrderDefault = $this->Menu->getMenuOrder('Default');
           foreach ($rowActions as $a) {
             $ok = false;
+            $callbackUrl = '';
+            
             if (!empty($a['controller']) && $a['controller'] != $tableName) {
               $relTableName = Inflector::camelize($a['controller']);
   
               if (isset($vv_permission_set[$entity->id][$relTableName][$a['action']])) {
                 $ok = $vv_permission_set[$entity->id][$relTableName][$a['action']];
               }
+            } elseif(!empty($a['callbackUrl']) && is_callable($a['callbackUrl'])) {
+              // We are constructing a URL in a callback function.
+              $callbackUrl = $a['callbackUrl']($entity);
+              $ok = true; // There is no action to test in this case.
             } else {
               $ok = $vv_permission_set[$entity->id][$a['action']];
             }
@@ -306,7 +312,7 @@
               $actionIcon = !empty($a['icon']) ? $a['icon'] : $this->Menu->getMenuIcon('Default');
               $actionIconClass = !empty($a['iconClass']) ? $a['iconClass'] : '';
               $actionClass = !empty($a['class']) ? $a['class'] : '';
-              $actionUrl = ['action' => $a['action'], $entity->id];
+              $actionUrl = !empty($callbackUrl) ? $callbackUrl : ['action' => $a['action'], $entity->id];
               $actionLabel = !empty($a['label']) ? $a['label'] : __d('operation', $a['action']);
   
               if (!empty($a['controller']) && $a['controller'] != $tableName) {
diff --git a/app/templates/TermsAndConditions/columns.inc b/app/templates/TermsAndConditions/columns.inc
index bd0113d87..620e141ba 100644
--- a/app/templates/TermsAndConditions/columns.inc
+++ b/app/templates/TermsAndConditions/columns.inc
@@ -43,4 +43,19 @@ $indexColumns = [
     'type' => 'fk',
     'sortable' => true
   ]
-];
\ No newline at end of file
+];
+
+$rowActions = [
+  [
+    'icon'  => 'arrow_outward',
+    'label' => __d('operation', 'visit.tandc'),
+    'callbackUrl' => function($entity) use ($vv_base_url) {
+      // There should always be either a Mostly Static Page or a URL to reference. 
+      if(!empty($entity->mostly_static_page->name)) {
+        // The T&C is a mostly static page. Provide a link to it.
+        return $vv_base_url . '/' . $entity->mostly_static_page->name;
+      }
+      return $entity->url;
+    }
+  ]
+];
diff --git a/app/templates/TermsAndConditions/fields.inc b/app/templates/TermsAndConditions/fields.inc
index aa667a564..cbadbd763 100644
--- a/app/templates/TermsAndConditions/fields.inc
+++ b/app/templates/TermsAndConditions/fields.inc
@@ -28,8 +28,21 @@
 $fields = [
   'description',
   'status',
+  'mostly_static_page_id' => [
+    'afterField' =>
+      $this->Html->link(
+        __d('operation','manage.a',[__d('controller','MostlyStaticPages', 99)]),
+        [
+          'controller' => 'MostlyStaticPages', 
+          'action' => 'index',
+          '?' => [
+            'co_id' => $vv_cur_co->id
+          ]
+        ],
+        ['class' => 'manage-link']
+      )
+  ],
   'url',
-  'mostly_static_page_id',
   'cou_id',
   'agreement_duration',
   'agree_to_updates',
diff --git a/app/templates/TermsAndConditions/status.php b/app/templates/TermsAndConditions/status.php
index 7a624ef87..913ef833c 100644
--- a/app/templates/TermsAndConditions/status.php
+++ b/app/templates/TermsAndConditions/status.php
@@ -42,8 +42,7 @@
   <table id="termsandconditionsstatus-table" class="index-table list-mode with-actions">
     <thead>
       <tr>
-        <td class="actions"></td>
-        <th><?= __d('controller', 'TermsAndConditions', [1]); ?></th>
+        <th class="with-field-actions"><?= __d('controller', 'TermsAndConditions', [1]); ?></th>
         <th><?= __d('field', 'status'); ?></th>
         <th><?= __d('field', 'changelog.actor_identifier'); ?></th>
         <th><?= __d('field', 'timestamp.tz', [$vv_tz->getName()]); ?></th>
@@ -53,8 +52,9 @@
     </tbody>
       <?php foreach($vv_tandc_statuses as $t): ?>
       <tr>
-        <td class="actions">
-          <div class="field-actions">
+        <td class="with-field-actions">
+          <div class="field-actions-container">
+            <div class="field-actions">
           <?php
             // Build the row actions
             $action_args = array();
@@ -110,8 +110,9 @@
             }
           ?>
           </div>
+            <?= $t['tandc']->description; ?>
+          </div>
         </td>
-        <td><?= $t['tandc']->description; ?></td>
         <td><?= __d('enumeration', 'TAndCStatusEnum.'.$t['status']); ?></td>
         <td><?= $t['agreement']->identifier ?? "" ?></td>
         <td><?= 
diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php
index 5b6c66297..68bce6f46 100644
--- a/app/templates/element/menuPanel.php
+++ b/app/templates/element/menuPanel.php
@@ -436,7 +436,7 @@
         <li>
           <h3><?= __d('menu','co.configuration.title') ?></h3>
           <p class="menu-panel-links-desc"><?= __d('menu','co.configuration.desc') ?></p>
-          <ul class="menu-panel-links-inner">
+          <ul class="menu-panel-links-inner col2">
             <li>
               <?php
                 $menuUrl = $this->Url->build(
@@ -539,6 +539,22 @@
                 <div class="menu-panel-link-text"><?= __d('controller','Servers', [2]) ?></div>
               </a>
             </li>
+            <li>
+              <?php
+                $menuUrl = $this->Url->build(
+                  ['plugin'       => null,
+                   'controller'   => 'terms_and_conditions',
+                   'action'       => 'index',
+                   '?'            => [
+                     'co_id' => $vv_cur_co->id
+                   ]]
+                );
+              ?>
+              <a href="<?= $menuUrl ?>">
+                <div class="material-symbols-outlined" aria-hidden="true">policy</div>
+                <div class="menu-panel-link-text"><?= __d('controller', 'TermsAndConditions', [99]) ?></div>
+              </a>
+            </li>
             <li>
               <?php
                 $menuUrl = $this->Url->build(
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index c07b7a294..5a9a53185 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1639,6 +1639,12 @@ ul.form-list select {
 ul.form-list .not-set {
   padding: 4px 6px;
 }
+ul.form-list .manage-link {
+  display: inline-block;
+  margin: 0.5em 0;
+  font-size: 0.9em;
+  font-style: italic;
+}
 .form-select:disabled {
   background-color: var(--cmg-color-bg-009);
 }
@@ -1715,6 +1721,10 @@ html.dark-mode .form-check-input:checked {
   display: inline;
   margin: 0;
 }
+.form-check-input:disabled ~ .form-check-label, 
+.form-check-input[disabled] ~ .form-check-label {
+  opacity: 0.65; /* adjust Bootstrapism for accessibility */
+}
 #content .material-symbols,
 #content .material-symbols-outlined {
   font-size: 17px;
@@ -2111,11 +2121,12 @@ body.start .submit {
   gap: 0.5em;
 }
 /* DIALOG BOX */
-#dialog .modal-header {
+.co-dialog .modal-header {
+  justify-content: space-between;
   background-color: var(--cmg-color-bg-004);
   border-bottom: none;
 }
-#dialog .modal-footer {
+.co-dialog .modal-footer {
   border-top: none;
 }
 .modal-header .btn-close {
@@ -2129,6 +2140,9 @@ body.start .submit {
   gap: 0.25em;
   margin: auto;
 }
+td .co-dialog {
+  text-align: left;
+}
 /* MVEA & STANDARD MODAL */
 .cm-modal .modal-header {
   padding: 0.5rem 1rem;
@@ -2291,6 +2305,22 @@ ul.petition-attrs-subset li {
 .petition-attrs-subset-label {
   color: var(--cmg-color-txt-soft);
 }
+/* TERMS AND CONDITIONS */
+.tc-agree {
+  font-size: 1.2em;
+}
+body.termsandconditions ul.form-list li.fields-mostly_static_page_id,
+body.termsandconditions ul.form-list li.fields-url {
+  border-left: 2px solid var(--cmg-color-highlight-012);
+}
+.tc-agree-dialog .modal-body h1,
+.tc-agree-dialog .modal-body h2,
+.tc-agree-dialog .modal-body h3,
+.tc-agree-dialog .modal-body h4,
+.tc-agree-dialog .modal-body h5,
+.tc-agree-dialog .modal-body h6 {
+  margin-bottom: 0.5em;
+}
 /* MOSTLY STATIC PAGES */
 body.pages.logged-out #top-bar,
 body.pages.logged-out #breadcrumbs {
diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index cc5aa9ad2..0d06aa9c4 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -344,6 +344,9 @@
   #main-menu .menu-panel .config-platform-notice {
     margin: 10em 0 4em;
   }
+  .menu-panel ul.col2 {
+    columns: 2;
+  }
   /* PEOPLE PICKER */
   #cm-people-picker {
     flex-direction: row;
@@ -596,6 +599,11 @@
   #changelog .accordion-body {
     overflow-x: unset;
   }
+  /* SPECIAL */
+  .fields-mostly_static_page_id .field-info {
+    display: flex;
+    gap: 1em;
+  }
   /* FOOTER */
   #co-footer {
     position: static;
diff --git a/app/webroot/js/comanage/comanage.js b/app/webroot/js/comanage/comanage.js
index 41af5426e..c0d63c207 100644
--- a/app/webroot/js/comanage/comanage.js
+++ b/app/webroot/js/comanage/comanage.js
@@ -139,7 +139,7 @@ function jsConfirmGeneric(txt, confirmUrl, clickId, confirmbtxt, cancelbtxt, tit
   // Set the body text of the dialog
   $("#dialog-text").text(bodyText);
   
-  $("#dialog-confirm-button").click(function() {
+  $("#dialog-confirm-button").off('click').on('click', function() {
     if(clickId !== undefined) {
       // If we have a clickId, set the dialog confirmation button to click the DOM
       // element referenced by it.