diff --git a/README.md b/README.md
index 11429d5..fbaf351 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,18 @@ Sends server-side `short_url_visit` hits using the **GA4 Measurement Protocol AP
 *   **GA4 API Secret**: Create this secret in Google Analytics under `Admin -> Data Streams -> Measurement Protocol API secrets`.
 *   **Firebase App ID / Measurement ID**: The target analytics stream identifier.
 
+### 4. Counter Buffering (Write-back Caching)
+For extremely high-traffic applications, direct database writes for click counts can cause row-locking bottlenecks.
+*   **Buffer Click Counts**: Toggling this option buffers total and unique visit count increments in the application cache.
+*   **Cron Synchronization**: When enabled, you must schedule the synchronization command to run periodically (e.g., every minute) to flush counts to the database:
+    ```bash
+    php artisan short-url:sync-counters
+    ```
+    In your scheduler (`routes/console.php` or `app/Console/Kernel.php`):
+    ```php
+    $schedule->command('short-url:sync-counters')->everyMinute();
+    ```
+
 ---
 
 ## Configuration Reference (.env)
@@ -162,6 +174,7 @@ You can also pre-configure all parameters via your `.env` file:
 | `SHORT_URL_CACHE_TTL` | `cache_ttl` | `3600` | Redirection model caching TTL (set to `0` to disable). |
 | `GA4_API_SECRET` | `ga4.api_secret` | `null` | Google Analytics 4 Measurement Protocol API Secret. |
 | `FIREBASE_APP_ID` | `ga4.firebase_app_id` | `null` | Google Analytics 4 Firebase App ID (or uses Measurement ID). |
+| `SHORT_URL_COUNTER_BUFFERING` | `counter_buffering.enabled` | `false` | Buffer click counts in cache (flushed via console command). |
 
 ---
 
