diff --git a/public_html/assets/api/install.php b/public_html/assets/api/install.php
index 067325f..2f2b55e 100644
--- a/public_html/assets/api/install.php
+++ b/public_html/assets/api/install.php
@@ -657,8 +657,10 @@ trait InstallAPI {
         $iw_uid = intval($_POST['iw_uid'] ?? 0);
 
         $rs = qry("
-            SELECT *
-            FROM tbl_install_waitlist
+            SELECT iw.*, CONCAT(m.m_firstname, ' ', m.m_lastname) as iw_created_member
+            FROM tbl_install_waitlist iw
+            LEFT OUTER JOIN tbl_member m
+                ON iw.iw_created_by = m.m_uid
             WHERE iw_uid = '{$iw_uid}'
             LIMIT 1
         ");
diff --git a/public_html/doc/install_wait_list.php b/public_html/doc/install_wait_list.php
index 9eee16c..11bdba0 100644
--- a/public_html/doc/install_wait_list.php
+++ b/public_html/doc/install_wait_list.php
@@ -71,7 +71,7 @@ $sql = "
   ) di ON di.di_wait_uid = iw.iw_uid
   WHERE {$statusWhere}
     $add_where
-  ORDER BY iw_requested_due_date ASC, iw_request_at ASC
+  ORDER BY iw_category, iw_requested_due_date ASC, iw_request_at ASC
 ";
 $rs = $jdb->nQuery($sql, "Load waitlist error");
 
@@ -441,7 +441,8 @@ $categoryLabels = [
       };
 
       InstallWait.job = {
-        type: data.iw_work_type
+        type: data.iw_work_type,
+        createdBy: data.iw_created_member
       };
 
       InstallWait.status = (data.iw_status || '');
@@ -1374,9 +1375,20 @@ $categoryLabels = [
       `;
 
       const tooltipHtml = `
-        Req note: ${r.di_request_note || '-'}<br>
-        CS note: ${r.di_cs_note || '-'}<br>
-        Work note: ${r.di_work_note || '-'}
+        <div class="mb-1">
+          <strong>Req</strong><br>
+          <small>${r.di_request_note || '-'}</small>
+        </div>
+
+        <div class="mb-1">
+          <br><strong>CS</strong><br>
+          <small>${r.di_cs_note || '-'}</small>
+        </div>
+
+        <div>
+          <br><strong>Work</strong><br>
+          <small>${r.di_work_note || '-'}</small>
+        </div>
       `;
 
       tr.setAttribute('data-bs-toggle', 'tooltip');
@@ -1396,7 +1408,13 @@ $categoryLabels = [
 
   function initTooltips() {
     const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-    tooltipTriggerList.forEach(el => new bootstrap.Tooltip(el));
+
+    tooltipTriggerList.forEach(el => {
+      new bootstrap.Tooltip(el, {
+        placement: 'auto',
+        boundary: 'window'
+      });
+    });
   }
 
   function safeFitBounds(bounds, tryCount = 0) {
diff --git a/public_html/js/install_wait_modal.js b/public_html/js/install_wait_modal.js
index 636a7fe..3cb76f5 100644
--- a/public_html/js/install_wait_modal.js
+++ b/public_html/js/install_wait_modal.js
@@ -378,9 +378,16 @@ function initInstallWaitStep3() {
 
 function setStep3Title() {
   const jobLabel = InstallWait.job?.type || '';
-  const acct = InstallWait.customer?.account ? ` of ${InstallWait.customer.account}` : '';
+  const acct = InstallWait.customer?.account ? ` of ${InstallWait.customer.name} (${InstallWait.customer.account})` : '';
+  const createdBy = InstallWait.job?.createdBy || '';
   const titleEl = document.getElementById('iwStep3Title');
-  if (titleEl) titleEl.innerText = `Step 3 of 3 - ${jobLabel}${acct} Detail`;
+  if (titleEl) titleEl.innerHTML = `Step 3 of 3 - ${jobLabel}${acct} Detail
+    ${createdBy ? `
+      <small class="text-muted ms-2">
+        created by ${createdBy}
+      </small>
+    ` : ''}
+  `;
 }
 
 function renderStep3ActionBoxes() {