diff --git a/src/options/options.css b/src/options/options.css
index dabfe1e..4c9a11e 100644
--- a/src/options/options.css
+++ b/src/options/options.css
@@ -68,12 +68,19 @@ header h1 { font-size: 24px; font-weight: 600; }
 }
 
 /* Table */
-.mapping-table { width: 100%; border-collapse: collapse; margin-bottom: 16px; }
+.mapping-table { width: 100%; border-collapse: collapse; margin-bottom: 16px; table-layout: fixed; }
+.mapping-table th:nth-child(1) { width: 35%; }
+.mapping-table th:nth-child(2) { width: 35%; }
+.mapping-table th:nth-child(3) { width: 12%; }
+.mapping-table th:nth-child(4) { width: 8%; }
+.mapping-table th:nth-child(5) { width: 6%; }
+.mapping-table th:nth-child(6) { width: 4%; }
 .mapping-table th {
   text-align: left; font-size: 11px; font-weight: 600;
   text-transform: uppercase; letter-spacing: 0.5px;
   color: #6b7280; padding: 8px 10px; border-bottom: 1px solid #e5e7eb;
 }
+.mapping-table td { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .mapping-table td {
   padding: 8px 10px; border-bottom: 1px solid #f3f4f6; font-size: 13px;
 }
diff --git a/src/options/options.html b/src/options/options.html
index bcb5290..22a0e8d 100644
--- a/src/options/options.html
+++ b/src/options/options.html
@@ -368,39 +368,6 @@
       <div id="versionHistoryList" style="font-size:13px"></div>
     </section>
 
-    <!-- Organization -->
-    <section class="section">
-      <h2>Organization</h2>
-      <p class="section-desc">Join an organization to receive required substitution rules and secret scanner patterns from your admin. Org rules merge with your personal rules and cannot be disabled.</p>
-
-      <div id="orgNotJoined">
-        <div style="display:flex;gap:8px;flex-wrap:wrap;margin-bottom:8px">
-          <input type="text" id="orgInviteCode" placeholder="Invite code" style="flex:1;min-width:140px;font-size:12px;padding:5px 8px;border:1px solid #d1d5db;border-radius:6px;font-family:monospace">
-          <button class="btn btn-primary" id="btnJoinOrgCode">Join</button>
-        </div>
-        <div style="display:flex;gap:8px;flex-wrap:wrap;margin-bottom:8px">
-          <input type="url" id="orgPolicyUrl" placeholder="Policy URL (https://…/policy.json)" style="flex:1;min-width:200px;font-size:12px;padding:5px 8px;border:1px solid #d1d5db;border-radius:6px">
-          <button class="btn" id="btnJoinOrgUrl">Join by URL</button>
-        </div>
-      </div>
-
-      <div id="orgJoined" style="display:none">
-        <div style="padding:10px;background:#f0fdf4;border:1px solid #86efac;border-radius:6px;margin-bottom:8px">
-          <div style="display:flex;justify-content:space-between;align-items:center;flex-wrap:wrap;gap:8px">
-            <div>
-              <strong id="orgNameDisplay" style="font-size:13px"></strong>
-              <span id="orgPolicyVersion" style="font-size:11px;color:#6b7280;margin-left:6px"></span>
-            </div>
-            <button class="btn btn-sm btn-danger" id="btnLeaveOrg">Leave</button>
-          </div>
-          <div id="orgComplianceStatus" style="font-size:12px;margin-top:6px"></div>
-          <div id="orgRequiredMappings" style="font-size:11px;color:#6b7280;margin-top:4px"></div>
-        </div>
-      </div>
-
-      <div id="orgStatus" style="font-size:12px;min-height:16px"></div>
-    </section>
-
     <section class="section">
       <h2>Transfer Data</h2>
       <p class="section-desc">Export all your identities, mappings, and settings to a file. Encrypted exports require a password to decrypt.</p>