diff --git a/config/filament-short-url.php b/config/filament-short-url.php
index f3e6699..08f2109 100644
--- a/config/filament-short-url.php
+++ b/config/filament-short-url.php
@@ -132,4 +132,42 @@ return [
         'gradient_type' => 'linear',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Counter Buffering (Write-back Caching)
+    |--------------------------------------------------------------------------
+    | For high-traffic applications, direct database writes on every visit
+    | can cause locks. Enable this to buffer total/unique visit counts in
+    | cache, then sync them to the database periodically via a scheduled task.
+    */
+    'counter_buffering' => [
+        'enabled' => (bool) env('SHORT_URL_COUNTER_BUFFERING', false),
+        'cache_key_prefix' => 'filament-short-url:buffer:',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Trust CDN/Proxy Headers
+    |--------------------------------------------------------------------------
+    | If your application sits behind a CDN (like Cloudflare, AWS CloudFront)
+    | or a reverse proxy, set this to true to parse real visitor IP addresses
+    | and country codes from proxy headers. Only enable this if you are
+    | actually behind a proxy to prevent client IP spoofing!
+    |
+    */
+    'trust_cdn_headers' => (bool) env('SHORT_URL_TRUST_CDN_HEADERS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Redirect Route Middleware
+    |--------------------------------------------------------------------------
+    | The middleware list applied to the short URL redirect route.
+    | By default, standard web middleware and rate limiting are applied.
+    |
+    */
+    'middleware' => [
+        'web',
+        'throttle:120,1',
+    ],
+
 ];
diff --git a/resources/lang/en/default.php b/resources/lang/en/default.php
index 8a6200e..34eacad 100644
--- a/resources/lang/en/default.php
+++ b/resources/lang/en/default.php
@@ -180,4 +180,35 @@ return [
     'settings_ga4_api_secret_helper' => 'Generate this in GA4 → Admin → Data Streams → your stream → Measurement Protocol API secrets.',
     'settings_ga4_firebase_app_id' => 'Firebase App ID (optional)',
     'settings_ga4_firebase_app_id_helper' => 'Required only if tracking a Firebase / app stream. Leave empty for standard web GA4 streams.',
+
+    'settings_section_buffering' => 'Visit Counters Buffering',
+    'settings_buffering_enabled' => 'Buffer Visit Counts in Cache',
+    'settings_buffering_helper' => 'When enabled, visit count increments are temporarily buffered in the application cache and must be flushed periodically to the database via "php artisan short-url:sync-counters". This prevents row-locking issues and performance degradation under high-traffic spikes.',
+
+    // CDN Trust Settings
+    'settings_trust_cdn_headers' => 'Trust CDN & Proxy Headers',
+    'settings_trust_cdn_headers_helper' => 'Enable this if your app sits behind a CDN (like Cloudflare, AWS CloudFront) or a reverse proxy. This allows extracting the real client IP and country code from CDN headers. Warning: only enable this if you are actually behind a proxy, otherwise client IP addresses can be spoofed!',
+
+    // Stats View & Export Localization
+    'stats_filter_visited_from' => 'Visited From',
+    'stats_filter_visited_until' => 'Visited Until',
+    'stats_action_export' => 'Export CSV',
+    'stats_csv_time' => 'Time',
+    'stats_csv_ip' => 'IP Address',
+    'stats_csv_country' => 'Country',
+    'stats_csv_device' => 'Device',
+    'stats_csv_browser' => 'Browser',
+    'stats_csv_os' => 'OS',
+    'stats_csv_referer' => 'Referer',
+
+    // Bulk Actions Localization
+    'action_enable_selected' => 'Enable selected',
+    'action_disable_selected' => 'Disable selected',
+
+    // Form Sections Localization
+    'form_section_options' => 'Options',
+    'form_section_notes' => 'Internal Notes',
+    'form_section_tracking' => 'Visit Tracking',
+    'form_section_tracked_fields' => 'Tracked Fields',
+    'form_section_analytics' => 'Third-Party Analytics',
 ];
diff --git a/resources/lang/pl/default.php b/resources/lang/pl/default.php
index 4da7f5b..79ed21b 100644
--- a/resources/lang/pl/default.php
+++ b/resources/lang/pl/default.php
@@ -181,4 +181,35 @@ return [
     'settings_ga4_api_secret_helper' => 'Wygeneruj w GA4 → Admin → Strumienie danych → twój strumień → Klucze API Measurement Protocol.',
     'settings_ga4_firebase_app_id' => 'Firebase App ID (opcjonalne)',
     'settings_ga4_firebase_app_id_helper' => 'Wymagane tylko przy śledzeniu strumienia Firebase/aplikacji. Zostaw puste dla standardowych strumieni GA4.',
+
+    'settings_section_buffering' => 'Buforowanie liczników wizyt',
+    'settings_buffering_enabled' => 'Buforuj kliknięcia w pamięci podręcznej (Cache)',
+    'settings_buffering_helper' => 'Po włączeniu, zliczenia kliknięć będą buforowane w pamięci podręcznej aplikacji i muszą być okresowo synchronizowane z bazą danych za pomocą komendy "php artisan short-url:sync-counters". Zapobiega to blokowaniu wierszy bazy danych i spadkom wydajności przy masowym ruchu.',
+
+    // CDN Trust Settings
+    'settings_trust_cdn_headers' => 'Ufaj nagłówkom CDN i proxy',
+    'settings_trust_cdn_headers_helper' => 'Włącz tę opcję, jeśli Twoja aplikacja działa za CDN (np. Cloudflare, AWS CloudFront) lub reverse proxy. Pozwala to na pobieranie prawdziwego adresu IP klienta i kodu kraju z nagłówków CDN. Uwaga: włączaj tylko wtedy, gdy faktycznie korzystasz z proxy, w przeciwnym razie adresy IP mogą być sfałszowane!',
+
+    // Stats View & Export Localization
+    'stats_filter_visited_from' => 'Odwiedzono od',
+    'stats_filter_visited_until' => 'Odwiedzono do',
+    'stats_action_export' => 'Eksportuj CSV',
+    'stats_csv_time' => 'Czas',
+    'stats_csv_ip' => 'Adres IP',
+    'stats_csv_country' => 'Kraj',
+    'stats_csv_device' => 'Urządzenie',
+    'stats_csv_browser' => 'Przeglądarka',
+    'stats_csv_os' => 'System operacyjny',
+    'stats_csv_referer' => 'Źródło (Referer)',
+
+    // Bulk Actions Localization
+    'action_enable_selected' => 'Włącz zaznaczone',
+    'action_disable_selected' => 'Wyłącz zaznaczone',
+
+    // Form Sections Localization
+    'form_section_options' => 'Opcje',
+    'form_section_notes' => 'Wewnętrzne notatki',
+    'form_section_tracking' => 'Śledzenie wizyt',
+    'form_section_tracked_fields' => 'Śledzone pola',
+    'form_section_analytics' => 'Zewnętrzne systemy analityczne',
 ];
diff --git a/resources/views/qr-designer.blade.php b/resources/views/qr-designer.blade.php
index 9280189..7b43f53 100644
--- a/resources/views/qr-designer.blade.php
+++ b/resources/views/qr-designer.blade.php
@@ -254,7 +254,7 @@
 
         {{-- Size & Margin --}}
         <div class="qr-section">
-            <div class="grid grid-cols-2 gap-3">
+            <div class="grid grid-cols-2 gap-3" style="display:grid;grid-template-columns:repeat(2, minmax(0, 1fr));gap:12px">
                 <div>
                     <span class="qr-label">{{ __('filament-short-url::default.qr_label_size') }}</span>
                     <input type="number" x-model.number="size" min="100" max="1000" step="10" class="qr-input-num" />
@@ -288,7 +288,7 @@
             <span class="qr-label">{{ __('filament-short-url::default.qr_label_foreground_color') }}</span>
 
             {{-- Mode radio --}}
-            <div class="flex gap-2">
+            <div class="flex gap-2" style="display:flex;gap:8px">
                 <button type="button"
                     :class="colorMode === 'solid' ? 'active' : ''"
                     class="qr-radio-option flex-1 justify-center text-center"
@@ -308,7 +308,7 @@
             {{-- Single color picker --}}
             <div x-show="colorMode === 'solid'" x-transition style="display:block" class="mt-3 qr-margin-top">
                 <span class="qr-label">{{ __('filament-short-url::default.qr_label_color') }}</span>
-                <div class="flex items-center gap-2">
+                <div class="flex items-center gap-2" style="display:flex;align-items:center;gap:8px">
                     <div class="qr-color-swatch qr-color-picker" :style="'background:'+fgColor">
                         <input type="color" x-model="fgColor" />
                     </div>
@@ -321,10 +321,10 @@
 
             {{-- Gradient pickers --}}
             <div x-show="colorMode === 'gradient'" x-transition style="display:none" class="mt-3 space-y-3 qr-space-y qr-margin-top">
-                <div class="grid grid-cols-2 gap-2">
+                <div class="grid grid-cols-2 gap-2" style="display:grid;grid-template-columns:repeat(2, minmax(0, 1fr));gap:8px">
                     <div>
                         <span class="qr-label">{{ __('filament-short-url::default.qr_label_from') }}</span>
-                        <div class="flex items-center gap-1.5">
+                        <div class="flex items-center gap-1.5" style="display:flex;align-items:center;gap:6px">
                             <div class="qr-color-swatch qr-color-picker" :style="'background:'+gradientFrom">
                                 <input type="color" x-model="gradientFrom" />
                             </div>
@@ -336,7 +336,7 @@
                     </div>
                     <div>
                         <span class="qr-label">{{ __('filament-short-url::default.qr_label_to') }}</span>
-                        <div class="flex items-center gap-1.5">
+                        <div class="flex items-center gap-1.5" style="display:flex;align-items:center;gap:6px">
                             <div class="qr-color-swatch qr-color-picker" :style="'background:'+gradientTo">
                                 <input type="color" x-model="gradientTo" />
                             </div>
@@ -360,7 +360,7 @@
         {{-- Background --}}
         <div class="qr-section">
             <span class="qr-label">{{ __('filament-short-url::default.qr_label_background') }}</span>
-            <div class="flex items-center justify-between">
+            <div class="flex items-center justify-between" style="display:flex;align-items:center;justify-content:space-between">
                 <span style="font-size:13px;font-weight:500;color:#374151" class="dark:text-gray-300">{{ __('filament-short-url::default.qr_label_transparent') }}</span>
                 <button type="button"
                     :class="bgTransparent ? 'on' : 'off'"
@@ -369,9 +369,9 @@
                     <span class="qr-toggle-thumb"></span>
                 </button>
             </div>
-            <div x-show="!bgTransparent" x-transition style="display:block" class="mt-3">
+            <div x-show="!bgTransparent" x-transition style="display:block;margin-top:12px" class="mt-3 qr-margin-top">
                 <span class="qr-label">{{ __('filament-short-url::default.qr_label_color') }}</span>
-                <div class="flex items-center gap-2">
+                <div class="flex items-center gap-2" style="display:flex;align-items:center;gap:8px">
                     <div class="qr-color-swatch qr-color-picker" :style="'background:'+bgColor">
                         <input type="color" x-model="bgColor" />
                     </div>
@@ -381,8 +381,8 @@
                         maxlength="7" placeholder="#ffffff" />
                 </div>
             </div>
-            <div x-show="bgTransparent" x-transition style="display:none" class="mt-3">
-                <div class="qr-checker flex h-9 w-full items-center justify-center rounded-lg border border-dashed border-gray-300" style="font-size:11px;color:#9ca3af;font-weight:600">
+            <div x-show="bgTransparent" x-transition style="display:none;margin-top:12px" class="mt-3 qr-margin-top">
+                <div class="qr-checker flex h-9 w-full items-center justify-center rounded-lg border border-dashed border-gray-300" style="display:flex;align-items:center;justify-content:center;font-size:11px;color:#9ca3af;font-weight:600">
                     TRANSPARENT
                 </div>
             </div>
@@ -390,7 +390,7 @@
 
         {{-- Eye Config --}}
         <div class="qr-section">
-            <div class="flex items-center justify-between">
+            <div class="flex items-center justify-between" style="display:flex;align-items:center;justify-content:space-between">
                 <span class="qr-label" style="margin-bottom:0">{{ __('filament-short-url::default.qr_label_eye_config') }}</span>
                 <button type="button"
                     :class="eyeConfigEnabled ? 'on' : 'off'"
@@ -417,7 +417,7 @@
                 </div>
                 <div>
                     <span class="qr-label">{{ __('filament-short-url::default.qr_label_eye_color') }}</span>
-                    <div class="flex items-center gap-2">
+                    <div class="flex items-center gap-2" style="display:flex;align-items:center;gap:8px">
                         <div class="qr-color-swatch qr-color-picker" :style="'background:'+eyeColor">
                             <input type="color" x-model="eyeColor" />
                         </div>
@@ -436,9 +436,9 @@
     <div style="display:flex;flex-direction:column;min-width:0;height:100%">
 
         {{-- Top bar --}}
-        <div class="mb-4 flex items-center justify-between">
+        <div class="mb-4 flex items-center justify-between" style="display:flex;align-items:center;justify-content:space-between;margin-bottom:16px">
             <span style="font-size:13px;font-weight:600;color:#9ca3af">{{ __('filament-short-url::default.qr_label_preview') }}</span>
-            <div class="flex items-center gap-2">
+            <div class="flex items-center gap-2" style="display:flex;align-items:center;gap:8px">
                 <button type="button" x-on:click="download('png')" class="qr-dl-btn">
                     <svg style="width:13px;height:13px" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3"/>
diff --git a/routes/web.php b/routes/web.php
index 4f6419c..b5ba86e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -9,4 +9,4 @@ Route::get(
 )
     ->name('short-url.redirect')
     ->where('key', '[a-zA-Z0-9_-]+')
-    ->middleware('throttle:120,1');
+    ->middleware(config('filament-short-url.middleware', ['web', 'throttle:120,1']));
diff --git a/src/Console/Commands/SyncBufferedCountersCommand.php b/src/Console/Commands/SyncBufferedCountersCommand.php
new file mode 100644
index 0000000..3ef3295
--- /dev/null
+++ b/src/Console/Commands/SyncBufferedCountersCommand.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Bjanczak\FilamentShortUrl\Console\Commands;
+
+use Bjanczak\FilamentShortUrl\Models\ShortUrl;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+
+class SyncBufferedCountersCommand extends Command
+{
+    /** @var string */
+    protected $signature = 'short-url:sync-counters';
+
+    /** @var string */
+    protected $description = 'Sync buffered short URL visit counters from cache to the database';
+
+    public function handle(): int
+    {
+        $prefix = config('filament-short-url.counter_buffering.cache_key_prefix', 'filament-short-url:buffer:');
+        $dirtyKey = "{$prefix}dirty_ids";
+
+        // Pull the list atomically to avoid race conditions with incoming clicks
+        if (Cache::getDefaultDriver() === 'redis' && class_exists(\Illuminate\Support\Facades\Redis::class)) {
+            $tempKey = "{$dirtyKey}:temp:" . time();
+            try {
+                \Illuminate\Support\Facades\Redis::rename($dirtyKey, $tempKey);
+                $dirtyIds = \Illuminate\Support\Facades\Redis::smembers($tempKey);
+                \Illuminate\Support\Facades\Redis::del($tempKey);
+            } catch (\Throwable) {
+                // If key does not exist or rename fails, fallback
+                $dirtyIds = [];
+            }
+        } else {
+            $dirtyIds = Cache::pull($dirtyKey, []);
+        }
+
+        if (empty($dirtyIds)) {
+            $this->info('No buffered counters to synchronize.');
+
+            return 0;
+        }
+
+        $dirtyIds = array_unique(array_filter($dirtyIds));
+        $processed = 0;
+
+        foreach ($dirtyIds as $id) {
+            $totalKey = "{$prefix}total:{$id}";
+            $uniqueKey = "{$prefix}unique:{$id}";
+
+            $totalDelta = (int) Cache::pull($totalKey, 0);
+            $uniqueDelta = (int) Cache::pull($uniqueKey, 0);
+
+            if ($totalDelta > 0 || $uniqueDelta > 0) {
+                // Perform a single atomic update query for this URL
+                ShortUrl::where('id', $id)->update([
+                    'total_visits' => DB::raw("total_visits + {$totalDelta}"),
+                    'unique_visits' => DB::raw("unique_visits + {$uniqueDelta}"),
+                ]);
+                $processed++;
+            }
+        }
+
+        $this->info("Successfully synchronized counters for {$processed} short URLs.");
+
+        return 0;
+    }
+}
diff --git a/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php b/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
index c28438a..235c7b8 100644
--- a/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
+++ b/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
@@ -45,6 +45,8 @@ class ShortUrlSettingsPage extends Page implements HasForms
             'queue_connection' => $mgr->get('queue_connection', 'sync'),
             'ga4_api_secret' => $mgr->get('ga4_api_secret'),
             'ga4_firebase_app_id' => $mgr->get('ga4_firebase_app_id'),
+            'counter_buffering_enabled' => $mgr->get('counter_buffering_enabled', false),
+            'trust_cdn_headers' => $mgr->get('trust_cdn_headers', false),
         ]);
     }
 
