diff --git a/admin/pages.php b/admin/pages.php
index 9c67e4a..508252d 100644
--- a/admin/pages.php
+++ b/admin/pages.php
@@ -36,6 +36,7 @@ function dm_render_admin_page() {
         $current_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'settings';
         $tabs = array(
             'settings' => __( 'Settings', 'wp-domain-mapping' ),
+            'dns-setup' => __( 'DNS Setup', 'wp-domain-mapping' ),
             'health' => __( 'Domain Health', 'wp-domain-mapping' ),
             'import-export' => __( 'Import/Export', 'wp-domain-mapping' )
         );
@@ -81,34 +82,49 @@ function dm_render_admin_page() {
         }
         ?>
 
-        <!-- Tab Navigation -->
-        <div class="domain-mapping-tabs">
-            <?php foreach ( $tabs as $tab_key => $tab_label ) : ?>
-                <button type="button" class="domain-mapping-tab <?php echo $current_tab === $tab_key ? 'active' : ''; ?>"
-                        data-tab="<?php echo esc_attr( $tab_key ); ?>"
-                        onclick="switchTab('<?php echo esc_js( $tab_key ); ?>')">
-                    <?php echo esc_html( $tab_label ); ?>
-                </button>
-            <?php endforeach; ?>
-        </div>
-
-        <!-- Tab Content -->
-        <div class="domain-mapping-content">
-            <!-- Settings Tab -->
-            <div class="domain-mapping-section" data-section="settings" <?php echo $current_tab !== 'settings' ? 'style="display:none;"' : ''; ?>>
-                <?php dm_render_settings_content(); ?>
+        <!-- Main Configuration Card -->
+        <div class="card domain-mapping-card">
+            <!-- Tab Navigation inside card -->
+            <div class="domain-mapping-tabs">
+                <?php foreach ( $tabs as $tab_key => $tab_label ) : ?>
+                    <button type="button" class="domain-mapping-tab <?php echo $current_tab === $tab_key ? 'active' : ''; ?>"
+                            data-tab="<?php echo esc_attr( $tab_key ); ?>"
+                            onclick="switchTab('<?php echo esc_js( $tab_key ); ?>')">
+                        <?php echo esc_html( $tab_label ); ?>
+                    </button>
+                <?php endforeach; ?>
             </div>
 
-            <!-- Health Tab -->
-            <div class="domain-mapping-section" data-section="health" <?php echo $current_tab !== 'health' ? 'style="display:none;"' : ''; ?>>
-                <?php dm_render_health_content(); ?>
-            </div>
+            <!-- Tab Content -->
+            <div class="domain-mapping-content">
+                <!-- Settings Tab -->
+                <div class="domain-mapping-section" data-section="settings" <?php echo $current_tab !== 'settings' ? 'style="display:none;"' : ''; ?>>
+                    <?php dm_render_settings_content(); ?>
+                </div>
 
-            <!-- Import/Export Tab -->
-            <div class="domain-mapping-section" data-section="import-export" <?php echo $current_tab !== 'import-export' ? 'style="display:none;"' : ''; ?>>
-                <?php dm_render_import_export_content(); ?>
+                <!-- DNS Setup Tab -->
+                <div class="domain-mapping-section" data-section="dns-setup" <?php echo $current_tab !== 'dns-setup' ? 'style="display:none;"' : ''; ?>>
+                    <?php
+                    $dm_ipaddress = get_site_option( 'dm_ipaddress', '' );
+                    $dm_cname = get_site_option( 'dm_cname', '' );
+                    dm_render_dns_content( $dm_ipaddress, $dm_cname );
+                    ?>
+                </div>
+
+                <!-- Domain Health Tab -->
+                <div class="domain-mapping-section" data-section="health" <?php echo $current_tab !== 'health' ? 'style="display:none;"' : ''; ?>>
+                    <?php dm_render_health_content(); ?>
+                </div>
+
+                <!-- Import/Export Tab -->
+                <div class="domain-mapping-section" data-section="import-export" <?php echo $current_tab !== 'import-export' ? 'style="display:none;"' : ''; ?>>
+                    <?php dm_render_import_export_content(); ?>
+                </div>
             </div>
         </div>
+
+        <!-- Installation Check Card (independent) -->
+        <?php dm_render_installation_check(); ?>
     </div>
 
     <script>
@@ -131,7 +147,7 @@ function dm_render_admin_page() {
 }
 
 /**
- * Render settings tab content
+ * Render settings tab content (without card wrapper)
  */
 function dm_render_settings_content() {
     // Get current options
@@ -154,137 +170,243 @@ function dm_render_settings_content() {
         }
     }
     ?>
-    <div class="card domain-mapping-card">
-        <form method="POST">
-            <input type="hidden" name="action" value="update" />
-            <?php wp_nonce_field( 'domain_mapping' ); ?>
+    <form method="POST">
+        <input type="hidden" name="action" value="update" />
+        <?php wp_nonce_field( 'domain_mapping' ); ?>
 
-            <h2><?php esc_html_e( 'Server Configuration', 'wp-domain-mapping' ); ?></h2>
-            <p><?php esc_html_e( 'Configure the IP address or CNAME for domain mapping.', 'wp-domain-mapping' ); ?></p>
+        <h2><?php esc_html_e( 'Server Configuration', 'wp-domain-mapping' ); ?></h2>
+        <p><?php esc_html_e( 'Configure the IP address or CNAME for domain mapping.', 'wp-domain-mapping' ); ?></p>
 
-            <table class="form-table" role="presentation">
-                <tr>
-                    <th scope="row"><label for="ipaddress"><?php esc_html_e( 'Server IP Address:', 'wp-domain-mapping' ); ?></label></th>
-                    <td>
-                        <input type="text" id="ipaddress" name="ipaddress" value="<?php echo esc_attr( $dm_ipaddress ); ?>" class="regular-text" />
+        <table class="form-table" role="presentation">
+            <tr>
+                <th scope="row"><label for="ipaddress"><?php esc_html_e( 'Server IP Address:', 'wp-domain-mapping' ); ?></label></th>
+                <td>
+                    <input type="text" id="ipaddress" name="ipaddress" value="<?php echo esc_attr( $dm_ipaddress ); ?>" class="regular-text" />
+                    <p class="description">
+                        <?php esc_html_e( 'Enter the IP address(es) users should point their DNS A records to. Use commas to separate multiple IPs.', 'wp-domain-mapping' ); ?>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><label for="cname"><?php esc_html_e( 'Server CNAME Domain:', 'wp-domain-mapping' ); ?></label></th>
+                <td>
+                    <input type="text" id="cname" name="cname" value="<?php echo esc_attr( $dm_cname ); ?>" class="regular-text" placeholder="server.example.com" />
+                    <p class="description">
+                        <?php
+                        printf(
+                            /* translators: %s: IDN warning message */
+                            esc_html__( 'Use a CNAME instead of an IP (overrides IP settings). %s', 'wp-domain-mapping' ),
+                            dm_idn_warning()
+                        );
+                        ?>
+                    </p>
+                </td>
+            </tr>
+        </table>
+
+        <h3><?php esc_html_e( 'Domain Options', 'wp-domain-mapping' ); ?></h3>
+        <table class="form-table" role="presentation">
+            <tr>
+                <th scope="row"></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><?php esc_html_e( 'Domain Options', 'wp-domain-mapping' ); ?></legend>
+                        <label for="dm_remote_login">
+                            <input type="checkbox" name="dm_remote_login" id="dm_remote_login" value="1" <?php checked( $dm_remote_login, 1 ); ?> />
+                            <?php esc_html_e( 'Enable Remote Login', 'wp-domain-mapping' ); ?>
+                        </label>
                         <p class="description">
-                            <?php esc_html_e( 'Enter the IP address(es) users should point their DNS A records to. Use commas to separate multiple IPs.', 'wp-domain-mapping' ); ?>
+                            <?php esc_html_e( 'Allows users to log in from mapped domains and be redirected to the original domain for authentication.', 'wp-domain-mapping' ); ?>
                         </p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><label for="cname"><?php esc_html_e( 'Server CNAME Domain:', 'wp-domain-mapping' ); ?></label></th>
-                    <td>
-                        <input type="text" id="cname" name="cname" value="<?php echo esc_attr( $dm_cname ); ?>" class="regular-text" placeholder="server.example.com" />
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><?php esc_html_e( 'Permanent Redirect', 'wp-domain-mapping' ); ?></legend>
+                        <label for="permanent_redirect">
+                            <input type="checkbox" name="permanent_redirect" id="permanent_redirect" value="1" <?php checked( $dm_301_redirect, 1 ); ?> />
+                            <?php esc_html_e( 'Use Permanent Redirect (301)', 'wp-domain-mapping' ); ?>
+                        </label>
                         <p class="description">
-                            <?php
-                            printf(
-                                /* translators: %s: IDN warning message */
-                                esc_html__( 'Use a CNAME instead of an IP (overrides IP settings). %s', 'wp-domain-mapping' ),
-                                dm_idn_warning()
-                            );
-                            ?>
+                            <?php esc_html_e( 'Use 301 redirects instead of 302 redirects. This is better for SEO but may cause caching issues.', 'wp-domain-mapping' ); ?>
                         </p>
-                    </td>
-                </tr>
-            </table>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><?php esc_html_e( 'User Settings', 'wp-domain-mapping' ); ?></legend>
+                        <label for="dm_user_settings">
+                            <input type="checkbox" name="dm_user_settings" id="dm_user_settings" value="1" <?php checked( $dm_user_settings, 1 ); ?> />
+                            <?php esc_html_e( 'Enable User Domain Mapping Page', 'wp-domain-mapping' ); ?>
+                        </label>
+                        <p class="description">
+                            <?php esc_html_e( 'Allow site administrators to manage their domain mappings from the Tools menu.', 'wp-domain-mapping' ); ?>
+                        </p>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><?php esc_html_e( 'Redirect Admin', 'wp-domain-mapping' ); ?></legend>
+                        <label for="always_redirect_admin">
+                            <input type="checkbox" name="always_redirect_admin" id="always_redirect_admin" value="1" <?php checked( $dm_redirect_admin, 1 ); ?> />
+                            <?php esc_html_e( 'Redirect Admin Pages to Original Domain', 'wp-domain-mapping' ); ?>
+                        </label>
+                        <p class="description">
+                            <?php esc_html_e( 'Force admin pages to use the original WordPress domain instead of the mapped domain.', 'wp-domain-mapping' ); ?>
+                        </p>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><?php esc_html_e( 'Disable Primary Domain', 'wp-domain-mapping' ); ?></legend>
+                        <label for="dm_no_primary_domain">
+                            <input type="checkbox" name="dm_no_primary_domain" id="dm_no_primary_domain" value="1" <?php checked( $dm_no_primary_domain, 1 ); ?> />
+                            <?php esc_html_e( 'Disable Primary Domain Check', 'wp-domain-mapping' ); ?>
+                        </label>
+                        <p class="description">
+                            <?php esc_html_e( 'Do not redirect to the primary domain, but allow access through any mapped domain.', 'wp-domain-mapping' ); ?>
+                        </p>
+                    </fieldset>
+                </td>
+            </tr>
+        </table>
 
-            <h3><?php esc_html_e( 'Domain Options', 'wp-domain-mapping' ); ?></h3>
-            <table class="form-table" role="presentation">
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><?php esc_html_e( 'Domain Options', 'wp-domain-mapping' ); ?></legend>
-                            <label for="dm_remote_login">
-                                <input type="checkbox" name="dm_remote_login" id="dm_remote_login" value="1" <?php checked( $dm_remote_login, 1 ); ?> />
-                                <?php esc_html_e( 'Enable Remote Login', 'wp-domain-mapping' ); ?>
-                            </label>
-                            <p class="description">
-                                <?php esc_html_e( 'Allows users to log in from mapped domains and be redirected to the original domain for authentication.', 'wp-domain-mapping' ); ?>
-                            </p>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><?php esc_html_e( 'Permanent Redirect', 'wp-domain-mapping' ); ?></legend>
-                            <label for="permanent_redirect">
-                                <input type="checkbox" name="permanent_redirect" id="permanent_redirect" value="1" <?php checked( $dm_301_redirect, 1 ); ?> />
-                                <?php esc_html_e( 'Use Permanent Redirect (301)', 'wp-domain-mapping' ); ?>
-                            </label>
-                            <p class="description">
-                                <?php esc_html_e( 'Use 301 redirects instead of 302 redirects. This is better for SEO but may cause caching issues.', 'wp-domain-mapping' ); ?>
-                            </p>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><?php esc_html_e( 'User Settings', 'wp-domain-mapping' ); ?></legend>
-                            <label for="dm_user_settings">
-                                <input type="checkbox" name="dm_user_settings" id="dm_user_settings" value="1" <?php checked( $dm_user_settings, 1 ); ?> />
-                                <?php esc_html_e( 'Enable User Domain Mapping Page', 'wp-domain-mapping' ); ?>
-                            </label>
-                            <p class="description">
-                                <?php esc_html_e( 'Allow site administrators to manage their domain mappings from the Tools menu.', 'wp-domain-mapping' ); ?>
-                            </p>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><?php esc_html_e( 'Redirect Admin', 'wp-domain-mapping' ); ?></legend>
-                            <label for="always_redirect_admin">
-                                <input type="checkbox" name="always_redirect_admin" id="always_redirect_admin" value="1" <?php checked( $dm_redirect_admin, 1 ); ?> />
-                                <?php esc_html_e( 'Redirect Admin Pages to Original Domain', 'wp-domain-mapping' ); ?>
-                            </label>
-                            <p class="description">
-                                <?php esc_html_e( 'Force admin pages to use the original WordPress domain instead of the mapped domain.', 'wp-domain-mapping' ); ?>
-                            </p>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><?php esc_html_e( 'Disable Primary Domain', 'wp-domain-mapping' ); ?></legend>
-                            <label for="dm_no_primary_domain">
-                                <input type="checkbox" name="dm_no_primary_domain" id="dm_no_primary_domain" value="1" <?php checked( $dm_no_primary_domain, 1 ); ?> />
-                                <?php esc_html_e( 'Disable Primary Domain Check', 'wp-domain-mapping' ); ?>
-                            </label>
-                            <p class="description">
-                                <?php esc_html_e( 'Do not redirect to the primary domain, but allow access through any mapped domain.', 'wp-domain-mapping' ); ?>
-                            </p>
-                        </fieldset>
-                    </td>
-                </tr>
-            </table>
-
-            <p class="submit">
-                <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Configuration', 'wp-domain-mapping' ); ?>" />
-                <a href="<?php echo esc_url( admin_url( 'network/sites.php?page=domains' ) ); ?>" class="button button-secondary">
-                    <?php esc_html_e( 'Manage Domains', 'wp-domain-mapping' ); ?>
-                </a>
-            </p>
-        </form>
-    </div>
-
-    <!-- DNS Instructions and Installation Check sections from settings-page.php -->
-    <?php dm_render_dns_instructions( $dm_ipaddress, $dm_cname ); ?>
-    <?php dm_render_installation_check(); ?>
+        <p class="submit">
+            <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Configuration', 'wp-domain-mapping' ); ?>" />
+            <a href="<?php echo esc_url( admin_url( 'network/sites.php?page=domains' ) ); ?>" class="button button-secondary">
+                <?php esc_html_e( 'Manage Domains', 'wp-domain-mapping' ); ?>
+            </a>
+        </p>
+    </form>
     <?php
 }
 
 /**
- * Render DNS instructions
+ * Render DNS setup tab content (without card wrapper)
+ */
+function dm_render_dns_content( $dm_ipaddress, $dm_cname ) {
+    ?>
+    <h2><?php esc_html_e( 'DNS Setup Instructions', 'wp-domain-mapping' ); ?></h2>
+
+    <div class="dns-instructions">
+        <?php if ( ! empty( $dm_cname ) ) : ?>
+            <h3><?php esc_html_e( 'CNAME Method (Recommended)', 'wp-domain-mapping' ); ?></h3>
+            <p>
+                <?php
+                printf(
+                    /* translators: %s: CNAME value */
+                    esc_html__( 'Tell your users to add a DNS "CNAME" record for their domain pointing to: %s', 'wp-domain-mapping' ),
+                    '<code>' . esc_html( $dm_cname ) . '</code>'
+                );
+                ?>
+            </p>
+            <div class="dns-example">
+                <h4><?php esc_html_e( 'Example DNS Record', 'wp-domain-mapping' ); ?></h4>
+                <table class="widefat striped">
+                    <thead>
+                        <tr>
+                            <th><?php esc_html_e( 'Type', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'Name', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'Value', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'TTL', 'wp-domain-mapping' ); ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td><code>CNAME</code></td>
+                            <td><code>@</code> <?php esc_html_e( '(or empty)', 'wp-domain-mapping' ); ?></td>
+                            <td><code><?php echo esc_html( $dm_cname ); ?></code></td>
+                            <td><code>3600</code></td>
+                        </tr>
+                        <tr>
+                            <td><code>CNAME</code></td>
+                            <td><code>www</code></td>
+                            <td><code><?php echo esc_html( $dm_cname ); ?></code></td>
+                            <td><code>3600</code></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        <?php endif; ?>
+
+        <?php if ( ! empty( $dm_ipaddress ) ) : ?>
+            <h3><?php esc_html_e( 'A Record Method', 'wp-domain-mapping' ); ?></h3>
+            <p>
+                <?php
+                printf(
+                    /* translators: %s: IP address(es) */
+                    esc_html__( 'Tell your users to add a DNS "A" record for their domain pointing to: %s', 'wp-domain-mapping' ),
+                    '<code>' . esc_html( $dm_ipaddress ) . '</code>'
+                );
+                ?>
+            </p>
+            <div class="dns-example">
+                <h4><?php esc_html_e( 'Example DNS Record', 'wp-domain-mapping' ); ?></h4>
+                <table class="widefat striped">
+                    <thead>
+                        <tr>
+                            <th><?php esc_html_e( 'Type', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'Name', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'Value', 'wp-domain-mapping' ); ?></th>
+                            <th><?php esc_html_e( 'TTL', 'wp-domain-mapping' ); ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php
+                        $ips = array_map( 'trim', explode( ',', $dm_ipaddress ) );
+                        foreach ( $ips as $index => $ip ) :
+                        ?>
+                        <tr>
+                            <td><code>A</code></td>
+                            <td><code>@</code> <?php esc_html_e( '(or empty)', 'wp-domain-mapping' ); ?></td>
+                            <td><code><?php echo esc_html( $ip ); ?></code></td>
+                            <td><code>3600</code></td>
+                        </tr>
+                        <?php endforeach; ?>
+                        <tr>
+                            <td><code>A</code></td>
+                            <td><code>www</code></td>
+                            <td><code><?php echo esc_html( $ips[0] ); ?></code></td>
+                            <td><code>3600</code></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        <?php endif; ?>
+
+        <?php if ( empty( $dm_ipaddress ) && empty( $dm_cname ) ) : ?>
+            <div class="notice notice-warning">
+                <p>
+                    <?php esc_html_e( 'Please configure either a Server IP Address or CNAME in the Settings tab to provide DNS setup instructions.', 'wp-domain-mapping' ); ?>
+                </p>
+            </div>
+        <?php endif; ?>
+
+        <h3><?php esc_html_e( 'Additional DNS Tips', 'wp-domain-mapping' ); ?></h3>
+        <ul class="dns-tips">
+            <li><?php esc_html_e( 'Most DNS changes take 24-48 hours to fully propagate worldwide.', 'wp-domain-mapping' ); ?></li>
+            <li><?php esc_html_e( 'For "www" subdomain, create a separate CNAME record with "www" as the name pointing to the same value.', 'wp-domain-mapping' ); ?></li>
+            <li><?php esc_html_e( 'If you\'re using Cloudflare or similar services, you may need to adjust proxy settings.', 'wp-domain-mapping' ); ?></li>
+            <li><?php esc_html_e( 'For SSL to work properly, make sure your web server is configured with the appropriate SSL certificates for mapped domains.', 'wp-domain-mapping' ); ?></li>
+        </ul>
+    </div>
+    <?php
+}
+
+/**
+ * Render DNS instructions (independent card) - kept for backward compatibility
  */
 function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
     ?>
@@ -311,6 +433,7 @@ function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
                                 <th><?php esc_html_e( 'Type', 'wp-domain-mapping' ); ?></th>
                                 <th><?php esc_html_e( 'Name', 'wp-domain-mapping' ); ?></th>
                                 <th><?php esc_html_e( 'Value', 'wp-domain-mapping' ); ?></th>
+                                <th><?php esc_html_e( 'TTL', 'wp-domain-mapping' ); ?></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -318,6 +441,13 @@ function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
                                 <td><code>CNAME</code></td>
                                 <td><code>@</code> <?php esc_html_e( '(or empty)', 'wp-domain-mapping' ); ?></td>
                                 <td><code><?php echo esc_html( $dm_cname ); ?></code></td>
+                                <td><code>3600</code></td>
+                            </tr>
+                            <tr>
+                                <td><code>CNAME</code></td>
+                                <td><code>www</code></td>
+                                <td><code><?php echo esc_html( $dm_cname ); ?></code></td>
+                                <td><code>3600</code></td>
                             </tr>
                         </tbody>
                     </table>
@@ -343,6 +473,7 @@ function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
                                 <th><?php esc_html_e( 'Type', 'wp-domain-mapping' ); ?></th>
                                 <th><?php esc_html_e( 'Name', 'wp-domain-mapping' ); ?></th>
                                 <th><?php esc_html_e( 'Value', 'wp-domain-mapping' ); ?></th>
+                                <th><?php esc_html_e( 'TTL', 'wp-domain-mapping' ); ?></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -354,8 +485,15 @@ function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
                                 <td><code>A</code></td>
                                 <td><code>@</code> <?php esc_html_e( '(or empty)', 'wp-domain-mapping' ); ?></td>
                                 <td><code><?php echo esc_html( $ip ); ?></code></td>
+                                <td><code>3600</code></td>
                             </tr>
                             <?php endforeach; ?>
+                            <tr>
+                                <td><code>A</code></td>
+                                <td><code>www</code></td>
+                                <td><code><?php echo esc_html( $ips[0] ); ?></code></td>
+                                <td><code>3600</code></td>
+                            </tr>
                         </tbody>
                     </table>
                 </div>