@@ -93,6 +95,12 @@ class ShortUrlSettingsPage extends Page implements HasForms
                                             ->minValue(0)
                                             ->suffix('s')
                                             ->required(),
+
+                                        Toggle::make('trust_cdn_headers')
+                                            ->label(__('filament-short-url::default.settings_trust_cdn_headers'))
+                                            ->helperText(__('filament-short-url::default.settings_trust_cdn_headers_helper'))
+                                            ->columnSpanFull()
+                                            ->inline(false),
                                     ]),
 
                                 Section::make(__('filament-short-url::default.settings_section_queue'))
@@ -111,6 +119,14 @@ class ShortUrlSettingsPage extends Page implements HasForms
                                             })
                                             ->required(),
                                     ]),
+
+                                Section::make(__('filament-short-url::default.settings_section_buffering'))
+                                    ->schema([
+                                        Toggle::make('counter_buffering_enabled')
+                                            ->label(__('filament-short-url::default.settings_buffering_enabled'))
+                                            ->helperText(__('filament-short-url::default.settings_buffering_helper'))
+                                            ->inline(false),
+                                    ]),
                             ]),
 
                         // ── Geo-IP ───────────────────────────────────────────
diff --git a/src/Filament/Resources/ShortUrlResource/Pages/ViewShortUrlLogs.php b/src/Filament/Resources/ShortUrlResource/Pages/ViewShortUrlLogs.php
index c4f851a..fa20c8f 100644
--- a/src/Filament/Resources/ShortUrlResource/Pages/ViewShortUrlLogs.php
+++ b/src/Filament/Resources/ShortUrlResource/Pages/ViewShortUrlLogs.php
@@ -112,9 +112,9 @@ class ViewShortUrlLogs extends Page implements HasForms, HasTable
                 Tables\Filters\Filter::make('visited_at')
                     ->form([
                         DatePicker::make('visited_from')
-                            ->label('Visited From'),
+                            ->label(__('filament-short-url::default.stats_filter_visited_from')),
                         DatePicker::make('visited_until')
-                            ->label('Visited Until'),
+                            ->label(__('filament-short-url::default.stats_filter_visited_until')),
                     ])
                     ->query(function ($query, array $data) {
                         return $query
@@ -124,19 +124,26 @@ class ViewShortUrlLogs extends Page implements HasForms, HasTable
             ])
             ->headerActions([
                 Action::make('export_csv')
-                    ->label('Export CSV')
+                    ->label(__('filament-short-url::default.stats_action_export'))
                     ->icon('heroicon-o-arrow-down-tray')
                     ->color('gray')
-                    ->action(function () {
-                        return response()->streamDownload(function () {
+                    ->action(function (Tables\Contracts\HasTable $livewire) {
+                        return response()->streamDownload(function () use ($livewire) {
                             $handle = fopen('php://output', 'w');
                             // Add UTF-8 BOM for Microsoft Excel
                             fprintf($handle, chr(0xEF).chr(0xBB).chr(0xBF));
 
-                            fputcsv($handle, ['Time', 'IP Address', 'Country', 'Device', 'Browser', 'OS', 'Referer']);
+                            fputcsv($handle, [
+                                __('filament-short-url::default.stats_csv_time'),
+                                __('filament-short-url::default.stats_csv_ip'),
+                                __('filament-short-url::default.stats_csv_country'),
+                                __('filament-short-url::default.stats_csv_device'),
+                                __('filament-short-url::default.stats_csv_browser'),
+                                __('filament-short-url::default.stats_csv_os'),
+                                __('filament-short-url::default.stats_csv_referer'),
+                            ]);
 
-                            ShortUrlVisit::query()
-                                ->where('short_url_id', $this->record->id)
+                            $livewire->getFilteredTableQuery()
                                 ->orderBy('visited_at', 'desc')
                                 ->chunk(200, function ($visits) use ($handle) {
                                     foreach ($visits as $visit) {
diff --git a/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php b/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
index 4a2b677..2386079 100644
--- a/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
+++ b/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
@@ -105,7 +105,7 @@ class ShortUrlForm
                         ->required(),
                 ])->columns(2),
 
-                Section::make('Options')->schema([
+                Section::make(__('filament-short-url::default.form_section_options'))->schema([
                     Toggle::make('is_enabled')
                         ->label(__('filament-short-url::default.status'))
                         ->default(true)
@@ -129,7 +129,7 @@ class ShortUrlForm
                         ->native(false),
                 ])->columns(2),
 
-                Section::make('Internal Notes')->schema([
+                Section::make(__('filament-short-url::default.form_section_notes'))->schema([
                     Textarea::make('notes')
                         ->label(__('filament-short-url::default.notes'))
                         ->rows(3)
@@ -177,7 +177,7 @@ class ShortUrlForm
         return Tab::make(__('filament-short-url::default.tab_tracking'))
             ->icon('heroicon-o-chart-bar')
             ->schema([
-                Section::make('Visit Tracking')
+                Section::make(__('filament-short-url::default.form_section_tracking'))
                     ->schema([
                         Toggle::make('track_visits')
                             ->label(__('filament-short-url::default.track_visits'))
@@ -187,7 +187,7 @@ class ShortUrlForm
                             ->columnSpanFull(),
                     ])->columns(1),
 
-                Section::make('Tracked Fields')
+                Section::make(__('filament-short-url::default.form_section_tracked_fields'))
                     ->schema([
                         Toggle::make('track_ip_address')
                             ->label(__('filament-short-url::default.track_ip'))
@@ -277,7 +277,7 @@ class ShortUrlForm
                     ])
                     ->columns(2),
 
-                Section::make('Third-Party Analytics')
+                Section::make(__('filament-short-url::default.form_section_analytics'))
                     ->schema([
                         TextInput::make('ga_tracking_id')
                             ->label(__('filament-short-url::default.ga_tracking_id'))
diff --git a/src/Filament/Resources/ShortUrlResource/Tables/ShortUrlsTable.php b/src/Filament/Resources/ShortUrlResource/Tables/ShortUrlsTable.php
index 124598c..9d68521 100644
--- a/src/Filament/Resources/ShortUrlResource/Tables/ShortUrlsTable.php
+++ b/src/Filament/Resources/ShortUrlResource/Tables/ShortUrlsTable.php
@@ -101,21 +101,7 @@ class ShortUrlsTable
                     ->icon('heroicon-o-chart-bar')
                     ->color('gray')
                     ->size('sm')
-                    ->url(fn (ShortUrl $record): string => route(
-                        'filament.admin.resources.short-urls.stats',
-                        ['record' => $record->id]
-                    )),
-
-                Action::make('copy')
-                    ->label(__('filament-short-url::default.action_copy'))
-                    ->icon('heroicon-o-clipboard')
-                    ->color('gray')
-                    ->size('sm')
-                    ->action(fn () => null) // Copy happens client-side
-                    ->extraAttributes(fn (ShortUrl $record): array => [
-                        'x-on:click' => 'navigator.clipboard.writeText("'.$record->getShortUrl().'")',
-                        'title' => 'Copy short URL',
-                    ]),
+                    ->url(fn (ShortUrl $record): string => ShortUrlResource::getUrl('stats', ['record' => $record])),
 
                 EditAction::make()
                     ->icon('heroicon-o-pencil-square')
@@ -125,13 +111,13 @@ class ShortUrlsTable
             ->toolbarActions([
                 BulkActionGroup::make([
                     BulkAction::make('enable')
-                        ->label('Enable selected')
+                        ->label(__('filament-short-url::default.action_enable_selected'))
                         ->icon('heroicon-o-check-circle')
                         ->action(fn ($records) => $records->each->update(['is_enabled' => true]))
                         ->deselectRecordsAfterCompletion(),
 
                     BulkAction::make('disable')
-                        ->label('Disable selected')
+                        ->label(__('filament-short-url::default.action_disable_selected'))
                         ->icon('heroicon-o-x-circle')
                         ->action(fn ($records) => $records->each->update(['is_enabled' => false]))
                         ->deselectRecordsAfterCompletion(),
diff --git a/src/FilamentShortUrlServiceProvider.php b/src/FilamentShortUrlServiceProvider.php
index f0f2de0..6e9e296 100644
--- a/src/FilamentShortUrlServiceProvider.php
+++ b/src/FilamentShortUrlServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Bjanczak\FilamentShortUrl;
 
+use Bjanczak\FilamentShortUrl\Console\Commands\SyncBufferedCountersCommand;
 use Bjanczak\FilamentShortUrl\Services\GeoIpService;
 use Bjanczak\FilamentShortUrl\Services\ShortUrlService;
 use Bjanczak\FilamentShortUrl\Services\ShortUrlSettingsManager;
@@ -25,6 +26,7 @@ class FilamentShortUrlServiceProvider extends PackageServiceProvider
                 '2024_01_01_000001_create_short_urls_table',
                 '2024_01_01_000002_create_short_url_visits_table',
             ])
+            ->hasCommand(SyncBufferedCountersCommand::class)
             ->hasRoutes(['web']);
     }
 
diff --git a/src/Http/Controllers/ShortUrlRedirectController.php b/src/Http/Controllers/ShortUrlRedirectController.php
index 6a7dbee..dedb01a 100644
--- a/src/Http/Controllers/ShortUrlRedirectController.php
+++ b/src/Http/Controllers/ShortUrlRedirectController.php
@@ -31,7 +31,7 @@ class ShortUrlRedirectController extends Controller
         }
 
         if ($shortUrl->track_visits) {
-            $connection = config('filament-short-url.queue_connection');
+            $connection = config('filament-short-url.queue_connection', 'sync');
             $ipAddress = ClientIpExtractor::getIp($request);
             $countryCode = ClientIpExtractor::getCountryCode($request);
 
@@ -43,10 +43,10 @@ class ShortUrlRedirectController extends Controller
                 countryCode: $countryCode,
             );
 
-            if ($connection && $connection !== 'default') {
+            if ($connection) {
                 dispatch($job->onConnection($connection));
             } else {
-                dispatch($job);
+                dispatch($job->onConnection('sync'));
             }
         }
 
@@ -60,6 +60,9 @@ class ShortUrlRedirectController extends Controller
             if ($affected === 0) {
                 abort(410);
             }
+
+            // Manually forget cache since DB-level update does not trigger Eloquent events
+            cache()->forget("filament-short-url:{$shortUrl->url_key}");
         }
 
         $redirectUrl = $this->service->resolveRedirectUrl($shortUrl, $request);
diff --git a/src/Models/ShortUrl.php b/src/Models/ShortUrl.php
index 1b3a56f..1f34b3a 100644
--- a/src/Models/ShortUrl.php
+++ b/src/Models/ShortUrl.php
@@ -238,10 +238,40 @@ class ShortUrl extends Model
 
     /**
      * Atomically increment visit counters — single query when unique,
-     * to avoid race conditions and two round-trips.
+     * to avoid race conditions and two round-trips. Supports write-back caching.
      */
     public function incrementVisits(bool $isUnique = false): void
     {
+        if (config('filament-short-url.counter_buffering.enabled', false)) {
+            $prefix = config('filament-short-url.counter_buffering.cache_key_prefix', 'filament-short-url:buffer:');
+            try {
+                // Safely increment total visits in cache
+                cache()->increment("{$prefix}total:{$this->id}");
+
+                if ($isUnique) {
+                    cache()->increment("{$prefix}unique:{$this->id}");
+                }
+
+                $dirtyKey = "{$prefix}dirty_ids";
+
+                // Check if Redis is being used for the cache to prevent set race conditions
+                if (cache()->getDefaultDriver() === 'redis' && class_exists(\Illuminate\Support\Facades\Redis::class)) {
+                    \Illuminate\Support\Facades\Redis::sadd($dirtyKey, $this->id);
+                } else {
+                    // Fallback to array for standard cache drivers
+                    $dirtyIds = cache()->get($dirtyKey, []);
+                    if (! in_array($this->id, $dirtyIds)) {
+                        $dirtyIds[] = $this->id;
+                        cache()->put($dirtyKey, $dirtyIds, now()->addDays(7));
+                    }
+                }
+
+                return;
+            } catch (\Throwable) {
+                // Fallback to database below if cache fails or doesn't support increments
+            }
+        }
+
         $this->newQuery()
             ->where('id', $this->id)
             ->increment('total_visits', 1, $isUnique ? ['unique_visits' => DB::raw('unique_visits + 1')] : []);
diff --git a/src/Services/ClientIpExtractor.php b/src/Services/ClientIpExtractor.php
index 756264c..9a15c24 100644
--- a/src/Services/ClientIpExtractor.php
+++ b/src/Services/ClientIpExtractor.php
@@ -11,29 +11,31 @@ class ClientIpExtractor
      */
     public static function getIp(Request $request): string
     {
-        // 1. Cloudflare connecting IP header
-        if ($cfIp = $request->header('CF-Connecting-IP')) {
-            return trim($cfIp);
+        if (config('filament-short-url.trust_cdn_headers', false)) {
+            // 1. Cloudflare connecting IP header
+            if ($cfIp = $request->header('CF-Connecting-IP')) {
+                return trim($cfIp);
+            }
+
+            // 2. Akamai or other CDNs True-Client-IP header
+            if ($trueIp = $request->header('True-Client-IP')) {
+                return trim($trueIp);
+            }
+
+            // 3. General reverse proxy / Nginx X-Real-IP header
+            if ($realIp = $request->header('X-Real-IP')) {
+                return trim($realIp);
+            }
+
+            // 4. Standard X-Forwarded-For header chain (first IP is the client)
+            if ($forwardedFor = $request->header('X-Forwarded-For')) {
+                $ips = explode(',', $forwardedFor);
+
+                return trim($ips[0]);
+            }
         }
 
-        // 2. Akamai or other CDNs True-Client-IP header
-        if ($trueIp = $request->header('True-Client-IP')) {
-            return trim($trueIp);
-        }
-
-        // 3. General reverse proxy / Nginx X-Real-IP header
-        if ($realIp = $request->header('X-Real-IP')) {
-            return trim($realIp);
-        }
-
-        // 4. Standard X-Forwarded-For header chain (first IP is the client)
-        if ($forwardedFor = $request->header('X-Forwarded-For')) {
-            $ips = explode(',', $forwardedFor);
-
-            return trim($ips[0]);
-        }
-
-        // 5. Fallback to standard Laravel/Symfony IP resolver
+        // 5. Fallback to standard Laravel/Symfony IP resolver (which respects Trusted Proxies)
         return $request->ip() ?? '0.0.0.0';
     }
 
@@ -42,19 +44,21 @@ class ClientIpExtractor
      */
     public static function getCountryCode(Request $request): ?string
     {
-        // 1. Cloudflare IP Country header
-        if ($cfCountry = $request->header('CF-IPCountry')) {
-            return strtoupper(trim($cfCountry));
-        }
+        if (config('filament-short-url.trust_cdn_headers', false)) {
+            // 1. Cloudflare IP Country header
+            if ($cfCountry = $request->header('CF-IPCountry')) {
+                return strtoupper(trim($cfCountry));
+            }
 
-        // 2. AWS CloudFront country header
-        if ($cfViewerCountry = $request->header('CloudFront-Viewer-Country')) {
-            return strtoupper(trim($cfViewerCountry));
-        }
+            // 2. AWS CloudFront country header
+            if ($cfViewerCountry = $request->header('CloudFront-Viewer-Country')) {
+                return strtoupper(trim($cfViewerCountry));
+            }
 
-        // 3. Generic CDN / Proxy country header
-        if ($xCountry = $request->header('X-Country-Code')) {
-            return strtoupper(trim($xCountry));
+            // 3. Generic CDN / Proxy country header
+            if ($xCountry = $request->header('X-Country-Code')) {
+                return strtoupper(trim($xCountry));
+            }
         }
 
         return null;
diff --git a/src/Services/ShortUrlSettingsManager.php b/src/Services/ShortUrlSettingsManager.php
index 8f4e410..f50b518 100644
--- a/src/Services/ShortUrlSettingsManager.php
+++ b/src/Services/ShortUrlSettingsManager.php
@@ -49,6 +49,8 @@ class ShortUrlSettingsManager
             'ga4_firebase_app_id' => config('filament-short-url.ga4.firebase_app_id'),
             'queue_connection' => config('filament-short-url.queue_connection', 'sync'),
             'cache_ttl' => config('filament-short-url.cache_ttl', 3600),
+            'counter_buffering_enabled' => config('filament-short-url.counter_buffering.enabled', false),
+            'trust_cdn_headers' => config('filament-short-url.trust_cdn_headers', false),
         ], $stored);
 
         return $this->cache;
@@ -87,6 +89,8 @@ class ShortUrlSettingsManager
             'ga4_firebase_app_id',
             'queue_connection',
             'cache_ttl',
+            'counter_buffering_enabled',
+            'trust_cdn_headers',
         ];
 
         $filtered = array_intersect_key($data, array_flip($keys));
@@ -110,6 +114,12 @@ class ShortUrlSettingsManager
         if (isset($filtered['cache_ttl'])) {
             $filtered['cache_ttl'] = (int) $filtered['cache_ttl'];
         }
+        if (isset($filtered['counter_buffering_enabled'])) {
+            $filtered['counter_buffering_enabled'] = (bool) $filtered['counter_buffering_enabled'];
+        }
+        if (isset($filtered['trust_cdn_headers'])) {
+            $filtered['trust_cdn_headers'] = (bool) $filtered['trust_cdn_headers'];
+        }
 
         File::put($path, json_encode($filtered, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
         $this->cache = null;
@@ -138,6 +148,8 @@ class ShortUrlSettingsManager
             'filament-short-url.ga4.firebase_app_id' => $settings['ga4_firebase_app_id'],
             'filament-short-url.queue_connection' => $settings['queue_connection'],
             'filament-short-url.cache_ttl' => $settings['cache_ttl'],
+            'filament-short-url.counter_buffering.enabled' => $settings['counter_buffering_enabled'],
+            'filament-short-url.trust_cdn_headers' => $settings['trust_cdn_headers'],
         ]);
     }
 }