@@ -382,7 +520,7 @@ function dm_render_dns_instructions( $dm_ipaddress, $dm_cname ) {
 }
 
 /**
- * Render installation check
+ * Render installation check (independent card)
  */
 function dm_render_installation_check() {
     ?>
@@ -467,24 +605,44 @@ function dm_render_installation_check() {
                 </tr>
                 <tr>
                     <td>
-                        <?php if ( ! defined( 'COOKIE_DOMAIN' ) ) : ?>
+                        <?php
+                        // Check COOKIE_DOMAIN configuration in a performance-friendly way
+                        $cookie_domain_status = dm_check_cookie_domain_status();
+
+                        if ($cookie_domain_status['is_optimal']): ?>
                             <span class="dashicons dashicons-yes-alt" style="color: #46b450;"></span>
-                        <?php else : ?>
+                        <?php elseif ($cookie_domain_status['has_warning']): ?>
+                            <span class="dashicons dashicons-warning" style="color: #f56e28;"></span>
+                        <?php else: ?>
                             <span class="dashicons dashicons-no-alt" style="color: #dc3232;"></span>
                         <?php endif; ?>
                     </td>
-                    <td><?php esc_html_e( 'COOKIE_DOMAIN', 'wp-domain-mapping' ); ?></td>
+                    <td><?php esc_html_e('COOKIE_DOMAIN', 'wp-domain-mapping'); ?></td>
                     <td>
-                        <?php if ( ! defined( 'COOKIE_DOMAIN' ) ) : ?>
-                            <?php esc_html_e( 'Not defined (correct)', 'wp-domain-mapping' ); ?>
-                        <?php else : ?>
-                            <?php
-                            printf(
-                                /* translators: %s: COOKIE_DOMAIN constant value */
-                                esc_html__( 'Defined as: %s - remove this from wp-config.php', 'wp-domain-mapping' ),
-                                '<code>' . esc_html( COOKIE_DOMAIN ) . '</code>'
-                            );
-                            ?>
+                        <?php if ($cookie_domain_status['is_optimal']): ?>
+                            <span style="color: #46b450;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                        <?php elseif ($cookie_domain_status['has_warning']): ?>
+                            <span style="color: #f56e28;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                            <br><small style="color: #666;">
+                                <?php esc_html_e('This may cause login issues on mapped domains. Consider removing the COOKIE_DOMAIN definition from wp-config.php.', 'wp-domain-mapping'); ?>
+                            </small>
+                        <?php else: ?>
+                            <span style="color: #dc3232;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                            <br><small style="color: #666;">
+                                <?php esc_html_e('Remove the define(\'COOKIE_DOMAIN\', ...) line from wp-config.php to enable dynamic cookie domain handling.', 'wp-domain-mapping'); ?>
+                            </small>
+                        <?php endif; ?>
+
+                        <?php if (defined('WP_DEBUG') && WP_DEBUG && !empty($cookie_domain_status['debug_info'])): ?>
+                            <br><small style="color: #999; font-style: italic;">
+                                <?php echo esc_html($cookie_domain_status['debug_info']); ?>
+                            </small>
                         <?php endif; ?>
                     </td>
                 </tr>
@@ -560,244 +718,240 @@ function dm_render_health_content() {
     $health_check_progress = get_site_option( 'dm_health_check_progress', false );
     ?>
 
-    <div class="card domain-mapping-card">
-        <h2><?php _e( 'Domain Health Status', 'wp-domain-mapping' ); ?></h2>
+    <h2><?php _e( 'Domain Health Status', 'wp-domain-mapping' ); ?></h2>
 
-        <?php if ( $health_check_progress !== false ) : ?>
-            <div class="notice notice-info">
-                <p>
-                    <?php _e( 'Health check in progress...', 'wp-domain-mapping' ); ?>
-                    <span id="health-check-progress-text">
-                        <?php
-                        printf(
-                            __( 'Processed %d of %d domains (%d%%)', 'wp-domain-mapping' ),
-                            $health_check_progress['processed'],
-                            $health_check_progress['total'],
-                            round( ( $health_check_progress['processed'] / $health_check_progress['total'] ) * 100 )
-                        );
-                        ?>
-                    </span>
-                </p>
-                <div class="progress-bar-outer" style="background-color: #f0f0f1; border-radius: 4px; height: 20px; width: 100%; overflow: hidden; margin-top: 10px;">
-                    <div id="health-check-progress-bar" class="progress-bar-inner" style="background-color: #2271b1; height: 100%; width: <?php echo round( ( $health_check_progress['processed'] / $health_check_progress['total'] ) * 100 ); ?>%; transition: width 0.5s;"></div>
-                </div>
-            </div>
-            <script>
-            jQuery(document).ready(function($) {
-                var healthCheckInterval = setInterval(function() {
-                    $.ajax({
-                        url: ajaxurl,
-                        type: 'POST',
-                        data: {
-                            action: 'dm_check_domain_health_batch',
-                            nonce: '<?php echo wp_create_nonce( 'dm_check_domain_health_batch' ); ?>'
-                        },
-                        success: function(response) {
-                            if (response.success) {
-                                if (response.data.complete) {
-                                    clearInterval(healthCheckInterval);
-                                    location.reload();
-                                } else {
-                                    $('#health-check-progress-text').text(
-                                        '<?php _e( 'Processed ', 'wp-domain-mapping' ); ?>' +
-                                        response.data.processed + ' <?php _e( 'of', 'wp-domain-mapping' ); ?> ' +
-                                        response.data.total + ' <?php _e( 'domains', 'wp-domain-mapping' ); ?> (' +
-                                        response.data.percentage + '%)'
-                                    );
-                                    $('#health-check-progress-bar').css('width', response.data.percentage + '%');
-                                }
-                            }
-                        }
-                    });
-                }, 2000);
-            });
-            </script>
-        <?php else : ?>
+    <?php if ( $health_check_progress !== false ) : ?>
+        <div class="notice notice-info">
             <p>
-                <form method="post" action="">
-                    <?php wp_nonce_field( 'dm_manual_health_check', 'dm_manual_health_check_nonce' ); ?>
-                    <input type="hidden" name="dm_manual_health_check" value="1">
-                    <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Check All Domains Now', 'wp-domain-mapping' ); ?>">
-                </form>
-            </p>
-        <?php endif; ?>
-
-        <div class="tablenav top">
-            <div class="tablenav-pages">
-                <span class="displaying-num">
+                <?php _e( 'Health check in progress...', 'wp-domain-mapping' ); ?>
+                <span id="health-check-progress-text">
                     <?php
-                    if ( ! empty( $domains ) ) {
-                        printf(
-                            _n( '%s domain', '%s domains', count( $domains ), 'wp-domain-mapping' ),
-                            number_format_i18n( count( $domains ) )
-                        );
-                    } else {
-                        _e( 'No domains found', 'wp-domain-mapping' );
-                    }
+                    printf(
+                        __( 'Processed %d of %d domains (%d%%)', 'wp-domain-mapping' ),
+                        $health_check_progress['processed'],
+                        $health_check_progress['total'],
+                        round( ( $health_check_progress['processed'] / $health_check_progress['total'] ) * 100 )
+                    );
                     ?>
                 </span>
-            </div>
-            <br class="clear">
-        </div>
-
-        <table class="wp-list-table widefat fixed striped domains-health-table">
-            <thead>
-                <tr>
-                    <th class="column-domain"><?php _e( 'Domain', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-site"><?php _e( 'Site', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-dns"><?php _e( 'DNS Status', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-ssl"><?php _e( 'SSL Status', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-status"><?php _e( 'Reachable', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-last-check"><?php _e( 'Last Check', 'wp-domain-mapping' ); ?></th>
-                    <th class="column-actions"><?php _e( 'Actions', 'wp-domain-mapping' ); ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php if ( ! empty( $domains ) ) : ?>
-                    <?php foreach ( $domains as $domain ) :
-                        $domain_key = md5( $domain->domain );
-                        $health_data = isset( $health_results[$domain_key] ) ? $health_results[$domain_key] : null;
-                        $site_name = get_blog_option( $domain->blog_id, 'blogname', __( 'Unknown', 'wp-domain-mapping' ) );
-                    ?>
-                        <tr data-domain="<?php echo esc_attr( $domain->domain ); ?>" data-blog-id="<?php echo esc_attr( $domain->blog_id ); ?>">
-                            <td class="column-domain">
-                                <?php echo esc_html( $domain->domain ); ?>
-                                <?php if ( $domain->active ) : ?>
-                                    <span class="dashicons dashicons-star-filled" style="color: #f0b849;" title="<?php esc_attr_e( 'Primary Domain', 'wp-domain-mapping' ); ?>"></span>
-                                <?php endif; ?>
-                            </td>
-                            <td class="column-site">
-                                <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $domain->blog_id ) ); ?>">
-                                    <?php echo esc_html( $site_name ); ?>
-                                    <div class="row-actions">
-                                        <span class="original-domain"><?php echo esc_html( $domain->original_domain . $domain->path ); ?></span>
-                                    </div>
-                                </a>
-                            </td>
-                            <td class="column-dns">
-                                <?php if ( $health_data && isset( $health_data['dns_status'] ) ) : ?>
-                                    <?php if ( $health_data['dns_status'] === 'success' ) : ?>
-                                        <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'DNS correctly configured', 'wp-domain-mapping' ); ?>"></span>
-                                    <?php else : ?>
-                                        <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php echo esc_attr( $health_data['dns_message'] ); ?>"></span>
-                                    <?php endif; ?>
-                                <?php else : ?>
-                                    <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
-                                <?php endif; ?>
-                            </td>
-                            <td class="column-ssl">
-                                <?php if ( $health_data && isset( $health_data['ssl_valid'] ) ) : ?>
-                                    <?php if ( $health_data['ssl_valid'] ) : ?>
-                                        <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'SSL certificate valid', 'wp-domain-mapping' ); ?>"></span>
-                                        <div class="row-actions">
-                                            <span><?php echo esc_html( sprintf( __( 'Expires: %s', 'wp-domain-mapping' ), isset( $health_data['ssl_expiry'] ) ? date( 'Y-m-d', strtotime( $health_data['ssl_expiry'] ) ) : '-' ) ); ?></span>
-                                        </div>
-                                    <?php else : ?>
-                                        <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php esc_attr_e( 'SSL certificate issue', 'wp-domain-mapping' ); ?>"></span>
-                                    <?php endif; ?>
-                                <?php else : ?>
-                                    <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
-                                <?php endif; ?>
-                            </td>
-                            <td class="column-status">
-                                <?php if ( $health_data && isset( $health_data['accessible'] ) ) : ?>
-                                    <?php if ( $health_data['accessible'] ) : ?>
-                                        <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'Site is accessible', 'wp-domain-mapping' ); ?>"></span>
-                                    <?php else : ?>
-                                        <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php esc_attr_e( 'Site is not accessible', 'wp-domain-mapping' ); ?>"></span>
-                                    <?php endif; ?>
-                                <?php else : ?>
-                                    <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
-                                <?php endif; ?>
-                            </td>
-                            <td class="column-last-check">
-                                <?php
-                                if ( $health_data && isset( $health_data['last_check'] ) ) {
-                                    echo esc_html( human_time_diff( strtotime( $health_data['last_check'] ), current_time( 'timestamp' ) ) ) . ' ' . __( 'ago', 'wp-domain-mapping' );
-                                } else {
-                                    _e( 'Never', 'wp-domain-mapping' );
-                                }
-                                ?>
-                            </td>
-                            <td class="column-actions">
-                                <button type="button" class="button button-small check-domain-health" data-domain="<?php echo esc_attr( $domain->domain ); ?>">
-                                    <?php _e( 'Check Now', 'wp-domain-mapping' ); ?>
-                                </button>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                <?php else : ?>
-                    <tr>
-                        <td colspan="7"><?php _e( 'No domains found.', 'wp-domain-mapping' ); ?></td>
-                    </tr>
-                <?php endif; ?>
-            </tbody>
-        </table>
-    </div>
-
-    <div class="card domain-mapping-card">
-        <h2><?php _e( 'Health Check Settings', 'wp-domain-mapping' ); ?></h2>
-
-        <form method="post" action="">
-            <?php wp_nonce_field( 'dm_health_settings', 'dm_health_settings_nonce' ); ?>
-            <input type="hidden" name="dm_health_settings" value="1">
-
-            <table class="form-table" role="presentation">
-                <tr>
-                    <th scope="row"><?php _e( 'Automatic Health Checks', 'wp-domain-mapping' ); ?></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><span><?php _e( 'Automatic Health Checks', 'wp-domain-mapping' ); ?></span></legend>
-                            <label for="health_check_enabled">
-                                <input name="health_check_enabled" type="checkbox" id="health_check_enabled" value="1" <?php checked( get_site_option( 'dm_health_check_enabled', true ) ); ?>>
-                                <?php _e( 'Enable automatic daily health checks', 'wp-domain-mapping' ); ?>
-                            </label>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><?php _e( 'Email Notifications', 'wp-domain-mapping' ); ?></th>
-                    <td>
-                        <fieldset>
-                            <legend class="screen-reader-text"><span><?php _e( 'Email Notifications', 'wp-domain-mapping' ); ?></span></legend>
-                            <label for="health_notifications_enabled">
-                                <input name="health_notifications_enabled" type="checkbox" id="health_notifications_enabled" value="1" <?php checked( get_site_option( 'dm_health_notifications_enabled', true ) ); ?>>
-                                <?php _e( 'Send email notifications when domain health issues are detected', 'wp-domain-mapping' ); ?>
-                            </label>
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><label for="notification_email"><?php _e( 'Notification Email', 'wp-domain-mapping' ); ?></label></th>
-                    <td>
-                        <input name="notification_email" type="email" id="notification_email" class="regular-text" value="<?php echo esc_attr( get_site_option( 'dm_notification_email', get_option( 'admin_email' ) ) ); ?>">
-                        <p class="description"><?php _e( 'Email address for domain health notifications.', 'wp-domain-mapping' ); ?></p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><label for="ssl_expiry_threshold"><?php _e( 'SSL Expiry Warning', 'wp-domain-mapping' ); ?></label></th>
-                    <td>
-                        <input name="ssl_expiry_threshold" type="number" id="ssl_expiry_threshold" min="1" max="90" class="small-text" value="<?php echo esc_attr( get_site_option( 'dm_ssl_expiry_threshold', 14 ) ); ?>">
-                        <span><?php _e( 'days', 'wp-domain-mapping' ); ?></span>
-                        <p class="description"><?php _e( 'Send notifications when SSL certificates are expiring within this many days.', 'wp-domain-mapping' ); ?></p>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row"><label for="health_check_batch_size"><?php _e( 'Batch Size', 'wp-domain-mapping' ); ?></label></th>
-                    <td>
-                        <input name="health_check_batch_size" type="number" id="health_check_batch_size" min="5" max="50" class="small-text" value="<?php echo esc_attr( get_site_option( 'dm_health_check_batch_size', 10 ) ); ?>">
-                        <span><?php _e( 'domains per batch', 'wp-domain-mapping' ); ?></span>
-                        <p class="description"><?php _e( 'Number of domains to check in each batch. Lower values prevent timeouts but take longer.', 'wp-domain-mapping' ); ?></p>
-                    </td>
-                </tr>
-            </table>
-
-            <p class="submit">
-                <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Changes', 'wp-domain-mapping' ); ?>">
             </p>
-        </form>
+            <div class="progress-bar-outer" style="background-color: #f0f0f1; border-radius: 4px; height: 20px; width: 100%; overflow: hidden; margin-top: 10px;">
+                <div id="health-check-progress-bar" class="progress-bar-inner" style="background-color: #2271b1; height: 100%; width: <?php echo round( ( $health_check_progress['processed'] / $health_check_progress['total'] ) * 100 ); ?>%; transition: width 0.5s;"></div>
+            </div>
+        </div>
+        <script>
+        jQuery(document).ready(function($) {
+            var healthCheckInterval = setInterval(function() {
+                $.ajax({
+                    url: ajaxurl,
+                    type: 'POST',
+                    data: {
+                        action: 'dm_check_domain_health_batch',
+                        nonce: '<?php echo wp_create_nonce( 'dm_check_domain_health_batch' ); ?>'
+                    },
+                    success: function(response) {
+                        if (response.success) {
+                            if (response.data.complete) {
+                                clearInterval(healthCheckInterval);
+                                location.reload();
+                            } else {
+                                $('#health-check-progress-text').text(
+                                    '<?php _e( 'Processed ', 'wp-domain-mapping' ); ?>' +
+                                    response.data.processed + ' <?php _e( 'of', 'wp-domain-mapping' ); ?> ' +
+                                    response.data.total + ' <?php _e( 'domains', 'wp-domain-mapping' ); ?> (' +
+                                    response.data.percentage + '%)'
+                                );
+                                $('#health-check-progress-bar').css('width', response.data.percentage + '%');
+                            }
+                        }
+                    }
+                });
+            }, 2000);
+        });
+        </script>
+    <?php else : ?>
+        <p>
+            <form method="post" action="">
+                <?php wp_nonce_field( 'dm_manual_health_check', 'dm_manual_health_check_nonce' ); ?>
+                <input type="hidden" name="dm_manual_health_check" value="1">
+                <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Check All Domains Now', 'wp-domain-mapping' ); ?>">
+            </form>
+        </p>
+    <?php endif; ?>
+
+    <div class="tablenav top">
+        <div class="tablenav-pages">
+            <span class="displaying-num">
+                <?php
+                if ( ! empty( $domains ) ) {
+                    printf(
+                        _n( '%s domain', '%s domains', count( $domains ), 'wp-domain-mapping' ),
+                        number_format_i18n( count( $domains ) )
+                    );
+                } else {
+                    _e( 'No domains found', 'wp-domain-mapping' );
+                }
+                ?>
+            </span>
+        </div>
+        <br class="clear">
     </div>
 
+    <table class="wp-list-table widefat fixed striped domains-health-table">
+        <thead>
+            <tr>
+                <th class="column-domain"><?php _e( 'Domain', 'wp-domain-mapping' ); ?></th>
+                <th class="column-site"><?php _e( 'Site', 'wp-domain-mapping' ); ?></th>
+                <th class="column-dns"><?php _e( 'DNS Status', 'wp-domain-mapping' ); ?></th>
+                <th class="column-ssl"><?php _e( 'SSL Status', 'wp-domain-mapping' ); ?></th>
+                <th class="column-status"><?php _e( 'Reachable', 'wp-domain-mapping' ); ?></th>
+                <th class="column-last-check"><?php _e( 'Last Check', 'wp-domain-mapping' ); ?></th>
+                <th class="column-actions"><?php _e( 'Actions', 'wp-domain-mapping' ); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php if ( ! empty( $domains ) ) : ?>
+                <?php foreach ( $domains as $domain ) :
+                    $domain_key = md5( $domain->domain );
+                    $health_data = isset( $health_results[$domain_key] ) ? $health_results[$domain_key] : null;
+                    $site_name = get_blog_option( $domain->blog_id, 'blogname', __( 'Unknown', 'wp-domain-mapping' ) );
+                ?>
+                    <tr data-domain="<?php echo esc_attr( $domain->domain ); ?>" data-blog-id="<?php echo esc_attr( $domain->blog_id ); ?>">
+                        <td class="column-domain">
+                            <?php echo esc_html( $domain->domain ); ?>
+                            <?php if ( $domain->active ) : ?>
+                                <span class="dashicons dashicons-star-filled" style="color: #f0b849;" title="<?php esc_attr_e( 'Primary Domain', 'wp-domain-mapping' ); ?>"></span>
+                            <?php endif; ?>
+                        </td>
+                        <td class="column-site">
+                            <a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $domain->blog_id ) ); ?>">
+                                <?php echo esc_html( $site_name ); ?>
+                                <div class="row-actions">
+                                    <span class="original-domain"><?php echo esc_html( $domain->original_domain . $domain->path ); ?></span>
+                                </div>
+                            </a>
+                        </td>
+                        <td class="column-dns">
+                            <?php if ( $health_data && isset( $health_data['dns_status'] ) ) : ?>
+                                <?php if ( $health_data['dns_status'] === 'success' ) : ?>
+                                    <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'DNS correctly configured', 'wp-domain-mapping' ); ?>"></span>
+                                <?php else : ?>
+                                    <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php echo esc_attr( $health_data['dns_message'] ); ?>"></span>
+                                <?php endif; ?>
+                            <?php else : ?>
+                                <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
+                            <?php endif; ?>
+                        </td>
+                        <td class="column-ssl">
+                            <?php if ( $health_data && isset( $health_data['ssl_valid'] ) ) : ?>
+                                <?php if ( $health_data['ssl_valid'] ) : ?>
+                                    <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'SSL certificate valid', 'wp-domain-mapping' ); ?>"></span>
+                                    <div class="row-actions">
+                                        <span><?php echo esc_html( sprintf( __( 'Expires: %s', 'wp-domain-mapping' ), isset( $health_data['ssl_expiry'] ) ? date( 'Y-m-d', strtotime( $health_data['ssl_expiry'] ) ) : '-' ) ); ?></span>
+                                    </div>
+                                <?php else : ?>
+                                    <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php esc_attr_e( 'SSL certificate issue', 'wp-domain-mapping' ); ?>"></span>
+                                <?php endif; ?>
+                            <?php else : ?>
+                                <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
+                            <?php endif; ?>
+                        </td>
+                        <td class="column-status">
+                            <?php if ( $health_data && isset( $health_data['accessible'] ) ) : ?>
+                                <?php if ( $health_data['accessible'] ) : ?>
+                                    <span class="dashicons dashicons-yes-alt" style="color: #46b450;" title="<?php esc_attr_e( 'Site is accessible', 'wp-domain-mapping' ); ?>"></span>
+                                <?php else : ?>
+                                    <span class="dashicons dashicons-warning" style="color: #dc3232;" title="<?php esc_attr_e( 'Site is not accessible', 'wp-domain-mapping' ); ?>"></span>
+                                <?php endif; ?>
+                            <?php else : ?>
+                                <span class="dashicons dashicons-minus" style="color: #999;" title="<?php esc_attr_e( 'Not checked yet', 'wp-domain-mapping' ); ?>"></span>
+                            <?php endif; ?>
+                        </td>
+                        <td class="column-last-check">
+                            <?php
+                            if ( $health_data && isset( $health_data['last_check'] ) ) {
+                                echo esc_html( human_time_diff( strtotime( $health_data['last_check'] ), current_time( 'timestamp' ) ) ) . ' ' . __( 'ago', 'wp-domain-mapping' );
+                            } else {
+                                _e( 'Never', 'wp-domain-mapping' );
+                            }
+                            ?>
+                        </td>
+                        <td class="column-actions">
+                            <button type="button" class="button button-small check-domain-health" data-domain="<?php echo esc_attr( $domain->domain ); ?>">
+                                <?php _e( 'Check Now', 'wp-domain-mapping' ); ?>
+                            </button>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            <?php else : ?>
+                <tr>
+                    <td colspan="7"><?php _e( 'No domains found.', 'wp-domain-mapping' ); ?></td>
+                </tr>
+            <?php endif; ?>
+        </tbody>
+    </table>
+
+    <h3><?php _e( 'Health Check Settings', 'wp-domain-mapping' ); ?></h3>
+
+    <form method="post" action="">
+        <?php wp_nonce_field( 'dm_health_settings', 'dm_health_settings_nonce' ); ?>
+        <input type="hidden" name="dm_health_settings" value="1">
+
+        <table class="form-table" role="presentation">
+            <tr>
+                <th scope="row"><?php _e( 'Automatic Health Checks', 'wp-domain-mapping' ); ?></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><span><?php _e( 'Automatic Health Checks', 'wp-domain-mapping' ); ?></span></legend>
+                        <label for="health_check_enabled">
+                            <input name="health_check_enabled" type="checkbox" id="health_check_enabled" value="1" <?php checked( get_site_option( 'dm_health_check_enabled', true ) ); ?>>
+                            <?php _e( 'Enable automatic daily health checks', 'wp-domain-mapping' ); ?>
+                        </label>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><?php _e( 'Email Notifications', 'wp-domain-mapping' ); ?></th>
+                <td>
+                    <fieldset>
+                        <legend class="screen-reader-text"><span><?php _e( 'Email Notifications', 'wp-domain-mapping' ); ?></span></legend>
+                        <label for="health_notifications_enabled">
+                            <input name="health_notifications_enabled" type="checkbox" id="health_notifications_enabled" value="1" <?php checked( get_site_option( 'dm_health_notifications_enabled', true ) ); ?>>
+                            <?php _e( 'Send email notifications when domain health issues are detected', 'wp-domain-mapping' ); ?>
+                        </label>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><label for="notification_email"><?php _e( 'Notification Email', 'wp-domain-mapping' ); ?></label></th>
+                <td>
+                    <input name="notification_email" type="email" id="notification_email" class="regular-text" value="<?php echo esc_attr( get_site_option( 'dm_notification_email', get_option( 'admin_email' ) ) ); ?>">
+                    <p class="description"><?php _e( 'Email address for domain health notifications.', 'wp-domain-mapping' ); ?></p>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><label for="ssl_expiry_threshold"><?php _e( 'SSL Expiry Warning', 'wp-domain-mapping' ); ?></label></th>
+                <td>
+                    <input name="ssl_expiry_threshold" type="number" id="ssl_expiry_threshold" min="1" max="90" class="small-text" value="<?php echo esc_attr( get_site_option( 'dm_ssl_expiry_threshold', 14 ) ); ?>">
+                    <span><?php _e( 'days', 'wp-domain-mapping' ); ?></span>
+                    <p class="description"><?php _e( 'Send notifications when SSL certificates are expiring within this many days.', 'wp-domain-mapping' ); ?></p>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><label for="health_check_batch_size"><?php _e( 'Batch Size', 'wp-domain-mapping' ); ?></label></th>
+                <td>
+                    <input name="health_check_batch_size" type="number" id="health_check_batch_size" min="5" max="50" class="small-text" value="<?php echo esc_attr( get_site_option( 'dm_health_check_batch_size', 10 ) ); ?>">
+                    <span><?php _e( 'domains per batch', 'wp-domain-mapping' ); ?></span>
+                    <p class="description"><?php _e( 'Number of domains to check in each batch. Lower values prevent timeouts but take longer.', 'wp-domain-mapping' ); ?></p>
+                </td>
+            </tr>
+        </table>
+
+        <p class="submit">
+            <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Changes', 'wp-domain-mapping' ); ?>">
+        </p>
+    </form>
+
     <script type="text/javascript">
     jQuery(document).ready(function($) {
         // Single domain health check
@@ -891,8 +1045,8 @@ function dm_render_import_export_content() {
         </div>
     <?php endif; ?>
 
-    <div class="card domain-mapping-card" <?php echo ! $wp_china_yes_active ? 'style="opacity: 0.5; pointer-events: none;"' : ''; ?>>
-        <h2><?php _e( 'Export Domain Mappings', 'wp-domain-mapping' ); ?></h2>
+    <h2><?php _e( 'Export Domain Mappings', 'wp-domain-mapping' ); ?></h2>
+    <div class="export-section" <?php echo ! $wp_china_yes_active ? 'style="opacity: 0.5; pointer-events: none;"' : ''; ?>>
         <p><?php _e( 'Export all domain mappings to a CSV file.', 'wp-domain-mapping' ); ?></p>
 
         <form method="post" action="">
@@ -918,8 +1072,8 @@ function dm_render_import_export_content() {
         </form>
     </div>
 
-    <div class="card domain-mapping-card" <?php echo ! $wp_china_yes_active ? 'style="opacity: 0.5; pointer-events: none;"' : ''; ?>>
-        <h2><?php _e( 'Import Domain Mappings', 'wp-domain-mapping' ); ?></h2>
+    <h2><?php _e( 'Import Domain Mappings', 'wp-domain-mapping' ); ?></h2>
+    <div class="import-section" <?php echo ! $wp_china_yes_active ? 'style="opacity: 0.5; pointer-events: none;"' : ''; ?>>
         <p><?php _e( 'Import domain mappings from a CSV file.', 'wp-domain-mapping' ); ?></p>
 
         <form method="post" enctype="multipart/form-data" id="domain-mapping-import-form">
@@ -978,38 +1132,36 @@ function dm_render_import_export_content() {
         </div>
     </div>
 
-    <div class="card domain-mapping-card">
-        <h2><?php _e( 'CSV Format', 'wp-domain-mapping' ); ?></h2>
-        <p><?php _e( 'The CSV file should follow this format:', 'wp-domain-mapping' ); ?></p>
+    <h2><?php _e( 'CSV Format', 'wp-domain-mapping' ); ?></h2>
+    <p><?php _e( 'The CSV file should follow this format:', 'wp-domain-mapping' ); ?></p>
 
-        <table class="widefat" style="margin-top: 10px;">
-            <thead>
-                <tr>
-                    <th>blog_id</th>
-                    <th>domain</th>
-                    <th>active</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>1</td>
-                    <td>example.com</td>
-                    <td>1</td>
-                </tr>
-                <tr>
-                    <td>2</td>
-                    <td>example.org</td>
-                    <td>0</td>
-                </tr>
-            </tbody>
-        </table>
+    <table class="widefat" style="margin-top: 10px;">
+        <thead>
+            <tr>
+                <th>blog_id</th>
+                <th>domain</th>
+                <th>active</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>1</td>
+                <td>example.com</td>
+                <td>1</td>
+            </tr>
+            <tr>
+                <td>2</td>
+                <td>example.org</td>
+                <td>0</td>
+            </tr>
+        </tbody>
+    </table>
 
-        <ul style="margin-top: 15px;">
-            <li><strong>blog_id</strong>: <?php _e( 'The ID of the WordPress site (required)', 'wp-domain-mapping' ); ?></li>
-            <li><strong>domain</strong>: <?php _e( 'The domain name without http:// or https:// (required)', 'wp-domain-mapping' ); ?></li>
-            <li><strong>active</strong>: <?php _e( 'Set to 1 to make this the primary domain, 0 otherwise (required)', 'wp-domain-mapping' ); ?></li>
-        </ul>
-    </div>
+    <ul style="margin-top: 15px;">
+        <li><strong>blog_id</strong>: <?php _e( 'The ID of the WordPress site (required)', 'wp-domain-mapping' ); ?></li>
+        <li><strong>domain</strong>: <?php _e( 'The domain name without http:// or https:// (required)', 'wp-domain-mapping' ); ?></li>
+        <li><strong>active</strong>: <?php _e( 'Set to 1 to make this the primary domain, 0 otherwise (required)', 'wp-domain-mapping' ); ?></li>
+    </ul>
 
     <?php if ( $wp_china_yes_active ) : ?>
     <script type="text/javascript">
@@ -1150,3 +1302,134 @@ function dm_render_user_page( $protocol = null, $domains = null ) {
     // Include original user page content
     require_once WP_DOMAIN_MAPPING_DIR_PATH . 'admin/user-page.php';
 }
+
+/**
+ * Check COOKIE_DOMAIN configuration status in a performance-friendly way
+ * Uses caching to avoid reading wp-config.php on every page load
+ *
+ * @return array Status information about COOKIE_DOMAIN configuration
+ */
+function dm_check_cookie_domain_status() {
+    // Cache key for storing the check result
+    $cache_key = 'dm_cookie_domain_check_' . md5(ABSPATH);
+    $cached_result = get_transient($cache_key);
+
+    // Return cached result if still valid (cached for 1 hour)
+    if ($cached_result !== false) {
+        // Always check runtime values as they can change
+        $cached_result['runtime_defined'] = defined('COOKIE_DOMAIN');
+        $cached_result['is_mapped_request'] = defined('MAPPED_DOMAIN') && MAPPED_DOMAIN;
+
+        // Update debug info
+        if (defined('WP_DEBUG') && WP_DEBUG) {
+            $debug_parts = array();
+            $debug_parts[] = 'Runtime defined: ' . ($cached_result['runtime_defined'] ? 'Yes' : 'No');
+            if ($cached_result['runtime_defined']) {
+                $debug_parts[] = 'Value: ' . COOKIE_DOMAIN;
+            }
+            $debug_parts[] = 'Mapped request: ' . ($cached_result['is_mapped_request'] ? 'Yes' : 'No');
+            $cached_result['debug_info'] = 'Debug: ' . implode(', ', $debug_parts);
+        }
+
+        return $cached_result;
+    }
+
+    // Initialize result array
+    $result = array(
+        'is_optimal' => false,
+        'has_warning' => false,
+        'message' => '',
+        'debug_info' => '',
+        'wp_config_has_definition' => false,
+        'runtime_defined' => defined('COOKIE_DOMAIN'),
+        'is_mapped_request' => defined('MAPPED_DOMAIN') && MAPPED_DOMAIN
+    );
+
+    // Check if COOKIE_DOMAIN is defined in wp-config.php
+    $wp_config_path = ABSPATH . 'wp-config.php';
+    if (file_exists($wp_config_path)) {
+        // Use a more efficient approach - only read first part of file
+        $file_handle = fopen($wp_config_path, 'r');
+        if ($file_handle) {
+            $line_count = 0;
+            $max_lines = 200; // Only check first 200 lines for performance
+
+            while (($line = fgets($file_handle)) !== false && $line_count < $max_lines) {
+                $line = trim($line);
+                $line_count++;
+
+                // Skip empty lines and comments
+                if (empty($line) || substr($line, 0, 2) === '//' || substr($line, 0, 1) === '#' || substr($line, 0, 2) === '/*') {
+                    continue;
+                }
+
+                // Stop at the end of configuration section
+                if (strpos($line, "require_once") !== false && strpos($line, "wp-settings.php") !== false) {
+                    break;
+                }
+
+                // Check for COOKIE_DOMAIN definition
+                if (preg_match('/define\s*\(\s*[\'"]COOKIE_DOMAIN[\'"]/', $line)) {
+                    $result['wp_config_has_definition'] = true;
+                    break;
+                }
+            }
+            fclose($file_handle);
+        }
+    }
+
+    // Determine status and message - Always allow access, just show warnings
+    if (!$result['wp_config_has_definition']) {
+        $result['is_optimal'] = true;
+        if ($result['runtime_defined'] && $result['is_mapped_request']) {
+            $result['message'] = __('Not defined in wp-config.php (optimal). Currently managed by domain mapping.', 'wp-domain-mapping');
+        } else {
+            $result['message'] = __('Not defined in wp-config.php (optimal for domain mapping)', 'wp-domain-mapping');
+        }
+    } else {
+        // Even if defined in wp-config.php, don't block access - just show warning
+        if ($result['runtime_defined']) {
+            $result['has_warning'] = true;
+            $result['message'] = __('Defined in wp-config.php but currently working', 'wp-domain-mapping');
+        } else {
+            $result['has_warning'] = true;
+            $result['message'] = __('Defined in wp-config.php (may affect some domain mapping features)', 'wp-domain-mapping');
+        }
+    }
+
+    // Add debug information if WP_DEBUG is enabled
+    if (defined('WP_DEBUG') && WP_DEBUG) {
+        $debug_parts = array();
+        $debug_parts[] = 'Runtime defined: ' . ($result['runtime_defined'] ? 'Yes' : 'No');
+        if ($result['runtime_defined']) {
+            $debug_parts[] = 'Value: ' . COOKIE_DOMAIN;
+        }
+        $debug_parts[] = 'Mapped request: ' . ($result['is_mapped_request'] ? 'Yes' : 'No');
+        $debug_parts[] = 'Config file check: ' . ($result['wp_config_has_definition'] ? 'Found' : 'Not found');
+        $result['debug_info'] = 'Debug: ' . implode(', ', $debug_parts);
+    }
+
+    // Cache the result for 1 hour (exclude runtime values from cache)
+    $cache_data = $result;
+    unset($cache_data['runtime_defined'], $cache_data['is_mapped_request'], $cache_data['debug_info']);
+    set_transient($cache_key, $cache_data, HOUR_IN_SECONDS);
+
+    return $result;
+}
+
+/**
+ * Legacy function to prevent blocking access - always returns false
+ * This ensures backward compatibility with any existing checks
+ */
+function dm_cookie_domain_is_blocking() {
+    return false;
+}
+
+/**
+ * Safe check for COOKIE_DOMAIN without blocking access
+ * This can be used throughout the plugin without causing access issues
+ */
+function dm_is_cookie_domain_safe() {
+    $status = dm_check_cookie_domain_status();
+    return $status['is_optimal'] || $status['has_warning'];
+}
diff --git a/admin/settings-page.php b/admin/settings-page.php
index 181bc88..48b730d 100644
--- a/admin/settings-page.php
+++ b/admin/settings-page.php
@@ -358,24 +358,44 @@ settings_errors( 'dm_settings' );
                 </tr>
                 <tr>
                     <td>
-                        <?php if ( ! defined( 'COOKIE_DOMAIN' ) ) : ?>
+                        <?php
+                        // Use the improved COOKIE_DOMAIN check function from pages.php
+                        $cookie_domain_status = dm_check_cookie_domain_status();
+
+                        if ($cookie_domain_status['is_optimal']): ?>
                             <span class="dashicons dashicons-yes-alt" style="color: #46b450;"></span>
-                        <?php else : ?>
+                        <?php elseif ($cookie_domain_status['has_warning']): ?>
+                            <span class="dashicons dashicons-warning" style="color: #f56e28;"></span>
+                        <?php else: ?>
                             <span class="dashicons dashicons-no-alt" style="color: #dc3232;"></span>
                         <?php endif; ?>
                     </td>
-                    <td><?php esc_html_e( 'COOKIE_DOMAIN', 'wp-domain-mapping' ); ?></td>
+                    <td><?php esc_html_e('COOKIE_DOMAIN', 'wp-domain-mapping'); ?></td>
                     <td>
-                        <?php if ( ! defined( 'COOKIE_DOMAIN' ) ) : ?>
-                            <?php esc_html_e( 'Not defined (correct)', 'wp-domain-mapping' ); ?>
-                        <?php else : ?>
-                            <?php
-                            printf(
-                                /* translators: %s: COOKIE_DOMAIN constant value */
-                                esc_html__( 'Defined as: %s - remove this from wp-config.php', 'wp-domain-mapping' ),
-                                '<code>' . esc_html( COOKIE_DOMAIN ) . '</code>'
-                            );
-                            ?>
+                        <?php if ($cookie_domain_status['is_optimal']): ?>
+                            <span style="color: #46b450;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                        <?php elseif ($cookie_domain_status['has_warning']): ?>
+                            <span style="color: #f56e28;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                            <br><small style="color: #666;">
+                                <?php esc_html_e('This may cause login issues on mapped domains. Consider removing the COOKIE_DOMAIN definition from wp-config.php.', 'wp-domain-mapping'); ?>
+                            </small>
+                        <?php else: ?>
+                            <span style="color: #dc3232;">
+                                <?php echo esc_html($cookie_domain_status['message']); ?>
+                            </span>
+                            <br><small style="color: #666;">
+                                <?php esc_html_e('Remove the define(\'COOKIE_DOMAIN\', ...) line from wp-config.php to enable dynamic cookie domain handling.', 'wp-domain-mapping'); ?>
+                            </small>
+                        <?php endif; ?>
+
+                        <?php if (defined('WP_DEBUG') && WP_DEBUG && !empty($cookie_domain_status['debug_info'])): ?>
+                            <br><small style="color: #999; font-style: italic;">
+                                <?php echo esc_html($cookie_domain_status['debug_info']); ?>
+                            </small>
                         <?php endif; ?>
                     </td>
                 </tr>
diff --git a/assets/css/admin.css b/assets/css/admin.css
index cb211c7..6b17118 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -1,4 +1,4 @@
-/* WP Domain Mapping Admin Styles */
+/* WP Domain Mapping Admin Styles - Optimized Layout */
 
 /* Main cards */
 .domain-mapping-card {
@@ -9,9 +9,14 @@
     margin-top: 20px;
     padding: 20px;
     box-shadow: 0 1px 1px rgba(0,0,0,.04);
+    overflow: hidden;
+}
+
+/* Tabs - Now inside the main card */
+.domain-mapping-wrapper {
+    margin-bottom: 20px;
 }
 
-/* Tabs */
 .domain-mapping-tabs {
     display: flex;
     flex-wrap: wrap;
@@ -40,8 +45,21 @@
     border-bottom-color: #dcdcde;
 }
 
+/* Tab Content */
 .domain-mapping-content {
-    flex: 1;
+    background: #fff;
+    min-height: 400px;
+}
+
+.domain-mapping-content h2:first-child {
+    margin-top: 0;
+}
+
+.domain-mapping-content h3 {
+    margin-top: 30px;
+    margin-bottom: 15px;
+    color: #1d2327;
+    font-size: 16px;
 }
 
 /* Search form */
@@ -50,7 +68,11 @@
     flex-wrap: wrap;
     align-items: flex-end;
     gap: 15px;
-    margin-bottom: 15px;
+    margin-bottom: 20px;
+    padding: 20px;
+    background: #f9f9f9;
+    border: 1px solid #ddd;
+    border-radius: 4px;
 }
 
 .search-form-field {
@@ -62,6 +84,7 @@
 .search-form-field label {
     margin-bottom: 5px;
     font-weight: 500;
+    color: #1d2327;
 }
 
 .search-form-submit {
@@ -72,9 +95,10 @@
 
 /* Tables */
 .tablenav {
-    margin: 10px 0;
+    margin: 15px 0;
     display: flex;
     align-items: center;
+    justify-content: space-between;
 }
 
 .tablenav-pages {
@@ -92,23 +116,32 @@
     font-weight: 400;
     text-align: center;
     text-decoration: none;
+    border-radius: 3px;
+    margin: 0 2px;
 }
 
 .tablenav-pages span.current {
-    background: #007cba;
+    background: #2271b1;
+    color: #fff;
+    border-color: #2271b1;
+}
+
+.tablenav-pages a:hover {
+    background: #2271b1;
     color: #fff;
-    border-color: #007cba;
 }
 
 .displaying-num {
     margin-left: 10px;
-    color: #555;
+    color: #646970;
+    font-size: 13px;
 }
 
 .domains-table th,
 .logs-table th,
 .domains-health-table th {
     font-weight: 600;
+    color: #1d2327;
 }
 
 .column-site-id {
@@ -152,8 +185,8 @@
     background: #2271b1;
     color: #fff;
     font-weight: 500;
-    padding: 0 5px;
-    border-radius: 3px;
+    padding: 2px 8px;
+    border-radius: 4px;
     font-size: 12px;
 }
 
@@ -161,6 +194,8 @@
 .form-table th {
     width: 200px;
     padding: 15px 10px 15px 0;
+    font-weight: 600;
+    color: #1d2327;
 }
 
 .form-table td {
@@ -168,16 +203,23 @@
 }
 
 .description {
-    color: #666;
+    color: #646970;
     font-size: 13px;
     margin-top: 4px;
+    line-height: 1.4;
+}
+
+.regular-text {
+    width: 25em;
+    max-width: 100%;
 }
 
 /* Notices */
 .notice {
     padding: 8px 12px;
-    border-radius: 3px;
+    border-radius: 4px;
     margin: 5px 0 15px;
+    border-left: 4px solid #ddd;
 }
 
 .notice p {
@@ -187,63 +229,85 @@
 
 .notice-success {
     background-color: #f0f9eb;
-    border-left: 4px solid #46b450;
+    border-left-color: #46b450;
 }
 
 .notice-error {
     background-color: #fef0f0;
-    border-left: 4px solid #dc3232;
+    border-left-color: #dc3232;
 }
 
 .notice-warning {
     background-color: #fff8e5;
-    border-left: 4px solid #ffb900;
+    border-left-color: #ffb900;
 }
 
 .notice-info {
     background-color: #f0f6fa;
-    border-left: 4px solid #00a0d2;
+    border-left-color: #00a0d2;
+}
+
+.notice.inline {
+    display: block;
+    margin: 15px 0;
 }
 
 /* DNS instructions */
 .dns-instructions {
-    margin-top: 10px;
+    margin-top: 15px;
+}
+
+.dns-instructions h3 {
+    color: #1d2327;
+    margin-top: 25px;
+    margin-bottom: 10px;
 }
 
 .dns-example {
-    background: #f9f9f9;
-    border: 1px solid #e5e5e5;
-    border-radius: 3px;
+    background: #f6f7f7;
+    border: 1px solid #ddd;
+    border-radius: 4px;
     padding: 15px;
     margin: 15px 0;
 }
 
 .dns-example h4 {
     margin-top: 0;
+    margin-bottom: 10px;
+    color: #1d2327;
+}
+
+.dns-example table {
+    margin-top: 10px;
 }
 
 .dns-tips {
     list-style: disc;
     margin-left: 20px;
+    line-height: 1.6;
 }
 
 .dns-tips li {
     margin-bottom: 8px;
+    color: #50575e;
 }
 
 /* Status indicators */
 .dashicons-yes-alt,
-.dashicons-no-alt {
-    font-size: 24px;
-    width: 24px;
-    height: 24px;
+.dashicons-no-alt,
+.dashicons-warning,
+.dashicons-minus {
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
 }
 
 /* Logs table styles */
 .logs-filter {
     display: flex;
     align-items: center;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
+    gap: 10px;
 }
 
 .logs-table .column-user,
@@ -261,41 +325,49 @@
 
 .log-action {
     display: inline-block;
-    padding: 2px 8px;
+    padding: 3px 8px;
     border-radius: 3px;
-    font-size: 12px;
-    font-weight: bold;
+    font-size: 11px;
+    font-weight: 400;
+    text-transform: uppercase;
 }
 
 .log-action-add {
-    background-color: #dff0d8;
-    color: #3c763d;
+    background-color: #d1e7dd;
+    color: #0f5132;
 }
 
 .log-action-edit {
-    background-color: #d9edf7;
-    color: #31708f;
+    background-color: #cce7ff;
+    color: #004085;
 }
 
 .log-action-delete {
-    background-color: #f2dede;
-    color: #a94442;
+    background-color: #f8d7da;
+    color: #721c24;
+}
+
+.log-action-import {
+    background-color: #fff3cd;
+    color: #856404;
 }
 
 /* Health details */
 .health-details-content {
     padding: 15px;
     background: #f9f9f9;
-    border-radius: 3px;
+    border-radius: 4px;
+    margin-top: 10px;
 }
 
 .health-details-content h4 {
     margin-top: 0;
+    color: #1d2327;
 }
 
 /* Progress bar */
 .progress-bar-outer {
-    background-color: #f0f0f1;
+    background-color: #e9ecef;
     border-radius: 4px;
     height: 20px;
     width: 100%;
@@ -304,18 +376,30 @@
 }
 
 .progress-bar-inner {
-    background-color: #2271b1;
+    background: linear-gradient(90deg, #2271b1 0%, #72aee6 100%);
     height: 100%;
     width: 0%;
     transition: width 0.3s ease;
+    border-radius: 4px 0 0 4px;
 }
 
 .progress-text {
     text-align: center;
     font-weight: 500;
+    color: #1d2327;
+    margin-top: 5px;
 }
 
 /* Import/Export specific */
+.export-section,
+.import-section {
+    margin-bottom: 30px;
+    padding: 20px;
+    background: #f9f9f9;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+}
+
 .import-summary,
 .import-details {
     margin-top: 15px;
@@ -337,11 +421,414 @@
     background-color: #fff8e5;
 }
 
-/* Responsive */
+/* Buttons */
+.button {
+    text-decoration: none;
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid;
+    cursor: pointer;
+    font-size: 13px;
+    line-height: 2.15384615;
+    margin: 0;
+    padding: 0 10px;
+    text-align: center;
+    white-space: nowrap;
+    box-sizing: border-box;
+    transition: all 0.2s ease;
+}
+
+.button-primary {
+    background: #2271b1;
+    border-color: #2271b1;
+    color: #fff;
+}
+
+.button-primary:hover,
+.button-primary:focus {
+    background: #135e96;
+    border-color: #135e96;
+    color: #fff;
+}
+
+.button-secondary {
+    background: #f6f7f7;
+    border-color: #dcdcde;
+    color: #50575e;
+}
+
+.button-secondary:hover,
+.button-secondary:focus {
+    background: #f0f0f1;
+    border-color: #8c8f94;
+    color: #1d2327;
+}
+
+.button-small {
+    font-size: 11px;
+    height: auto;
+    line-height: 1.5;
+    padding: 4px 8px;
+}
+
+.button:disabled,
+.button[disabled] {
+    background: #f6f7f7 !important;
+    border-color: #dcdcde !important;
+    color: #a7aaad !important;
+    cursor: default;
+}
+
+/* Health check specific buttons */
+.check-domain-health {
+    font-size: 11px;
+    padding: 4px 8px;
+    line-height: 1.4;
+}
+
+/* Table row hover effects */
+.wp-list-table tbody tr:hover {
+    background-color: #f6f7f7;
+}
+
+.wp-list-table tbody tr.hover {
+    background-color: #f0f6fa;
+}
+
+/* Bulk actions */
+.bulkactions {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+}
+
+.bulkactions select {
+    margin-right: 5px;
+}
+
+/* Row actions */
+.row-actions {
+    visibility: hidden;
+    padding: 2px 0 0;
+    color: #646970;
+}
+
+.wp-list-table tbody tr:hover .row-actions {
+    visibility: visible;
+}
+
+.row-actions span {
+    display: inline;
+}
+
+.row-actions a {
+    color: #2271b1;
+    text-decoration: none;
+}
+
+.row-actions a:hover {
+    color: #135e96;
+}
+
+/* Dashboard Widget Styles */
+.dm-dashboard-widget {
+    padding: 0;
+}
+
+.dm-dashboard-widget > div {
+    margin-bottom: 15px;
+    padding-bottom: 15px;
+    border-bottom: 1px solid #eee;
+}
+
+.dm-dashboard-widget > div:last-child {
+    margin-bottom: 0;
+    padding-bottom: 0;
+    border-bottom: none;
+}
+
+.dm-dashboard-widget h4 {
+    margin: 0 0 8px 0;
+    font-size: 13px;
+    font-weight: 600;
+    color: #1d2327;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dm-domain-primary {
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.dm-domain-primary a {
+    text-decoration: none;
+    color: #2271b1;
+}
+
+.dm-domain-primary a:hover {
+    color: #135e96;
+    text-decoration: underline;
+}
+
+.dm-no-primary {
+    color: #646970;
+    font-style: italic;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.dm-stats-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    text-align: center;
+}
+
+.dm-stat {
+    background: #f0f0f1;
+    padding: 10px;
+    border-radius: 4px;
+}
+
+.dm-stat-value {
+    display: block;
+    font-size: 24px;
+    font-weight: 600;
+    color: #2271b1;
+    line-height: 1;
+}
+
+.dm-stat-label {
+    display: block;
+    font-size: 11px;
+    color: #646970;
+    margin-top: 5px;
+}
+
+.dm-domains-list ul {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.dm-domains-list li {
+    padding: 5px 0;
+    display: flex;
+    align-items: center;
+    gap: 5px;
+}
+
+.dm-domains-list a {
+    text-decoration: none;
+    color: #50575e;
+}
+
+.dm-domains-list a:hover {
+    color: #2271b1;
+}
+
+.dm-badge-primary {
+    background: #2271b1;
+    color: #fff;
+    font-size: 11px;
+    padding: 2px 6px;
+    border-radius: 3px;
+    margin-left: auto;
+}
+
+.dm-health-status {
+    position: relative;
+}
+
+.dm-refresh-health {
+    padding: 2px 4px !important;
+    min-height: 24px !important;
+    line-height: 1 !important;
+}
+
+.dm-refresh-health .dashicons {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+}
+
+.dm-health-good {
+    color: #46b450;
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    margin: 0;
+}
+
+.dm-health-issues {
+    background: #fcf0f1;
+    border: 1px solid #f0c4c6;
+    border-radius: 4px;
+    padding: 10px;
+}
+
+.dm-issue-item {
+    margin-bottom: 5px;
+}
+
+.dm-issue-item:last-child {
+    margin-bottom: 0;
+}
+
+.dm-issue-list {
+    color: #d63638;
+    font-size: 12px;
+}
+
+.dm-last-check {
+    margin: 8px 0 0;
+    font-size: 12px;
+    color: #646970;
+    font-style: italic;
+}
+
+.dm-dns-info code {
+    background: #f0f0f1;
+    padding: 3px 6px;
+    border-radius: 3px;
+    font-family: Consolas, Monaco, monospace;
+    font-size: 12px;
+}
+
+.dm-activity-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.dm-activity-list li {
+    padding: 6px 0;
+    border-bottom: 1px solid #f0f0f1;
+    font-size: 12px;
+}
+
+.dm-activity-list li:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+}
+
+.dm-activity-action {
+    display: inline-block;
+    padding: 2px 6px;
+    border-radius: 3px;
+    font-size: 11px;
+    font-weight: 600;
+    margin-right: 5px;
+}
+
+.dm-action-add {
+    background-color: #dff0d8;
+    color: #3c763d;
+}
+
+.dm-action-edit {
+    background-color: #d9edf7;
+    color: #31708f;
+}
+
+.dm-action-delete {
+    background-color: #f2dede;
+    color: #a94442;
+}
+
+.dm-activity-domain {
+    font-weight: 500;
+    color: #1d2327;
+}
+
+.dm-activity-meta {
+    display: block;
+    color: #646970;
+    margin-top: 2px;
+}
+
+.dm-quick-actions {
+    display: flex;
+    gap: 10px;
+}
+
+.dm-quick-actions .button {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 5px;
+}
+
+.dm-quick-actions .dashicons {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+    line-height: 1;
+}
+
+.dm-loading {
+    opacity: 0.6;
+    pointer-events: none;
+}
+
+.dm-loading::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 20px;
+    height: 20px;
+    margin: -10px 0 0 -10px;
+    border: 2px solid #f0f0f1;
+    border-top-color: #2271b1;
+    border-radius: 50%;
+    animation: dm-spin 1s linear infinite;
+}
+
+@keyframes dm-spin {
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+/* Responsive design */
 @media screen and (max-width: 782px) {
+    .domain-mapping-tabs {
+        flex-direction: column;
+        padding: 10px;
+    }
+
+    .domain-mapping-tab {
+        width: 100%;
+        text-align: left;
+        border-radius: 4px;
+        margin-bottom: 5px;
+        border: 1px solid #ddd;
+    }
+
+    .domain-mapping-tab.active {
+        border-color: #2271b1;
+        border-left: 4px solid #2271b1;
+    }
+
+    .domain-mapping-tab.active::after {
+        display: none;
+    }
+
+    .domain-mapping-content {
+        padding: 15px;
+    }
+
     .search-form {
         flex-direction: column;
         align-items: stretch;
+        padding: 15px;
     }
 
     .search-form-field {
@@ -353,9 +840,11 @@
         max-width: 100%;
         width: auto;
     }
+
     .form-table th {
         width: 100%;
         display: block;
+        padding-bottom: 5px;
     }
 
     .form-table td {
@@ -363,20 +852,25 @@
         padding: 0 0 15px;
     }
 
-    .domain-mapping-tabs {
+    .dm-stats-grid {
+        grid-template-columns: repeat(3, 1fr);
+        gap: 5px;
+    }
+
+    .dm-stat {
+        padding: 8px 5px;
+    }
+
+    .dm-stat-value {
+        font-size: 20px;
+    }
+
+    .dm-quick-actions {
         flex-direction: column;
     }
 
-    .domain-mapping-tab {
+    .dm-quick-actions .button {
         width: 100%;
-        text-align: left;
-        border-bottom: 1px solid #ddd;
-        border-radius: 0;
-    }
-
-    .domain-mapping-tab.active {
-        border-bottom: 1px solid #007cba;
-        border-left: 4px solid #007cba;
     }
 
     /* Hide less important columns on mobile */
@@ -391,9 +885,19 @@
     .wp-list-table td.column-actions {
         display: table-cell;
     }
+
+    .tablenav {
+        flex-direction: column;
+        align-items: stretch;
+        gap: 10px;
+    }
+
+    .tablenav-pages {
+        margin-left: 0;
+        text-align: center;
+    }
 }
 
-/* 在文件末尾添加移动端优化 */
 @media screen and (max-width: 600px) {
     .wp-list-table {
         font-size: 12px;
@@ -405,11 +909,24 @@
     }
 
     .domain-mapping-card {
+        margin-top: 15px;
+    }
+
+    .domain-mapping-content {
         padding: 15px;
     }
 }
 
-/* 添加验证消息样式 */
+/* Widget specific styles */
+#dm_domain_status_widget .postbox-header {
+    cursor: move;
+}
+
+#dm_domain_status_widget.closed .inside {
+    display: none;
+}
+
+/* Domain validation feedback */
 #domain-validation-message {
     margin-top: 5px;
     padding: 5px;
@@ -421,3 +938,99 @@
     color: #721c24;
     border: 1px solid #f5c6cb;
 }
+
+#domain-validation-message.success {
+    background-color: #d1e7dd;
+    color: #0f5132;
+    border: 1px solid #badbcc;
+}
+
+/* Animation utilities */
+.fade-in {
+    animation: fadeIn 0.3s ease-in;
+}
+
+@keyframes fadeIn {
+    from {
+        opacity: 0;
+        transform: translateY(-10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.slide-in {
+    animation: slideIn 0.3s ease-out;
+}
+
+@keyframes slideIn {
+    from {
+        transform: translateX(-20px);
+        opacity: 0;
+    }
+    to {
+        transform: translateX(0);
+        opacity: 1;
+    }
+}
+
+/* Accessibility improvements */
+.screen-reader-text {
+    border: 0;
+    clip: rect(1px, 1px, 1px, 1px);
+    clip-path: inset(50%);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute !important;
+    width: 1px;
+    word-wrap: normal !important;
+}
+
+/* Focus styles */
+.domain-mapping-tab:focus,
+.button:focus,
+input:focus,
+select:focus,
+textarea:focus {
+    box-shadow: 0 0 0 2px #2271b1;
+    outline: none;
+}
+
+/* Loading states */
+.button.loading {
+    position: relative;
+    color: transparent;
+}
+
+.button.loading::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 16px;
+    height: 16px;
+    margin: -8px 0 0 -8px;
+    border: 2px solid transparent;
+    border-top-color: currentColor;
+    border-radius: 50%;
+    animation: dm-spin 1s linear infinite;
+}
+
+/* High contrast mode support */
+@media (prefers-contrast: high) {
+    .domain-mapping-tab.active {
+        border-width: 2px;
+    }
+
+    .button-primary {
+        border-width: 2px;
+    }
+
+    .notice {
+        border-left-width: 6px;
+    }
+}
diff --git a/assets/js/admin.js b/assets/js/admin.js
index 694e1b1..1458b27 100644
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -33,11 +33,11 @@ jQuery(document).ready(function($) {
             return false;
         }
 
-        // Basic domain format validation
-        var domainPattern = /^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]?\.[a-zA-Z]{2,}$/;
+        // Enhanced domain format validation - more flexible validation
+        var domainPattern = /^[a-zA-Z0-9][a-zA-Z0-9.-]*[a-zA-Z0-9]\.[a-zA-Z]{2,}$/;
         if (!domainPattern.test(domain)) {
             e.preventDefault();
-            showNotice('#edit-domain-status', 'Please enter a valid domain format (e.g., example.com)', 'error');
+            showNotice('#edit-domain-status', 'Please enter a valid domain format (e.g., example.com, www.example.com)', 'error');
             $('#domain').focus();
             return false;
         }
@@ -527,7 +527,7 @@ jQuery(document).ready(function($) {
                 $feedback.html('<span style="color: #dc3232;">Please remove http:// or https://</span>').show();
             } else if (domain.indexOf('/') !== -1) {
                 $feedback.html('<span style="color: #dc3232;">Please remove any paths or slashes</span>').show();
-            } else if (!/^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]?\.[a-zA-Z]{2,}$/.test(domain)) {
+            } else if (!/^[a-zA-Z0-9][a-zA-Z0-9.-]*[a-zA-Z0-9]\.[a-zA-Z]{2,}$/.test(domain)) {
                 $feedback.html('<span style="color: #dc3232;">Please enter a valid domain format</span>').show();
             } else {
                 $feedback.html('<span style="color: #46b450;">Domain format looks good</span>').show();
@@ -586,10 +586,11 @@ jQuery(document).ready(function($) {
     // Initialize when document is ready
     initializePage();
 });
+
 // Domain Mapping Dashboard Widget JavaScript
 jQuery(document).ready(function($) {
 
-    // 健康状态刷新按钮
+    // Health status refresh button
     $(document).on('click', '.dm-refresh-health', function(e) {
         e.preventDefault();
 
@@ -600,7 +601,7 @@ jQuery(document).ready(function($) {
         $button.prop('disabled', true);
         $healthContent.addClass('dm-loading');
 
-        // 旋转图标
+        // Rotate icon
         $button.find('.dashicons').addClass('dashicons-update-spin');
 
         $.ajax({
@@ -615,7 +616,7 @@ jQuery(document).ready(function($) {
                 if (response.success) {
                     $healthContent.html(response.data.html);
 
-                    // 显示成功消息
+                    // Show success message
                     var $notice = $('<div class="notice notice-success is-dismissible"><p>' +
                                   response.data.message + '</p></div>');
                     $('#dm_domain_status_widget .inside').prepend($notice);
@@ -635,7 +636,7 @@ jQuery(document).ready(function($) {
         });
     });
 
-    // 检查所有域名健康状态
+    // Check all domain health status
     $(document).on('click', '.dm-check-all-health', function(e) {
         e.preventDefault();
 
@@ -658,12 +659,12 @@ jQuery(document).ready(function($) {
             },
             success: function(response) {
                 if (response.success) {
-                    // 刷新健康状态区域
+                    // Refresh health status area
                     if ($('#dm-widget-health-status').length) {
                         $('#dm-widget-health-status .dm-health-content').html(response.data.html);
                     }
 
-                    // 显示成功消息
+                    // Show success message
                     var $notice = $('<div class="notice notice-success is-dismissible"><p>' +
                                   response.data.message + '</p></div>');
                     $('#dm_domain_status_widget .inside').prepend($notice);
@@ -686,27 +687,27 @@ jQuery(document).ready(function($) {
         });
     });
 
-    // 自动刷新（可选）
+    // Auto-refresh (optional)
     if ($('#dm_domain_status_widget').length && $('#dm_domain_status_widget').is(':visible')) {
-        // 每10分钟自动刷新一次
+        // Auto-refresh every 10 minutes
         var autoRefreshInterval = setInterval(function() {
             if ($('#dm_domain_status_widget').is(':visible')) {
                 $('.dm-refresh-health').first().trigger('click');
             }
-        }, 600000); // 10分钟
+        }, 600000); // 10 minutes
 
-        // 页面卸载时清除定时器
+        // Clear timer on page unload
         $(window).on('beforeunload', function() {
             clearInterval(autoRefreshInterval);
         });
     }
 
-    // 小工具配置保存
+    // Widget configuration save
     $(document).on('submit', '#dm_domain_status_widget form', function(e) {
-        // 配置会自动保存，这里可以添加额外的处理
+        // Configuration will auto-save, here we can add additional processing
         var showHealth = $('#dm_widget_show_health').is(':checked');
 
-        // 如果取消勾选健康状态，隐藏相关区域
+        // If unchecked health status, hide related areas
         if (!showHealth) {
             $('#dm-widget-health-status').fadeOut();
         } else {
@@ -714,14 +715,14 @@ jQuery(document).ready(function($) {
         }
     });
 
-    // 为域名链接添加外部图标
+    // Add external icons for domain links
     $('.dm-domains-list a, .dm-domain-primary a').each(function() {
         if (!$(this).find('.dashicons-external').length) {
             $(this).append(' <span class="dashicons dashicons-external" style="font-size: 14px; vertical-align: middle;"></span>');
         }
     });
 
-    // 工具提示
+    // Tooltips
     if ($.fn.tooltip) {
         $('#dm_domain_status_widget [title]').tooltip({
             position: {
diff --git a/includes/class-admin.php b/includes/class-admin.php
index 66959d5..9328d7e 100644
--- a/includes/class-admin.php
+++ b/includes/class-admin.php
@@ -822,173 +822,205 @@ class WP_Domain_Mapping_Admin {
     }
 
     /**
-     * AJAX handler for domain actions
-     * UPDATED: Support editing domain names and better conflict checking
+     * AJAX handler for domain actions - IMPROVED SECURITY
      */
     public function ajax_handle_actions() {
-        check_ajax_referer( 'domain_mapping', 'nonce' );
+        // Verify nonce first
+        if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'domain_mapping' ) ) {
+            wp_send_json_error( __( 'Security check failed.', 'wp-domain-mapping' ) );
+        }
 
+        // Check permissions
         if ( ! current_user_can( 'manage_network' ) ) {
             wp_send_json_error( __( 'Permission denied.', 'wp-domain-mapping' ) );
         }
 
         global $wpdb;
 
-        $action = sanitize_text_field( $_POST['action_type'] );
-        $domain = dm_clean_domain( sanitize_text_field( isset( $_POST['domain'] ) ? strtolower( $_POST['domain'] ) : '' ) );
+        // Sanitize and validate inputs
+        $action = isset( $_POST['action_type'] ) ? sanitize_key( $_POST['action_type'] ) : '';
+        $domain = isset( $_POST['domain'] ) ? dm_clean_domain( sanitize_text_field( $_POST['domain'] ) ) : '';
         $blog_id = isset( $_POST['blog_id'] ) ? absint( $_POST['blog_id'] ) : 0;
         $active = isset( $_POST['active'] ) ? absint( $_POST['active'] ) : 0;
         $orig_domain = isset( $_POST['orig_domain'] ) ? dm_clean_domain( sanitize_text_field( $_POST['orig_domain'] ) ) : '';
         $current_user_id = get_current_user_id();
 
+        // Validate action type
+        $allowed_actions = array( 'save', 'delete' );
+        if ( ! in_array( $action, $allowed_actions ) ) {
+            wp_send_json_error( __( 'Invalid action.', 'wp-domain-mapping' ) );
+        }
+
         switch ( $action ) {
             case 'save':
-                if ( $blog_id != 0 && $blog_id != 1 ) {
-                    // Validate domain format
-                    if ( ! dm_validate_domain( $domain ) ) {
-                        wp_send_json_error( __( 'Invalid domain format.', 'wp-domain-mapping' ) );
+                // Enhanced validation for save action
+                if ( $blog_id <= 0 || $blog_id === 1 ) {
+                    wp_send_json_error( __( 'Invalid site ID.', 'wp-domain-mapping' ) );
+                }
+
+                // Validate domain format
+                if ( empty( $domain ) || ! dm_validate_domain( $domain ) ) {
+                    wp_send_json_error( __( 'Invalid domain format.', 'wp-domain-mapping' ) );
+                }
+
+                // Check if blog exists
+                if ( ! get_blog_details( $blog_id ) ) {
+                    wp_send_json_error( __( 'Site does not exist.', 'wp-domain-mapping' ) );
+                }
+
+                // For editing, check if domain changed
+                $domain_changed = ! empty( $orig_domain ) && $orig_domain !== $domain;
+
+                if ( $domain_changed || empty( $orig_domain ) ) {
+                    // Check if domain exists for another blog
+                    $exists = dm_domain_exists_for_another_blog( $domain, $blog_id );
+
+                    if ( $exists ) {
+                        wp_send_json_error( sprintf(
+                            __( 'Domain %s is already mapped to site ID %d.', 'wp-domain-mapping' ),
+                            esc_html( $domain ),
+                            intval( $exists->blog_id )
+                        ));
                     }
+                }
 
-                    // For editing, check if domain changed
-                    $domain_changed = ! empty( $orig_domain ) && $orig_domain !== $domain;
+                $wpdb->query( 'START TRANSACTION' );
 
-                    if ( $domain_changed || empty( $orig_domain ) ) {
-                        // Check if domain exists for another blog
-                        $exists = dm_domain_exists_for_another_blog( $domain, $blog_id );
-
-                        if ( $exists ) {
-                            wp_send_json_error( sprintf(
-                                __( 'Domain %s is already mapped to site ID %d.', 'wp-domain-mapping' ),
-                                $domain,
-                                $exists->blog_id
-                            ));
-                        }
-                    }
-
-                    $wpdb->query( 'START TRANSACTION' );
-
-                    try {
-                        if ( empty( $orig_domain ) ) {
-                            // Insert new domain
-                            $success = $wpdb->insert(
-                                $this->tables['domains'],
-                                array(
-                                    'blog_id' => $blog_id,
-                                    'domain' => $domain,
-                                    'active' => $active
-                                ),
-                                array( '%d', '%s', '%d' )
-                            );
-
-                            if ( $success ) {
-                                // If setting as primary, reset other domains
-                                if ( $active ) {
-                                    $wpdb->update(
-                                        $this->tables['domains'],
-                                        array( 'active' => 0 ),
-                                        array(
-                                            'blog_id' => $blog_id,
-                                            'domain !=' => $domain
-                                        ),
-                                        array( '%d' ),
-                                        array( '%d', '%s' )
-                                    );
-                                }
-
-                                // Log the action
-                                dm_log_action( 'add', $domain, $blog_id, $current_user_id );
-
-                                $wpdb->query( 'COMMIT' );
-                                wp_send_json_success( __( 'Domain added successfully.', 'wp-domain-mapping' ) );
-                            } else {
-                                $wpdb->query( 'ROLLBACK' );
-                                wp_send_json_error( __( 'Failed to add domain.', 'wp-domain-mapping' ) );
-                            }
-                        } else {
-                            // Update existing domain
-
-                            // Prepare update data
-                            $update_data = array(
+                try {
+                    if ( empty( $orig_domain ) ) {
+                        // Insert new domain
+                        $success = $wpdb->insert(
+                            $this->tables['domains'],
+                            array(
                                 'blog_id' => $blog_id,
+                                'domain' => $domain,
                                 'active' => $active
-                            );
-                            $update_format = array( '%d', '%d' );
+                            ),
+                            array( '%d', '%s', '%d' )
+                        );
 
-                            // If domain changed, update it
-                            if ( $domain_changed ) {
-                                $update_data['domain'] = $domain;
-                                $update_format[] = '%s';
-                            }
-
-                            // If setting as primary, reset other domains first
+                        if ( $success ) {
+                            // If setting as primary, reset other domains
                             if ( $active ) {
                                 $wpdb->update(
                                     $this->tables['domains'],
                                     array( 'active' => 0 ),
-                                    array( 'blog_id' => $blog_id ),
+                                    array(
+                                        'blog_id' => $blog_id,
+                                        'domain' => array( 'NOT LIKE', $domain )
+                                    ),
                                     array( '%d' ),
                                     array( '%d' )
                                 );
                             }
 
-                            $success = $wpdb->update(
-                                $this->tables['domains'],
-                                $update_data,
-                                array( 'domain' => $orig_domain ),
-                                $update_format,
-                                array( '%s' )
-                            );
+                            // Log the action
+                            dm_log_action( 'add', $domain, $blog_id, $current_user_id );
 
-                            if ( $success !== false ) {
-                                // Log the action
-                                dm_log_action( 'edit', $domain, $blog_id, $current_user_id );
-
-                                $wpdb->query( 'COMMIT' );
-                                wp_send_json_success( __( 'Domain updated successfully.', 'wp-domain-mapping' ) );
-                            } else {
-                                $wpdb->query( 'ROLLBACK' );
-                                wp_send_json_error( __( 'No changes were made or update failed.', 'wp-domain-mapping' ) );
-                            }
+                            $wpdb->query( 'COMMIT' );
+                            wp_send_json_success( __( 'Domain added successfully.', 'wp-domain-mapping' ) );
+                        } else {
+                            $wpdb->query( 'ROLLBACK' );
+                            wp_send_json_error( __( 'Failed to add domain.', 'wp-domain-mapping' ) );
+                        }
+                    } else {
+                        // Validate original domain exists
+                        $orig_exists = dm_get_domain_by_name( $orig_domain );
+                        if ( ! $orig_exists || $orig_exists->blog_id != $blog_id ) {
+                            $wpdb->query( 'ROLLBACK' );
+                            wp_send_json_error( __( 'Original domain not found or access denied.', 'wp-domain-mapping' ) );
+                        }
+
+                        // Update existing domain
+                        $update_data = array(
+                            'blog_id' => $blog_id,
+                            'active' => $active
+                        );
+                        $update_format = array( '%d', '%d' );
+
+                        // If domain changed, update it
+                        if ( $domain_changed ) {
+                            $update_data['domain'] = $domain;
+                            $update_format[] = '%s';
+                        }
+
+                        // If setting as primary, reset other domains first
+                        if ( $active ) {
+                            $wpdb->update(
+                                $this->tables['domains'],
+                                array( 'active' => 0 ),
+                                array( 'blog_id' => $blog_id ),
+                                array( '%d' ),
+                                array( '%d' )
+                            );
+                        }
+
+                        $success = $wpdb->update(
+                            $this->tables['domains'],
+                            $update_data,
+                            array( 'domain' => $orig_domain ),
+                            $update_format,
+                            array( '%s' )
+                        );
+
+                        if ( $success !== false ) {
+                            // Log the action
+                            dm_log_action( 'edit', $domain, $blog_id, $current_user_id );
+
+                            $wpdb->query( 'COMMIT' );
+                            wp_send_json_success( __( 'Domain updated successfully.', 'wp-domain-mapping' ) );
+                        } else {
+                            $wpdb->query( 'ROLLBACK' );
+                            wp_send_json_error( __( 'No changes were made or update failed.', 'wp-domain-mapping' ) );
                         }
-                    } catch ( Exception $e ) {
-                        $wpdb->query( 'ROLLBACK' );
-                        wp_send_json_error( __( 'An error occurred while saving domain.', 'wp-domain-mapping' ) );
                     }
-                } else {
-                    wp_send_json_error( __( 'Invalid site ID.', 'wp-domain-mapping' ) );
+                } catch ( Exception $e ) {
+                    $wpdb->query( 'ROLLBACK' );
+                    error_log( 'Domain mapping error: ' . $e->getMessage() );
+                    wp_send_json_error( __( 'An error occurred while saving domain.', 'wp-domain-mapping' ) );
                 }
                 break;
 
             case 'delete':
                 $domains = isset( $_POST['domains'] ) ? array_map( 'sanitize_text_field', (array) $_POST['domains'] ) : array( $domain );
 
+                // Validate domains array
+                $domains = array_filter( $domains, function( $d ) {
+                    return ! empty( $d ) && dm_validate_domain( $d );
+                });
+
+                if ( empty( $domains ) ) {
+                    wp_send_json_error( __( 'No valid domains provided for deletion.', 'wp-domain-mapping' ) );
+                }
+
                 $wpdb->query( 'START TRANSACTION' );
                 $deleted = 0;
 
                 try {
                     foreach ( $domains as $del_domain ) {
-                        if ( empty( $del_domain ) ) continue;
+                        // Get domain info before deletion for logging and validation
+                        $domain_info = dm_get_domain_by_name( $del_domain );
 
-                        // Get blog_id before deletion for logging
-                        $affected_blog_id = $wpdb->get_var( $wpdb->prepare(
-                            "SELECT blog_id FROM {$this->tables['domains']} WHERE domain = %s",
-                            $del_domain
-                        ));
+                        if ( ! $domain_info ) {
+                            continue; // Skip non-existent domains
+                        }
 
-                        if ( $affected_blog_id ) {
-                            // Delete the domain
-                            $result = $wpdb->delete(
-                                $this->tables['domains'],
-                                array( 'domain' => $del_domain ),
-                                array( '%s' )
-                            );
+                        // Check if user has permission to delete this domain
+                        if ( ! current_user_can( 'manage_network' ) ) {
+                            continue; // Skip if no permission
+                        }
 
-                            if ( $result ) {
-                                $deleted++;
+                        // Delete the domain
+                        $result = $wpdb->delete(
+                            $this->tables['domains'],
+                            array( 'domain' => $del_domain ),
+                            array( '%s' )
+                        );
 
-                                // Log the action
-                                dm_log_action( 'delete', $del_domain, $affected_blog_id, $current_user_id );
-                            }
+                        if ( $result ) {
+                            $deleted++;
+                            // Log the action
+                            dm_log_action( 'delete', $del_domain, $domain_info->blog_id, $current_user_id );
                         }
                     }
 
@@ -1010,6 +1042,7 @@ class WP_Domain_Mapping_Admin {
                     }
                 } catch ( Exception $e ) {
                     $wpdb->query( 'ROLLBACK' );
+                    error_log( 'Domain mapping deletion error: ' . $e->getMessage() );
                     wp_send_json_error( __( 'An error occurred while deleting domains.', 'wp-domain-mapping' ) );
                 }
                 break;
@@ -1313,7 +1346,7 @@ class WP_Domain_Mapping_Admin {
         if ( ! get_site_option( 'dm_ipaddress' ) && ! get_site_option( 'dm_cname' ) ) {
             if ( dm_is_site_admin() ) {
                 echo wp_kses(
-                    __( "Please set the IP address or CNAME of your server in the <a href='wpmu-admin.php?page=domain-mapping'>site admin page</a>.", 'wp-domain-mapping' ),
+                    __( "Please set the IP address or CNAME of your server in the <a href='wp-admin/network/settings.php?page=domain-mapping'>site admin page</a>.", 'wp-domain-mapping' ),
                     array( 'a' => array( 'href' => array() ) )
                 );
             } else {
@@ -1355,7 +1388,7 @@ class WP_Domain_Mapping_Admin {
      * @return array Modified columns
      */
     public function add_domain_mapping_columns( $columns ) {
-        $columns['map'] = __( 'Mapping' );
+        $columns['map'] = __( 'Mapping', 'wp-domain-mapping' );
         return $columns;
     }
 
diff --git a/includes/class-core.php b/includes/class-core.php
index 298fe3d..9ae5fbd 100644
--- a/includes/class-core.php
+++ b/includes/class-core.php
@@ -105,7 +105,7 @@ class WP_Domain_Mapping_Core {
     }
 
     /**
-     * Create required database tables
+     * Create required database tables - OPTIMIZED
      */
     public function create_tables() {
         global $wpdb;
@@ -127,7 +127,7 @@ class WP_Domain_Mapping_Core {
         $created = 0;
         $charset_collate = $wpdb->get_charset_collate();
 
-        // Create domain_mapping table
+        // Create domain_mapping table - IMPROVED INDEXES
         if ( $wpdb->get_var( "SHOW TABLES LIKE '{$this->tables['domains']}'" ) != $this->tables['domains'] ) {
             $wpdb->query( "CREATE TABLE IF NOT EXISTS `{$this->tables['domains']}` (
                 `id` bigint(20) NOT NULL auto_increment,
@@ -135,24 +135,29 @@ class WP_Domain_Mapping_Core {
                 `domain` varchar(255) NOT NULL,
                 `active` tinyint(4) default '1',
                 PRIMARY KEY  (`id`),
-                KEY `blog_id` (`blog_id`,`domain`,`active`)
+                UNIQUE KEY `domain` (`domain`),
+                KEY `blog_id` (`blog_id`),
+                KEY `blog_active` (`blog_id`, `active`),
+                KEY `active_domain` (`active`, `domain`)
             ) $charset_collate;" );
             $created = 1;
         }
 
-        // Create domain_mapping_logins table
+        // Create domain_mapping_logins table - IMPROVED INDEXES
         if ( $wpdb->get_var( "SHOW TABLES LIKE '{$this->tables['logins']}'" ) != $this->tables['logins'] ) {
             $wpdb->query( "CREATE TABLE IF NOT EXISTS `{$this->tables['logins']}` (
                 `id` varchar(32) NOT NULL,
                 `user_id` bigint(20) NOT NULL,
                 `blog_id` bigint(20) NOT NULL,
                 `t` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-                PRIMARY KEY  (`id`)
+                PRIMARY KEY  (`id`),
+                KEY `user_blog` (`user_id`, `blog_id`),
+                KEY `timestamp` (`t`)
             ) $charset_collate;" );
             $created = 1;
         }
 
-        // Create domain_mapping_logs table
+        // Create domain_mapping_logs table - IMPROVED INDEXES
         if ( $wpdb->get_var( "SHOW TABLES LIKE '{$this->tables['logs']}'" ) != $this->tables['logs'] ) {
             $wpdb->query( "CREATE TABLE IF NOT EXISTS `{$this->tables['logs']}` (
                 `id` bigint(20) NOT NULL auto_increment,
@@ -161,7 +166,11 @@ class WP_Domain_Mapping_Core {
                 `domain` varchar(255) NOT NULL,
                 `blog_id` bigint(20) NOT NULL,
                 `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`)
+                PRIMARY KEY (`id`),
+                KEY `blog_timestamp` (`blog_id`, `timestamp`),
+                KEY `user_action` (`user_id`, `action`),
+                KEY `domain_action` (`domain`, `action`),
+                KEY `timestamp` (`timestamp`)
             ) $charset_collate;" );
             $created = 1;
         }
@@ -176,7 +185,7 @@ class WP_Domain_Mapping_Core {
             $tables_created = true;
         }
     }
-
+    
     /**
      * Delete blog domain mappings when a blog is deleted
      *
@@ -472,109 +481,115 @@ class WP_Domain_Mapping_Core {
     /**
      * Handle remote login JS
      */
-    public function remote_login_js() {
-        global $current_blog, $current_user, $wpdb;
+     public function remote_login_js() {
+         global $current_blog, $current_user, $wpdb;
 
-        if (strtotime($details->t) < (time() - 300)) { 
-            wp_die(__('Login key expired', 'wp-domain-mapping'));
-        }
+         if ( 0 == get_site_option( 'dm_remote_login' ) ) {
+             return;
+         }
 
-        if ( 0 == get_site_option( 'dm_remote_login' ) ) {
-            return;
-        }
+         $hash = $this->get_hash();
+         $protocol = is_ssl() ? 'https://' : 'http://';
 
-        $hash = $this->get_hash();
-        $protocol = is_ssl() ? 'https://' : 'http://';
+         if ( $_GET['dm'] == $hash ) {
+             if ( $_GET['action'] == 'load' ) {
+                 if ( ! is_user_logged_in() ) {
+                     exit;
+                 }
 
-        if ( $_GET['dm'] == $hash ) {
-            if ( $_GET['action'] == 'load' ) {
-                if ( ! is_user_logged_in() ) {
-                    exit;
-                }
+                 $key = md5( time() . mt_rand() );
 
-                $key = md5( time() . mt_rand() );
+                 $wpdb->insert(
+                     $this->tables['logins'],
+                     array(
+                         'id' => $key,
+                         'user_id' => $current_user->ID,
+                         'blog_id' => $_GET['blogid'],
+                         't' => current_time( 'mysql' )
+                     ),
+                     array( '%s', '%d', '%d', '%s' )
+                 );
 
-                $wpdb->insert(
-                    $this->tables['logins'],
-                    array(
-                        'id' => $key,
-                        'user_id' => $current_user->ID,
-                        'blog_id' => $_GET['blogid'],
-                        't' => current_time( 'mysql' )
-                    ),
-                    array( '%s', '%d', '%d', '%s' )
-                );
+                 $url = add_query_arg(
+                     array(
+                         'action' => 'login',
+                         'dm' => $hash,
+                         'k' => $key,
+                         't' => mt_rand()
+                     ),
+                     $_GET['back']
+                 );
 
-                $url = add_query_arg(
-                    array(
-                        'action' => 'login',
-                        'dm' => $hash,
-                        'k' => $key,
-                        't' => mt_rand()
-                    ),
-                    $_GET['back']
-                );
+                 echo "window.location = '" . esc_url( $url ) . "'";
+                 exit;
 
-                echo "window.location = '" . esc_url( $url ) . "'";
-                exit;
+             } elseif ( $_GET['action'] == 'login' ) {
+                 $details = $wpdb->get_row( $wpdb->prepare(
+                     "SELECT * FROM {$this->tables['logins']} WHERE id = %s AND blog_id = %d",
+                     $_GET['k'], $wpdb->blogid
+                 ));
 
-            } elseif ( $_GET['action'] == 'login' ) {
-                $details = $wpdb->get_row( $wpdb->prepare(
-                    "SELECT * FROM {$this->tables['logins']} WHERE id = %s AND blog_id = %d",
-                    $_GET['k'], $wpdb->blogid
-                ));
+                 if ( $details ) {
+                     // FIX: Add time validation that was missing
+                     if ( strtotime( $details->t ) < ( time() - 300 ) ) {
+                         wp_die( __( 'Login key expired', 'wp-domain-mapping' ) );
+                     }
 
-                if ( $details ) {
-                    if ( $details->blog_id == $wpdb->blogid ) {
-                        $wpdb->delete(
-                            $this->tables['logins'],
-                            array( 'id' => $_GET['k'] ),
-                            array( '%s' )
-                        );
+                     if ( $details->blog_id == $wpdb->blogid ) {
+                         $wpdb->delete(
+                             $this->tables['logins'],
+                             array( 'id' => $_GET['k'] ),
+                             array( '%s' )
+                         );
 
-                        $wpdb->query( $wpdb->prepare(
-                            "DELETE FROM {$this->tables['logins']} WHERE t < %s",
-                            date( 'Y-m-d H:i:s', time() - 120 )
-                        ));
+                         $wpdb->query( $wpdb->prepare(
+                             "DELETE FROM {$this->tables['logins']} WHERE t < %s",
+                             date( 'Y-m-d H:i:s', time() - 120 )
+                         ));
 
-                        wp_set_auth_cookie( $details->user_id );
+                         wp_set_auth_cookie( $details->user_id );
 
-                        wp_redirect( remove_query_arg(
-                            array( 'dm', 'action', 'k', 't' ),
-                            $protocol . $current_blog->domain . $_SERVER['REQUEST_URI']
-                        ));
-                        exit;
+                         wp_redirect( remove_query_arg(
+                             array( 'dm', 'action', 'k', 't' ),
+                             $protocol . $current_blog->domain . $_SERVER['REQUEST_URI']
+                         ));
+                         exit;
 
-                    } else {
-                        wp_die( esc_html__( "Incorrect or out of date login key", 'wp-domain-mapping' ) );
-                    }
-                } else {
-                    wp_die( esc_html__( "Unknown login key", 'wp-domain-mapping' ) );
-                }
+                     } else {
+                         wp_die( esc_html__( "Incorrect or out of date login key", 'wp-domain-mapping' ) );
+                     }
+                 } else {
+                     wp_die( esc_html__( "Unknown login key", 'wp-domain-mapping' ) );
+                 }
 
-            } elseif ( $_GET['action'] == 'logout' ) {
-                $details = $wpdb->get_row( $wpdb->prepare(
-                    "SELECT * FROM {$this->tables['logins']} WHERE id = %s AND blog_id = %d",
-                    $_GET['k'], $_GET['blogid']
-                ));
+             } elseif ( $_GET['action'] == 'logout' ) {
+                 $details = $wpdb->get_row( $wpdb->prepare(
+                     "SELECT * FROM {$this->tables['logins']} WHERE id = %s AND blog_id = %d",
+                     $_GET['k'], $_GET['blogid']
+                 ));
 
-                if ( $details ) {
-                    $wpdb->delete(
-                        $this->tables['logins'],
-                        array( 'id' => $_GET['k'] ),
-                        array( '%s' )
-                    );
+                 if ( $details ) {
+                     // FIX: Add time validation for logout too
+                     if ( strtotime( $details->t ) < ( time() - 300 ) ) {
+                         wp_die( __( 'Logout key expired', 'wp-domain-mapping' ) );
+                     }
 
-                    $blog = get_blog_details( $_GET['blogid'] );
-                    wp_clear_auth_cookie();
-                    wp_redirect( trailingslashit( $blog->siteurl ) . "wp-login.php?loggedout=true" );
-                    exit;
-                } else {
-                    wp_die( esc_html__( "Unknown logout key", 'wp-domain-mapping' ) );
-                }
-            }
-        }
-    }
+                     $wpdb->delete(
+                         $this->tables['logins'],
+                         array( 'id' => $_GET['k'] ),
+                         array( '%s' )
+                     );
+
+                     $blog = get_blog_details( $_GET['blogid'] );
+                     wp_clear_auth_cookie();
+                     wp_redirect( trailingslashit( $blog->siteurl ) . "wp-login.php?loggedout=true" );
+                     exit;
+                 } else {
+                     wp_die( esc_html__( "Unknown logout key", 'wp-domain-mapping' ) );
+                 }
+             }
+         }
+     }
 
     /**
      * Add JS loader for remote login
diff --git a/includes/class-tools.php b/includes/class-tools.php
index c37d1f0..941a2f4 100644
--- a/includes/class-tools.php
+++ b/includes/class-tools.php
@@ -94,6 +94,14 @@ class WP_Domain_Mapping_Tools {
         add_action( 'admin_init', array( $this, 'handle_export' ) );
         add_action( 'admin_init', array( $this, 'handle_health_manual_check' ) );
         add_action( 'admin_init', array( $this, 'handle_health_settings_save' ) );
+
+        // Add debug hooks
+        add_action( 'admin_notices', array( $this, 'show_cron_debug_info' ) );
+
+        // Add manual trigger cron hook (only for debugging)
+        if ( isset( $_GET['dm_test_cron'] ) && current_user_can( 'manage_network' ) ) {
+            add_action( 'admin_init', array( $this, 'test_cron_execution' ) );
+        }
     }
 
     /**
@@ -278,32 +286,56 @@ class WP_Domain_Mapping_Tools {
     }
 
     // ========================================
-    // Health Check Functions
+    // Health Check Functions - IMPROVED
     // ========================================
 
     /**
-     * Schedule health check
+     * Schedule health check - improved version
      */
     public function schedule_health_check() {
-        if ( ! wp_next_scheduled( 'dm_domain_health_check' ) ) {
-            wp_schedule_event( time(), 'daily', 'dm_domain_health_check' );
+        // First clear existing schedules
+        $this->unschedule_health_check();
+
+        // Check if setting is enabled
+        if ( ! get_site_option( 'dm_health_check_enabled', true ) ) {
+            return;
         }
+
+        // Set next execution time (tomorrow at 2:00 AM)
+        $next_run = strtotime( 'tomorrow 2:00 AM' );
+
+        // Schedule event
+        $scheduled = wp_schedule_event( $next_run, 'daily', 'dm_domain_health_check' );
+
+        // Log scheduling status
+        if ( $scheduled !== false ) {
+            error_log( 'WP Domain Mapping: Health check scheduled for ' . date( 'Y-m-d H:i:s', $next_run ) );
+        } else {
+            error_log( 'WP Domain Mapping: Failed to schedule health check' );
+        }
+
+        // Also set an option to track scheduling status
+        update_site_option( 'dm_health_check_scheduled', array(
+            'scheduled_at' => current_time( 'timestamp' ),
+            'next_run' => $next_run,
+            'status' => $scheduled !== false ? 'scheduled' : 'failed'
+        ) );
     }
 
     /**
-     * Unschedule health check
+     * Unschedule health check - improved version
      */
     public function unschedule_health_check() {
-        $timestamp = wp_next_scheduled( 'dm_domain_health_check' );
-        if ( $timestamp ) {
-            wp_unschedule_event( $timestamp, 'dm_domain_health_check' );
-        }
+        // Clear main health check
+        wp_clear_scheduled_hook( 'dm_domain_health_check' );
 
-        // Also clear any batch processing
-        $timestamp = wp_next_scheduled( 'dm_domain_health_check_batch' );
-        if ( $timestamp ) {
-            wp_unschedule_event( $timestamp, 'dm_domain_health_check_batch' );
-        }
+        // Clear batch processing health check
+        wp_clear_scheduled_hook( 'dm_domain_health_check_batch' );
+
+        // Clear scheduling status option
+        delete_site_option( 'dm_health_check_scheduled' );
+
+        error_log( 'WP Domain Mapping: Health check unscheduled' );
     }
 
     /**
@@ -443,15 +475,25 @@ class WP_Domain_Mapping_Tools {
     }
 
     /**
-     * Scheduled health check
+     * Scheduled health check - improved version
      */
     public function scheduled_health_check() {
+        // Log execution start
+        error_log( 'WP Domain Mapping: Starting scheduled health check at ' . current_time( 'mysql' ) );
+
         // Check if health checks are enabled
         if ( ! get_site_option( 'dm_health_check_enabled', true ) ) {
+            error_log( 'WP Domain Mapping: Health check is disabled, skipping' );
             return;
         }
 
+        // Update last execution time
+        update_site_option( 'dm_last_health_check', current_time( 'timestamp' ) );
+
+        // Start batch processing
         $this->start_health_check_batch();
+
+        error_log( 'WP Domain Mapping: Scheduled health check batch started' );
     }
 
     /**
@@ -821,6 +863,73 @@ class WP_Domain_Mapping_Tools {
         wp_mail( $notification_email, $subject, $message );
     }
 
+    /**
+     * Add new method: check cron status
+     */
+    public function get_cron_status() {
+        $scheduled_info = get_site_option( 'dm_health_check_scheduled', false );
+        $next_scheduled = wp_next_scheduled( 'dm_domain_health_check' );
+        $last_check = get_site_option( 'dm_last_health_check', false );
+
+        return array(
+            'scheduled_info' => $scheduled_info,
+            'next_scheduled' => $next_scheduled,
+            'next_scheduled_formatted' => $next_scheduled ? date( 'Y-m-d H:i:s', $next_scheduled ) : 'Not scheduled',
+            'last_check' => $last_check,
+            'last_check_formatted' => $last_check ? date( 'Y-m-d H:i:s', $last_check ) : 'Never',
+            'wp_cron_disabled' => defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON,
+            'cron_running' => ! defined( 'DISABLE_WP_CRON' ) || ! DISABLE_WP_CRON
+        );
+    }
+
+    /**
+     * Show cron debug info (only show on network admin pages)
+     */
+    public function show_cron_debug_info() {
+        if ( ! is_network_admin() || ! current_user_can( 'manage_network' ) ) {
+            return;
+        }
+
+        $current_screen = get_current_screen();
+        if ( ! $current_screen || $current_screen->id !== 'settings_page_domain-mapping-network' ) {
+            return;
+        }
+
+        $status = $this->get_cron_status();
+
+        if ( $status['wp_cron_disabled'] ) {
+            echo '<div class="notice notice-warning"><p>';
+            echo '<strong>WP Domain Mapping:</strong> WordPress Cron is disabled (DISABLE_WP_CRON = true). ';
+            echo 'Automatic health checks will not work. Please set up a system cron job.';
+            echo '</p></div>';
+        }
+
+        // Show next execution time (only in debug mode)
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            echo '<div class="notice notice-info"><p>';
+            echo '<strong>Health Check Status:</strong><br>';
+            echo 'Next scheduled: ' . esc_html( $status['next_scheduled_formatted'] ) . '<br>';
+            echo 'Last check: ' . esc_html( $status['last_check_formatted'] ) . '<br>';
+            echo '<a href="' . add_query_arg( 'dm_test_cron', '1' ) . '">Test Cron Execution</a>';
+            echo '</p></div>';
+        }
+    }
+
+    /**
+     * Test cron execution (only for debugging)
+     */
+    public function test_cron_execution() {
+        if ( ! isset( $_GET['dm_test_cron'] ) || ! current_user_can( 'manage_network' ) ) {
+            return;
+        }
+
+        // Manually trigger health check
+        $this->scheduled_health_check();
+
+        wp_redirect( remove_query_arg( 'dm_test_cron' ) );
+        exit;
+    }
+
     // ========================================
     // Import/Export Functions
     // ========================================
@@ -899,7 +1008,7 @@ class WP_Domain_Mapping_Tools {
             wp_send_json_error( __( 'Invalid security token. Please try again.', 'wp-domain-mapping' ) );
         }
 
-        // 在处理文件之前添加：
+        // Check file size before processing
         if ($_FILES['csv_file']['size'] > 5 * 1024 * 1024) {
             wp_send_json_error(__('File size exceeds 5MB limit.', 'wp-domain-mapping'));
             return;
@@ -915,7 +1024,7 @@ class WP_Domain_Mapping_Tools {
         $update_existing = isset( $_POST['update_existing'] ) ? (bool) $_POST['update_existing'] : false;
         $validate_sites = isset( $_POST['validate_sites'] ) ? (bool) $_POST['validate_sites'] : true;
 
-        // 验证文件类型
+        // Validate file type
         $file_type = wp_check_filetype($_FILES['csv_file']['name']);
         if (!in_array($file_type['ext'], array('csv', 'txt'))) {
             wp_send_json_error(__('Only CSV files are allowed.', 'wp-domain-mapping'));
diff --git a/includes/functions.php b/includes/functions.php
index 63b91e3..6c69982 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -25,7 +25,7 @@ function dm_ensure_protocol( $domain ) {
 
 /**
  * Clean domain name (remove protocol and trailing slash)
- * UPDATED: Keep www prefix to distinguish www.domain.com from domain.com
+ * UPDATED: Improved domain cleaning function, preserves www prefix
  *
  * @param string $domain Domain name
  * @return string Cleaned domain
@@ -49,10 +49,15 @@ function dm_clean_domain( $domain ) {
     if ( function_exists( 'idn_to_ascii' ) && preg_match( '/[^a-z0-9\-\.]/i', $domain ) ) {
         if (defined('INTL_IDNA_VARIANT_UTS46')) {
             // PHP 7.2+
-            $domain = idn_to_ascii( $domain, 0, INTL_IDNA_VARIANT_UTS46 );
+            $ascii_domain = idn_to_ascii( $domain, 0, INTL_IDNA_VARIANT_UTS46 );
         } else {
             // PHP < 7.2
-            $domain = idn_to_ascii( $domain );
+            $ascii_domain = idn_to_ascii( $domain );
+        }
+
+        // Only use converted result if conversion was successful
+        if ($ascii_domain !== false) {
+            $domain = $ascii_domain;
         }
     }
 
@@ -61,14 +66,82 @@ function dm_clean_domain( $domain ) {
 
 /**
  * Validate a domain name
- * UPDATED: Accept www prefix as valid
+ * UPDATED: More flexible domain validation, supports www prefix and more valid formats
  *
  * @param string $domain The domain
  * @return bool True if valid
  */
 function dm_validate_domain( $domain ) {
-    // Basic validation - now accepts www prefix
-    return (bool) preg_match( '/^(www\.)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,}$/i', $domain );
+    // Remove possible protocol and path
+    $domain = preg_replace('#^https?://#', '', $domain);
+    $domain = preg_replace('#/.*$#', '', $domain);
+    $domain = trim($domain);
+
+    // Check if empty
+    if (empty($domain)) {
+        return false;
+    }
+
+    // Check length limit (RFC 1035)
+    if (strlen($domain) > 253) {
+        return false;
+    }
+
+    // Check if contains only valid characters (letters, numbers, dots, hyphens)
+    if (!preg_match('/^[a-zA-Z0-9.-]+$/', $domain)) {
+        return false;
+    }
+
+    // Check if starts or ends with dot
+    if (substr($domain, 0, 1) === '.' || substr($domain, -1) === '.') {
+        return false;
+    }
+
+    // Check for consecutive dots
+    if (strpos($domain, '..') !== false) {
+        return false;
+    }
+
+    // Split domain into parts
+    $parts = explode('.', $domain);
+
+    // Need at least two parts (domain.tld)
+    if (count($parts) < 2) {
+        return false;
+    }
+
+    // Check each part
+    foreach ($parts as $part) {
+        // Each part cannot be empty
+        if (empty($part)) {
+            return false;
+        }
+
+        // Each part cannot exceed 63 characters (RFC 1035)
+        if (strlen($part) > 63) {
+            return false;
+        }
+
+        // Each part cannot start or end with hyphen
+        if (substr($part, 0, 1) === '-' || substr($part, -1) === '-') {
+            return false;
+        }
+
+        // Each part can only contain letters, numbers and hyphens
+        if (!preg_match('/^[a-zA-Z0-9-]+$/', $part)) {
+            return false;
+        }
+    }
+
+    // Check TLD (last part) validity
+    $tld = end($parts);
+
+    // TLD needs at least 2 characters and can only contain letters
+    if (strlen($tld) < 2 || !preg_match('/^[a-zA-Z]+$/', $tld)) {
+        return false;
+    }
+
+    return true;
 }
 
 /**
@@ -443,20 +516,302 @@ function dm_format_action_name( $action ) {
     }
 }
 
-// Cache functions
+/**
+ * Enhanced caching functions for better performance
+ */
+
+// Cache functions - IMPROVED
 function dm_get_domains_by_blog_id_cached($blog_id) {
     $cache_key = 'dm_domains_' . $blog_id;
-    $domains = wp_cache_get($cache_key, 'domain_mapping');
+    $cache_group = 'domain_mapping';
+
+    $domains = wp_cache_get($cache_key, $cache_group);
 
     if (false === $domains) {
         $domains = dm_get_domains_by_blog_id($blog_id);
-        wp_cache_set($cache_key, $domains, 'domain_mapping', HOUR_IN_SECONDS);
+        // Cache for 1 hour, or until manually cleared
+        wp_cache_set($cache_key, $domains, $cache_group, HOUR_IN_SECONDS);
     }
 
     return $domains;
 }
 
-// Clear cache function
-function dm_clear_domain_cache($blog_id) {
-    wp_cache_delete('dm_domains_' . $blog_id, 'domain_mapping');
+// Clear cache function - IMPROVED
+function dm_clear_domain_cache($blog_id = null) {
+    $cache_group = 'domain_mapping';
+
+    if ($blog_id) {
+        // Clear specific blog cache
+        wp_cache_delete('dm_domains_' . $blog_id, $cache_group);
+        wp_cache_delete('dm_domain_exists_' . $blog_id, $cache_group);
+    } else {
+        // Clear all domain mapping caches
+        wp_cache_flush_group($cache_group);
+    }
+
+    // Also clear object cache if available
+    if (function_exists('wp_cache_flush_group')) {
+        wp_cache_flush_group($cache_group);
+    }
+}
+
+/**
+ * Cached domain existence check
+ */
+function dm_domain_exists_cached($domain) {
+    $cache_key = 'dm_domain_exists_' . md5($domain);
+    $cache_group = 'domain_mapping';
+
+    $exists = wp_cache_get($cache_key, $cache_group);
+
+    if (false === $exists) {
+        $exists = dm_get_domain_by_name($domain);
+        // Cache for 30 minutes
+        wp_cache_set($cache_key, $exists, $cache_group, 30 * MINUTE_IN_SECONDS);
+    }
+
+    return $exists;
+}
+
+/**
+ * Batch clear cache for multiple blogs
+ */
+function dm_clear_multiple_domain_cache($blog_ids) {
+    if (!is_array($blog_ids)) {
+        $blog_ids = array($blog_ids);
+    }
+
+    foreach ($blog_ids as $blog_id) {
+        dm_clear_domain_cache($blog_id);
+    }
+}
+
+/**
+ * Health check results caching
+ */
+function dm_get_health_result_cached($domain) {
+    $cache_key = 'dm_health_' . md5($domain);
+    $cache_group = 'domain_mapping_health';
+
+    $result = wp_cache_get($cache_key, $cache_group);
+
+    if (false === $result) {
+        $result = dm_get_health_result($domain);
+        if ($result) {
+            // Cache for 1 hour
+            wp_cache_set($cache_key, $result, $cache_group, HOUR_IN_SECONDS);
+        }
+    }
+
+    return $result;
+}
+
+/**
+ * Clear health check cache
+ */
+function dm_clear_health_cache($domain = null) {
+    $cache_group = 'domain_mapping_health';
+
+    if ($domain) {
+        wp_cache_delete('dm_health_' . md5($domain), $cache_group);
+    } else {
+        if (function_exists('wp_cache_flush_group')) {
+            wp_cache_flush_group($cache_group);
+        }
+    }
+}
+/**
+ * Enhanced error handling and logging functions
+ */
+
+/**
+ * Log domain mapping errors
+ */
+function dm_log_error($message, $context = array()) {
+    if (!defined('WP_DEBUG') || !WP_DEBUG) {
+        return;
+    }
+
+    $log_message = '[WP Domain Mapping] ' . $message;
+
+    if (!empty($context)) {
+        $log_message .= ' Context: ' . json_encode($context);
+    }
+
+    error_log($log_message);
+}
+
+/**
+ * Log domain mapping info
+ */
+function dm_log_info($message, $context = array()) {
+    if (!defined('WP_DEBUG') || !WP_DEBUG) {
+        return;
+    }
+
+    $log_message = '[WP Domain Mapping INFO] ' . $message;
+
+    if (!empty($context)) {
+        $log_message .= ' Context: ' . json_encode($context);
+    }
+
+    error_log($log_message);
+}
+
+/**
+ * Safe database query execution
+ */
+function dm_safe_query($query, $params = array()) {
+    global $wpdb;
+
+    try {
+        if (!empty($params)) {
+            $prepared = $wpdb->prepare($query, $params);
+        } else {
+            $prepared = $query;
+        }
+
+        $result = $wpdb->query($prepared);
+
+        if ($result === false) {
+            dm_log_error('Database query failed', array(
+                'query' => $query,
+                'params' => $params,
+                'error' => $wpdb->last_error
+            ));
+        }
+
+        return $result;
+    } catch (Exception $e) {
+        dm_log_error('Database exception', array(
+            'query' => $query,
+            'params' => $params,
+            'exception' => $e->getMessage()
+        ));
+        return false;
+    }
+}
+
+/**
+ * Enhanced domain validation with error details
+ */
+function dm_validate_domain_with_errors($domain) {
+    $errors = array();
+
+    // Remove possible protocol and path
+    $original_domain = $domain;
+    $domain = preg_replace('#^https?://#', '', $domain);
+    $domain = preg_replace('#/.*$#', '', $domain);
+    $domain = trim($domain);
+
+    // Check if empty
+    if (empty($domain)) {
+        $errors[] = __('Domain cannot be empty', 'wp-domain-mapping');
+        return array('valid' => false, 'errors' => $errors, 'domain' => $domain);
+    }
+
+    // Check length limit (RFC 1035)
+    if (strlen($domain) > 253) {
+        $errors[] = __('Domain name too long (max 253 characters)', 'wp-domain-mapping');
+    }
+
+    // Check if contains only valid characters
+    if (!preg_match('/^[a-zA-Z0-9.-]+$/', $domain)) {
+        $errors[] = __('Domain contains invalid characters', 'wp-domain-mapping');
+    }
+
+    // Check if starts or ends with dot
+    if (substr($domain, 0, 1) === '.' || substr($domain, -1) === '.') {
+        $errors[] = __('Domain cannot start or end with a dot', 'wp-domain-mapping');
+    }
+
+    // Check for consecutive dots
+    if (strpos($domain, '..') !== false) {
+        $errors[] = __('Domain cannot contain consecutive dots', 'wp-domain-mapping');
+    }
+
+    // Split domain into parts
+    $parts = explode('.', $domain);
+
+    // Need at least two parts
+    if (count($parts) < 2) {
+        $errors[] = __('Domain must have at least two parts (e.g., domain.com)', 'wp-domain-mapping');
+    }
+
+    // Check each part
+    foreach ($parts as $i => $part) {
+        if (empty($part)) {
+            $errors[] = sprintf(__('Domain part %d is empty', 'wp-domain-mapping'), $i + 1);
+            continue;
+        }
+
+        if (strlen($part) > 63) {
+            $errors[] = sprintf(__('Domain part "%s" too long (max 63 characters)', 'wp-domain-mapping'), $part);
+        }
+
+        if (substr($part, 0, 1) === '-' || substr($part, -1) === '-') {
+            $errors[] = sprintf(__('Domain part "%s" cannot start or end with hyphen', 'wp-domain-mapping'), $part);
+        }
+
+        if (!preg_match('/^[a-zA-Z0-9-]+$/', $part)) {
+            $errors[] = sprintf(__('Domain part "%s" contains invalid characters', 'wp-domain-mapping'), $part);
+        }
+    }
+
+    // Check TLD
+    if (count($parts) >= 2) {
+        $tld = end($parts);
+        if (strlen($tld) < 2 || !preg_match('/^[a-zA-Z]+$/', $tld)) {
+            $errors[] = __('Invalid top-level domain (TLD)', 'wp-domain-mapping');
+        }
+    }
+
+    $is_valid = empty($errors);
+
+    // Log validation attempts if debugging
+    if (!$is_valid) {
+        dm_log_info('Domain validation failed', array(
+            'original' => $original_domain,
+            'cleaned' => $domain,
+            'errors' => $errors
+        ));
+    }
+
+    return array(
+        'valid' => $is_valid,
+        'errors' => $errors,
+        'domain' => $domain,
+        'original' => $original_domain
+    );
+}
+
+/**
+ * Enhanced health check with error handling
+ */
+function dm_check_domain_health_safe($domain) {
+    try {
+        $tools = WP_Domain_Mapping_Tools::get_instance();
+        $result = $tools->check_domain_health($domain);
+
+        dm_log_info('Health check completed', array(
+            'domain' => $domain,
+            'result' => $result
+        ));
+
+        return $result;
+    } catch (Exception $e) {
+        dm_log_error('Health check failed', array(
+            'domain' => $domain,
+            'exception' => $e->getMessage()
+        ));
+
+        return array(
+            'domain' => $domain,
+            'last_check' => current_time('mysql'),
+            'error' => $e->getMessage(),
+            'dns_status' => 'error',
+            'ssl_valid' => false,
+            'accessible' => false
+        );
+    }
 }
diff --git a/languages/wp-domain-mapping-zh_CN.mo b/languages/wp-domain-mapping-zh_CN.mo
index 5e00556..d1e1753 100644
Binary files a/languages/wp-domain-mapping-zh_CN.mo and b/languages/wp-domain-mapping-zh_CN.mo differ
diff --git a/languages/wp-domain-mapping-zh_CN.po b/languages/wp-domain-mapping-zh_CN.po
index a8b77b2..645e539 100644
--- a/languages/wp-domain-mapping-zh_CN.po
+++ b/languages/wp-domain-mapping-zh_CN.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: WP Domain Mapping\n"
-"POT-Creation-Date: 2025-05-24 12:42+0800\n"
-"PO-Revision-Date: 2025-05-24 13:09+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-26 11:10+0800\n"
+"PO-Revision-Date: 2025-05-26 22:26+0800\n"
 "Last-Translator: \n"
-"Language-Team: \n"
+"Language-Team: 简体中文\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,861 +18,54 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: "
 "__;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Loco-Version: 2.8.0; wp-6.8.1; php-8.3.0-dev\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: *.min.js\n"
 
-#: admin/domains-page.php:18 admin/pages.php:21 admin/settings-page.php:39
+#: admin/pages.php:67
+msgid "%d domain mapping imported successfully."
+msgid_plural "%d domain mappings imported successfully."
+msgstr[0] "成功导入 %d 个域名映射。"
+
+#. %s: time ago
+#: admin/logs-table.php:128
 #, php-format
-msgid "Version: %s"
-msgstr "版本：%s"
+msgid "%s ago"
+msgstr "%s之前"
 
-#: admin/domains-page.php:21 admin/pages.php:24 admin/settings-page.php:42
-msgid "Document"
-msgstr "文档"
-
-#: admin/domains-page.php:24 admin/pages.php:27 admin/settings-page.php:45
-msgid "Support"
-msgstr "支持"
-
-#: admin/domains-page.php:29
-msgid "Edit Domain"
-msgstr "编辑域名"
-
-#: admin/domains-page.php:29 admin/templates.php:386 admin/user-page.php:43
-msgid "Add New Domain"
-msgstr "添加新域名"
-
-#: admin/domains-page.php:36 admin/domains-page.php:307
-#: includes/class-tools.php:145
-msgid "Site ID"
-msgstr "站点 ID"
-
-#: admin/domains-page.php:46
+#: admin/pages.php:788
 #, php-format
-msgid ""
-"Not sure about Site ID? <a href=\"%s\" target=\"_blank\">View all sites</a> "
-"to find the ID."
-msgstr ""
+msgid "%s domain"
+msgid_plural "%s domains"
+msgstr[0] "%s 域名"
 
-#: admin/domains-page.php:57 admin/domains-page.php:309 admin/logs-table.php:73
-#: admin/pages.php:646 admin/templates.php:393 admin/templates.php:429
-#: admin/templates.php:578 admin/user-page.php:50 admin/user-page.php:86
-msgid "Domain"
-msgstr "域名"
-
-#: admin/domains-page.php:62 admin/templates.php:398 admin/user-page.php:55
-msgid "Enter the domain without http:// or https:// (e.g., example.com)"
-msgstr "输入不带 http:// 或 https:// 的域名（例如 example.com）"
-
-#: admin/domains-page.php:67 admin/domains-page.php:310 admin/templates.php:430
-#: admin/user-page.php:87
-msgid "Primary"
-msgstr "主域名"
-
-#: admin/domains-page.php:71
-msgid "Set as the primary domain for this site"
-msgstr ""
-
-#: admin/domains-page.php:78 admin/domains-page.php:368
-msgid "Warning! Primary domains are currently disabled in network settings."
-msgstr ""
-
-#: admin/domains-page.php:85
-msgid "Update Domain"
-msgstr "更新域名"
-
-#: admin/domains-page.php:86 admin/templates.php:417 admin/user-page.php:74
-msgid "Add Domain"
-msgstr "添加域名"
-
-#: admin/domains-page.php:90
-msgid "Cancel"
-msgstr ""
-
-#: admin/domains-page.php:98
-msgid "Search & Filter Domains"
-msgstr "搜索和过滤域名"
-
-#: admin/domains-page.php:103
-msgid "Domain:"
-msgstr "域名："
-
-#: admin/domains-page.php:108
-msgid "Site ID:"
-msgstr "站点 ID："
-
-#: admin/domains-page.php:113
-msgid "Primary:"
-msgstr "主域："
-
-#: admin/domains-page.php:115
-msgid "All"
-msgstr "全部"
-
-#: admin/domains-page.php:117 admin/domains-page.php:339
-#: admin/templates.php:446 admin/user-page.php:103
-msgid "Yes"
-msgstr "是"
-
-#: admin/domains-page.php:120 admin/domains-page.php:342
-msgid "No"
-msgstr "否"
-
-#: admin/domains-page.php:126 admin/logs-table.php:31
-msgid "Filter"
-msgstr "筛选"
-
-#: admin/domains-page.php:129 admin/logs-table.php:35
-msgid "Clear"
-msgstr ""
-
-#: admin/domains-page.php:140 admin/pages.php:274 admin/settings-page.php:175
-#: admin/templates.php:73
-msgid "Manage Domains"
-msgstr "管理域名"
-
-#: admin/domains-page.php:143
-msgid "Domain Logs"
-msgstr "域名日志"
-
-#: admin/domains-page.php:205 admin/logs-table.php:47 admin/logs-table.php:144
-msgid "&laquo;"
-msgstr "&laquo;"
-
-#: admin/domains-page.php:206 admin/logs-table.php:48 admin/logs-table.php:145
-msgid "&raquo;"
-msgstr "&raquo;"
-
-#. translators: %s: number of items
+#. %s: number of items
 #: admin/domains-page.php:217
 #, php-format
 msgid "%s item"
 msgid_plural "%s items"
 msgstr[0] "%s 项"
 
-#. translators: %s: IDN warning message
+#. %s: number of items
+#: admin/logs-table.php:59 admin/logs-table.php:156
+#, php-format
+msgid "%s log entry"
+msgid_plural "%s log entries"
+msgstr[0] "%s 条日志"
+
+#: admin/pages.php:329 admin/pages.php:373 admin/pages.php:442
+#: admin/pages.php:486 admin/settings-page.php:209 admin/settings-page.php:245
+msgid "(or empty)"
+msgstr "（或空）"
+
+#. %s: IDN warning message
 #: admin/domains-page.php:230
 #, php-format
 msgid "<strong>Note:</strong> %s"
 msgstr "<strong>注意：</strong> %s"
 
-#: admin/domains-page.php:245
-msgid "Domain Statistics"
-msgstr "域名统计"
-
-#: admin/domains-page.php:249
-msgid "Total Domains"
-msgstr "域名总数"
-
-#: admin/domains-page.php:253
-msgid "Primary Domains"
-msgstr "主域"
-
-#: admin/domains-page.php:257
-msgid "Sites with Mapped Domains"
-msgstr ""
-
-#: admin/domains-page.php:280 admin/pages.php:731 admin/templates.php:744
-msgid "No domains found."
-msgstr "未找到域名。"
-
-#: admin/domains-page.php:292
-msgid "Select bulk action"
-msgstr "选择批量操作"
-
-#: admin/domains-page.php:294
-msgid "Bulk Actions"
-msgstr "批量操作"
-
-#: admin/domains-page.php:295 admin/domains-page.php:355
-#: admin/templates.php:462 admin/user-page.php:119
-msgid "Delete"
-msgstr "删除"
-
-#: admin/domains-page.php:297
-msgid "Apply"
-msgstr "应用"
-
-#: admin/domains-page.php:308
-msgid "Site Name"
-msgstr "站点名称"
-
-#: admin/domains-page.php:311 admin/pages.php:652 admin/templates.php:431
-#: admin/templates.php:584 admin/user-page.php:88
-msgid "Actions"
-msgstr "操作"
-
-#: admin/domains-page.php:316 admin/pages.php:660 admin/templates.php:592
-msgid "Unknown"
-msgstr ""
-
-#: admin/domains-page.php:349
-msgid "Edit"
-msgstr "编辑"
-
-#: admin/domains-page.php:385
-msgid ""
-"Domain mapping logs table is missing. Please deactivate and reactivate the "
-"plugin."
-msgstr ""
-
-#: admin/domains-page.php:421
-msgid "No domain mapping logs available."
-msgstr ""
-
-#: admin/logs-table.php:21
-msgid "Filter by action"
-msgstr ""
-
-#: admin/logs-table.php:23
-msgid "All actions"
-msgstr ""
-
-#. translators: %s: number of items
-#: admin/logs-table.php:59 admin/logs-table.php:156
+#: admin/pages.php:1266 includes/class-admin.php:1264
 #, php-format
-msgid "%s log entry"
-msgid_plural "%s log entries"
-msgstr[0] ""
-
-#: admin/logs-table.php:71
-msgid "User"
-msgstr "用户"
-
-#: admin/logs-table.php:72
-msgid "Action"
-msgstr "操作"
-
-#: admin/logs-table.php:74 admin/pages.php:647 admin/templates.php:579
-msgid "Site"
-msgstr "站点"
-
-#: admin/logs-table.php:75
-msgid "Date"
-msgstr ""
-
-#: admin/logs-table.php:88
-#, php-format
-msgid "User #%d"
-msgstr ""
-
-#: admin/logs-table.php:102
-#, php-format
-msgid "Site #%d"
-msgstr "站点 #%d"
-
-#. translators: %s: time ago
-#: admin/logs-table.php:128
-#, php-format
-msgid "%s ago"
-msgstr ""
-
-#: admin/pages.php:38
-msgid "Settings"
-msgstr ""
-
-#: admin/pages.php:39
-msgid "Domain Health"
-msgstr "域名健康"
-
-#: admin/pages.php:40
-msgid "Import/Export"
-msgstr ""
-
-#: admin/pages.php:46 admin/templates.php:535
-msgid "Domain health check completed."
-msgstr ""
-
-#: admin/pages.php:52
-msgid "Domain health check started. The check is running in the background."
-msgstr ""
-
-#: admin/pages.php:58 admin/templates.php:541 includes/class-admin.php:610
-msgid "Settings saved."
-msgstr ""
-
-#: admin/pages.php:67 admin/templates.php:824
-#, php-format
-msgid "%d domain mapping imported successfully."
-msgid_plural "%d domain mappings imported successfully."
-msgstr[0] ""
-
-#: admin/pages.php:79 admin/templates.php:836
-msgid "Domain mappings exported successfully."
-msgstr ""
-
-#: admin/pages.php:162 admin/settings-page.php:54
-msgid "Server Configuration"
-msgstr "服务器配置"
-
-#: admin/pages.php:163 admin/settings-page.php:55
-msgid "Configure the IP address or CNAME for domain mapping."
-msgstr "配置域映射的IP地址或CNAME。"
-
-#: admin/pages.php:167 admin/settings-page.php:59
-msgid "Server IP Address:"
-msgstr "服务器 IP 地址："
-
-#: admin/pages.php:171 admin/settings-page.php:63
-msgid ""
-"Enter the IP address(es) users should point their DNS A records to. Use "
-"commas to separate multiple IPs."
-msgstr "输入用户应将其 DNS A 记录指向的 IP 地址。使用逗号分隔多个 IP。"
-
-#: admin/pages.php:176 admin/settings-page.php:77
-msgid "Server CNAME Domain:"
-msgstr "服务器 CNAME 域名："
-
-#. translators: %s: IDN warning message
-#: admin/pages.php:183 admin/settings-page.php:84
-#, php-format
-msgid "Use a CNAME instead of an IP (overrides IP settings). %s"
-msgstr "使用 CNAME 而不是 IP（覆盖 IP 设置）。%s"
-
-#: admin/pages.php:192 admin/pages.php:198 admin/settings-page.php:93
-#: admin/settings-page.php:99
-msgid "Domain Options"
-msgstr "域名选项"
-
-#: admin/pages.php:201 admin/settings-page.php:102
-msgid "Enable Remote Login"
-msgstr "启用远程登录"
-
-#: admin/pages.php:204 admin/settings-page.php:105
-msgid ""
-"Allows users to log in from mapped domains and be redirected to the original "
-"domain for authentication."
-msgstr ""
-
-#: admin/pages.php:213 admin/settings-page.php:114 admin/templates.php:12
-msgid "Permanent Redirect"
-msgstr ""
-
-#: admin/pages.php:216 admin/settings-page.php:117 admin/templates.php:15
-msgid "Use Permanent Redirect (301)"
-msgstr ""
-
-#: admin/pages.php:219 admin/settings-page.php:120 admin/templates.php:18
-msgid ""
-"Use 301 redirects instead of 302 redirects. This is better for SEO but may "
-"cause caching issues."
-msgstr ""
-
-#: admin/pages.php:228 admin/settings-page.php:129 admin/templates.php:27
-msgid "User Settings"
-msgstr ""
-
-#: admin/pages.php:231 admin/settings-page.php:132 admin/templates.php:30
-msgid "Enable User Domain Mapping Page"
-msgstr "启用用户域映射页面"
-
-#: admin/pages.php:234 admin/settings-page.php:135 admin/templates.php:33
-msgid ""
-"Allow site administrators to manage their domain mappings from the Tools "
-"menu."
-msgstr ""
-
-#: admin/pages.php:243 admin/settings-page.php:144 admin/templates.php:42
-msgid "Redirect Admin"
-msgstr ""
-
-#: admin/pages.php:246 admin/settings-page.php:147 admin/templates.php:45
-msgid "Redirect Admin Pages to Original Domain"
-msgstr "将管理页面重定向到原始域"
-
-#: admin/pages.php:249 admin/settings-page.php:150 admin/templates.php:48
-msgid ""
-"Force admin pages to use the original WordPress domain instead of the mapped "
-"domain."
-msgstr ""
-
-#: admin/pages.php:258 admin/settings-page.php:159 admin/templates.php:57
-msgid "Disable Primary Domain"
-msgstr ""
-
-#: admin/pages.php:261 admin/settings-page.php:162 admin/templates.php:60
-msgid "Disable Primary Domain Check"
-msgstr "禁用主域检查"
-
-#: admin/pages.php:264 admin/settings-page.php:165 admin/templates.php:63
-msgid ""
-"Do not redirect to the primary domain, but allow access through any mapped "
-"domain."
-msgstr ""
-
-#: admin/pages.php:272 admin/settings-page.php:173 admin/templates.php:71
-msgid "Save Configuration"
-msgstr "保存配置"
-
-#: admin/pages.php:292 admin/settings-page.php:182 admin/templates.php:80
-msgid "DNS Setup Instructions"
-msgstr ""
-
-#: admin/pages.php:296 admin/settings-page.php:186 admin/templates.php:84
-#: admin/templates.php:488 admin/user-page.php:145
-msgid "CNAME Method (Recommended)"
-msgstr ""
-
-#. translators: %s: CNAME value
-#: admin/pages.php:301 admin/settings-page.php:191 admin/templates.php:88
-#, php-format
-msgid ""
-"Tell your users to add a DNS \"CNAME\" record for their domain pointing to: "
-"%s"
-msgstr ""
-
-#: admin/pages.php:307 admin/pages.php:339 admin/settings-page.php:197
-#: admin/settings-page.php:229 admin/templates.php:94 admin/templates.php:125
-msgid "Example DNS Record"
-msgstr ""
-
-#: admin/pages.php:311 admin/pages.php:343 admin/settings-page.php:201
-#: admin/settings-page.php:233 admin/templates.php:98 admin/templates.php:129
-msgid "Type"
-msgstr ""
-
-#: admin/pages.php:312 admin/pages.php:344 admin/settings-page.php:202
-#: admin/settings-page.php:234 admin/templates.php:99 admin/templates.php:130
-msgid "Name"
-msgstr ""
-
-#: admin/pages.php:313 admin/pages.php:345 admin/pages.php:396
-#: admin/settings-page.php:203 admin/settings-page.php:235
-#: admin/settings-page.php:287 admin/templates.php:100 admin/templates.php:131
-#: admin/templates.php:183
-msgid "Value"
-msgstr ""
-
-#: admin/pages.php:319 admin/pages.php:355 admin/settings-page.php:209
-#: admin/settings-page.php:245 admin/templates.php:106 admin/templates.php:141
-msgid "(or empty)"
-msgstr ""
-
-#: admin/pages.php:328 admin/settings-page.php:218 admin/templates.php:115
-#: admin/templates.php:493 admin/user-page.php:150
-msgid "A Record Method"
-msgstr ""
-
-#. translators: %s: IP address(es)
-#: admin/pages.php:333 admin/settings-page.php:223 admin/templates.php:119
-#, php-format
-msgid ""
-"Tell your users to add a DNS \"A\" record for their domain pointing to: %s"
-msgstr ""
-
-#: admin/pages.php:367 admin/settings-page.php:257 admin/templates.php:153
-msgid ""
-"Please configure either a Server IP Address or CNAME to provide DNS setup "
-"instructions."
-msgstr ""
-
-#: admin/pages.php:372 admin/settings-page.php:262 admin/templates.php:158
-msgid "Additional DNS Tips"
-msgstr ""
-
-#: admin/pages.php:374 admin/settings-page.php:265 admin/templates.php:161
-msgid "Most DNS changes take 24-48 hours to fully propagate worldwide."
-msgstr ""
-
-#: admin/pages.php:375 admin/settings-page.php:268 admin/templates.php:164
-msgid ""
-"For \"www\" subdomain, create a separate CNAME record with \"www\" as the "
-"name pointing to the same value."
-msgstr ""
-
-#: admin/pages.php:376 admin/settings-page.php:271 admin/templates.php:167
-msgid ""
-"If you're using Cloudflare or similar services, you may need to adjust proxy "
-"settings."
-msgstr ""
-
-#: admin/pages.php:377 admin/settings-page.php:274 admin/templates.php:170
-msgid ""
-"For SSL to work properly, make sure your web server is configured with the "
-"appropriate SSL certificates for mapped domains."
-msgstr ""
-
-#: admin/pages.php:390 admin/settings-page.php:281 admin/templates.php:177
-msgid "Installation Check"
-msgstr ""
-
-#: admin/pages.php:394 admin/settings-page.php:285 admin/templates.php:181
-msgid "Status"
-msgstr ""
-
-#: admin/pages.php:395 admin/settings-page.php:286 admin/templates.php:182
-msgid "Check"
-msgstr ""
-
-#: admin/pages.php:406 admin/settings-page.php:297 admin/templates.php:193
-msgid "sunrise.php file"
-msgstr ""
-
-#: admin/pages.php:409 admin/settings-page.php:300 admin/templates.php:196
-msgid "Found"
-msgstr ""
-
-#. translators: %s: WordPress content directory
-#: admin/pages.php:414 admin/settings-page.php:305 admin/templates.php:200
-#, php-format
-msgid "Not found - copy sunrise.php to %s"
-msgstr ""
-
-#: admin/pages.php:429 admin/settings-page.php:320 admin/templates.php:215
-msgid "SUNRISE constant"
-msgstr ""
-
-#. translators: %s: SUNRISE constant value
-#: admin/pages.php:435 admin/settings-page.php:326 admin/templates.php:220
-#, php-format
-msgid "Defined as: %s"
-msgstr ""
-
-#: admin/pages.php:440 admin/settings-page.php:331 admin/templates.php:225
-msgid "Not defined - add to wp-config.php: "
-msgstr ""
-
-#: admin/pages.php:453 admin/settings-page.php:344 admin/templates.php:238
-msgid "SUNRISE_LOADED"
-msgstr ""
-
-#: admin/pages.php:456 admin/settings-page.php:347 admin/templates.php:241
-msgid "Loaded successfully"
-msgstr ""
-
-#: admin/pages.php:460 admin/settings-page.php:351 admin/templates.php:245
-msgid ""
-"Not loaded - make sure SUNRISE is defined before the require_once() in wp-"
-"config.php"
-msgstr ""
-
-#: admin/pages.php:462 admin/settings-page.php:353 admin/templates.php:247
-msgid "Not loaded - SUNRISE constant not defined"
-msgstr ""
-
-#: admin/pages.php:476 admin/settings-page.php:367 admin/templates.php:261
-msgid "COOKIE_DOMAIN"
-msgstr ""
-
-#: admin/pages.php:479 admin/settings-page.php:370 admin/templates.php:264
-msgid "Not defined (correct)"
-msgstr ""
-
-#. translators: %s: COOKIE_DOMAIN constant value
-#: admin/pages.php:484 admin/settings-page.php:375 admin/templates.php:268
-#, php-format
-msgid "Defined as: %s - remove this from wp-config.php"
-msgstr ""
-
-#: admin/pages.php:510 admin/settings-page.php:404 admin/templates.php:297
-msgid "Database tables"
-msgstr ""
-
-#: admin/pages.php:513 admin/settings-page.php:407 admin/templates.php:300
-msgid "All tables exist"
-msgstr ""
-
-#: admin/pages.php:515 admin/settings-page.php:409 admin/templates.php:302
-msgid "Some tables are missing - deactivate and reactivate the plugin"
-msgstr ""
-
-#: admin/pages.php:527 admin/settings-page.php:421 admin/templates.php:314
-msgid "Multisite"
-msgstr ""
-
-#: admin/pages.php:530 admin/settings-page.php:424 admin/templates.php:317
-msgid "Enabled"
-msgstr ""
-
-#: admin/pages.php:532 admin/settings-page.php:426 admin/templates.php:319
-msgid "Not enabled - this plugin requires WordPress Multisite"
-msgstr ""
-
-#: admin/pages.php:564 admin/templates.php:547
-msgid "Domain Health Status"
-msgstr "域名健康状态"
-
-#: admin/pages.php:569
-msgid "Health check in progress..."
-msgstr ""
-
-#: admin/pages.php:573
-#, php-format
-msgid "Processed %d of %d domains (%d%%)"
-msgstr ""
-
-#: admin/pages.php:602
-msgid "Processed "
-msgstr "正在处理"
-
-#: admin/pages.php:603
-msgid "of"
-msgstr ""
-
-#: admin/pages.php:604
-msgid "domains"
-msgstr "域名"
-
-#: admin/pages.php:620 admin/templates.php:553
-msgid "Check All Domains Now"
-msgstr ""
-
-#: admin/pages.php:631 admin/templates.php:563
-#, php-format
-msgid "%s domain"
-msgid_plural "%s domains"
-msgstr[0] "%s 域名"
-
-#: admin/pages.php:635 admin/templates.php:567
-msgid "No domains found"
-msgstr "未找到域名"
-
-#: admin/pages.php:648 admin/templates.php:580 admin/templates.php:679
-msgid "DNS Status"
-msgstr "DNS 状态"
-
-#: admin/pages.php:649 admin/templates.php:581
-msgid "SSL Status"
-msgstr "SSL 状态"
-
-#: admin/pages.php:650 admin/templates.php:582 includes/class-tools.php:177
-#: includes/class-tools.php:190
-msgid "Reachable"
-msgstr "可达"
-
-#: admin/pages.php:651 admin/templates.php:583 admin/templates.php:675
-msgid "Last Check"
-msgstr "最后检测"
-
-#: admin/pages.php:666 admin/templates.php:403 admin/templates.php:406
-#: admin/templates.php:598 admin/user-page.php:60 admin/user-page.php:63
-msgid "Primary Domain"
-msgstr "主域"
-
-#: admin/pages.php:680 admin/templates.php:612 admin/templates.php:684
-msgid "DNS correctly configured"
-msgstr ""
-
-#: admin/pages.php:685 admin/pages.php:699 admin/pages.php:710
-#: admin/templates.php:617 admin/templates.php:631 admin/templates.php:642
-msgid "Not checked yet"
-msgstr ""
-
-#: admin/pages.php:691 admin/templates.php:623
-msgid "SSL certificate valid"
-msgstr ""
-
-#: admin/pages.php:693 admin/templates.php:625
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: admin/pages.php:696 admin/templates.php:628
-msgid "SSL certificate issue"
-msgstr ""
-
-#: admin/pages.php:705 admin/templates.php:637 includes/class-tools.php:243
-msgid "Site is accessible"
-msgstr ""
-
-#: admin/pages.php:707 admin/templates.php:639 includes/class-tools.php:245
-msgid "Site is not accessible"
-msgstr ""
-
-#: admin/pages.php:716 admin/templates.php:648
-msgid "ago"
-msgstr ""
-
-#: admin/pages.php:718 admin/templates.php:650
-msgid "Never"
-msgstr ""
-
-#: admin/pages.php:724 admin/pages.php:826 admin/pages.php:831
-#: admin/templates.php:656
-msgid "Check Now"
-msgstr ""
-
-#: admin/pages.php:739 admin/templates.php:752
-msgid "Health Check Settings"
-msgstr ""
-
-#: admin/pages.php:747 admin/pages.php:750 admin/templates.php:760
-#: admin/templates.php:763
-msgid "Automatic Health Checks"
-msgstr ""
-
-#: admin/pages.php:753 admin/templates.php:766
-msgid "Enable automatic daily health checks"
-msgstr ""
-
-#: admin/pages.php:759 admin/pages.php:762 admin/templates.php:772
-#: admin/templates.php:775
-msgid "Email Notifications"
-msgstr ""
-
-#: admin/pages.php:765 admin/templates.php:778
-msgid "Send email notifications when domain health issues are detected"
-msgstr ""
-
-#: admin/pages.php:771 admin/templates.php:784
-msgid "Notification Email"
-msgstr ""
-
-#: admin/pages.php:774 admin/templates.php:787
-msgid "Email address for domain health notifications."
-msgstr ""
-
-#: admin/pages.php:778 admin/templates.php:791
-msgid "SSL Expiry Warning"
-msgstr ""
-
-#: admin/pages.php:781 admin/templates.php:794
-msgid "days"
-msgstr ""
-
-#: admin/pages.php:782 admin/templates.php:795
-msgid ""
-"Send notifications when SSL certificates are expiring within this many days."
-msgstr ""
-
-#: admin/pages.php:786
-msgid "Batch Size"
-msgstr ""
-
-#: admin/pages.php:789
-msgid "domains per batch"
-msgstr ""
-
-#: admin/pages.php:790
-msgid ""
-"Number of domains to check in each batch. Lower values prevent timeouts but "
-"take longer."
-msgstr ""
-
-#: admin/pages.php:796 admin/templates.php:801
-msgid "Save Changes"
-msgstr ""
-
-#: admin/pages.php:809
-msgid "Checking..."
-msgstr "检查中..."
-
-#: admin/pages.php:825 admin/pages.php:830
-msgid "An error occurred during the health check."
-msgstr ""
-
-#: admin/pages.php:846 admin/templates.php:844
-msgid "Export Domain Mappings"
-msgstr "导出域名映射"
-
-#: admin/pages.php:847 admin/templates.php:845
-msgid "Export all domain mappings to a CSV file."
-msgstr ""
-
-#: admin/pages.php:856 admin/templates.php:854
-msgid "Include column headers"
-msgstr ""
-
-#: admin/pages.php:861 admin/templates.php:859
-msgid "Export for specific site ID (optional):"
-msgstr ""
-
-#: admin/pages.php:863 admin/templates.php:861
-msgid "Leave empty to export all domains."
-msgstr ""
-
-#: admin/pages.php:867 admin/templates.php:865
-msgid "Export to CSV"
-msgstr ""
-
-#: admin/pages.php:873 admin/templates.php:871
-msgid "Import Domain Mappings"
-msgstr "导入域名映射"
-
-#: admin/pages.php:874 admin/templates.php:872
-msgid "Import domain mappings from a CSV file."
-msgstr ""
-
-#: admin/pages.php:881 admin/templates.php:879
-msgid "CSV File:"
-msgstr ""
-
-#: admin/pages.php:884 admin/templates.php:882
-msgid "The CSV file should have the columns: blog_id, domain, active (1 or 0)."
-msgstr ""
-
-#: admin/pages.php:885 admin/templates.php:883
-msgid "Example: 1,example.com,1"
-msgstr ""
-
-#: admin/pages.php:892 admin/templates.php:890
-msgid "First row contains column headers"
-msgstr ""
-
-#: admin/pages.php:899 admin/templates.php:897
-msgid "Update existing mappings"
-msgstr ""
-
-#: admin/pages.php:901 admin/templates.php:899
-#, fuzzy
-#| msgid "New domain already exists."
-msgid "If unchecked, will skip domains that already exist."
-msgstr "新的域名已经存在。"
-
-#: admin/pages.php:907 admin/templates.php:905
-msgid "Validate site IDs"
-msgstr ""
-
-#: admin/pages.php:909 admin/templates.php:907
-msgid "If checked, will only import domains for existing sites."
-msgstr ""
-
-#: admin/pages.php:913 admin/templates.php:911
-msgid "Import from CSV"
-msgstr ""
-
-#: admin/pages.php:918 admin/templates.php:916
-#, fuzzy
-#| msgid "Processing..."
-msgid "Processing import..."
-msgstr "正在处理…"
-
-#: admin/pages.php:926 admin/templates.php:924
-msgid "Import Results"
-msgstr ""
-
-#: admin/pages.php:933 admin/templates.php:931
-msgid "CSV Format"
-msgstr ""
-
-#: admin/pages.php:934 admin/templates.php:932
-msgid "The CSV file should follow this format:"
-msgstr ""
-
-#: admin/pages.php:959 admin/templates.php:957
-msgid "The ID of the WordPress site (required)"
-msgstr ""
-
-#: admin/pages.php:960 admin/templates.php:958
-#, fuzzy
-#| msgid "Enter the domain without http:// or https:// (e.g., example.com)"
-msgid "The domain name without http:// or https:// (required)"
-msgstr "输入不带 http:// 或 https:// 的域名（例如 example.com）"
-
-#: admin/pages.php:961 admin/templates.php:959
-msgid "Set to 1 to make this the primary domain, 0 otherwise (required)"
-msgstr ""
-
-#: admin/pages.php:1029
-msgid "An error occurred during import."
-msgstr ""
-
-#: admin/pages.php:1063 includes/class-admin.php:549
-#, fuzzy, php-format
-#| msgid ""
-#| "<strong>Warning!</strong> This plugin will only work if WordPress is "
-#| "installed in the root directory of your webserver. It is currently "
-#| "installed in ’%s’."
 msgid ""
 "<strong>Warning!</strong> This plugin will only work if WordPress is "
 "installed in the root directory of your webserver. It is currently installed "
@@ -880,195 +74,985 @@ msgstr ""
 "<strong>警告！</strong>此插件仅当 WordPress 安装在您的网络服务器的根目录中时"
 "才有效。它当前安装在『%s』中。"
 
-#. translators: %s: Server IP address
+#: includes/class-tools.php:814
+#, php-format
+msgid "[%s] Domain Mapping Health Alert"
+msgstr "[%s] 域名映射健康警报"
+
+#: admin/pages.php:345 admin/pages.php:458 admin/settings-page.php:218
+#: admin/user-page.php:150
+msgid "A Record Method"
+msgstr "A 记录方法"
+
+#: admin/logs-table.php:72
+msgid "Action"
+msgstr "操作"
+
+#: admin/domains-page.php:311 admin/pages.php:809 admin/user-page.php:88
+msgid "Actions"
+msgstr "操作"
+
+#: admin/domains-page.php:86 admin/user-page.php:74
+msgid "Add Domain"
+msgstr "添加域名"
+
+#: admin/domains-page.php:29 admin/user-page.php:43
+msgid "Add New Domain"
+msgstr "添加新域名"
+
+#: includes/functions.php:507
+msgid "Added"
+msgstr "已添加"
+
+#: admin/pages.php:397 admin/pages.php:510 admin/settings-page.php:262
+msgid "Additional DNS Tips"
+msgstr "其他 DNS 提示"
+
+#: admin/pages.php:873
+msgid "ago"
+msgstr "之前"
+
+#: admin/domains-page.php:115
+msgid "All"
+msgstr "全部"
+
+#: admin/logs-table.php:23
+msgid "All actions"
+msgstr "所有操作"
+
+#: includes/class-admin.php:613
+msgid "All domains are healthy!"
+msgstr "全部域名都健康！"
+
+#: includes/class-admin.php:293
+msgid "All Mapped Domains"
+msgstr "全部映射域名"
+
+#: admin/pages.php:671 admin/settings-page.php:427
+msgid "All tables exist"
+msgstr "所有表都存在"
+
+#: admin/pages.php:249 admin/settings-page.php:135
+msgid ""
+"Allow site administrators to manage their domain mappings from the Tools "
+"menu."
+msgstr "允许站点管理员从工具菜单管理他们的域名映射。"
+
+#: admin/pages.php:219 admin/settings-page.php:105
+msgid ""
+"Allows users to log in from mapped domains and be redirected to the original "
+"domain for authentication."
+msgstr "允许用户从映射域名登录，并重定向到原始域名进行身份验证。"
+
+#: admin/pages.php:1231
+msgid "An error occurred during import."
+msgstr "导入过程中发生错误。"
+
+#: admin/pages.php:979 admin/pages.php:984
+msgid "An error occurred during the health check."
+msgstr "健康检查过程中发生错误。"
+
+#: includes/class-admin.php:1046
+msgid "An error occurred while deleting domains."
+msgstr "删除域名时发生错误。"
+
+#: includes/class-admin.php:980
+msgid "An error occurred while saving domain."
+msgstr "保存域名时发生错误。"
+
+#: includes/class-admin.php:750
+msgid "An error occurred."
+msgstr "发生了错误。"
+
+#: admin/domains-page.php:297
+msgid "Apply"
+msgstr "应用"
+
+#: admin/user-page.php:118
+msgid "Are you sure you want to delete this domain?"
+msgstr "您确定要删除此域名吗？"
+
+#: admin/pages.php:902 admin/pages.php:905
+msgid "Automatic Health Checks"
+msgstr "自动健康检查"
+
+#: admin/pages.php:941
+msgid "Batch Size"
+msgstr "批处理大小"
+
+#: admin/domains-page.php:294
+msgid "Bulk Actions"
+msgstr "批量操作"
+
+#: includes/class-admin.php:367
+#, php-format
+msgid "by %s %s ago"
+msgstr "%s于%s前"
+
+#: admin/domains-page.php:90
+msgid "Cancel"
+msgstr "取消"
+
+#: includes/class-admin.php:1211
+msgid ""
+"Cannot delete the primary domain. Please set another domain as primary first."
+msgstr "无法删除主域名，请先设置其他域名为主域名。"
+
+#: includes/class-tools.php:679
+msgid "Cannot verify DNS configuration."
+msgstr "无法验证 DNS 配置。"
+
+#: admin/pages.php:533 admin/settings-page.php:286
+msgid "Check"
+msgstr "检查"
+
+#: admin/pages.php:777
+msgid "Check All Domains Now"
+msgstr "立即检查所有域名"
+
+#: includes/class-admin.php:386
+msgid "Check Health"
+msgstr "健康检查"
+
+#: admin/pages.php:881 admin/pages.php:980 admin/pages.php:985
+msgid "Check Now"
+msgstr "立即检查"
+
+#: admin/pages.php:963 includes/class-admin.php:753
+msgid "Checking..."
+msgstr "检查中..."
+
+#: admin/domains-page.php:129 admin/logs-table.php:35
+msgid "Clear"
+msgstr "清除"
+
+#: admin/pages.php:305 admin/pages.php:418 admin/settings-page.php:186
+#: admin/user-page.php:145
+msgid "CNAME Method (Recommended)"
+msgstr "CNAME 方法（推荐）"
+
+#: admin/pages.php:178 admin/settings-page.php:55
+msgid "Configure the IP address or CNAME for domain mapping."
+msgstr "配置域映射的IP地址或CNAME。"
+
+#: admin/pages.php:620 admin/settings-page.php:373
+msgid "COOKIE_DOMAIN"
+msgstr "COOKIE_DOMAIN"
+
+#: includes/class-tools.php:1037
+msgid "Could not open the uploaded file."
+msgstr "无法打开上传的文件。"
+
+#: admin/user-page.php:146
+#, php-format
+msgid "Create a CNAME record for your domain pointing to: <code>%s</code>"
+msgstr "为您的域名创建指向 <code>%s</code> 的 CNAME 记录"
+
+#: admin/user-page.php:151
+#, php-format
+msgid "Create an A record for your domain pointing to: <code>%s</code>"
+msgstr "为您的域名创建指向 <code>%s</code> 的 A 记录"
+
+#: admin/pages.php:1084
+msgid "CSV File:"
+msgstr "CSV 文件："
+
+#: admin/pages.php:1135
+msgid "CSV Format"
+msgstr "CSV 格式"
+
+#: includes/class-tools.php:138
+msgid "Current site ID"
+msgstr "当前站点 ID"
+
+#: admin/pages.php:668 admin/settings-page.php:424
+msgid "Database tables"
+msgstr "数据库表"
+
+#: admin/logs-table.php:75
+msgid "Date"
+msgstr "日期"
+
+#: admin/pages.php:936
+msgid "days"
+msgstr "天"
+
+#. %s: SUNRISE constant value
+#: admin/pages.php:573 admin/settings-page.php:326
+#, php-format
+msgid "Defined as: %s"
+msgstr "定义为：%s"
+
+#: admin/pages.php:1396
+msgid "Defined in wp-config.php (may affect some domain mapping features)"
+msgstr "在 wp-config.php 中定义（可能会影响某些域映射功能）"
+
+#: admin/pages.php:1393
+msgid "Defined in wp-config.php but currently working"
+msgstr "在 wp-config.php 中定义但当前正在运行"
+
+#: admin/domains-page.php:295 admin/domains-page.php:355
+#: admin/user-page.php:119
+msgid "Delete"
+msgstr "删除"
+
+#: includes/functions.php:511
+msgid "Deleted"
+msgstr "已删除"
+
+#. %s: Server IP address
 #: admin/settings-page.php:69
 #, php-format
 msgid "Detected server IP: %s"
-msgstr ""
+msgstr "检测到的服务器 IP：%s"
 
-#: admin/templates.php:367 admin/user-page.php:23 includes/class-admin.php:298
+#: admin/pages.php:273 admin/settings-page.php:159
+msgid "Disable Primary Domain"
+msgstr "禁用主域名"
+
+#: admin/pages.php:276 admin/settings-page.php:162
+msgid "Disable Primary Domain Check"
+msgstr "禁用主域检查"
+
+#: admin/user-page.php:154
+msgid ""
+"DNS changes may take 24-48 hours to fully propagate across the internet."
+msgstr "DNS 更改可能需要 24-48 小时才能在互联网上完全传播。"
+
+#: includes/class-tools.php:635
+msgid "DNS check not performed"
+msgstr "未执行 DNS 检查"
+
+#: includes/class-admin.php:333
+msgid "DNS Configuration"
+msgstr "DNS 配置"
+
+#: admin/user-page.php:131
+msgid "DNS Configuration Instructions"
+msgstr "DNS 配置说明"
+
+#: admin/pages.php:837
+msgid "DNS correctly configured"
+msgstr "DNS 配置正确"
+
+#: includes/class-admin.php:601
+msgid "DNS issue"
+msgstr "DNS 问题"
+
+#: includes/class-tools.php:825
+#, php-format
+msgid "DNS Issue: %s"
+msgstr "DNS 问题：%s"
+
+#: admin/pages.php:39
+msgid "DNS Setup"
+msgstr "DNS 配置"
+
+#: admin/pages.php:301 admin/pages.php:414 admin/settings-page.php:182
+msgid "DNS Setup Instructions"
+msgstr "DNS 设置说明"
+
+#: admin/pages.php:805
+msgid "DNS Status"
+msgstr "DNS 状态"
+
+#: admin/pages.php:279 admin/settings-page.php:165
+msgid ""
+"Do not redirect to the primary domain, but allow access through any mapped "
+"domain."
+msgstr "不重定向到主域名，但允许通过任何映射域名访问。"
+
+#: admin/domains-page.php:21 admin/pages.php:24 admin/settings-page.php:42
+msgid "Document"
+msgstr "文档"
+
+#: admin/domains-page.php:57 admin/domains-page.php:309 admin/logs-table.php:73
+#: admin/pages.php:803 admin/user-page.php:50 admin/user-page.php:86
+msgid "Domain"
+msgstr "域名"
+
+#: includes/class-admin.php:880
+#, php-format
+msgid "Domain %s is already mapped to site ID %d."
+msgstr "域名 %s 已映射到站点 ID %d。"
+
+#: includes/class-admin.php:1101
+#, php-format
+msgid "Domain '%s' is already mapped to another site."
+msgstr "域名 '%s' 已映射到另一个站点。"
+
+#: includes/class-tools.php:654
+msgid "Domain A record is correctly pointing to server IP."
+msgstr "域名 A 记录正确指向服务器 IP。"
+
+#: admin/user-page.php:23 includes/class-admin.php:921
 msgid "Domain added successfully."
 msgstr "域名添加成功。"
 
-#: admin/templates.php:370 admin/user-page.php:26
-#, fuzzy
-#| msgid "New domain already exists."
-msgid "This domain is already mapped to a site."
-msgstr "新的域名已经存在。"
+#: includes/functions.php:709
+msgid "Domain cannot be empty"
+msgstr "域名不能为空"
 
-#: admin/templates.php:373 admin/user-page.php:29
-msgid "Primary domain updated."
-msgstr ""
+#: includes/functions.php:730
+msgid "Domain cannot contain consecutive dots"
+msgstr "域名不能包含连续的点"
 
-#: admin/templates.php:376 admin/user-page.php:32 includes/class-admin.php:377
-#, fuzzy, php-format
-#| msgid "Domain updated successfully."
+#: includes/functions.php:725
+msgid "Domain cannot start or end with a dot"
+msgstr "域名不能以点开头或结尾"
+
+#: includes/class-tools.php:674
+msgid "Domain CNAME record is correctly configured."
+msgstr "域名 CNAME 记录配置正确。"
+
+#: includes/functions.php:720
+msgid "Domain contains invalid characters"
+msgstr "域名包含无效字符"
+
+#: admin/user-page.php:32 includes/class-admin.php:1030
 msgid "Domain deleted successfully."
-msgid_plural "%d domains deleted successfully."
-msgstr[0] "域名更新成功。"
+msgstr "域名已删除成功。"
 
-#: admin/templates.php:383 admin/user-page.php:15 includes/class-admin.php:108
-#: includes/class-admin.php:109 includes/class-admin.php:123
-#: includes/class-admin.php:124
+#: includes/class-admin.php:1444
+msgid "Domain deleted."
+msgstr "域名已删除。"
+
+#: includes/class-tools.php:682
+msgid "Domain does not resolve to an IP address."
+msgstr "域名无法解析为 IP 地址。"
+
+#: admin/pages.php:40
+msgid "Domain Health"
+msgstr "域名健康"
+
+#: admin/pages.php:47
+msgid "Domain health check completed."
+msgstr "域名健康检查已完成。"
+
+#: admin/pages.php:53
+msgid "Domain health check started. The check is running in the background."
+msgstr "域名健康检查已开始。检查正在后台运行。"
+
+#: includes/class-tools.php:817
+#, php-format
+msgid "Domain health issues were detected on %s."
+msgstr "在 %s 上检测到域名健康问题。"
+
+#: admin/pages.php:721
+msgid "Domain Health Status"
+msgstr "域名健康状态"
+
+#: includes/class-tools.php:676
+msgid "Domain is not pointing to the correct server."
+msgstr "域名未指向正确的服务器。"
+
+#: includes/class-admin.php:746
+msgid "Domain is required."
+msgstr "域名是必填项。"
+
+#: admin/domains-page.php:143
+msgid "Domain Logs"
+msgstr "域名日志"
+
+#: admin/user-page.php:15 includes/class-admin.php:115
+#: includes/class-admin.php:116 includes/class-admin.php:130
+#: includes/class-admin.php:131
 msgid "Domain Mapping"
 msgstr "域名映射"
 
-#: admin/templates.php:409 admin/user-page.php:66
-msgid "Set this domain as the primary domain for this site"
-msgstr ""
+#: includes/class-core.php:182
+msgid "Domain mapping database tables created."
+msgstr "域映射数据库表已创建。"
 
-#: admin/templates.php:424 admin/user-page.php:81
-#, fuzzy
-#| msgid "Manage Domains"
-msgid "Your Mapped Domains"
-msgstr "管理域名"
+#: includes/class-admin.php:813
+msgid "Domain Mapping Disabled."
+msgstr "域映射已禁用。"
 
-#: admin/templates.php:452 admin/user-page.php:109
-#, fuzzy
-#| msgid "Primary"
-msgid "Make Primary"
-msgstr "主域名"
-
-#: admin/templates.php:461 admin/user-page.php:118
-msgid "Are you sure you want to delete this domain?"
-msgstr ""
-
-#: admin/templates.php:474 admin/user-page.php:131
-#, fuzzy
-#| msgid "Save Configuration"
-msgid "DNS Configuration Instructions"
-msgstr "保存配置"
-
-#: admin/templates.php:482 admin/user-page.php:139
+#: admin/domains-page.php:385
 msgid ""
-"The site administrator has not configured the DNS settings. Please contact "
-"them for assistance."
-msgstr ""
+"Domain mapping logs table is missing. Please deactivate and reactivate the "
+"plugin."
+msgstr "域名映射日志表缺失。请先停用再重新激活插件。"
 
-#: admin/templates.php:485 admin/user-page.php:142
-msgid ""
-"To map your domain to this site, you need to update your DNS records with "
-"your domain registrar."
-msgstr ""
+#: includes/class-admin.php:163
+msgid "Domain Mapping Status"
+msgstr "域名映射状态"
 
-#: admin/templates.php:489 admin/user-page.php:146
-#, fuzzy, php-format
-#| msgid "Add a DNS \"CNAME\" record pointing to: <strong>%s</strong>"
-msgid "Create a CNAME record for your domain pointing to: <code>%s</code>"
-msgstr "添加指向以下地址的 DNS“CNAME”记录：<strong>%s</strong>"
+#: admin/pages.php:80
+msgid "Domain mappings exported successfully."
+msgstr "域名映射导出成功。"
 
-#: admin/templates.php:494 admin/user-page.php:151
+#: includes/functions.php:738
+msgid "Domain must have at least two parts (e.g., domain.com)"
+msgstr "域名必须至少包含两部分（例如，domain.com）"
+
+#: includes/functions.php:715
+msgid "Domain name too long (max 253 characters)"
+msgstr "域名太长（最多 253 个字符）"
+
+#: includes/class-admin.php:1158 includes/class-admin.php:1206
+msgid "Domain not found or does not belong to this site."
+msgstr "未找到该域名或该域名不属于此站点。"
+
+#: admin/pages.php:207 admin/pages.php:213 admin/settings-page.php:93
+#: admin/settings-page.php:99
+msgid "Domain Options"
+msgstr "域名选项"
+
+#: includes/functions.php:753
 #, php-format
-msgid "Create an A record for your domain pointing to: <code>%s</code>"
-msgstr ""
+msgid "Domain part \"%s\" cannot start or end with hyphen"
+msgstr "域名部分\"%s\"不能以连字符开头或结尾"
 
-#: admin/templates.php:497 admin/user-page.php:154
-msgid ""
-"DNS changes may take 24-48 hours to fully propagate across the internet."
-msgstr ""
-
-#: admin/templates.php:510 admin/templates.php:815
-msgid "You do not have sufficient permissions to access this page."
-msgstr ""
-
-#: admin/templates.php:661
-msgid "Details"
-msgstr ""
-
-#: admin/templates.php:670
+#: includes/functions.php:757
 #, php-format
-msgid "Health Details for %s"
-msgstr ""
+msgid "Domain part \"%s\" contains invalid characters"
+msgstr "域名部分\"%s\"包含无效字符"
 
-#: admin/templates.php:690 admin/templates.php:710 includes/class-tools.php:248
-msgid "Not checked"
-msgstr ""
+#: includes/functions.php:749
+#, php-format
+msgid "Domain part \"%s\" too long (max 63 characters)"
+msgstr "域名部分\"%s\"太长（最多 63 个字符）"
 
-#: admin/templates.php:695
-msgid "Resolved IP"
-msgstr ""
+#: includes/functions.php:744
+msgid "Domain part %d is empty"
+msgstr "域名部分 %d 为空"
 
-#: admin/templates.php:699
-msgid "SSL Valid"
-msgstr ""
+#: admin/domains-page.php:245 includes/class-admin.php:273
+msgid "Domain Statistics"
+msgstr "域名统计"
 
-#: admin/templates.php:704
-msgid "Valid"
-msgstr ""
+#: includes/class-admin.php:971
+msgid "Domain updated successfully."
+msgstr "域名更新成功。"
 
-#: admin/templates.php:707
-msgid "Invalid"
-msgstr "无效"
+#: admin/domains-page.php:103
+msgid "Domain:"
+msgstr "域名："
 
-#: admin/templates.php:715
-msgid "SSL Expiry"
-msgstr ""
+#: includes/class-tools.php:821
+#, php-format
+msgid "Domain: %s"
+msgstr "域名： %s"
 
-#: admin/templates.php:719
-msgid "Response Code"
-msgstr ""
-
-#: includes/class-admin.php:103
-msgid ""
-"The domain mapping plugin only works if the site is installed in /. This is "
-"a limitation of how virtual servers work and is very difficult to work "
-"around."
-msgstr ""
-"域映射插件只能在站点是安装位于根目录时才有效。这是虚拟服务器工作方式的限制，"
-"很难解决。"
-
-#: includes/class-admin.php:132 includes/class-admin.php:133
-#: includes/class-admin.php:664
+#: includes/class-admin.php:139 includes/class-admin.php:140
+#: includes/class-admin.php:1379
 msgid "Domains"
 msgstr "域名"
 
-#: includes/class-admin.php:168
-#, fuzzy
-#| msgid "Domain deleted."
-msgid "Domain is required."
-msgstr "域名已删除。"
+#: admin/pages.php:761
+msgid "domains"
+msgstr "域名"
 
-#: includes/class-admin.php:169
-msgid "Site ID is required."
+#: admin/pages.php:944
+msgid "domains per batch"
+msgstr "每批处理域名数"
+
+#: admin/domains-page.php:349
+msgid "Edit"
+msgstr "编辑"
+
+#: admin/domains-page.php:29
+msgid "Edit Domain"
+msgstr "编辑域名"
+
+#: includes/class-tools.php:138
+msgid "Edit this site"
+msgstr "编辑此站点"
+
+#: admin/pages.php:929
+msgid "Email address for domain health notifications."
+msgstr "用于域名健康通知的邮箱地址。"
+
+#: admin/pages.php:914 admin/pages.php:917
+msgid "Email Notifications"
+msgstr "邮件通知"
+
+#: admin/pages.php:908
+msgid "Enable automatic daily health checks"
+msgstr "启用每日自动健康检查"
+
+#: admin/pages.php:216 admin/settings-page.php:102
+msgid "Enable Remote Login"
+msgstr "启用远程登录"
+
+#: admin/pages.php:246 admin/settings-page.php:132
+msgid "Enable User Domain Mapping Page"
+msgstr "启用用户域映射页面"
+
+#: admin/pages.php:688 admin/settings-page.php:444
+msgid "Enabled"
+msgstr "已启用"
+
+#: admin/domains-page.php:62 admin/user-page.php:55
+msgid "Enter the domain without http:// or https:// (e.g., example.com)"
+msgstr "输入不带 http:// 或 https:// 的域名（例如 example.com）"
+
+#: admin/pages.php:186 admin/settings-page.php:63
+msgid ""
+"Enter the IP address(es) users should point their DNS A records to. Use "
+"commas to separate multiple IPs."
+msgstr "输入用户应将其 DNS A 记录指向的 IP 地址。使用逗号分隔多个 IP。"
+
+#: admin/pages.php:316 admin/pages.php:356 admin/pages.php:429
+#: admin/pages.php:469 admin/settings-page.php:197 admin/settings-page.php:229
+msgid "Example DNS Record"
+msgstr "DNS 记录示例"
+
+#: admin/pages.php:1088
+msgid "Example: 1,example.com,1"
+msgstr "示例：1,example.com,1"
+
+#: admin/pages.php:850
+#, php-format
+msgid "Expires: %s"
+msgstr "过期时间：%s"
+
+#: admin/pages.php:1050
+msgid "Export all domain mappings to a CSV file."
+msgstr "将所有域名映射导出到 CSV 文件。"
+
+#: admin/pages.php:1048
+msgid "Export Domain Mappings"
+msgstr "导出域名映射"
+
+#: admin/pages.php:1064
+msgid "Export for specific site ID (optional):"
+msgstr "导出特定站点 ID（可选）："
+
+#: admin/pages.php:1070
+msgid "Export to CSV"
+msgstr "导出为 CSV"
+
+#: includes/class-admin.php:924
+msgid "Failed to add domain."
+msgstr "添加域名失败。"
+
+#: includes/class-tools.php:1013
+msgid "File size exceeds 5MB limit."
+msgstr "文件大小超过5MB限制。"
+
+#: admin/domains-page.php:126 admin/logs-table.php:31
+msgid "Filter"
+msgstr "筛选"
+
+#: admin/logs-table.php:21
+msgid "Filter by action"
+msgstr "按操作筛选"
+
+#: admin/pages.php:1095
+msgid "First row contains column headers"
+msgstr "第一行包含列标题"
+
+#: admin/pages.php:400 admin/pages.php:513 admin/settings-page.php:268
+msgid ""
+"For \"www\" subdomain, create a separate CNAME record with \"www\" as the "
+"name pointing to the same value."
 msgstr ""
+"对于 \"www\" 子域名，创建一个单独的 CNAME 记录，名称为 \"www\"，指向相同的"
+"值。"
 
-#: includes/class-admin.php:170
-msgid "Saving..."
-msgstr "正在保存..."
+#: admin/pages.php:402 admin/pages.php:515 admin/settings-page.php:274
+msgid ""
+"For SSL to work properly, make sure your web server is configured with the "
+"appropriate SSL certificates for mapped domains."
+msgstr ""
+"为了使 SSL 正常工作，请确保您的 Web 服务器配置了映射域名的适当 SSL 证书。"
 
-#: includes/class-admin.php:171
-msgid "Processing..."
-msgstr "正在处理…"
+#: admin/pages.php:264 admin/settings-page.php:150
+msgid ""
+"Force admin pages to use the original WordPress domain instead of the mapped "
+"domain."
+msgstr "强制管理页面使用原始 WordPress 域名而不是映射域名。"
 
-#: includes/class-admin.php:172
-#, fuzzy
-#| msgid "Server error occurred."
-msgid "An error occurred."
-msgstr "发生服务器错误。"
+#: admin/pages.php:547 admin/settings-page.php:300
+msgid "Found"
+msgstr "已找到"
 
-#: includes/class-admin.php:173
-msgid "Please select at least one domain."
-msgstr "请至少选择一个域名。"
+#: includes/class-admin.php:687 includes/class-tools.php:567
+msgid "Health check completed."
+msgstr "健康检查已完成。"
 
-#. translators: %1$s: Content directory, %2$s: WordPress install path
-#: includes/class-admin.php:191
-#, fuzzy, php-format
-#| msgid ""
-#| "Please copy sunrise.php to %s/sunrise.php and ensure the SUNRISE "
-#| "definition is in %swp-config.php"
+#: admin/pages.php:726
+msgid "Health check in progress..."
+msgstr "健康检查进行中..."
+
+#: admin/pages.php:894
+msgid "Health Check Settings"
+msgstr "健康检查设置"
+
+#: includes/class-admin.php:314
+msgid "Health Status"
+msgstr "域名健康状态"
+
+#: includes/class-tools.php:849
+msgid "HTTP Response Code: %d"
+msgstr "HTTP 响应代码：%d"
+
+#. URI of the plugin
+msgid "https://wenpai.org/plugins/wp-domain-mapping/"
+msgstr "https://wenpai.org/plugins/wp-domain-mapping/"
+
+#. Author URI of the plugin
+msgid "https://wpdomain.com/"
+msgstr "https://wpdomain.com/"
+
+#: admin/pages.php:1112
+msgid "If checked, will only import domains for existing sites."
+msgstr "如果选中，将仅导入现有站点的域名。"
+
+#: admin/pages.php:1104
+msgid "If unchecked, will skip domains that already exist."
+msgstr "如果未选中，将跳过已存在的域名。"
+
+#: admin/pages.php:401 admin/pages.php:514 admin/settings-page.php:271
+msgid ""
+"If you're using Cloudflare or similar services, you may need to adjust proxy "
+"settings."
+msgstr "如果您使用 Cloudflare 或类似服务，您可能需要调整代理设置。"
+
+#: includes/class-tools.php:1187
+msgid "Import completed: %d imported, %d skipped, %d errors."
+msgstr "导入完成：%d 个已导入，%d 个已跳过，%d 个错误。"
+
+#: admin/pages.php:1075
+msgid "Import Domain Mappings"
+msgstr "导入域名映射"
+
+#: admin/pages.php:1077
+msgid "Import domain mappings from a CSV file."
+msgstr "从 CSV 文件导入域名映射。"
+
+#: admin/pages.php:1116
+msgid "Import from CSV"
+msgstr "从 CSV 导入"
+
+#: admin/pages.php:1129
+msgid "Import Results"
+msgstr "导入结果"
+
+#: admin/pages.php:41
+msgid "Import/Export"
+msgstr "导入/导出"
+
+#: includes/functions.php:513
+msgid "Imported"
+msgstr "已导入"
+
+#: admin/pages.php:1059
+msgid "Include column headers"
+msgstr "包含列标题"
+
+#: includes/class-core.php:559
+msgid "Incorrect or out of date login key"
+msgstr "登录密钥不正确或过期"
+
+#: admin/pages.php:1036
+#, php-format
+msgid ""
+"Install the %s high-performance component to use batch domain import/export."
+msgstr "请先下载并安装 %s 高性能组件，以启用域名批量导入/导出功能。"
+
+#: admin/pages.php:528 admin/settings-page.php:281
+msgid "Installation Check"
+msgstr "安装检查"
+
+#. %s: URL to punycode converter
+#: includes/functions.php:171
+#, php-format
+msgid ""
+"International Domain Names should be in <a href=\"%s\" "
+"target=\"_blank\">punycode</a> format."
+msgstr "国际域名应采用<a href=\"%s\" target=\"_blank\">punycode</a>格式。"
+
+#: includes/class-admin.php:851 includes/class-admin.php:1051
+msgid "Invalid action."
+msgstr "无效操作。"
+
+#: includes/class-admin.php:1082
+msgid "Invalid domain format"
+msgstr "无效的域名格式"
+
+#: includes/class-admin.php:752 includes/class-admin.php:863
+msgid "Invalid domain format."
+msgstr "无效的域名格式。"
+
+#: includes/class-tools.php:952 includes/class-tools.php:1008
+msgid "Invalid security token. Please try again."
+msgstr "无效的安全令牌。请重试。"
+
+#: includes/class-admin.php:858
+msgid "Invalid site ID."
+msgstr "无效的站点 ID。"
+
+#: includes/functions.php:765
+msgid "Invalid top-level domain (TLD)"
+msgstr "无效的顶级域名 (TLD)"
+
+#: admin/pages.php:808
+msgid "Last Check"
+msgstr "最后检测"
+
+#: includes/class-admin.php:630
+#, php-format
+msgid "Last checked: %s ago"
+msgstr "最后检测：%s前"
+
+#: admin/pages.php:1066
+msgid "Leave empty to export all domains."
+msgstr "留空以导出所有域名。"
+
+#: admin/pages.php:594 admin/settings-page.php:347
+msgid "Loaded successfully"
+msgstr "加载成功"
+
+#: includes/class-core.php:535
+msgid "Login key expired"
+msgstr "登录密钥已过期"
+
+#: includes/class-core.php:574
+msgid "Logout key expired"
+msgstr "登录密钥已过期"
+
+#: includes/class-tools.php:228
+msgid "Main site is accessible"
+msgstr "主站点可访问"
+
+#: includes/class-tools.php:434
+msgid "Main site is always accessible"
+msgstr "主站点始终可访问"
+
+#: admin/user-page.php:109
+msgid "Make Primary"
+msgstr "设为主域"
+
+#: admin/domains-page.php:140 admin/pages.php:289 admin/settings-page.php:175
+#: includes/class-admin.php:382
+msgid "Manage Domains"
+msgstr "管理域名"
+
+#. Description of the plugin
+msgid ""
+"Map any site on a WordPress website to another domain with enhanced "
+"management features."
+msgstr "使用增强的管理功能将 WordPress 网站上的任何站点映射到另一个域名。"
+
+#: includes/class-admin.php:1391
+msgid "Mapping"
+msgstr "映射"
+
+#: admin/pages.php:399 admin/pages.php:512 admin/settings-page.php:265
+msgid "Most DNS changes take 24-48 hours to fully propagate worldwide."
+msgstr "大多数 DNS 更改需要 24-48 小时才能在全球完全传播。"
+
+#: admin/pages.php:685 admin/settings-page.php:441
+msgid "Multisite"
+msgstr "多站点"
+
+#: admin/pages.php:321 admin/pages.php:361 admin/pages.php:434
+#: admin/pages.php:474 admin/settings-page.php:202 admin/settings-page.php:234
+msgid "Name"
+msgstr "名称"
+
+#: admin/pages.php:875
+msgid "Never"
+msgstr "从未"
+
+#: includes/class-admin.php:1435
+msgid "New domain added."
+msgstr "已添加新域名。"
+
+#: includes/class-admin.php:1438
+msgid "New domain already exists."
+msgstr "新的域名已经存在。"
+
+#: includes/class-admin.php:1441
+msgid "New primary domain."
+msgstr "新的主域名。"
+
+#: admin/domains-page.php:120 admin/domains-page.php:342
+msgid "No"
+msgstr "否"
+
+#: includes/class-admin.php:974
+msgid "No changes were made or update failed."
+msgstr "未进行任何更改或更新失败。"
+
+#: includes/class-tools.php:259
+msgid "No domain"
+msgstr "无域名"
+
+#: admin/domains-page.php:421
+msgid "No domain mapping logs available."
+msgstr "没有可用的域名映射日志。"
+
+#: includes/class-tools.php:423
+msgid "No domain specified."
+msgstr "未指定域名。"
+
+#: admin/pages.php:792
+msgid "No domains found"
+msgstr "未找到域名"
+
+#: admin/domains-page.php:280 admin/pages.php:888 includes/class-admin.php:667
+msgid "No domains found."
+msgstr "未找到域名。"
+
+#: includes/class-admin.php:578
+msgid "No domains to check."
+msgstr "无域名可检查。"
+
+#: includes/class-admin.php:1041
+msgid "No domains were deleted."
+msgstr "没有域名被删除。"
+
+#: includes/class-tools.php:1019
+msgid "No file uploaded or upload error."
+msgstr "没有上传文件或上传错误。"
+
+#: includes/class-admin.php:253 includes/class-tools.php:220
+msgid "No SSL"
+msgstr "无 SSL"
+
+#: includes/class-admin.php:993
+msgid "No valid domains provided for deletion."
+msgstr "未提供可供删除的有效域。"
+
+#: includes/class-admin.php:591
+msgid "Not accessible"
+msgstr "不可访问"
+
+#: includes/class-tools.php:256
+msgid "Not checked"
+msgstr "未检查"
+
+#: admin/pages.php:842 admin/pages.php:856 admin/pages.php:867
+msgid "Not checked yet"
+msgstr "尚未检查"
+
+#: admin/pages.php:578 admin/settings-page.php:331
+msgid "Not defined - add to wp-config.php: "
+msgstr "未定义 - 添加到 wp-config.php："
+
+#: admin/pages.php:1387
+msgid "Not defined in wp-config.php (optimal for domain mapping)"
+msgstr "wp-config.php 中未定义（最适合域映射）"
+
+#: admin/pages.php:1385
+msgid ""
+"Not defined in wp-config.php (optimal). Currently managed by domain mapping."
+msgstr "wp-config.php 中未定义（最佳）。目前由域名映射管理。"
+
+#: admin/pages.php:690 admin/settings-page.php:446
+msgid "Not enabled - this plugin requires WordPress Multisite"
+msgstr "未启用 - 此插件需要 WordPress 多站点"
+
+#. %s: WordPress content directory
+#: admin/pages.php:552 admin/settings-page.php:305
+#, php-format
+msgid "Not found - copy sunrise.php to %s"
+msgstr "未找到 - 将 sunrise.php 复制到 %s"
+
+#: admin/pages.php:598 admin/settings-page.php:351
+msgid ""
+"Not loaded - make sure SUNRISE is defined before the require_once() in wp-"
+"config.php"
+msgstr "未加载 - 确保在 wp-config.php 中的 require_once() 之前定义 SUNRISE"
+
+#: admin/pages.php:600 admin/settings-page.php:353
+msgid "Not loaded - SUNRISE constant not defined"
+msgstr "未加载 - SUNRISE 常量未定义"
+
+#. %s: URL to sites list
+#: admin/domains-page.php:46
+#, php-format
+msgid ""
+"Not sure about Site ID? <a href=\"%s\" target=\"_blank\">View all sites</a> "
+"to find the ID."
+msgstr ""
+"不确定站点 ID？<a href=\"%s\" target=\"_blank\">查看所有站点</a>以找到 ID。"
+
+#: admin/pages.php:926
+msgid "Notification Email"
+msgstr "通知邮箱"
+
+#: admin/pages.php:945
+msgid ""
+"Number of domains to check in each batch. Lower values prevent timeouts but "
+"take longer."
+msgstr "每批检查的域名数量。较低的值可防止超时，但耗时更长。"
+
+#: admin/pages.php:760
+msgid "of"
+msgstr "/"
+
+#: includes/class-tools.php:1030
+msgid "Only CSV files are allowed."
+msgstr "仅支持CSV格式文件。"
+
+#: includes/class-admin.php:931
+msgid "Original domain not found or access denied."
+msgstr "未找到原始域或拒绝访问。"
+
+#: admin/pages.php:228 admin/settings-page.php:114
+msgid "Permanent Redirect"
+msgstr "永久重定向"
+
+#: includes/class-admin.php:643 includes/class-admin.php:660
+#: includes/class-admin.php:835
+msgid "Permission denied."
+msgstr "没有权限。"
+
+#: admin/pages.php:392
+msgid ""
+"Please configure either a Server IP Address or CNAME in the Settings tab to "
+"provide DNS setup instructions."
+msgstr "请在“设置”选项卡中配置服务器 IP 地址或 CNAME 以提供 DNS 设置说明。"
+
+#: admin/pages.php:505 admin/settings-page.php:257
+msgid ""
+"Please configure either a Server IP Address or CNAME to provide DNS setup "
+"instructions."
+msgstr "请配置服务器 IP 地址或 CNAME 以提供 DNS 设置说明。"
+
+#. %1$s: Content directory, %2$s: WordPress install path
+#: includes/class-admin.php:771
+#, php-format
 msgid ""
 "Please copy sunrise.php to %1$s/sunrise.php and ensure the SUNRISE "
 "definition is in %2$swp-config.php"
 msgstr ""
-"请复制sunrise.php到 %s/sunrise.php，并确保SUNRISE定义在%swp-config.php文件"
+"请复制sunrise.php到 %1$s/sunrise.php，并确保SUNRISE定义在%2$swp-config.php文"
+"件"
 
-#: includes/class-admin.php:197 includes/class-admin.php:210
-#: includes/class-admin.php:223 includes/class-admin.php:638
-msgid "This plugin has not been configured correctly yet."
-msgstr "该插件尚未正确配置。"
+#. %s: WordPress install path
+#: includes/class-admin.php:798
+#, php-format
+msgid ""
+"Please edit your %swp-config.php and move the line <em>define( 'SUNRISE', "
+"'on' );</em> above the last require_once() in that file or make sure you "
+"updated sunrise.php."
+msgstr ""
+"请编辑您的 %swp-config.php 和移动行<em>define( 'SUNRISE', 'on' );</em>上面最"
+"后一次()需要在文件或确保您sunrise.php更新。"
 
-#. translators: %s: WordPress install path
-#: includes/class-admin.php:205
+#: includes/class-admin.php:751
+msgid "Please select at least one domain."
+msgstr "请至少选择一个域名。"
+
+#: includes/class-admin.php:1349
+#| msgid ""
+#| "Please set the IP address or CNAME of your server in the <a href='wpmu-"
+#| "admin.php?page=domain-mapping'>site admin page</a>."
+msgid ""
+"Please set the IP address or CNAME of your server in the <a href='wp-admin/"
+"network/settings.php?page=domain-mapping'>site admin page</a>."
+msgstr ""
+"请在<a href='wp-admin/network/settings.php?page=domain-mapping'>站点管理页面"
+"</a>中设置您服务器的 IP 地址或 CNAME。"
+
+#. %s: WordPress install path
+#: includes/class-admin.php:785
 #, php-format
 msgid ""
 "Please uncomment the line <em>define( 'SUNRISE', 'on' );</em> or add it to "
@@ -1077,415 +1061,530 @@ msgstr ""
 "请取消注释行 <em>define( 'SUNRISE', 'on' );</em> 或将其添加到您的 %swp-"
 "config.php"
 
-#. translators: %s: WordPress install path
-#: includes/class-admin.php:218
+#: includes/class-admin.php:338
+#, php-format
+msgid "Point your domain A record to: %s"
+msgstr "请将您的域名A记录指向：%s"
+
+#: includes/class-admin.php:336
+#, php-format
+msgid "Point your domain CNAME to: %s"
+msgstr "请将您的域名CNAME记录指向：%s"
+
+#: admin/domains-page.php:67 admin/domains-page.php:310 admin/user-page.php:87
+#: includes/class-admin.php:281 includes/class-admin.php:302
+msgid "Primary"
+msgstr "主域名"
+
+#: admin/pages.php:823 admin/user-page.php:60 admin/user-page.php:63
+#: includes/class-admin.php:236
+msgid "Primary Domain"
+msgstr "主域"
+
+#: admin/user-page.php:29
+msgid "Primary domain updated."
+msgstr "主域名已更新。"
+
+#: admin/domains-page.php:253
+msgid "Primary Domains"
+msgstr "主域"
+
+#: admin/domains-page.php:113
+msgid "Primary:"
+msgstr "主域："
+
+#: admin/pages.php:759
+msgid "Processed "
+msgstr "正在处理"
+
+#: admin/pages.php:730
+#, php-format
+msgid "Processed %d of %d domains (%d%%)"
+msgstr "已处理 %d 个域名，共 %d 个（%d%%）"
+
+#: admin/pages.php:1121
+msgid "Processing import..."
+msgstr "正在处理导入..."
+
+#: admin/user-page.php:168 includes/class-admin.php:749
+msgid "Processing..."
+msgstr "正在处理…"
+
+#: admin/pages.php:807 includes/class-tools.php:185
+#: includes/class-tools.php:198
+msgid "Reachable"
+msgstr "可达"
+
+#: includes/class-admin.php:353
+msgid "Recent Activity"
+msgstr "近期活动"
+
+#: admin/pages.php:258 admin/settings-page.php:144
+msgid "Redirect Admin"
+msgstr "重定向管理"
+
+#: admin/pages.php:261 admin/settings-page.php:147
+msgid "Redirect Admin Pages to Original Domain"
+msgstr "将管理页面重定向到原始域"
+
+#: includes/class-admin.php:317
+msgid "Refresh"
+msgstr "刷新"
+
+#: admin/pages.php:638 admin/settings-page.php:391
+msgid ""
+"Remove the define('COOKIE_DOMAIN', ...) line from wp-config.php to enable "
+"dynamic cookie domain handling."
+msgstr ""
+"从 wp-config.php 中删除 Define('COOKIE_DOMAIN', ...) 行以启用动态 cookie 域处"
+"理。"
+
+#: includes/class-tools.php:1166
+#, php-format
+msgid "Row %d: Added domain %s for blog ID %d."
+msgstr "第 %d 行：已添加站点 ID %d 的域名 %s。"
+
+#: includes/class-tools.php:1135
+#, php-format
+msgid "Row %d: Domain %s already exists for blog ID %d. Skipped."
+msgstr "第 %d 行：域名 %s 已存在于站点 ID %d。已跳过。"
+
+#: includes/class-tools.php:1078
+#, php-format
+msgid "Row %d: Domain %s already processed in this import. Skipped duplicate."
+msgstr "第 %d 行：域名 %s 在此次导入中已处理。跳过重复项。"
+
+#: includes/class-tools.php:1128
+#, php-format
+msgid "Row %d: Domain %s is already mapped to blog ID %d."
+msgstr "第 %d 行：域名 %s 已映射到站点 ID %d。"
+
+#: includes/class-tools.php:1173
+#, php-format
+msgid "Row %d: Failed to add domain %s for blog ID %d."
+msgstr "第 %d 行：无法为站点 ID %d 添加域名 %s。"
+
+#: includes/class-tools.php:1153
+#, php-format
+msgid "Row %d: Failed to update domain %s for blog ID %d."
+msgstr "第 %d 行：无法更新站点 ID %d 的域名 %s。"
+
+#: includes/class-tools.php:1092
+msgid "Row %d: Invalid blog ID: %d"
+msgstr "第 %d 行：无效的站点 ID：%d"
+
+#: includes/class-tools.php:1114
+#, php-format
+msgid "Row %d: Invalid domain format: %s"
+msgstr "第 %d 行：域名格式无效：%s"
+
+#: includes/class-tools.php:1062
+msgid "Row %d: Invalid format. Expected at least 3 columns."
+msgstr "第 %d 行：格式无效。至少需要 3 列。"
+
+#: includes/class-tools.php:1103
+msgid "Row %d: Site ID %d does not exist."
+msgstr "第 %d 行：站点 ID %d 不存在。"
+
+#: includes/class-tools.php:1146
+#, php-format
+msgid "Row %d: Updated domain %s for blog ID %d."
+msgstr "第 %d 行：已更新站点 ID %d 的域名 %s。"
+
+#: admin/pages.php:951
+msgid "Save Changes"
+msgstr "保存更改"
+
+#: admin/pages.php:287 admin/settings-page.php:173
+msgid "Save Configuration"
+msgstr "保存配置"
+
+#: includes/class-admin.php:748
+msgid "Saving..."
+msgstr "正在保存..."
+
+#: admin/domains-page.php:98
+msgid "Search & Filter Domains"
+msgstr "搜索和过滤域名"
+
+#: includes/class-admin.php:285
+msgid "Secondary"
+msgstr "二级"
+
+#: includes/class-admin.php:830 includes/class-tools.php:348
+#: includes/class-tools.php:372 includes/class-tools.php:417
+#: includes/class-tools.php:468
+msgid "Security check failed."
+msgstr "安全检查失败。"
+
+#: admin/domains-page.php:292
+msgid "Select bulk action"
+msgstr "选择批量操作"
+
+#: admin/pages.php:920
+msgid "Send email notifications when domain health issues are detected"
+msgstr "检测到域名健康问题时发送邮件通知"
+
+#: admin/pages.php:937
+msgid ""
+"Send notifications when SSL certificates are expiring within this many days."
+msgstr "当 SSL 证书在指定天数内过期时发送通知。"
+
+#: admin/pages.php:191 admin/settings-page.php:77
+msgid "Server CNAME Domain:"
+msgstr "服务器 CNAME 域名："
+
+#: admin/pages.php:177 admin/settings-page.php:54
+msgid "Server Configuration"
+msgstr "服务器配置"
+
+#: admin/pages.php:182 admin/settings-page.php:59
+msgid "Server IP Address:"
+msgstr "服务器 IP 地址："
+
+#: admin/domains-page.php:71
+msgid "Set as the primary domain for this site"
+msgstr "设置为此站点的主域名"
+
+#: admin/user-page.php:66
+msgid "Set this domain as the primary domain for this site"
+msgstr "将此域名设置为此站点的主域名"
+
+#: admin/pages.php:1163
+msgid "Set to 1 to make this the primary domain, 0 otherwise (required)"
+msgstr "设置为 1 以使其成为主域名，否则为 0（必需）"
+
+#: admin/pages.php:38
+msgid "Settings"
+msgstr "设置"
+
+#: admin/pages.php:59 includes/class-admin.php:1325
+msgid "Settings saved."
+msgstr "设置已保存。"
+
+#: includes/class-admin.php:555
+msgid "Show health status"
+msgstr "显示健康状态"
+
+#: admin/logs-table.php:74 admin/pages.php:804
+msgid "Site"
+msgstr "站点"
+
+#: admin/logs-table.php:102
+msgid "Site #%d"
+msgstr "站点 #%d"
+
+#: includes/class-admin.php:868
+msgid "Site does not exist."
+msgstr "站点不存在。"
+
+#: admin/domains-page.php:36 admin/domains-page.php:307
+#: includes/class-tools.php:153
+msgid "Site ID"
+msgstr "站点 ID"
+
+#: includes/class-admin.php:747
+msgid "Site ID is required."
+msgstr "站点 ID 是必填项。"
+
+#: admin/domains-page.php:108
+msgid "Site ID:"
+msgstr "站点 ID："
+
+#: includes/class-tools.php:135
+msgid "Site ID: %d"
+msgstr "站点 ID：%d"
+
+#: admin/pages.php:862 includes/class-tools.php:251
+msgid "Site is accessible"
+msgstr "站点可访问"
+
+#: admin/pages.php:864 includes/class-tools.php:253
+msgid "Site is not accessible"
+msgstr "站点不可访问"
+
+#: includes/class-tools.php:847
+msgid "Site is not accessible."
+msgstr "站点不可访问。"
+
+#: admin/domains-page.php:308
+msgid "Site Name"
+msgstr "站点名称"
+
+#: admin/domains-page.php:257
+msgid "Sites with Mapped Domains"
+msgstr "已映射域名站点"
+
+#: admin/pages.php:673 admin/settings-page.php:429
+msgid "Some tables are missing - deactivate and reactivate the plugin"
+msgstr "某些表缺失 - 请停用并重新激活插件"
+
+#: includes/class-tools.php:184 includes/class-tools.php:197
+msgid "SSL"
+msgstr "SSL"
+
+#: includes/class-admin.php:251
+msgid "SSL Active"
+msgstr "SSL 可用"
+
+#: includes/class-tools.php:838
+#, php-format
+msgid "SSL Certificate expires on %s (within %d days)."
+msgstr "SSL 证书将于 %s 过期（%d 天内）。"
+
+#: includes/class-tools.php:830
+msgid "SSL Certificate is invalid or missing."
+msgstr "SSL 证书无效或缺失。"
+
+#: admin/pages.php:853
+msgid "SSL certificate issue"
+msgstr "SSL 证书问题"
+
+#: admin/pages.php:848
+msgid "SSL certificate valid"
+msgstr "SSL 证书有效"
+
+#: includes/class-tools.php:218
+msgid "SSL Enabled"
+msgstr "SSL 已启用"
+
+#: admin/pages.php:933
+msgid "SSL Expiry Warning"
+msgstr "SSL 过期警告"
+
+#: includes/class-admin.php:596
+msgid "SSL issue"
+msgstr "SSL 问题"
+
+#: admin/pages.php:806
+msgid "SSL Status"
+msgstr "SSL 状态"
+
+#: admin/pages.php:532 admin/settings-page.php:285
+msgid "Status"
+msgstr "状态"
+
+#: admin/pages.php:567 admin/settings-page.php:320
+msgid "SUNRISE constant"
+msgstr "SUNRISE 常量"
+
+#: admin/pages.php:544 admin/settings-page.php:297
+msgid "sunrise.php file"
+msgstr "sunrise.php 文件"
+
+#: admin/pages.php:591 admin/settings-page.php:344
+msgid "SUNRISE_LOADED"
+msgstr "SUNRISE_LOADED"
+
+#: admin/domains-page.php:24 admin/pages.php:27 admin/settings-page.php:45
+msgid "Support"
+msgstr "支持"
+
+#. %s: IP address(es)
+#: admin/pages.php:350 admin/pages.php:463 admin/settings-page.php:223
 #, php-format
 msgid ""
-"Please edit your %swp-config.php and move the line <em>define( 'SUNRISE', "
-"'on' );</em> above the last require_once() in that file or make sure you "
-"updated sunrise.php."
+"Tell your users to add a DNS \"A\" record for their domain pointing to: %s"
+msgstr "告诉您的用户为他们的域名添加指向 %s 的 DNS \"A\" 记录："
+
+#. %s: CNAME value
+#: admin/pages.php:310 admin/pages.php:423 admin/settings-page.php:191
+#, php-format
+msgid ""
+"Tell your users to add a DNS \"CNAME\" record for their domain pointing to: "
+"%s"
+msgstr "告诉您的用户为他们的域名添加指向 %s 的 DNS \"CNAME\" 记录："
+
+#: admin/pages.php:1136
+msgid "The CSV file should follow this format:"
+msgstr "CSV 文件应遵循以下格式："
+
+#: admin/pages.php:1087
+msgid "The CSV file should have the columns: blog_id, domain, active (1 or 0)."
+msgstr "CSV 文件应包含以下列：blog_id、domain、active（1 或 0）。"
+
+#: includes/class-admin.php:110
+#, php-format
+msgid ""
+"The domain mapping plugin only works if WordPress is installed in the root "
+"directory of your webserver. It is currently installed in '%s'."
+msgstr "域名映射插件仅当WordPress安装在网站根目录时有效，当前安装路径为'%s'。"
+
+#: admin/pages.php:1162
+msgid "The domain name without http:// or https:// (required)"
+msgstr "不带 http:// 或 https:// 的域名（必需）"
+
+#: includes/class-tools.php:818
+msgid "The following domains have issues:"
+msgstr "以下域名存在问题："
+
+#: admin/pages.php:1161
+msgid "The ID of the WordPress site (required)"
+msgstr "WordPress 站点的 ID（必需）"
+
+#: admin/user-page.php:139
+msgid ""
+"The site administrator has not configured the DNS settings. Please contact "
+"them for assistance."
+msgstr "站点管理员尚未配置 DNS 设置。请联系他们获取帮助。"
+
+#: admin/user-page.php:26
+msgid "This domain is already mapped to a site."
+msgstr "此域名已映射到一个站点。"
+
+#: admin/pages.php:631 admin/settings-page.php:384
+msgid ""
+"This may cause login issues on mapped domains. Consider removing the "
+"COOKIE_DOMAIN definition from wp-config.php."
 msgstr ""
-"请编辑你的 %swp-config.php 和移动行<em>define( 'SUNRISE', 'on' );</em>上面最"
-"后一次()需要在文件或确保您sunrise.php更新。"
+"这可能会导致映射域名的登录问题。请考虑从 wp-config.php 中删除 COOKIE_DOMAIN "
+"定义。"
 
-#: includes/class-admin.php:233
-msgid "Domain Mapping Disabled."
-msgstr "域映射已禁用。"
+#: includes/class-admin.php:777 includes/class-admin.php:790
+#: includes/class-admin.php:803 includes/class-admin.php:1353
+msgid "This plugin has not been configured correctly yet."
+msgstr "该插件尚未正确配置。"
 
-#: includes/class-admin.php:237
+#: admin/user-page.php:142
+msgid ""
+"To map your domain to this site, you need to update your DNS records with "
+"your domain registrar."
+msgstr "要将您的域名映射到此站点，您需要在域名注册商那里更新您的 DNS 记录。"
+
+#: includes/class-tools.php:858
+#, php-format
+msgid "To view and manage these issues, please visit: %s"
+msgstr "要查看和管理这些问题，请访问：%s"
+
+#: admin/domains-page.php:249 includes/class-admin.php:277
+msgid "Total Domains"
+msgstr "域名总数"
+
+#: admin/pages.php:323 admin/pages.php:363 admin/pages.php:436
+#: admin/pages.php:476
+msgid "TTL"
+msgstr "TTL"
+
+#: admin/pages.php:320 admin/pages.php:360 admin/pages.php:433
+#: admin/pages.php:473 admin/settings-page.php:201 admin/settings-page.php:233
+msgid "Type"
+msgstr "类型"
+
+#: admin/domains-page.php:316 admin/pages.php:817 includes/class-admin.php:357
+msgid "Unknown"
+msgstr "未知"
+
+#: includes/class-core.php:562
+msgid "Unknown login key"
+msgstr "未知的登录密钥"
+
+#: includes/class-core.php:588
+msgid "Unknown logout key"
+msgstr "未知的退出密钥"
+
+#: admin/domains-page.php:85
+msgid "Update Domain"
+msgstr "更新域名"
+
+#: admin/pages.php:1102
+msgid "Update existing mappings"
+msgstr "更新现有映射"
+
+#: includes/functions.php:509
+msgid "Updated"
+msgstr "已更新"
+
+#: admin/pages.php:234 admin/settings-page.php:120
+msgid ""
+"Use 301 redirects instead of 302 redirects. This is better for SEO but may "
+"cause caching issues."
+msgstr "使用 301 重定向而不是 302 重定向。这对 SEO 更好，但可能导致缓存问题。"
+
+#. %s: IDN warning message
+#: admin/pages.php:198 admin/settings-page.php:84
+#, php-format
+msgid "Use a CNAME instead of an IP (overrides IP settings). %s"
+msgstr "使用 CNAME 而不是 IP（覆盖 IP 设置）。%s"
+
+#: admin/pages.php:231 admin/settings-page.php:117
+msgid "Use Permanent Redirect (301)"
+msgstr "使用永久重定向（301）"
+
+#: admin/logs-table.php:71
+msgid "User"
+msgstr "用户"
+
+#: admin/logs-table.php:88
+msgid "User #%d"
+msgstr "用户 #%d"
+
+#: admin/pages.php:243 admin/settings-page.php:129
+msgid "User Settings"
+msgstr "用户设置"
+
+#: includes/class-admin.php:263
+msgid "Using original domain:"
+msgstr "使用原域名："
+
+#: admin/pages.php:1110
+msgid "Validate site IDs"
+msgstr "验证站点 ID"
+
+#: admin/pages.php:322 admin/pages.php:362 admin/pages.php:435
+#: admin/pages.php:475 admin/pages.php:534 admin/settings-page.php:203
+#: admin/settings-page.php:235 admin/settings-page.php:287
+msgid "Value"
+msgstr "数值"
+
+#: admin/domains-page.php:18 admin/pages.php:21 admin/settings-page.php:39
+#, php-format
+msgid "Version: %s"
+msgstr "版本：%s"
+
+#: admin/domains-page.php:78 admin/domains-page.php:368
+msgid "Warning! Primary domains are currently disabled in network settings."
+msgstr "警告！主域名功能当前在网络设置中被禁用。"
+
+#. Name of the plugin
+msgid "WP Domain Mapping"
+msgstr "文派域名映射"
+
+#. Author of the plugin
+msgid "WPDomain.com"
+msgstr "WPDomain.com"
+
+#: admin/domains-page.php:117 admin/domains-page.php:339
+#: admin/user-page.php:103
+msgid "Yes"
+msgstr "是"
+
+#: includes/class-tools.php:947
+msgid "You do not have sufficient permissions to export data."
+msgstr "您没有足够的权限导出数据。"
+
+#: includes/class-tools.php:1003
+msgid "You do not have sufficient permissions to import data."
+msgstr "您没有足够的权限导入数据。"
+
+#: includes/class-tools.php:353 includes/class-tools.php:377
+#: includes/class-tools.php:412 includes/class-tools.php:463
+msgid "You do not have sufficient permissions to perform this action."
+msgstr "您没有足够的权限执行此操作。"
+
+#. %s: URL to WordPress network creation documentation
+#: includes/class-admin.php:817
 #, php-format
 msgid "You must <a href=\"%1$s\">create a network</a> for it to work."
 msgstr "您必须<a href=\"%1$s\">创建网络</a>才能使其正常工作。"
 
-#: includes/class-admin.php:251
-msgid "Permission denied."
-msgstr "没有权限。"
-
-#: includes/class-admin.php:268
-#, fuzzy
-#| msgid "Invalid action."
-msgid "Invalid domain format."
-msgstr "无效操作。"
-
-#: includes/class-admin.php:301
-#, fuzzy
-#| msgid "Failed to save domain."
-msgid "Failed to add domain."
-msgstr "无法保存域名。"
-
-#: includes/class-admin.php:322
-msgid "Domain updated successfully."
-msgstr "域名更新成功。"
-
-#: includes/class-admin.php:325
-msgid "No changes were made or update failed."
-msgstr ""
-
-#: includes/class-admin.php:330
-msgid "An error occurred while saving domain."
-msgstr ""
-
-#: includes/class-admin.php:333
-#, fuzzy
-#| msgid "New domain already exists."
-msgid "Domain already exists for another site."
-msgstr "新的域名已经存在。"
-
-#: includes/class-admin.php:336
-msgid "Invalid site ID."
-msgstr ""
-
-#: includes/class-admin.php:387
-#, fuzzy
-#| msgid "Domain deleted."
-msgid "No domains were deleted."
-msgstr "域名已删除。"
-
-#: includes/class-admin.php:391
-msgid "An error occurred while deleting domains."
-msgstr ""
-
-#: includes/class-admin.php:396
-msgid "Invalid action."
-msgstr "无效操作。"
-
-#: includes/class-admin.php:412 includes/class-admin.php:503
+#: includes/class-admin.php:1069 includes/class-admin.php:1146
 msgid "You must enter a domain"
 msgstr "您必须输入一个域名"
 
-#: includes/class-admin.php:425
-msgid "Invalid domain format"
-msgstr ""
+#: admin/user-page.php:81
+msgid "Your Mapped Domains"
+msgstr "您的映射域名"
 
-#: includes/class-admin.php:634
-msgid ""
-"Please set the IP address or CNAME of your server in the <a href='wpmu-"
-"admin.php?page=domain-mapping'>site admin page</a>."
-msgstr ""
-"请在<a href='wpmu-admin.php?page=domain-mapping'>站点管理页面</a>中设置您服务"
-"器的 IP 地址或 CNAME。"
-
-#: includes/class-admin.php:676
-msgid "Mapping"
-msgstr "映射"
-
-#: includes/class-admin.php:720
-msgid "New domain added."
-msgstr "已添加新域名。"
-
-#: includes/class-admin.php:723
-msgid "New domain already exists."
-msgstr "新的域名已经存在。"
-
-#: includes/class-admin.php:726
-msgid "New primary domain."
-msgstr "新的主域名。"
-
-#: includes/class-admin.php:729
-msgid "Domain deleted."
-msgstr "域名已删除。"
-
-#: includes/class-core.php:173
-#, fuzzy
-#| msgid "Domain mapping database table created."
-msgid "Domain mapping database tables created."
-msgstr "域映射创建数据库表。"
-
-#: includes/class-core.php:545
-msgid "Incorrect or out of date login key"
-msgstr "登录密钥不正确或过期"
-
-#: includes/class-core.php:548
-msgid "Unknown login key"
-msgstr "未知的登录密钥"
-
-#: includes/class-core.php:569
-msgid "Unknown logout key"
-msgstr "未知的退出密钥"
-
-#: includes/class-tools.php:127
-#, php-format
-msgid "Site ID: %d"
-msgstr "站点 ID：%d"
-
-#: includes/class-tools.php:130
-msgid "Edit this site"
-msgstr ""
-
-#: includes/class-tools.php:130
-msgid "Current site ID"
-msgstr ""
-
-#: includes/class-tools.php:176 includes/class-tools.php:189
-msgid "SSL"
-msgstr ""
-
-#: includes/class-tools.php:210
-msgid "SSL Enabled"
-msgstr ""
-
-#: includes/class-tools.php:212
-msgid "No SSL"
-msgstr ""
-
-#: includes/class-tools.php:220
-msgid "Main site is accessible"
-msgstr ""
-
-#: includes/class-tools.php:251
-msgid "No domain"
-msgstr ""
-
-#: includes/class-tools.php:316 includes/class-tools.php:340
-#: includes/class-tools.php:385 includes/class-tools.php:436
-msgid "Security check failed."
-msgstr ""
-
-#: includes/class-tools.php:321 includes/class-tools.php:345
-#: includes/class-tools.php:380 includes/class-tools.php:431
-msgid "You do not have sufficient permissions to perform this action."
-msgstr ""
-
-#: includes/class-tools.php:391
-#, fuzzy
-#| msgid "No domains found."
-msgid "No domain specified."
-msgstr "未找到域名。"
-
-#: includes/class-tools.php:402
-msgid "Main site is always accessible"
-msgstr ""
-
-#: includes/class-tools.php:525
-msgid "Health check completed."
-msgstr ""
-
-#: includes/class-tools.php:593
-msgid "DNS check not performed"
-msgstr ""
-
-#: includes/class-tools.php:612
-msgid "Domain A record is correctly pointing to server IP."
-msgstr ""
-
-#: includes/class-tools.php:632
-msgid "Domain CNAME record is correctly configured."
-msgstr ""
-
-#: includes/class-tools.php:634
-msgid "Domain is not pointing to the correct server."
-msgstr ""
-
-#: includes/class-tools.php:637
-msgid "Cannot verify DNS configuration."
-msgstr ""
-
-#: includes/class-tools.php:640
-msgid "Domain does not resolve to an IP address."
-msgstr ""
-
-#: includes/class-tools.php:772
-#, php-format
-msgid "[%s] Domain Mapping Health Alert"
-msgstr ""
-
-#: includes/class-tools.php:775
-#, php-format
-msgid "Domain health issues were detected on %s."
-msgstr ""
-
-#: includes/class-tools.php:776
-msgid "The following domains have issues:"
-msgstr ""
-
-#: includes/class-tools.php:779
-#, php-format
-msgid "Domain: %s"
-msgstr "域名： %s"
-
-#: includes/class-tools.php:783
-#, php-format
-msgid "DNS Issue: %s"
-msgstr ""
-
-#: includes/class-tools.php:788
-msgid "SSL Certificate is invalid or missing."
-msgstr ""
-
-#: includes/class-tools.php:796
-#, php-format
-msgid "SSL Certificate expires on %s (within %d days)."
-msgstr ""
-
-#: includes/class-tools.php:805
-msgid "Site is not accessible."
-msgstr ""
-
-#: includes/class-tools.php:807
-#, php-format
-msgid "HTTP Response Code: %d"
-msgstr ""
-
-#: includes/class-tools.php:816
-#, php-format
-msgid "To view and manage these issues, please visit: %s"
-msgstr ""
-
-#: includes/class-tools.php:838
-msgid "You do not have sufficient permissions to export data."
-msgstr ""
-
-#: includes/class-tools.php:843 includes/class-tools.php:899
-msgid "Invalid security token. Please try again."
-msgstr ""
-
-#: includes/class-tools.php:894
-msgid "You do not have sufficient permissions to import data."
-msgstr ""
-
-#: includes/class-tools.php:904
-msgid "No file uploaded or upload error."
-msgstr ""
-
-#: includes/class-tools.php:915
-msgid "Could not open the uploaded file."
-msgstr ""
-
-#: includes/class-tools.php:940
-#, php-format
-msgid "Row %d: Invalid format. Expected at least 3 columns."
-msgstr ""
-
-#: includes/class-tools.php:956
-#, php-format
-msgid "Row %d: Domain %s already processed in this import. Skipped duplicate."
-msgstr ""
-
-#: includes/class-tools.php:970
-#, php-format
-msgid "Row %d: Invalid blog ID: %d"
-msgstr ""
-
-#: includes/class-tools.php:981
-#, php-format
-msgid "Row %d: Site ID %d does not exist."
-msgstr ""
-
-#: includes/class-tools.php:992
-#, php-format
-msgid "Row %d: Invalid domain format: %s"
-msgstr ""
-
-#: includes/class-tools.php:1006
-#, php-format
-msgid "Row %d: Domain %s is already mapped to blog ID %d."
-msgstr ""
-
-#: includes/class-tools.php:1013
-#, php-format
-msgid "Row %d: Domain %s already exists for blog ID %d. Skipped."
-msgstr ""
-
-#: includes/class-tools.php:1024
-#, php-format
-msgid "Row %d: Updated domain %s for blog ID %d."
-msgstr ""
-
-#: includes/class-tools.php:1031
-#, php-format
-msgid "Row %d: Failed to update domain %s for blog ID %d."
-msgstr ""
-
-#: includes/class-tools.php:1044
-#, php-format
-msgid "Row %d: Added domain %s for blog ID %d."
-msgstr ""
-
-#: includes/class-tools.php:1051
-#, php-format
-msgid "Row %d: Failed to add domain %s for blog ID %d."
-msgstr ""
-
-#: includes/class-tools.php:1065
-#, php-format
-msgid "Import completed: %d imported, %d skipped, %d errors."
-msgstr ""
-
-#: includes/functions.php:73
-#, php-format
-msgid ""
-"International Domain Names should be in <a href=\"%s\" "
-"target=\"_blank\">punycode</a> format."
-msgstr "国际域名应采用<a href=\"%s\" target=\"_blank\">punycode</a>格式。"
-
-#: includes/functions.php:331
-msgid "Added"
-msgstr ""
-
-#: includes/functions.php:333
-#, fuzzy
-#| msgid "Update Domain"
-msgid "Updated"
-msgstr "更新域名"
-
-#: includes/functions.php:335
-#, fuzzy
-#| msgid "Delete"
-msgid "Deleted"
-msgstr "删除"
-
-#: includes/functions.php:337
-msgid "Imported"
-msgstr ""
-
-#. Plugin Name of the plugin/theme
-msgid "WP Domain Mapping"
-msgstr "文派域名映射"
-
-#. Plugin URI of the plugin/theme
-msgid "https://wenpai.org/plugins/wp-domain-mapping/"
-msgstr "https://wenpai.org/plugins/wp-domain-mapping/"
-
-#. Description of the plugin/theme
-msgid ""
-"Map any site on a WordPress website to another domain with enhanced "
-"management features."
-msgstr "使用增强的管理功能将 WordPress 网站上的任何站点映射到另一个域名。"
-
-#. Author of the plugin/theme
-msgid "WPDomain.com"
-msgstr "WPDomain.com"
-
-#. Author URI of the plugin/theme
-msgid "https://wpdomain.com/"
-msgstr "https://wpdomain.com/"
-
-#~ msgid "Add a DNS \"A\" record pointing to: <strong>%s</strong>"
-#~ msgstr "添加指向 <strong>%s</strong> 的 DNS “A” 记录"
-
-#~ msgid "Add"
-#~ msgstr "添加"
-
-#~ msgid "* The primary domain cannot be deleted."
-#~ msgstr "*主域名不能被删除。"
-
-#~ msgid "Set Primary Domain"
-#~ msgstr "设置为主域"
-
-#~ msgid "Active Domains"
-#~ msgstr "活跃域名"
-
-#~ msgid "Domain Mapping Configuration"
-#~ msgstr "域映射配置"
-
-#~ msgid "Timestamp"
-#~ msgstr "时间戳"
-
-#~ msgid "Failed to delete domains."
-#~ msgstr "无法删除域名。"
-
-#~ msgid "Selected domains deleted successfully."
-#~ msgstr "选定的域名已成功删除。"
-
-#~ msgid "Invalid site ID or domain already exists."
-#~ msgstr "无效的站点 ID 或域名已存在。"
+#: admin/pages.php:1040
+msgid "文派叶子 🍃（WPCY.COM）"
+msgstr "文派叶子 🍃（WPCY.COM）"
diff --git a/sunrise.php b/sunrise.php
index a3c9c68..4b404f5 100644
--- a/sunrise.php
+++ b/sunrise.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Sunrise.php for WordPress Domain Mapping
+ * Sunrise.php for WP Domain Mapping
  *
  * This file must be copied to wp-content/sunrise.php
  * Also, you must add "define('SUNRISE', 'on');" to wp-config.php
@@ -18,16 +18,27 @@ if (!defined('MULTISITE') || !MULTISITE) {
 // Enable domain mapping
 define('DOMAIN_MAPPING', 1);
 
-// Check if we're on the main site already
-if (defined('COOKIE_DOMAIN') && COOKIE_DOMAIN == $_SERVER['HTTP_HOST']) {
-    return;
+// Don't process if we're in admin and on the original domain
+if (is_admin() && isset($_SERVER['HTTP_HOST'])) {
+    // Allow admin access from any domain - we'll handle this in the plugin itself
 }
 
 global $wpdb, $current_blog, $current_site;
 
+// Check if tables exist before proceeding
+if (!$wpdb) {
+    return;
+}
+
 // Get domains table name
 $domain_mapping_table = $wpdb->base_prefix . 'domain_mapping';
 
+// Check if the domain mapping table exists
+$table_exists = $wpdb->get_var("SHOW TABLES LIKE '{$domain_mapping_table}'") == $domain_mapping_table;
+if (!$table_exists) {
+    return;
+}
+
 // Check for the current domain in the domain mapping table
 $domain = sanitize_text_field($_SERVER['HTTP_HOST']);
 $blog_id = $wpdb->get_var($wpdb->prepare(
@@ -38,14 +49,19 @@ $blog_id = $wpdb->get_var($wpdb->prepare(
 // If we found a mapped domain, override current_blog
 if (!empty($blog_id)) {
     // Get the mapped blog details
-    $mapped_blog = $wpdb->get_row("SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$blog_id}' LIMIT 1");
+    $mapped_blog = $wpdb->get_row($wpdb->prepare(
+        "SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1",
+        $blog_id
+    ));
 
     if ($mapped_blog) {
         // Override current_blog
         $current_blog = $mapped_blog;
 
-        // Also set the cookie domain to the current domain
-        define('COOKIE_DOMAIN', $_SERVER['HTTP_HOST']);
+        // Set cookie domain for the mapped domain (only if not defined in wp-config.php)
+        if (!defined('COOKIE_DOMAIN')) {
+            define('COOKIE_DOMAIN', $domain);
+        }
 
         // Define the mapped domain constant
         define('MAPPED_DOMAIN', true);
@@ -53,12 +69,35 @@ if (!empty($blog_id)) {
         // Allow other plugins to know this is a mapped domain
         $GLOBALS['dm_domain'] = array(
             'original' => $current_blog->domain,
-            'mapped' => $_SERVER['HTTP_HOST']
+            'mapped' => $domain,
+            'blog_id' => $blog_id
         );
 
         // Fix request URI for path sites
         if ($current_blog->path != '/' && ($current_blog->path != '/wp/' || strpos($_SERVER['REQUEST_URI'], '/wp/') === false)) {
             $current_blog->path = '/';
         }
+
+        // Store original values for reference
+        if (!defined('DM_ORIGINAL_DOMAIN')) {
+            define('DM_ORIGINAL_DOMAIN', $mapped_blog->domain);
+        }
+        if (!defined('DM_ORIGINAL_PATH')) {
+            define('DM_ORIGINAL_PATH', $mapped_blog->path);
+        }
     }
 }
+
+// Function to check if current request is for admin area
+function dm_is_admin_request() {
+    if (!isset($_SERVER['REQUEST_URI'])) {
+        return false;
+    }
+
+    $request_uri = $_SERVER['REQUEST_URI'];
+    return (
+        strpos($request_uri, '/wp-admin/') !== false ||
+        strpos($request_uri, '/wp-login.php') !== false ||
+        (defined('WP_ADMIN') && WP_ADMIN)
+    );
+}
diff --git a/wp-domain-mapping.php b/wp-domain-mapping.php
index ac08bae..08f3603 100644
--- a/wp-domain-mapping.php
+++ b/wp-domain-mapping.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Domain Mapping
  * Plugin URI: https://wenpai.org/plugins/wp-domain-mapping/
  * Description: Map any site on a WordPress website to another domain with enhanced management features.
- * Version: 2.2.0
+ * Version: 2.0.0
  * Author: WPDomain.com
  * Author URI: https://wpdomain.com/
  * Network: true
@@ -20,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 // Define plugin constants
-define( 'WP_DOMAIN_MAPPING_VERSION', '2.2.0' );
+define( 'WP_DOMAIN_MAPPING_VERSION', '2.0.0' );
 define( 'WP_DOMAIN_MAPPING_DIR_URL', plugin_dir_url( __FILE__ ) );
 define( 'WP_DOMAIN_MAPPING_DIR_PATH', plugin_dir_path( __FILE__ ) );
 define( 'WP_DOMAIN_MAPPING_BASENAME', plugin_basename( __FILE__ ) );