diff --git "a/app.py" "b/app.py"
--- "a/app.py"
+++ "b/app.py"
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python3
 
 import os
@@ -9,32 +8,34 @@ import json
 from urllib.parse import unquote, parse_qs, quote
 import time
 from datetime import datetime
-import logging
 import threading
 import random
+import re
+import pytz
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
-import pytz
 
 BOT_TOKEN = os.getenv("BOT_TOKEN", "7835463659:AAGNePbelZIAOeaglyQi1qulOqnjs4BGQn4")
 HOST = '0.0.0.0'
 PORT = 7860
 DATA_FILE = 'data.json'
+ORG_INFO_FILE = 'organization_info.json'
 
 REPO_ID = "flpolprojects/examplebonus"
 HF_DATA_FILE_PATH = "data.json"
+HF_ORG_INFO_FILE_PATH = "organization_info.json"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
 BISHKEK_TZ = pytz.timezone('Asia/Bishkek')
 
 app = Flask(__name__)
-logging.basicConfig(level=logging.INFO)
 app.secret_key = os.urandom(24)
 
 _data_lock = threading.Lock()
+_org_info_lock = threading.Lock()
 visitor_data_cache = {}
-org_contact_info_cache = {}
+org_info_cache = {}
 
 def generate_unique_id(all_data):
     while True:
@@ -42,171 +43,134 @@ def generate_unique_id(all_data):
         if new_id not in all_data:
             return new_id
 
-def download_data_from_hf():
-    global visitor_data_cache, org_contact_info_cache
+def download_files_from_hf():
+    global visitor_data_cache, org_info_cache
     if not HF_TOKEN_READ:
-        logging.warning("HF_TOKEN_READ not set. Skipping Hugging Face download.")
-        return False
+        return
     try:
-        logging.info(f"Attempting to download {HF_DATA_FILE_PATH} from {REPO_ID}...")
-        hf_hub_download(
-            repo_id=REPO_ID,
-            filename=HF_DATA_FILE_PATH,
-            repo_type="dataset",
-            token=HF_TOKEN_READ,
-            local_dir=".",
-            local_dir_use_symlinks=False,
-            force_download=True,
-            etag_timeout=10
-        )
-        logging.info("Data file successfully downloaded from Hugging Face.")
+        hf_hub_download(repo_id=REPO_ID, filename=HF_DATA_FILE_PATH, repo_type="dataset", token=HF_TOKEN_READ, local_dir=".", local_dir_use_symlinks=False, force_download=True, etag_timeout=10)
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    full_data = json.load(f)
-                    visitor_data_cache = full_data.get('users', {})
-                    org_contact_info_cache = full_data.get('org_contact_info', {})
-                logging.info("Successfully loaded downloaded data into cache.")
-            except (FileNotFoundError, json.JSONDecodeError) as e:
-                 logging.error(f"Error reading downloaded data file: {e}. Starting with empty cache.")
+                    visitor_data_cache = json.load(f)
+            except (FileNotFoundError, json.JSONDecodeError):
                  visitor_data_cache = {}
-                 org_contact_info_cache = {}
-        return True
-    except RepositoryNotFoundError:
-        logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
-    except Exception as e:
-        logging.error(f"Error downloading data from Hugging Face: {e}")
-    return False
+    except Exception:
+        pass
 
-def load_full_data():
-    global visitor_data_cache, org_contact_info_cache
-    with _data_lock:
-        # Check cache first
-        if visitor_data_cache or org_contact_info_cache:
-             return {'users': visitor_data_cache, 'org_contact_info': org_contact_info_cache}
-
-        try:
-            with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                full_data = json.load(f)
-                visitor_data_cache = full_data.get('users', {})
-                org_contact_info_cache = full_data.get('org_contact_info', {})
-            logging.info("Full data loaded from local JSON.")
-        except FileNotFoundError:
-            logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
-            visitor_data_cache = {}
-            org_contact_info_cache = {}
-        except json.JSONDecodeError:
-            logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
-            visitor_data_cache = {}
-            org_contact_info_cache = {}
-        except Exception as e:
-            logging.error(f"Unexpected error loading full data: {e}")
-            visitor_data_cache = {}
-            org_contact_info_cache = {}
-
-        return {'users': visitor_data_cache, 'org_contact_info': org_contact_info_cache}
-
-
-def save_full_data():
+    try:
+        hf_hub_download(repo_id=REPO_ID, filename=HF_ORG_INFO_FILE_PATH, repo_type="dataset", token=HF_TOKEN_READ, local_dir=".", local_dir_use_symlinks=False, force_download=True, etag_timeout=10)
+        with _org_info_lock:
+            try:
+                with open(ORG_INFO_FILE, 'r', encoding='utf-8') as f:
+                    org_info_cache = json.load(f)
+            except (FileNotFoundError, json.JSONDecodeError):
+                org_info_cache = {}
+    except Exception:
+        pass
+
+def load_visitor_data():
+    global visitor_data_cache
     with _data_lock:
-        try:
-            full_data_to_save = {
-                'users': visitor_data_cache,
-                'org_contact_info': org_contact_info_cache
-            }
-            with open(DATA_FILE, 'w', encoding='utf-8') as f:
-                json.dump(full_data_to_save, f, ensure_ascii=False, indent=4)
-            logging.info(f"Full data successfully saved to {DATA_FILE}.")
-            upload_data_to_hf_async()
-        except Exception as e:
-            logging.error(f"Error saving full data: {e}")
-
+        if not visitor_data_cache:
+            try:
+                with open(DATA_FILE, 'r', encoding='utf-8') as f:
+                    visitor_data_cache = json.load(f)
+            except (FileNotFoundError, json.JSONDecodeError):
+                visitor_data_cache = {}
+    return visitor_data_cache
 
 def save_visitor_data(data):
     with _data_lock:
         visitor_data_cache.update(data)
-    save_full_data()
+        with open(DATA_FILE, 'w', encoding='utf-8') as f:
+            json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+        upload_data_to_hf_async()
+
+def load_org_info():
+    global org_info_cache
+    with _org_info_lock:
+        if not org_info_cache:
+            try:
+                with open(ORG_INFO_FILE, 'r', encoding='utf-8') as f:
+                    org_info_cache = json.load(f)
+            except (FileNotFoundError, json.JSONDecodeError):
+                org_info_cache = {
+                    "name": "Название вашей организации",
+                    "phones": ["+996 (555) 123-456"],
+                    "address": "г. Бишкек, ул. Примерная, 123",
+                    "links": [{"label": "Наш сайт", "url": "https://example.com"}]
+                }
+    return org_info_cache
 
-def save_org_contact_info(info):
-    global org_contact_info_cache
-    with _data_lock:
-        org_contact_info_cache = info
-    save_full_data()
+def save_org_info(data):
+    global org_info_cache
+    with _org_info_lock:
+        org_info_cache = data
+        with open(ORG_INFO_FILE, 'w', encoding='utf-8') as f:
+            json.dump(org_info_cache, f, ensure_ascii=False, indent=4)
+        upload_data_to_hf_async(is_org_info=True)
 
-def upload_data_to_hf():
+def upload_data_to_hf(is_org_info=False):
     if not HF_TOKEN_WRITE:
-        logging.warning("HF_TOKEN_WRITE not set. Skipping Hugging Face upload.")
         return
-    if not os.path.exists(DATA_FILE):
-        logging.warning(f"{DATA_FILE} does not exist. Skipping upload.")
+
+    file_to_upload = ORG_INFO_FILE if is_org_info else DATA_FILE
+    path_in_repo = HF_ORG_INFO_FILE_PATH if is_org_info else HF_DATA_FILE_PATH
+    commit_msg = f"Update org info {datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')}" if is_org_info else f"Update bonus data {datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')}"
+
+    if not os.path.exists(file_to_upload) or os.path.getsize(file_to_upload) == 0:
         return
 
     try:
         api = HfApi()
-        with _data_lock:
-             file_content_exists = os.path.getsize(DATA_FILE) > 0
-             if not file_content_exists:
-                 logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
-                 return
-
-             logging.info(f"Attempting to upload {DATA_FILE} to {REPO_ID}/{HF_DATA_FILE_PATH}...")
-             api.upload_file(
-                 path_or_fileobj=DATA_FILE,
-                 path_in_repo=HF_DATA_FILE_PATH,
-                 repo_id=REPO_ID,
-                 repo_type="dataset",
-                 token=HF_TOKEN_WRITE,
-                 commit_message=f"Update bonus data {datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')}"
-             )
-        logging.info("Bonus data successfully uploaded to Hugging Face.")
+        api.upload_file(
+            path_or_fileobj=file_to_upload,
+            path_in_repo=path_in_repo,
+            repo_id=REPO_ID,
+            repo_type="dataset",
+            token=HF_TOKEN_WRITE,
+            commit_message=commit_msg
+        )
     except Exception as e:
-        logging.error(f"Error uploading data to Hugging Face: {e}")
+        # Silently fail for now
+        pass
 
-def upload_data_to_hf_async():
-     upload_thread = threading.Thread(target=upload_data_to_hf, daemon=True)
+def upload_data_to_hf_async(is_org_info=False):
+     upload_thread = threading.Thread(target=upload_data_to_hf, args=(is_org_info,), daemon=True)
      upload_thread.start()
 
 def periodic_backup():
      if not HF_TOKEN_WRITE:
-         logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
          return
      while True:
          time.sleep(3600)
-         logging.info("Initiating periodic backup...")
-         save_full_data() # Save locally and trigger HF upload
+         upload_data_to_hf(is_org_info=False)
+         time.sleep(5)
+         upload_data_to_hf(is_org_info=True)
 
 def verify_telegram_data(init_data_str):
     try:
         parsed_data = parse_qs(init_data_str)
         received_hash = parsed_data.pop('hash', [None])[0]
-
         if not received_hash:
             return None, False
-
-        data_check_list = []
-        for key, value in sorted(parsed_data.items()):
-            data_check_list.append(f"{key}={value[0]}")
-        data_check_string = "\n".join(data_check_list)
-
+        data_check_list = sorted([(k, v[0]) for k, v in parsed_data.items()])
+        data_check_string = "\n".join([f"{k}={v}" for k, v in data_check_list])
         secret_key = hmac.new("WebAppData".encode(), BOT_TOKEN.encode(), hashlib.sha256).digest()
         calculated_hash = hmac.new(secret_key, data_check_string.encode(), hashlib.sha256).hexdigest()
-
         if calculated_hash == received_hash:
-            auth_date = int(parsed_data.get('auth_date', [0])[0])
-            current_time = int(time.time())
-            if current_time - auth_date > 86400:
-                 logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
-                 # Decide if you want to fail verification for old data
-                 # return parsed_data, False # Uncomment to fail old data
             return parsed_data, True
-        else:
-            logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
-            return parsed_data, False
-    except Exception as e:
-        logging.error(f"Error verifying Telegram data: {e}")
+        return parsed_data, False
+    except Exception:
         return None, False
 
-TEMPLATE = """
+def clean_phone_number(phone_str):
+    return re.sub(r'\D', '', phone_str)
+
+# =========== CLIENT-SIDE TEMPLATES ===========
+
+MAIN_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru">
 <head>
@@ -214,287 +178,33 @@ TEMPLATE = """
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
     <title>Bonus</title>
     <script src="https://telegram.org/js/telegram-web-app.js"></script>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&display=swap" rel="stylesheet">
     <style>
-        :root {
-            --brand-yellow: #FFC107;
-            --brand-black: #101010;
-            --brand-red: #F44336;
-            --brand-green: #4CAF50;
-            --card-bg: #1c1c1e;
-            --text-color: #ffffff;
-            --text-secondary-color: #a0a0a0;
-            --border-radius: 16px;
-            --padding-m: 16px;
-            --padding-l: 24px;
-            --font-family: 'Manrope', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
-            --shadow-color: rgba(255, 193, 7, 0.15);
-            --shadow-glow: 0 0 35px var(--shadow-color);
-            --shadow-color-red: rgba(244, 67, 54, 0.15);
-            --shadow-glow-red: 0 0 35px var(--shadow-color-red);
-            --section-bg: #2c2c2e;
-        }
+        :root { --brand-yellow: #FFC107; --brand-black: #101010; --brand-red: #F44336; --card-bg: #1c1c1e; --text-color: #ffffff; --text-secondary-color: #a0a0a0; --border-radius: 16px; --padding-m: 16px; --font-family: 'Manrope', sans-serif; }
         * { box-sizing: border-box; margin: 0; padding: 0; }
-        html, body {
-            background-color: var(--brand-black);
-            font-family: var(--font-family);
-            color: var(--text-color);
-            padding: var(--padding-m);
-            overscroll-behavior-y: none;
-            -webkit-font-smoothing: antialiased;
-            -moz-osx-font-smoothing: grayscale;
-            visibility: hidden; /* Hide until theme applied or loaded */
-            min-height: 100vh;
-        }
-        .container {
-            max-width: 600px;
-            margin: 0 auto;
-            display: flex;
-            flex-direction: column;
-            gap: var(--padding-m);
-        }
-        .header {
-            text-align: left;
-            padding: var(--padding-m) 0;
-        }
-        .logo {
-            font-size: 2.5em;
-            font-weight: 800;
-            color: var(--text-color);
-            letter-spacing: -1px;
-        }
+        html, body { background-color: var(--brand-black); font-family: var(--font-family); color: var(--text-color); padding: var(--padding-m); min-height: 100vh; }
+        body { visibility: hidden; }
+        .container { max-width: 600px; margin: 0 auto; display: flex; flex-direction: column; gap: var(--padding-m); }
+        .header { text-align: left; padding: var(--padding-m) 0; }
+        .logo { font-size: 2.5em; font-weight: 800; color: var(--text-color); letter-spacing: -1px; }
         .logo span { color: var(--brand-yellow); }
-        .welcome-text {
-            font-size: 1em;
-            color: var(--text-secondary-color);
-            margin-top: 4px;
-        }
-        .card-grid {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            gap: var(--padding-m);
-        }
-        .bonus-card, .debt-card {
-            background: linear-gradient(145deg, #2a2a2a, #1c1c1c);
-            border-radius: calc(var(--border-radius) + 8px);
-            padding: var(--padding-l);
-            text-align: center;
-            position: relative;
-            overflow: hidden;
-        }
-        .bonus-card {
-            box-shadow: var(--shadow-glow);
-            border: 1px solid rgba(255, 193, 7, 0.2);
-        }
-        .debt-card {
-            box-shadow: var(--shadow-glow-red);
-            border: 1px solid rgba(244, 67, 54, 0.2);
-        }
-         .card-label {
-            font-size: 1em;
-            font-weight: 500;
-            color: var(--text-secondary-color);
-            margin-bottom: 12px;
-        }
-        .bonus-amount {
-            font-size: 2.5em;
-            font-weight: 800;
-            color: var(--brand-yellow);
-            letter-spacing: -2px;
-            line-height: 1;
-        }
-        .debt-amount {
-            font-size: 2.5em;
-            font-weight: 800;
-            color: var(--brand-red);
-            letter-spacing: -2px;
-            line-height: 1;
-        }
-        .client-id-card {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-m);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        .client-id-label {
-            font-weight: 500;
-            color: var(--text-secondary-color);
-            font-size: 0.9em;
-        }
-        .client-id-value {
-            font-size: 1.1em;
-            font-weight: 700;
-            color: var(--brand-yellow);
-            letter-spacing: 1px;
-            background-color: rgba(255,193,7,0.1);
-            padding: 4px 8px;
-            border-radius: 8px;
-        }
-
-        .navigation {
-            display: flex;
-            justify-content: space-around;
-            gap: 10px;
-            margin-bottom: var(--padding-m);
-        }
-
-        .nav-button {
-            flex-grow: 1;
-            padding: 12px;
-            background-color: var(--card-bg);
-            color: var(--text-color);
-            border: none;
-            border-radius: var(--border-radius);
-            font-size: 0.9em;
-            font-weight: 600;
-            cursor: pointer;
-            transition: background-color 0.2s ease;
-            text-align: center;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
-        }
-        .nav-button:hover {
-            background-color: #3a3a3c;
-        }
-        .nav-button.active {
-            background-color: var(--brand-yellow);
-            color: var(--brand-black);
-        }
-
-        .content-section {
-            background-color: var(--section-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-l);
-            display: none; /* Hidden by default */
-        }
-        .content-section.active {
-            display: block;
-        }
-
-        .section-title {
-            font-size: 1.4em;
-            font-weight: 700;
-            margin-bottom: var(--padding-m);
-            padding-bottom: var(--padding-m);
-            border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-        }
-
-        /* History Styles */
-        .history-list {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-            max-height: 40vh; /* Limit height for scrolling */
-            overflow-y: auto;
-        }
-        .history-item {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 14px 4px;
-            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
-        }
-        .history-item:last-child { border-bottom: none; }
-        .history-details { display: flex; flex-direction: column; flex-grow: 1; margin-right: 10px;}
-        .history-description { font-size: 1em; font-weight: 500; word-break: break-word; }
-        .history-date { font-size: 0.8em; color: var(--text-secondary-color); margin-top: 4px; }
-        .history-amount { font-size: 1.1em; font-weight: 700; flex-shrink: 0; }
-        .history-amount.accrual { color: var(--brand-green); }
-        .history-amount.deduction { color: var(--brand-red); }
-        .history-amount.payment { color: var(--brand-green); } /* For debt payments */
-        .history-amount.debt-accrual { color: var(--brand-red); } /* For adding debt */
-
-        /* Invoice Styles */
-        .invoice-list {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-            max-height: 40vh; /* Limit height for scrolling */
-            overflow-y: auto;
-        }
-        .invoice-item {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            margin-bottom: var(--padding-m);
-            padding: var(--padding-m);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-        }
-        .invoice-summary {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 10px;
-            cursor: pointer; /* Make summary clickable to toggle items */
-        }
-        .invoice-summary .date { font-size: 0.9em; color: var(--text-secondary-color); }
-        .invoice-summary .total { font-size: 1.2em; font-weight: 700; color: var(--brand-yellow); }
-        .invoice-details {
-            margin-top: 10px;
-            padding-top: 10px;
-            border-top: 1px solid rgba(255, 255, 255, 0.05);
-            display: none; /* Hidden by default */
-        }
-        .invoice-details.expanded { display: block; }
-        .invoice-item-list { list-style: none; padding: 0; margin: 0; }
-        .invoice-line-item {
-            display: flex;
-            justify-content: space-between;
-            font-size: 0.9em;
-            padding: 5px 0;
-            border-bottom: 1px dashed rgba(255, 255, 255, 0.03);
-        }
-        .invoice-line-item:last-child { border-bottom: none; }
-        .invoice-line-item .item-name { flex-grow: 1; margin-right: 10px; }
-        .invoice-line-item .item-qty-price { flex-shrink: 0; text-align: right; color: var(--text-secondary-color); }
-        .no-items {
-            text-align: center;
-            color: var(--text-secondary-color);
-            padding: 2rem 0;
-        }
-
-        /* Contact Info Styles */
-        .contact-info-details {
-            display: flex;
-            flex-direction: column;
-            gap: 15px;
-        }
-        .contact-item {
-            display: flex;
-            align-items: center;
-            gap: 15px;
-            font-size: 1em;
-        }
-        .contact-item a {
-            color: var(--text-color);
-            text-decoration: none;
-            display: flex;
-            align-items: center;
-            gap: 10px;
-            word-break: break-word;
-        }
-        .contact-item a:hover {
-             color: var(--brand-yellow);
-        }
-        .contact-item svg {
-            width: 24px;
-            height: 24px;
-            fill: var(--brand-yellow);
-            flex-shrink: 0;
-        }
-         .org-name {
-            font-size: 1.2em;
-            font-weight: 700;
-            margin-bottom: var(--padding-m);
-         }
-         .no-contact-info {
-             text-align: center;
-             color: var(--text-secondary-color);
-             padding: 2rem 0;
-         }
-
+        .welcome-text { font-size: 1em; color: var(--text-secondary-color); margin-top: 4px; }
+        .card-grid { display: grid; grid-template-columns: 1fr 1fr; gap: var(--padding-m); }
+        .bonus-card, .debt-card { background: linear-gradient(145deg, #2a2a2a, #1c1c1c); border-radius: 24px; padding: 24px; text-align: center; border: 1px solid transparent; }
+        .bonus-card { box-shadow: 0 0 35px rgba(255, 193, 7, 0.15); border-color: rgba(255, 193, 7, 0.2); }
+        .debt-card { box-shadow: 0 0 35px rgba(244, 67, 54, 0.15); border-color: rgba(244, 67, 54, 0.2); }
+        .card-label { font-size: 1.1em; font-weight: 500; color: var(--text-secondary-color); margin-bottom: 12px; }
+        .bonus-amount, .debt-amount { font-size: 3em; font-weight: 800; letter-spacing: -2px; line-height: 1; }
+        .bonus-amount { color: var(--brand-yellow); }
+        .debt-amount { color: var(--brand-red); }
+        .client-id-card { background-color: var(--card-bg); border-radius: var(--border-radius); padding: var(--padding-m); display: flex; justify-content: space-between; align-items: center; }
+        .client-id-label { font-weight: 500; color: var(--text-secondary-color); }
+        .client-id-value { font-size: 1.3em; font-weight: 700; color: var(--brand-yellow); letter-spacing: 2px; background-color: rgba(255,193,7,0.1); padding: 4px 10px; border-radius: 8px; }
+        .nav-buttons { display: flex; flex-direction: column; gap: 12px; margin-top: 8px; }
+        .nav-btn { background-color: var(--card-bg); color: var(--text-color); border: none; border-radius: var(--border-radius); padding: 20px; font-size: 1.1em; font-weight: 600; text-align: left; width: 100%; cursor: pointer; transition: background-color 0.2s, transform 0.2s; display: flex; justify-content: space-between; align-items: center; }
+        .nav-btn:hover { background-color: #2c2c2e; }
+        .nav-btn:active { transform: scale(0.98); }
+        .nav-btn .arrow { font-size: 1.5em; color: var(--text-secondary-color); }
     </style>
 </head>
 <body>
@@ -503,7 +213,6 @@ TEMPLATE = """
             <div class="logo">BONUS<span>.</span></div>
             <p id="greeting" class="welcome-text">Добро пожаловать!</p>
         </header>
-
         <section class="card-grid">
             <div class="bonus-card">
                 <p class="card-label">Ваши бонусы</p>
@@ -514,20 +223,95 @@ TEMPLATE = """
                 <p class="debt-amount">{{ "%.2f"|format(user.debts|float) }}</p>
             </div>
         </section>
-        
         <section class="client-id-card">
             <p class="client-id-label">Ваш ID клиента</p>
             <p class="client-id-value">{{ user.id }}</p>
         </section>
-
-        <nav class="navigation">
-            <button class="nav-button" data-target="historySection">История</button>
-            <button class="nav-button" data-target="invoicesSection">Накладные</button>
-            <button class="nav-button" data-target="contactSection">Контакты</button>
+        <nav class="nav-buttons">
+            <button onclick="navigate('history')" class="nav-btn">История операций <span class="arrow">›</span></button>
+            <button onclick="navigate('invoices')" class="nav-btn">Мои накладные <span class="arrow">›</span></button>
+            <button onclick="navigate('card')" class="nav-btn">Визитка <span class="arrow">›</span></button>
         </nav>
+    </div>
+    <script>
+        const tg = window.Telegram.WebApp;
+        function applyTheme(themeParams) {
+            const root = document.documentElement;
+            root.style.setProperty('--brand-black', themeParams.bg_color || '#101010');
+            root.style.setProperty('--text-color', themeParams.text_color || '#ffffff');
+            root.style.setProperty('--text-secondary-color', themeParams.hint_color || '#a0a0a0');
+            root.style.setProperty('--brand-yellow', themeParams.button_color || '#FFC107');
+            root.style.setProperty('--card-bg', themeParams.secondary_bg_color || '#1c1c1e');
+        }
+        function setupTelegram() {
+             if (!tg || !tg.initData) { document.body.style.visibility = 'visible'; return; }
+             tg.ready();
+             tg.expand();
+             if (tg.themeParams && Object.keys(tg.themeParams).length > 0) { applyTheme(tg.themeParams); }
+             tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
+             const urlParams = new URLSearchParams(window.location.search);
+             const userIdForTest = urlParams.get('user_id_for_test');
+             if (!userIdForTest) {
+                fetch('/verify', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ initData: tg.initData }) })
+                .then(response => response.json())
+                .then(data => {
+                    if (data.status === 'ok' && data.verified && data.user_id) {
+                        window.location.replace('/?user_id_for_test=' + data.user_id);
+                    } else { document.body.style.visibility = 'visible'; }
+                })
+                .catch(error => { document.body.style.visibility = 'visible'; });
+             } else { document.body.style.visibility = 'visible'; }
+             const user = tg.initDataUnsafe?.user;
+             const greetingElement = document.getElementById('greeting');
+             if (user) { greetingElement.textContent = `Привет, ${user.first_name || user.username || 'Гость'}! 👋`; }
+             else { greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`; }
+        }
+        function navigate(page) {
+            const urlParams = new URLSearchParams(window.location.search);
+            const userId = urlParams.get('user_id_for_test');
+            if (userId) { window.location.href = `/?page=${page}&user_id_for_test=${userId}`; }
+        }
+        if (window.Telegram && window.Telegram.WebApp) { setupTelegram(); }
+        else { window.addEventListener('load', setupTelegram, {once: true}); setTimeout(() => { if (document.body.style.visibility !== 'visible') { document.body.style.visibility = 'visible'; } }, 2000); }
+    </script>
+</body>
+</html>
+"""
 
-        <section id="historySection" class="content-section">
-            <h2 class="section-title">История операций</h2>
+HISTORY_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
+    <title>История операций</title>
+    <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&display=swap" rel="stylesheet">
+    <style>
+        :root { --brand-yellow: #FFC107; --brand-black: #101010; --brand-red: #F44336; --card-bg: #1c1c1e; --text-color: #ffffff; --text-secondary-color: #a0a0a0; --border-radius: 16px; --padding-m: 16px; --font-family: 'Manrope', sans-serif; }
+        * { box-sizing: border-box; margin: 0; padding: 0; }
+        html, body { background-color: var(--brand-black); font-family: var(--font-family); color: var(--text-color); padding: var(--padding-m); min-height: 100vh; }
+        .container { max-width: 600px; margin: 0 auto; display: flex; flex-direction: column; gap: var(--padding-m); }
+        .history-section { background-color: var(--card-bg); border-radius: var(--border-radius); padding: 24px; }
+        .history-title { font-size: 1.4em; font-weight: 700; margin-bottom: var(--padding-m); padding-bottom: var(--padding-m); border-bottom: 1px solid rgba(255, 255, 255, 0.1); }
+        .history-list { list-style: none; padding: 0; margin: 0; max-height: 75vh; overflow-y: auto; }
+        .history-item { display: flex; justify-content: space-between; align-items: center; padding: 14px 4px; border-bottom: 1px solid rgba(255, 255, 255, 0.05); }
+        .history-item:last-child { border-bottom: none; }
+        .history-details { display: flex; flex-direction: column; }
+        .history-description { font-size: 1em; font-weight: 500; }
+        .history-date { font-size: 0.8em; color: var(--text-secondary-color); margin-top: 4px; }
+        .history-amount { font-size: 1.1em; font-weight: 700; }
+        .history-amount.accrual { color: #4CAF50; }
+        .history-amount.deduction { color: #F44336; }
+        .no-history { text-align: center; color: var(--text-secondary-color); padding: 2rem 0; }
+        .back-btn { display: inline-block; margin-bottom: 16px; color: var(--brand-yellow); text-decoration: none; font-weight: 600; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <a href="{{ url_for('index', user_id_for_test=user.id) }}" class="back-btn">‹ Назад</a>
+        <section class="history-section">
+            <h2 class="history-title">История операций</h2>
             {% if user.combined_history %}
                 <ul class="history-list">
                     {% for item in user.combined_history %}
@@ -541,266 +325,219 @@ TEMPLATE = """
                                     {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                 </span>
                             {% elif item.transaction_type == 'debt' %}
-                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'payment' }}"> {# 'accrual' for debt means adding debt (deduction from balance perspective), 'payment' means reducing debt (accrual from balance perspective) #}
-                                    {{ '+' if item.type == 'payment' else '-' }}{{ "%.2f"|format(item.amount|float) }}
-                                </span>
-                             {% elif item.transaction_type == 'invoice' %}
-                                <span class="history-amount">
-                                    {{ "%.2f"|format(item.total_amount|float) }}
+                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'accrual' }}">
+                                    {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                 </span>
                             {% endif %}
                         </li>
                     {% endfor %}
                 </ul>
             {% else %}
-                <p class="no-items">Операций пока не было.</p>
+                <p class="no-history">Операций пока не было.</p>
             {% endif %}
         </section>
-
-        <section id="invoicesSection" class="content-section">
-             <h2 class="section-title">Мои накладные</h2>
-             {% if user.invoices %}
-                 <ul class="invoice-list">
-                     {% for invoice in user.invoices|sort(attribute='date', reverse=true) %}
-                         <li class="invoice-item">
-                             <div class="invoice-summary" onclick="toggleInvoiceDetails(this)">
-                                 <span class="date">{{ invoice.date_str }}</span>
-                                 <span class="total">{{ "%.2f"|format(invoice.total_amount|float) }} ₽</span> {# Assuming Rubles #}
-                             </div>
-                             <div class="invoice-details">
-                                 <ul class="invoice-item-list">
-                                     {% for item in invoice.items %}
-                                         <li class="invoice-line-item">
-                                             <span class="item-name">{{ item.name }}</span>
-                                             <span class="item-qty-price">{{ item.quantity }} x {{ "%.2f"|format(item.price_per_unit|float) }} ₽</span>
-                                         </li>
-                                     {% endfor %}
-                                 </ul>
-                             </div>
-                         </li>
-                     {% endfor %}
-                 </ul>
-             {% else %}
-                 <p class="no-items">У вас пока нет накладных.</p>
-             {% endif %}
-        </section>
-
-         <section id="contactSection" class="content-section">
-             <h2 class="section-title">Контакты организации</h2>
-             {% if contact_info %}
-                <div class="org-name">{{ contact_info.name or 'Организация' }}</div>
-                 <div class="contact-info-details">
-                     {% if contact_info.phone %}
-                     <div class="contact-item">
-                         <a href="tel:{{ contact_info.phone }}">
-                             <svg viewBox="0 0 24 24"><path d="M20 15.586c-1.93 0-3.8-.56-5.48-1.63l-1.18 1.18c2.88 2.9 7.1 4.13 10.66 2.41l-3-3.96zM12 3.9c-1.65 0-3.3.58-4.65 1.6L6.17 3.75C8.27 2.2 10.17 1.07 12 1.07s3.73 1.13 5.83 2.68l-1.18 1.18c-1.35-1.02-3-1.6-4.65-1.6zM15.586 20H12c-4.96 0-9-4.04-9-9c0-1.65.58-3.3 1.6-4.65L3.75 6.17C2.2 8.27 1.07 10.17 1.07 12s1.13 3.73 2.68 5.83l1.18-1.18c1.02 1.35 1.6 3 1.6 4.65h3.586zm-3-8c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></svg>
-                             {{ contact_info.phone }} (Позвонить)
-                         </a>
-                     </div>
-                     {% endif %}
-                     {% if contact_info.whatsapp %}
-                     <div class="contact-item">
-                         <a href="https://wa.me/{{ contact_info.whatsapp|replace('+', '') }}" target="_blank">
-                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M12 2c-5.523 0-10 4.477-10 10s4.477 10 10 10 10-4.477 10-10-4.477-10-10-10zm4.797 14.23c-.346.138-.66.238-.994.367-.366.142-.737.29-.977.29-.24 0-.4-.07-.853-.244-.454-.173-1.412-.527-2.311-1.426-.898-.899-1.424-1.99-1.673-2.42-.249-.43-.027-.662.174-.863.182-.182.407-.431.546-.644.139-.213.186-.366.248-.486.062-.12.031-.224-.015-.313-.047-.09-.346-.833-.474-1.136-.129-.304-.264-.247-.36-.251-.095-.004-.206-.004-.336-.004s-.331.05-.506.221c-.173.17-.66.653-.66 1.593s.674 1.844.766 1.962c.092.117 1.37 2.037 3.332 2.855 1.96.817 2.355.634 2.78.592.426-.042.994-.404 1.132-.793.14-.39.14-1.11.095-1.243-.046-.134-.173-.213-.36-.304z"/></svg>
-                             {{ contact_info.whatsapp }} (WhatsApp)
-                         </a>
-                     </div>
-                     {% endif %}
-                     {% if contact_info.telegram %}
-                     <div class="contact-item">
-                         <a href="tg://resolve?domain={{ contact_info.telegram|replace('@', '') }}">
-                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm3.06 8.81l-3.48 6.83c-.16.35-.5.58-.88.58-.39 0-.74-.23-.9-.59l-1.65-5.33-4.13-2.34c-.33-.18-.44-.59-.26-.92.18-.33.59-.44.92-.26l9.82 5.58c.35.2.46.61.26.96-.09.18-.27.3-.46.34z"/></svg>
-                             @{{ contact_info.telegram|replace('@', '') }} (Telegram)
-                         </a>
-                     </div>
-                     {% endif %}
-                     {% if contact_info.address %}
-                     <div class="contact-item">
-                         <svg viewBox="0 0 24 24" width="24" height="24"><path d="M12 12.7c-.82 0-1.49-.67-1.49-1.49 0-.82.67-1.49 1.49-1.49.82 0 1.49.67 1.49 1.49 0 .82-.67 1.49-1.49 1.49zm0-11.7C7.05 1 3 5.05 3 10c0 5.5 7 12 9 12s9-6.5 9-12c0-4.95-4.05-9-9-9zm0 17.55C9.2 17.55 6 13.86 6 10c0-3.31 2.69-6 6-6s6 2.69 6 6c0 3.86-3.2 7.55-6 7.55z"/></svg>
-                         {{ contact_info.address }}
-                     </div>
-                     {% endif %}
-                     {% if contact_info.website %}
-                     <div class="contact-item">
-                          <a href="{{ contact_info.website }}" target="_blank">
-                             <svg viewBox="0 0 24 24" width="24" height="24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"/></svg>
-                              Сайт
-                         </a>
-                     </div>
-                     {% endif %}
-                 </div>
-             {% else %}
-                 <p class="no-items">Информация о компании пока не добавлена.</p>
-             {% endif %}
-         </section>
-
-
     </div>
-
     <script>
         const tg = window.Telegram.WebApp;
-        let currentUserId = '{{ user.id }}'; // Pass the user ID from Flask
-
+        tg.ready();
+        tg.expand();
         function applyTheme(themeParams) {
             const root = document.documentElement;
-            const isDark = themeParams.bg_color ? (parseInt(themeParams.bg_color.substring(1, 3), 16) < 128) : true;
-
             root.style.setProperty('--brand-black', themeParams.bg_color || '#101010');
             root.style.setProperty('--text-color', themeParams.text_color || '#ffffff');
             root.style.setProperty('--text-secondary-color', themeParams.hint_color || '#a0a0a0');
             root.style.setProperty('--brand-yellow', themeParams.button_color || '#FFC107');
-            root.style.setProperty('--card-bg', themeParams.secondary_bg_color || (isDark ? '#1c1c1e' : '#f1f1f1'));
-            root.style.setProperty('--section-bg', themeParams.secondary_bg_color || (isDark ? '#2c2c2e' : '#e9e9e9'));
+            root.style.setProperty('--card-bg', themeParams.secondary_bg_color || '#1c1c1e');
         }
+        if (tg.themeParams && Object.keys(tg.themeParams).length > 0) { applyTheme(tg.themeParams); }
+        tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
+        tg.BackButton.show();
+        tg.BackButton.onClick(() => window.location.href = `{{ url_for('index', user_id_for_test=user.id) }}`);
+    </script>
+</body>
+</html>
+"""
 
-        function setupTelegram() {
-             if (!tg || !tg.initData) {
-                 console.error("Telegram WebApp script not loaded or initData is missing.");
-                 document.body.style.visibility = 'visible';
-                 // Fallback greeting if TG data is missing
-                 const greetingElement = document.getElementById('greeting');
-                 if (greetingElement) greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`;
-                 return;
-             }
-
-            tg.ready();
-            tg.expand();
-
-            if (tg.themeParams && Object.keys(tg.themeParams).length > 0) {
-                applyTheme(tg.themeParams);
-            }
-            tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
-
-             const urlParams = new URLSearchParams(window.location.search);
-             const userIdFromUrl = urlParams.get('user_id_for_test');
-
-             // Only attempt backend verification if we don't have a verified user ID in the URL yet
-             if (!userIdFromUrl || userIdFromUrl === 'N/A') {
-                fetch('/verify', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
-                    body: JSON.stringify({ initData: tg.initData }),
-                })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.status === 'ok' && data.verified && data.user_id) {
-                         // If backend verified, reload the page with the correct user_id parameter
-                        window.location.replace('/?user_id_for_test=' + data.user_id);
-                    } else {
-                        console.warn('Backend verification failed:', data.message);
-                        // Show the page anyway, maybe with limited functionality or a message
-                        document.body.style.visibility = 'visible';
-                        // Set greeting based on potentially available user data even if verification failed
-                        const user = tg.initDataUnsafe?.user;
-                        const greetingElement = document.getElementById('greeting');
-                        if (user && greetingElement) {
-                            const name = user.first_name || user.username || 'Гость';
-                            greetingElement.textContent = `Привет, ${name}! 👋`;
-                        }
-                    }
-                })
-                .catch(error => {
-                    console.error('Error sending initData for verification:', error);
-                    document.body.style.visibility = 'visible';
-                     const user = tg.initDataUnsafe?.user;
-                     const greetingElement = document.getElementById('greeting');
-                     if (user && greetingElement) {
-                         const name = user.first_name || user.username || 'Гость';
-                         greetingElement.textContent = `Привет, ${name}! 👋`;
-                     }
-                });
-             } else {
-                 // If user_id_for_test is already in the URL, assume it's verified and show content
-                 document.body.style.visibility = 'visible';
-                 // Set greeting based on Telegram data
-                 const user = tg.initDataUnsafe?.user;
-                 const greetingElement = document.getElementById('greeting');
-                 if (user && greetingElement) {
-                     const name = user.first_name || user.username || 'Гость';
-                     greetingElement.textContent = `Привет, ${name}! 👋`;
-                 } else {
-                     // Fallback if TG data is missing but ID is in URL
-                     if (greetingElement) greetingElement.textContent = `Привет, клиент {{ user.id }}! 👋`;
-                 }
-             }
-
-             // Setup navigation after the body is visible
-             const navButtons = document.querySelectorAll('.nav-button');
-             const contentSections = document.querySelectorAll('.content-section');
-
-             function showSection(targetId) {
-                 contentSections.forEach(section => {
-                     section.classList.remove('active');
-                 });
-                 navButtons.forEach(button => {
-                     button.classList.remove('active');
-                 });
-
-                 const targetSection = document.getElementById(targetId);
-                 if (targetSection) {
-                     targetSection.classList.add('active');
-                     const activeNavButton = document.querySelector(`.nav-button[data-target="${targetId}"]`);
-                     if (activeNavButton) activeNavButton.classList.add('active');
-                 }
-             }
-
-             navButtons.forEach(button => {
-                 button.addEventListener('click', () => {
-                     const targetId = button.getAttribute('data-target');
-                     showSection(targetId);
-                 });
-             });
-
-             // Show the first section by default (or 'historySection')
-             showSection('historySection'); // Or get from hash/localStorage
-
-         }
-
-        function toggleInvoiceDetails(summaryElement) {
-            const details = summaryElement.nextElementSibling;
-            if (details && details.classList.contains('invoice-details')) {
-                details.classList.toggle('expanded');
-            }
+INVOICES_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
+    <title>Мои накладные</title>
+    <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&display=swap" rel="stylesheet">
+    <style>
+        :root { --brand-yellow: #FFC107; --brand-black: #101010; --card-bg: #1c1c1e; --text-color: #ffffff; --text-secondary-color: #a0a0a0; --border-radius: 16px; --padding-m: 16px; --font-family: 'Manrope', sans-serif; }
+        * { box-sizing: border-box; margin: 0; padding: 0; }
+        html, body { background-color: var(--brand-black); font-family: var(--font-family); color: var(--text-color); padding: var(--padding-m); min-height: 100vh; }
+        .container { max-width: 600px; margin: 0 auto; display: flex; flex-direction: column; gap: var(--padding-m); }
+        .back-btn { display: inline-block; margin-bottom: 16px; color: var(--brand-yellow); text-decoration: none; font-weight: 600; }
+        .invoices-list { display: flex; flex-direction: column; gap: 12px; }
+        .invoice-item summary { list-style: none; display: flex; justify-content: space-between; align-items: center; background-color: var(--card-bg); padding: 18px; border-radius: var(--border-radius); cursor: pointer; }
+        .invoice-item summary::-webkit-details-marker { display: none; }
+        .invoice-info .date { font-weight: 600; }
+        .invoice-info .id { font-size: 0.8em; color: var(--text-secondary-color); }
+        .invoice-total { font-size: 1.2em; font-weight: 700; color: var(--brand-yellow); }
+        .invoice-details { background-color: #2c2c2e; margin: -10px 6px 6px 6px; padding: 16px; border-radius: 0 0 12px 12px; }
+        .invoice-details table { width: 100%; border-collapse: collapse; }
+        .invoice-details th, .invoice-details td { text-align: left; padding: 8px; border-bottom: 1px solid rgba(255,255,255,0.1); }
+        .invoice-details th { font-weight: 500; color: var(--text-secondary-color); }
+        .invoice-details td.price { text-align: right; }
+        .no-invoices { text-align: center; color: var(--text-secondary-color); padding: 3rem 0; background-color: var(--card-bg); border-radius: var(--border-radius); }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <a href="{{ url_for('index', user_id_for_test=user.id) }}" class="back-btn">‹ Назад</a>
+        <h1 style="font-size: 1.5em; font-weight: 700;">Мои накладные</h1>
+        <div class="invoices-list">
+        {% if user.invoices %}
+            {% for invoice in user.invoices %}
+            <details class="invoice-item">
+                <summary>
+                    <div class="invoice-info">
+                        <div class="date">{{ invoice.date_str }}</div>
+                        <div class="id">Накладная #{{ invoice.id }}</div>
+                    </div>
+                    <div class="invoice-total">{{ "%.2f"|format(invoice.total_amount|float) }}</div>
+                </summary>
+                <div class="invoice-details">
+                    <table>
+                        <thead>
+                            <tr><th>Товар</th><th>Кол-во</th><th class="price">Цена</th><th class="price">Сумма</th></tr>
+                        </thead>
+                        <tbody>
+                        {% for item in invoice.items %}
+                            <tr>
+                                <td>{{ item.name }}</td>
+                                <td>{{ item.quantity }}</td>
+                                <td class="price">{{ "%.2f"|format(item.price_per_unit|float) }}</td>
+                                <td class="price">{{ "%.2f"|format(item.total_price|float) }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </details>
+            {% endfor %}
+        {% else %}
+            <p class="no-invoices">У вас пока нет накладных.</p>
+        {% endif %}
+        </div>
+    </div>
+    <script>
+        const tg = window.Telegram.WebApp;
+        tg.ready();
+        tg.expand();
+        function applyTheme(themeParams) {
+            const root = document.documentElement;
+            root.style.setProperty('--brand-black', themeParams.bg_color || '#101010');
+            root.style.setProperty('--text-color', themeParams.text_color || '#ffffff');
+            root.style.setProperty('--text-secondary-color', themeParams.hint_color || '#a0a0a0');
+            root.style.setProperty('--brand-yellow', themeParams.button_color || '#FFC107');
+            root.style.setProperty('--card-bg', themeParams.secondary_bg_color || '#1c1c1e');
         }
+        if (tg.themeParams && Object.keys(tg.themeParams).length > 0) { applyTheme(tg.themeParams); }
+        tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
+        tg.BackButton.show();
+        tg.BackButton.onClick(() => window.location.href = `{{ url_for('index', user_id_for_test=user.id) }}`);
+    </script>
+</body>
+</html>
+"""
 
+CARD_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
+    <title>Визитка</title>
+    <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <style>
+        :root { --brand-yellow: #FFC107; --brand-black: #101010; --card-bg: #1c1c1e; --text-color: #ffffff; --text-secondary-color: #a0a0a0; --border-radius: 16px; --padding-m: 16px; --font-family: 'Manrope', sans-serif; }
+        * { box-sizing: border-box; margin: 0; padding: 0; }
+        html, body { background-color: var(--brand-black); font-family: var(--font-family); color: var(--text-color); padding: var(--padding-m); min-height: 100vh; }
+        .container { max-width: 600px; margin: 0 auto; }
+        .back-btn { display: inline-block; margin-bottom: 24px; color: var(--brand-yellow); text-decoration: none; font-weight: 600; }
+        .card { background-color: var(--card-bg); border-radius: var(--border-radius); padding: 24px; }
+        .org-name { font-size: 1.8em; font-weight: 700; margin-bottom: 24px; }
+        .info-block { margin-bottom: 20px; }
+        .info-label { font-size: 0.9em; color: var(--text-secondary-color); margin-bottom: 8px; }
+        .info-value { font-size: 1.1em; font-weight: 500; }
+        .phone-block { margin-bottom: 20px; }
+        .phone-number { display: flex; align-items: center; justify-content: space-between; font-size: 1.2em; font-weight: 500; margin-bottom: 12px; }
+        .phone-actions { display: flex; gap: 8px; }
+        .action-btn { display: block; padding: 8px; border-radius: 8px; background-color: #333; }
+        .action-btn img { display: block; width: 24px; height: 24px; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <a href="{{ url_for('index', user_id_for_test=user.id) }}" class="back-btn">‹ Назад</a>
+        <div class="card">
+            <h1 class="org-name">{{ org_info.name }}</h1>
+            
+            <div class="info-block">
+                <div class="info-label">Номера телефонов</div>
+                {% for phone in org_info.phones %}
+                <div class="phone-block">
+                    <div class="phone-number">{{ phone }}</div>
+                    <div class="phone-actions">
+                        <a href="tel:{{ phone }}" class="action-btn">
+                            <img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='white'%3E%3Cpath d='M6.62 10.79c1.44 2.83 3.76 5.14 6.59 6.59l2.2-2.2c.27-.27.67-.36 1.02-.24 1.12.37 2.33.57 3.57.57.55 0 1 .45 1 1V20c0 .55-.45 1-1 1-9.39 0-17-7.61-17-17 0-.55.45-1 1-1h3.5c.55 0 1 .45 1 1 0 1.25.2 2.45.57 3.57.11.35.03.74-.25 1.02l-2.2 2.2z'/%3E%3C/svg%3E" alt="Call">
+                        </a>
+                        <a href="https://wa.me/{{ clean_phone(phone) }}" class="action-btn" target="_blank">
+                             <img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='white'%3E%3Cpath d='M12.04 2c-5.46 0-9.91 4.45-9.91 9.91 0 1.75.46 3.45 1.32 4.95L2 22l5.25-1.38c1.45.79 3.08 1.21 4.79 1.21h.01c5.46 0 9.91-4.45 9.91-9.91s-4.45-9.91-9.91-9.91zM17.5 14.3c-.28-.14-1.7-.84-1.96-.94-.26-.1-.45-.14-.64.14-.19.28-.74.94-.91 1.12-.17.18-.34.2-.62.06-.28-.14-1.17-.43-2.23-1.38-.83-.72-1.39-1.62-1.55-1.9-.16-.28 0-.43.13-.57.11-.11.28-.28.42-.42.12-.12.16-.2.24-.34.08-.14.04-.26 0-.4L10.1 8.9c-.1-.28-.2-.28-.28-.28h-.28c-.28 0-.48.06-.73.34-.25.28-.96.94-.96 2.28 0 1.34.99 2.64 1.12 2.82.14.18 1.96 2.99 4.75 4.2.65.28 1.16.45 1.56.58.56.18 1.06.16 1.46.1.44-.08 1.3-.53 1.48-1.04.18-.5.18-.94.12-1.04-.06-.1-.24-.16-.52-.3z'/%3E%3C/svg%3E" alt="WhatsApp">
+                        </a>
+                        <a href="https://t.me/{{ clean_phone(phone) }}" class="action-btn" target="_blank">
+                             <img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='white'%3E%3Cpath d='M22 2L11 13l-4 1 1-4 11-11-17 9v11l5-4.5 3 2.9L22 2z'/%3E%3C/svg%3E" alt="Telegram">
+                        </a>
+                    </div>
+                </div>
+                {% endfor %}
+            </div>
 
-        // Wait for the Telegram WebApp script to load or timeout
-        if (window.Telegram && window.Telegram.WebApp) {
-            setupTelegram();
-        } else {
-             window.addEventListener('load', setupTelegram, {once: true});
-             setTimeout(() => {
-                 if (document.body.style.visibility !== 'visible') {
-                      console.warn("Telegram WebApp script took too long to load or failed. Displaying content without full features.");
-                      document.body.style.visibility = 'visible';
-                      const greetingElement = document.getElementById('greeting');
-                       if (greetingElement) greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`;
-                       const navButtons = document.querySelectorAll('.nav-button');
-                       const contentSections = document.querySelectorAll('.content-section');
-                       function showSectionFallback(targetId) {
-                            contentSections.forEach(section => section.style.display = 'none');
-                            navButtons.forEach(button => button.classList.remove('active'));
-                            const targetSection = document.getElementById(targetId);
-                            if (targetSection) targetSection.style.display = 'block';
-                            const activeNavButton = document.querySelector(`.nav-button[data-target="${targetId}"]`);
-                            if (activeNavButton) activeNavButton.classList.add('active');
-                       }
-                       navButtons.forEach(button => {
-                           button.addEventListener('click', () => {
-                               const targetId = button.getAttribute('data-target');
-                               showSectionFallback(targetId);
-                           });
-                       });
-                        showSectionFallback('historySection'); // Show first section
-                  }
-             }, 3000); // 3 second timeout
-        }
+            <div class="info-block">
+                <div class="info-label">Адрес</div>
+                <div class="info-value">{{ org_info.address }}</div>
+            </div>
 
+            {% if org_info.links %}
+            <div class="info-block">
+                <div class="info-label">Ссылки</div>
+                {% for link in org_info.links %}
+                <a href="{{ link.url }}" target="_blank" style="display: block; color: var(--brand-yellow); margin-bottom: 8px; text-decoration: none;">{{ link.label }}</a>
+                {% endfor %}
+            </div>
+            {% endif %}
+        </div>
+    </div>
+    <script>
+        const tg = window.Telegram.WebApp;
+        tg.ready();
+        tg.expand();
+        function applyTheme(themeParams) {
+            const root = document.documentElement;
+            root.style.setProperty('--brand-black', themeParams.bg_color || '#101010');
+            root.style.setProperty('--text-color', themeParams.text_color || '#ffffff');
+            root.style.setProperty('--text-secondary-color', themeParams.hint_color || '#a0a0a0');
+            root.style.setProperty('--brand-yellow', themeParams.button_color || '#FFC107');
+            root.style.setProperty('--card-bg', themeParams.secondary_bg_color || '#1c1c1e');
+        }
+        if (tg.themeParams && Object.keys(tg.themeParams).length > 0) { applyTheme(tg.themeParams); }
+        tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
+        tg.BackButton.show();
+        tg.BackButton.onClick(() => window.location.href = `{{ url_for('index', user_id_for_test=user.id) }}`);
     </script>
 </body>
 </html>
 """
 
+# =========== ADMIN-SIDE TEMPLATE ===========
+
 ADMIN_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru">
@@ -808,524 +545,369 @@ ADMIN_TEMPLATE = """
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Bonus Admin</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <style>
-        :root {
-            --admin-bg: #f8f9fa;
-            --admin-text: #212529;
-            --admin-card-bg: #ffffff;
-            --admin-border: #dee2e6;
-            --admin-shadow: rgba(0, 0, 0, 0.05);
-            --admin-primary: #FFC107;
-            --admin-primary-dark: #e0a800;
-            --admin-secondary: #6c757d;
-            --admin-success: #198754;
-            --admin-danger: #dc3545;
-            --admin-info: #0d6efd;
-            --border-radius: 12px;
-            --padding: 1.5rem;
-            --font-family: 'Inter', sans-serif;
-        }
+        :root { --admin-bg: #f8f9fa; --admin-text: #212529; --admin-card-bg: #ffffff; --admin-border: #dee2e6; --admin-shadow: rgba(0, 0, 0, 0.05); --admin-primary: #FFC107; --admin-primary-dark: #e0a800; --admin-secondary: #6c757d; --admin-success: #198754; --admin-danger: #dc3545; --border-radius: 12px; --padding: 1.5rem; --font-family: 'Inter', sans-serif; }
         body { font-family: var(--font-family); background-color: var(--admin-bg); color: var(--admin-text); margin: 0; padding: var(--padding); line-height: 1.6; }
-        .container { max-width: 1200px; margin: 0 auto; }
-        h1, h2, h3 { color: #343a40; }
-        h1 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
-        .summary-bar { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: var(--padding); margin-bottom: var(--padding); }
-        .summary-card { background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); text-align: center; }
+        .container { max-width: 1400px; margin: 0 auto; }
+        h1, h2 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
+        .grid-container { display: grid; grid-template-columns: 3fr 1fr; gap: var(--padding); }
+        .main-content { display: flex; flex-direction: column; gap: var(--padding); }
+        .side-content { display: flex; flex-direction: column; gap: var(--padding); }
+        .card { background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); }
+        .summary-bar { display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: var(--padding); }
         .summary-card .value { font-size: 2em; font-weight: 700; }
         .summary-card .label { font-size: 0.9em; color: var(--admin-secondary); margin-top: 0.5rem; }
         .summary-card .value.bonus { color: var(--admin-primary-dark); }
         .summary-card .value.debt { color: var(--admin-danger); }
-         .summary-card .value.users { color: var(--admin-info); }
-
-        .controls-bar { display: flex; flex-wrap: wrap; gap: 1rem; align-items: center; background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); margin-bottom: var(--padding); }
-        .controls-bar input[type="text"] { flex-grow: 1; padding: 12px 15px; font-size: 1em; border-radius: 8px; border: 1px solid var(--admin-border); box-sizing: border-box; min-width: 200px; }
-        .btn { padding: 10px 18px; font-size: 1em; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s ease; }
+        .controls-bar { display: flex; flex-wrap: wrap; gap: 1rem; align-items: center; }
+        .controls-bar input[type="text"] { flex-grow: 1; padding: 12px 15px; font-size: 1.1em; border-radius: 8px; border: 1px solid var(--admin-border); min-width: 250px; }
+        .btn { padding: 12px 20px; font-size: 1em; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s ease; }
         .btn-primary { background-color: var(--admin-primary); color: #000; }
         .btn-primary:hover { background-color: var(--admin-primary-dark); }
         .btn-delete { background-color: var(--admin-danger); color: white; }
         .btn-delete:hover { background-color: #c82333; }
-        .btn-secondary { background-color: var(--admin-secondary); color: white; }
-        .btn-secondary:hover { background-color: #5a6268; }
-
-
-        .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); gap: var(--padding); margin-top: var(--padding); }
+        .btn-success { background-color: var(--admin-success); color: white; }
+        .btn-success:hover { background-color: #157347; }
+        .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); gap: var(--padding); }
         .user-card { background-color: var(--admin-card-bg); border-radius: var(--border-radius); padding: var(--padding); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); display: flex; flex-direction: column; transition: transform 0.2s ease, box-shadow 0.2s ease; }
         .user-card:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08); }
         .user-info { display: flex; align-items: center; gap: 1rem; margin-bottom: 1rem; }
-        .user-info img { width: 50px; height: 50px; border-radius: 50%; object-fit: cover; border: 2px solid var(--admin-border); background-color: #eee; }
-        .user-details .name { font-weight: 600; font-size: 1.1em; }
-        .user-details .username { color: var(--admin-secondary); font-size: 0.8em; }
+        .user-info img { width: 60px; height: 60px; border-radius: 50%; object-fit: cover; border: 3px solid var(--admin-border); background-color: #eee; }
+        .user-details .name { font-weight: 600; font-size: 1.2em; }
+        .user-details .username { color: var(--admin-secondary); font-size: 0.9em; }
         .user-balances { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; text-align: center; margin-bottom: 1rem; }
-        .user-balances .label { font-size: 0.8em; color: var(--admin-secondary); }
-        .user-balances .amount.bonus { font-size: 1.6em; font-weight: 700; color: var(--admin-primary-dark); }
-        .user-balances .amount.debt { font-size: 1.6em; font-weight: 700; color: var(--admin-danger); }
+        .user-balances .label { font-size: 0.9em; color: var(--admin-secondary); }
+        .user-balances .amount { font-size: 1.8em; font-weight: 700; }
+        .user-balances .amount.bonus { color: var(--admin-primary-dark); }
+        .user-balances .amount.debt { color: var(--admin-danger); }
         .user-actions { margin-top: auto; display: flex; flex-direction: column; gap: 0.5rem; }
         .btn-manage { display: block; width: 100%; padding: 10px; background-color: var(--admin-primary); color: #000; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s; }
         .btn-manage:hover { background-color: var(--admin-primary-dark); }
-        .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
-
-        /* Modals */
+        .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; padding: 2rem; }
         .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; overflow: auto; background-color: rgba(0,0,0,0.5); backdrop-filter: blur(5px); }
-        .modal-content { background-color: var(--admin-bg); margin: 3% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 95%; max-width: 800px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
+        .modal-content { background-color: var(--admin-bg); margin: 3% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 90%; max-width: 900px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
         .modal-close { color: #aaa; position: absolute; top: 15px; right: 25px; font-size: 28px; font-weight: bold; cursor: pointer; }
         .modal-header { padding-bottom: 1rem; margin-bottom: 1.5rem; border-bottom: 1px solid var(--admin-border); }
         .modal-header h2 { margin: 0; font-size: 1.5rem; }
         .modal-header .username { font-size: 1rem; color: var(--admin-secondary); }
-
-        /* Forms */
+        .modal-tabs { display: flex; border-bottom: 1px solid var(--admin-border); margin-bottom: 1.5rem; }
+        .modal-tab { padding: 10px 20px; cursor: pointer; border: none; background: none; font-size: 1.1em; font-weight: 500; color: var(--admin-secondary); }
+        .modal-tab.active { color: var(--admin-text); border-bottom: 3px solid var(--admin-primary); }
+        .modal-tab-content { display: none; }
+        .modal-tab-content.active { display: block; }
         .form-section { border: 1px solid var(--admin-border); border-radius: 8px; padding: 1rem; margin-bottom: 1.5rem; }
         .form-section h3 { margin-top: 0; margin-bottom: 1rem; font-size: 1.1em; }
-         .form-section hr { margin: 1rem 0; border: 0; border-top: 1px solid rgba(0,0,0,.1); }
-        .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: flex-start; margin-bottom: 1rem; }
-        .form-row.three-cols { grid-template-columns: 2fr 1fr 1fr; gap: 0.5rem; } /* For invoice items */
+        .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: flex-end; }
         .form-group { display: flex; flex-direction: column; }
         .form-group label { margin-bottom: 0.5rem; font-weight: 500; font-size: 0.9em; }
-        .form-group input[type="text"],
-        .form-group input[type="number"],
-        .form-group input[type="tel"] { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
-        .form-group input[type="number"] { -moz-appearance: textfield; } /* Hide arrows in Firefox */
-        .form-group input[type="number"]::-webkit-outer-spin-button,
-        .form-group input[type="number"]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } /* Hide arrows in Chrome/Safari */
-        .add-item-btn { background-color: var(--admin-secondary); color: white; padding: 10px 15px; border-radius: 8px; border: none; cursor: pointer; align-self: flex-end; }
-        .add-item-btn:hover { background-color: #5a6268; }
-        .remove-item-btn { background-color: var(--admin-danger); color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 0.8em; padding: 2px 6px;}
-
-        .calculation-summary, .invoice-summary-preview { background: #e9ecef; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
+        .form-group input, .form-group textarea { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
+        .calculation-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
         .summary-item { display: flex; justify-content: space-between; margin-bottom: 0.5rem; font-size: 0.95em; }
         .summary-item strong { font-weight: 600; }
-        .summary-item.total { font-size: 1.1em; font-weight: 700; }
-        .invoice-item-list-preview { list-style: none; padding: 0; max-height: 150px; overflow-y: auto; margin-bottom: 1rem; }
-        .invoice-item-list-preview li { padding: 5px 0; border-bottom: 1px dashed rgba(0,0,0,.05); display: flex; justify-content: space-between; align-items: center;}
-        .invoice-item-list-preview li:last-child { border-bottom: none; }
-
-
-        /* History & Invoices */
         .history-container { margin-top: 1.5rem; }
         .history-container h3 { font-size: 1.2rem; margin-bottom: 1rem; }
-        .history-list { list-style: none; padding: 0; max-height: 250px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
+        .history-list { list-style: none; padding: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
         .history-item { display: flex; justify-content: space-between; padding: 8px 12px; border-bottom: 1px solid var(--admin-border); }
         .history-item:last-child { border-bottom: none; }
-        .history-item .desc { font-size: 0.9em; flex-grow: 1; margin-right: 10px; }
-        .history-item .date { font-size: 0.8em; color: var(--admin-secondary); flex-shrink: 0; text-align: right; }
-        .history-item .amount { font-weight: 600; flex-shrink: 0; text-align: right;}
-        .history-item .amount.bonus-accrual, .history-item .amount.debt-payment { color: var(--admin-success); }
-        .history-item .amount.bonus-deduction, .history-item .amount.debt-accrual { color: var(--admin-danger); }
-         .history-item .amount.invoice { color: var(--admin-primary-dark); }
-
-        /* Modal Footer */
+        .history-item .desc { font-size: 0.9em; }
+        .history-item .date { font-size: 0.8em; color: var(--admin-secondary); }
+        .history-item .amount.bonus-accrual { color: var(--admin-success); font-weight: 600; }
+        .history-item .amount.bonus-deduction { color: var(--admin-danger); font-weight: 600; }
+        .history-item .amount.debt-accrual { color: var(--admin-danger); font-weight: 600; }
+        .history-item .amount.debt-payment { color: var(--admin-success); font-weight: 600; }
         .modal-footer { margin-top: 1.5rem; display: flex; justify-content: flex-end; align-items: center; gap: 1rem;}
-        .modal-footer button { padding: 12px 25px; font-size: 1.1em; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; }
-        .btn-submit { background-color: var(--admin-success); color: white; }
-         .btn-submit:hover { background-color: #157347; }
-        .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
-
-        /* Contact Info Admin */
-        #contactInfoModal .form-group { margin-bottom: 1rem;}
-        #contactInfoModal .form-group:last-of-type { margin-bottom: 0;}
-
-
+        #invoice-items-table { width: 100%; margin-top: 1rem; border-collapse: collapse; }
+        #invoice-items-table th, #invoice-items-table td { padding: 8px; border: 1px solid var(--admin-border); text-align: left;}
+        #invoice-items-table .btn-delete { padding: 4px 8px; font-size: 0.8em; }
     </style>
 </head>
 <body>
     <div class="container">
         <h1>Панель администратора Bonus</h1>
-        <div class="summary-bar">
-            <div class="summary-card">
-                <div class="value users">{{ summary.total_users }}</div>
-                <div class="label">Всего клиентов</div>
-            </div>
-            <div class="summary-card">
-                <div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div>
-                <div class="label">Всего бонусов</div>
-            </div>
-            <div class="summary-card">
-                <div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div>
-                <div class="label">Всего долгов</div>
-            </div>
-             <div class="summary-card">
-                <div class="value users">{{ summary.users_with_debt }}</div>
-                <div class="label">Клиенты с долгом</div>
-            </div>
-        </div>
-
-        <div class="controls-bar">
-            <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
-            <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
-            <button class="btn btn-secondary" onclick="openContactInfoModal({{ contact_info|tojson }})">Реквизиты компании</button>
-        </div>
-
-        {% if users %}
-            <div class="user-grid" id="userGrid">
-                {% for user in users|sort(attribute='visited_at', reverse=true) %}
-                    <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower }} {{ user.username|lower }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
-                        <div class="user-info">
-                            <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
-                            <div class="user-details">
-                                <div class="name">{{ user.first_name or 'Без имени' }} {{ user.last_name or '' }}</div>
-                                <div class="username">
-                                    {% if user.telegram_id %} @{{ user.username if user.username else 'tg user' }} {% endif %}
-                                    {% if user.phone_number %} {{ user.phone_number }} {% endif %}
-                                    {% if not user.telegram_id and not user.phone_number %} Нет контактных данных {% endif %}
-                                    | ID: {{ user.id }}
-                                </div>
-                            </div>
+        <div class="grid-container">
+            <div class="main-content">
+                <div class="card">
+                    <div class="summary-bar">
+                        <div class="summary-card">
+                            <div class="value">{{ summary.total_users }}</div><div class="label">Всего клиентов</div>
                         </div>
-                        <div class="user-balances">
-                            <div>
-                               <div class="label">Бонусы</div>
-                               <div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div>
-                            </div>
-                            <div>
-                               <div class="label">Долг</div>
-                               <div class="amount debt">{{ "%.2f"|format(user.debts|float) }}</div>
-                            </div>
+                        <div class="summary-card">
+                            <div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div><div class="label">Всего бонусов</div>
                         </div>
-                        <div class="user-actions">
-                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом и накладными</button>
-                            {% if user.telegram_id == None %}
-                            <button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>
-                            {% endif %}
+                        <div class="summary-card">
+                            <div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div><div class="label">Всего долгов</div>
+                        </div>
+                        <div class="summary-card">
+                            <div class="value debt">{{ summary.users_with_debt }}</div><div class="label">Клиенты с долгом</div>
                         </div>
                     </div>
-                {% endfor %}
+                </div>
+                <div class="card">
+                    <div class="controls-bar">
+                        <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
+                        <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
+                    </div>
+                    {% if users %}
+                        <div class="user-grid" id="userGrid">
+                            {% for user in users|sort(attribute='visited_at', reverse=true) %}
+                                <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower }} {{ user.username|lower }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
+                                    <div class="user-info">
+                                        <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
+                                        <div class="user-details">
+                                            <div class="name">{{ user.first_name or '' }} {{ user.last_name or '' }}</div>
+                                            <div class="username">@{{ user.username if user.username else user.phone_number }} | ID: {{ user.id }}</div>
+                                        </div>
+                                    </div>
+                                    <div class="user-balances">
+                                        <div><div class="label">Бонусы</div><div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div></div>
+                                        <div><div class="label">Долг</div><div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div></div>
+                                    </div>
+                                    <div class="user-actions">
+                                        <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
+                                        {% if user.telegram_id == None %}<button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>{% endif %}
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    {% else %}
+                        <p class="no-users">Пользователей пока нет.</p>
+                    {% endif %}
+                </div>
             </div>
-        {% else %}
-            <p class="no-users">Пользователей пока нет.</p>
-        {% endif %}
+            <div class="side-content">
+                <div class="card">
+                    <h2>Визитка</h2>
+                    <form action="/admin/update_organization_info" method="post">
+                        <div class="form-group" style="margin-bottom: 1rem;">
+                            <label for="orgName">Название организации</label>
+                            <input type="text" id="orgName" name="name" value="{{ org_info.name }}">
+                        </div>
+                        <div class="form-group" style="margin-bottom: 1rem;">
+                            <label for="orgPhones">Телефоны (каждый с новой строки)</label>
+                            <textarea id="orgPhones" name="phones" rows="3">{{ org_info.phones|join('\n') }}</textarea>
+                        </div>
+                        <div class="form-group" style="margin-bottom: 1rem;">
+                            <label for="orgAddress">Адрес</label>
+                            <input type="text" id="orgAddress" name="address" value="{{ org_info.address }}">
+                        </div>
+                        <div class="form-group" style="margin-bottom: 1.5rem;">
+                             <label for="orgLinks">Ссылки (формат: Название, URL; каждая с новой строки)</label>
+                             <textarea id="orgLinks" name="links" rows="3">{% for link in org_info.links %}{{ link.label }}, {{ link.url }}{{ '\n' if not loop.last }}{% endfor %}</textarea>
+                        </div>
+                        <button type="submit" class="btn btn-success" style="width: 100%;">Сохранить визитку</button>
+                    </form>
+                </div>
+            </div>
+        </div>
     </div>
 
     <div id="transactionModal" class="modal">
       <div class="modal-content">
         <span class="modal-close" onclick="closeModal('transactionModal')">×</span>
         <div class="modal-header">
-            <h2 id="modalUserName"></h2>
-            <div id="modalUserUsername" class="username"></div>
+            <h2 id="modalUserName"></h2><div id="modalUserUsername" class="username"></div>
         </div>
         <input type="hidden" id="modalUserId">
+        <div class="modal-tabs">
+            <button class="modal-tab active" onclick="switchTab(event, 'operations')">Операции</button>
+            <button class="modal-tab" onclick="switchTab(event, 'invoices')">Накладные</button>
+        </div>
 
-        <div class="form-section">
-            <h3>Операции с бонусами и долгами</h3>
-            <div class="form-row">
-                <div class="form-group">
-                    <label for="purchaseAmount">Сумма покупки (для начисления бонусов)</label>
-                    <input type="number" id="purchaseAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
+        <div id="operations" class="modal-tab-content active">
+            <div class="form-section">
+                <h3>Бонусы</h3>
+                <div class="form-row">
+                    <div class="form-group"><label for="purchaseAmount">Сумма покупки (для начисления)</label><input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()"></div>
+                    <div class="form-group"><label for="deductAmount">Списать бонусов</label><input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()"></div>
                 </div>
-                <div class="form-group">
-                    <label for="deductAmount">Списать бонусов</label>
-                    <input type="number" id="deductAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
+                <div class="calculation-summary">
+                    <div class="summary-item"><span>Текущий баланс:</span> <strong id="summaryCurrentBalance">0.00</strong></div>
+                    <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrual">+0.00</strong></div>
+                    <div class="summary-item"><span>Будет списано:</span> <strong id="summaryDeduction">-0.00</strong></div><hr>
+                    <div class="summary-item"><strong>Итоговый баланс бонусов:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
                 </div>
             </div>
-            <div class="form-row">
-                 <div class="form-group">
-                    <label for="addDebtAmount">Добавить долг</label>
-                    <input type="number" id="addDebtAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
+            <div class="form-section">
+                <h3>Долги</h3>
+                <div class="form-row">
+                     <div class="form-group"><label for="addDebtAmount">Добавить долг</label><input type="number" id="addDebtAmount" placeholder="500" oninput="updateCalculations()"></div>
+                     <div class="form-group"><label for="repayDebtAmount">Погасить долг</label><input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()"></div>
                 </div>
-                <div class="form-group">
-                    <label for="repayDebtAmount">Погасить долг</label>
-                    <input type="number" id="repayDebtAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
+                <div class="calculation-summary">
+                    <div class="summary-item"><span>Текущий долг:</span> <strong id="summaryCurrentDebt">0.00</strong></div>
+                    <div class="summary-item"><span>Будет добавлено:</span> <strong id="summaryAddDebt">+0.00</strong></div>
+                    <div class="summary-item"><span>Будет погашено:</span> <strong id="summaryRepayDebt">-0.00</strong></div><hr>
+                    <div class="summary-item"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
                 </div>
             </div>
-            <div class="calculation-summary">
-                <div class="summary-item"><span>Текущие бонусы:</span> <strong id="summaryCurrentBonus">0.00</strong></div>
-                <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrualBonus">+0.00</strong></div>
-                <div class="summary-item"><span>Будет списано бонусов:</span> <strong id="summaryDeductionBonus">-0.00</strong></div>
-                <hr>
-                <div class="summary-item"><span>Текущий долг:</span> <strong id="summaryCurrentDebt">0.00</strong></div>
-                <div class="summary-item"><span>Будет добавлено долга:</span> <strong id="summaryAddDebt">+0.00</strong></div>
-                <div class="summary-item"><span>Будет погашено долга:</span> <strong id="summaryRepayDebt">-0.00</strong></div>
-                <hr>
-                <div class="summary-item total"><strong>Итоговые бонусы:</strong> <strong id="summaryFinalBonus">0.00</strong></div>
-                <div class="summary-item total"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
-            </div>
-             <div class="modal-footer">
-                <div id="bonusDebtStatus" class="status-message"></div>
-                <button class="btn-submit" onclick="submitBonusDebtTransaction()">Провести операции с бонусами/долгом</button>
+            <div class="modal-footer">
+                <div id="modalStatus" class="status-message"></div>
+                <button class="btn btn-success" onclick="submitTransaction()">Провести операцию</button>
             </div>
         </div>
 
-         <div class="form-section">
-             <h3>Добавить накладную</h3>
-             <div id="invoiceItems">
-                 <!-- Invoice items will be added here -->
-             </div>
-             <div class="form-row three-cols">
-                 <div class="form-group"><label>Название товара</label><input type="text" id="newItemName"></div>
-                 <div class="form-group"><label>Кол-во</label><input type="number" id="newItemQty" value="1" step="0.01" min="0.01"></div>
-                 <div class="form-group"><label>Цена за ед.</label><input type="number" id="newItemPrice" value="0.00" step="0.01" min="0"></div>
-             </div>
-              <div class="form-row">
-                 <div class="form-group" style="grid-column: span 2;">
-                     <label for="invoiceDescription">Описание (необязательно)</label>
-                     <input type="text" id="invoiceDescription" placeholder="Например: Заказ #123">
-                 </div>
-                 <button class="btn add-item-btn" onclick="addInvoiceItem()">Добавить товар</button>
-              </div>
-             <div class="invoice-summary-preview">
-                 <div class="summary-item"><span>Всего позиций:</span> <strong id="invoiceTotalItems">0</strong></div>
-                 <div class="summary-item total"><strong>Итоговая сумма накладной:</strong> <strong id="invoiceTotalAmount">0.00 ₽</strong></div>
-             </div>
+        <div id="invoices" class="modal-tab-content">
+            <div class="form-section">
+                <h3>Создать накладную</h3>
+                <div style="display: grid; grid-template-columns: 2fr 1fr 1fr auto; gap: 1rem; align-items: flex-end;">
+                    <div class="form-group"><label for="itemName">Название товара</label><input type="text" id="itemName"></div>
+                    <div class="form-group"><label for="itemQty">Кол-во</label><input type="number" id="itemQty" value="1"></div>
+                    <div class="form-group"><label for="itemPrice">Цена</label><input type="number" id="itemPrice"></div>
+                    <button class="btn btn-primary" onclick="addInvoiceItem()">+</button>
+                </div>
+                <table id="invoice-items-table">
+                    <thead><tr><th>Товар</th><th>Кол-во</th><th>Цена</th><th>Сумма</th><th></th></tr></thead>
+                    <tbody id="invoiceItemsTbody"></tbody>
+                </table>
+                <div class="calculation-summary">
+                    <div class="summary-item"><strong>Итого по накладной:</strong> <strong id="invoiceTotal">0.00</strong></div>
+                </div>
+            </div>
+             <div class="history-container"><h3>Существующие накладные</h3><ul id="modalInvoicesList" class="history-list"></ul></div>
              <div class="modal-footer">
                 <div id="invoiceStatus" class="status-message"></div>
-                 <button class="btn-submit" onclick="submitInvoice()">Сохранить накладную</button>
-             </div>
-         </div>
-
-
-        <div class="history-container">
-            <h3>Общая история операций и накладных</h3>
-            <ul id="modalHistoryList" class="history-list"></ul>
+                <button class="btn btn-success" onclick="saveInvoice()">Сохранить накладную</button>
+            </div>
         </div>
-
       </div>
     </div>
-
+    
     <div id="addClientModal" class="modal">
-      <div class="modal-content">
+      <div class="modal-content" style="max-width: 500px;">
         <span class="modal-close" onclick="closeModal('addClientModal')">×</span>
-        <div class="modal-header">
-            <h2>Добавить нового клиента</h2>
-        </div>
-        <div class="form-group" style="margin-bottom: 1rem;">
-            <label for="newClientFirstName">Имя</label>
-            <input type="text" id="newClientFirstName" placeholder="Иван" required>
-        </div>
-        <div class="form-group" style="margin-bottom: 1.5rem;">
-            <label for="newClientPhone">Номер телефона (уникальный)</label>
-            <input type="tel" id="newClientPhone" placeholder="+79001234567">
-        </div>
-        <div class="modal-footer">
-            <div id="addClientStatus" class="status-message"></div>
-            <button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button>
-        </div>
-      </div>
-    </div>
-
-     <div id="contactInfoModal" class="modal">
-      <div class="modal-content">
-        <span class="modal-close" onclick="closeModal('contactInfoModal')">×</span>
-        <div class="modal-header">
-            <h2>Реквизиты компании</h2>
-        </div>
-        <div class="form-group">
-            <label for="orgName">Название организации</label>
-            <input type="text" id="orgName" placeholder="Название компании">
-        </div>
-         <div class="form-group">
-            <label for="orgPhone">Номер телефона (для звонков, WhatsApp)</label>
-            <input type="tel" id="orgPhone" placeholder="+79001234567">
-        </div>
-         <div class="form-group">
-            <label for="orgTelegram">Telegram username/ID</label>
-            <input type="text" id="orgTelegram" placeholder="@username или ID">
-        </div>
-         <div class="form-group">
-            <label for="orgAddress">Адрес</label>
-            <input type="text" id="orgAddress" placeholder="Улица, дом, офис">
-        </div>
-         <div class="form-group">
-            <label for="orgWebsite">Сайт (ссылка)</label>
-            <input type="text" id="orgWebsite" placeholder="https://example.com">
-        </div>
-        <div class="modal-footer">
-            <div id="contactInfoStatus" class="status-message"></div>
-            <button class="btn-submit" onclick="submitContactInfo()">Сохранить реквизиты</button>
-        </div>
+        <div class="modal-header"><h2>Добавить нового клиента</h2></div>
+        <div class="form-group" style="margin-bottom: 1rem;"><label for="newClientFirstName">Имя</label><input type="text" id="newClientFirstName" placeholder="Иван"></div>
+        <div class="form-group" style="margin-bottom: 1.5rem;"><label for="newClientPhone">Номер телефона (уникальный)</label><input type="tel" id="newClientPhone" placeholder="+996..."></div>
+        <div class="modal-footer"><div id="addClientStatus" class="status-message"></div><button class="btn btn-success" onclick="submitNewClient()">Сохранить клиента</button></div>
       </div>
     </div>
 
-
     <script>
         const transactionModal = document.getElementById('transactionModal');
         const addClientModal = document.getElementById('addClientModal');
-        const contactInfoModal = document.getElementById('contactInfoModal');
         let currentUserData = null;
-        let currentInvoiceItems = []; // Array to hold items for the new invoice being built
+        let currentInvoiceItems = [];
 
         function searchUsers() {
             const searchTerm = document.getElementById('searchInput').value.toLowerCase();
-            const userCards = document.querySelectorAll('.user-card');
-            userCards.forEach(card => {
-                const cardSearchTerm = card.getAttribute('data-search-term');
-                if (cardSearchTerm && cardSearchTerm.includes(searchTerm)) {
-                    card.style.display = 'flex';
-                } else {
-                    card.style.display = 'none';
-                }
+            document.querySelectorAll('.user-card').forEach(card => {
+                card.style.display = card.getAttribute('data-search-term').includes(searchTerm) ? 'flex' : 'none';
             });
         }
-
         function openTransactionModal(userData) {
             currentUserData = userData;
             document.getElementById('modalUserId').value = userData.id;
-            document.getElementById('modalUserName').textContent = `${userData.first_name || 'Без имени'} ${userData.last_name || ''}`;
-            let contactInfo = '';
-            if (userData.telegram_id) contactInfo += `@${userData.username || 'tg user'}`;
-            if (userData.phone_number) {
-                if (contactInfo) contactInfo += ' | ';
-                contactInfo += userData.phone_number;
+            document.getElementById('modalUserName').textContent = `${userData.first_name || ''} ${userData.last_name || ''}`;
+            document.getElementById('modalUserUsername').textContent = `@${userData.username || userData.phone_number} | ID: ${userData.id}`;
+            ['purchaseAmount', 'deductAmount', 'addDebtAmount', 'repayDebtAmount'].forEach(id => document.getElementById(id).value = '');
+            ['modalStatus', 'invoiceStatus'].forEach(id => document.getElementById(id).textContent = '');
+            
+            const invoicesList = document.getElementById('modalInvoicesList');
+            invoicesList.innerHTML = '';
+            if (userData.invoices && userData.invoices.length > 0) {
+                 userData.invoices.sort((a,b) => new Date(b.date) - new Date(a.date)).forEach(inv => {
+                    const li = document.createElement('li');
+                    li.className = 'history-item';
+                    li.innerHTML = `<div><div class="desc">Накладная #${inv.id}</div><div class="date">${inv.date_str}</div></div><div class="amount"><strong>${parseFloat(inv.total_amount).toFixed(2)}</strong></div>`;
+                    invoicesList.appendChild(li);
+                 });
+            } else {
+                invoicesList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет накладных</li>';
             }
-             if (!contactInfo) contactInfo = 'Нет контактных данных';
-            document.getElementById('modalUserUsername').textContent = `${contactInfo} | ID: ${userData.id}`;
-
-            // Reset bonus/debt form
-            document.getElementById('purchaseAmount').value = '';
-            document.getElementById('deductAmount').value = '';
-            document.getElementById('addDebtAmount').value = '';
-            document.getElementById('repayDebtAmount').value = '';
-            document.getElementById('bonusDebtStatus').textContent = '';
-            updateBonusDebtCalculations(); // Update summaries based on current data
-
-            // Reset invoice form
             currentInvoiceItems = [];
-            document.getElementById('invoiceItems').innerHTML = '';
-            document.getElementById('newItemName').value = '';
-            document.getElementById('newItemQty').value = '1';
-            document.getElementById('newItemPrice').value = '0.00';
-             document.getElementById('invoiceDescription').value = '';
-            document.getElementById('invoiceStatus').textContent = '';
-            updateInvoiceCalculations();
-
-            // Populate and display combined history
-            displayCombinedHistory(userData);
-
+            renderInvoiceItems();
+            updateCalculations();
+            switchTab({ currentTarget: document.querySelector('.modal-tab.active') }, 'operations');
             transactionModal.style.display = 'block';
         }
-
         function openAddClientModal() {
-            document.getElementById('newClientFirstName').value = '';
-            document.getElementById('newClientPhone').value = '';
+            ['newClientFirstName', 'newClientPhone'].forEach(id => document.getElementById(id).value = '');
             document.getElementById('addClientStatus').textContent = '';
             addClientModal.style.display = 'block';
         }
-
-        function openContactInfoModal(contactInfo) {
-             document.getElementById('orgName').value = contactInfo.name || '';
-             document.getElementById('orgPhone').value = contactInfo.phone || '';
-             document.getElementById('orgTelegram').value = contactInfo.telegram || '';
-             document.getElementById('orgAddress').value = contactInfo.address || '';
-             document.getElementById('orgWebsite').value = contactInfo.website || '';
-             document.getElementById('contactInfoStatus').textContent = '';
-             contactInfoModal.style.display = 'block';
-        }
-
-
         function closeModal(modalId) {
             document.getElementById(modalId).style.display = 'none';
-            if (modalId === 'transactionModal') {
-                currentUserData = null;
-            }
+            if (modalId === 'transactionModal') currentUserData = null;
         }
-
-        function updateBonusDebtCalculations() {
+        function switchTab(evt, tabName) {
+            document.querySelectorAll('.modal-tab-content').forEach(tc => tc.classList.remove('active'));
+            document.querySelectorAll('.modal-tab').forEach(t => t.classList.remove('active'));
+            document.getElementById(tabName).classList.add('active');
+            evt.currentTarget.classList.add('active');
+        }
+        function updateCalculations() {
             if (!currentUserData) return;
-
-            const currentBonus = parseFloat(currentUserData.bonuses) || 0;
+            const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
             let deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
             const accrualAmount = purchaseAmount * 0.02;
-
-            // Cap deduction at current bonus amount
-            if (deductAmount > currentBonus) {
-                deductAmount = currentBonus;
+            if (deductAmount > currentBalance + accrualAmount) {
+                deductAmount = currentBalance + accrualAmount;
                 document.getElementById('deductAmount').value = deductAmount > 0 ? deductAmount.toFixed(2) : '';
             }
-            const finalBonus = currentBonus + accrualAmount - deductAmount;
-
-            document.getElementById('summaryCurrentBonus').textContent = currentBonus.toFixed(2);
-            document.getElementById('summaryAccrualBonus').textContent = `+${accrualAmount.toFixed(2)}`;
-            document.getElementById('summaryDeductionBonus').textContent = `-${deductAmount.toFixed(2)}`;
-            document.getElementById('summaryFinalBonus').textContent = finalBonus.toFixed(2);
-
+            const finalBalance = currentBalance + accrualAmount - deductAmount;
+            document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
+            document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
+            document.getElementById('summaryDeduction').textContent = `-${deductAmount.toFixed(2)}`;
+            document.getElementById('summaryFinalBalance').textContent = finalBalance.toFixed(2);
             const currentDebt = parseFloat(currentUserData.debts) || 0;
             const addDebtAmount = parseFloat(document.getElementById('addDebtAmount').value) || 0;
             let repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
-
-             // Cap repayment at current debt amount
             if (repayDebtAmount > currentDebt) {
                 repayDebtAmount = currentDebt;
-                 document.getElementById('repayDebtAmount').value = repayDebtAmount > 0 ? repayDebtAmount.toFixed(2) : '';
+                document.getElementById('repayDebtAmount').value = repayDebtAmount > 0 ? repayDebtAmount.toFixed(2) : '';
             }
             const finalDebt = currentDebt + addDebtAmount - repayDebtAmount;
-
             document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
             document.getElementById('summaryAddDebt').textContent = `+${addDebtAmount.toFixed(2)}`;
             document.getElementById('summaryRepayDebt').textContent = `-${repayDebtAmount.toFixed(2)}`;
             document.getElementById('summaryFinalDebt').textContent = finalDebt.toFixed(2);
         }
-
         function addInvoiceItem() {
-            const nameInput = document.getElementById('newItemName');
-            const qtyInput = document.getElementById('newItemQty');
-            const priceInput = document.getElementById('newItemPrice');
-
-            const name = nameInput.value.trim();
-            const quantity = parseFloat(qtyInput.value);
-            const price_per_unit = parseFloat(priceInput.value);
-
-            if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price_per_unit) || price_per_unit < 0) {
-                alert('Пожалуйста, введите корректные данные товара (название, количество > 0, цена >= 0).');
-                return;
-            }
-
-            currentInvoiceItems.push({
-                name: name,
-                quantity: quantity,
-                price_per_unit: price_per_unit
-            });
-
+            const name = document.getElementById('itemName').value.trim();
+            const qty = parseFloat(document.getElementById('itemQty').value) || 1;
+            const price = parseFloat(document.getElementById('itemPrice').value) || 0;
+            if (!name || qty <= 0 || price <= 0) { alert('Введите корректные данные для товара.'); return; }
+            currentInvoiceItems.push({ name: name, quantity: qty, price_per_unit: price, total_price: qty * price });
+            document.getElementById('itemName').value = '';
+            document.getElementById('itemQty').value = '1';
+            document.getElementById('itemPrice').value = '';
             renderInvoiceItems();
-            updateInvoiceCalculations();
-
-            // Clear item inputs
-            nameInput.value = '';
-            qtyInput.value = '1';
-            priceInput.value = '0.00';
-            nameInput.focus();
+            document.getElementById('itemName').focus();
         }
-
         function removeInvoiceItem(index) {
             currentInvoiceItems.splice(index, 1);
             renderInvoiceItems();
-            updateInvoiceCalculations();
         }
-
         function renderInvoiceItems() {
-            const itemListEl = document.getElementById('invoiceItems');
-            itemListEl.innerHTML = ''; // Clear current list
-
+            const tbody = document.getElementById('invoiceItemsTbody');
+            tbody.innerHTML = '';
+            let total = 0;
             currentInvoiceItems.forEach((item, index) => {
-                const itemElement = document.createElement('div');
-                itemElement.className = 'form-row three-cols';
-                itemElement.innerHTML = `
-                    <div class="form-group"><input type="text" value="${item.name}" readonly></div>
-                    <div class="form-group"><input type="number" value="${item.quantity}" step="0.01" readonly></div>
-                    <div class="form-group" style="display:flex; align-items:center; gap: 5px;">
-                         <input type="number" value="${item.price_per_unit.toFixed(2)}" step="0.01" readonly style="flex-grow: 1;">
-                         <button class="remove-item-btn" onclick="removeInvoiceItem(${index})">X</button>
-                    </div>
-                `;
-                 itemListEl.appendChild(itemElement);
-            });
-        }
-
-        function updateInvoiceCalculations() {
-            let totalAmount = 0;
-            currentInvoiceItems.forEach(item => {
-                totalAmount += item.quantity * item.price_per_unit;
+                const row = tbody.insertRow();
+                row.innerHTML = `<td>${item.name}</td><td>${item.quantity}</td><td>${item.price_per_unit.toFixed(2)}</td><td>${item.total_price.toFixed(2)}</td><td><button class="btn btn-delete" onclick="removeInvoiceItem(${index})">X</button></td>`;
+                total += item.total_price;
             });
-            document.getElementById('invoiceTotalItems').textContent = currentInvoiceItems.length;
-            document.getElementById('invoiceTotalAmount').textContent = `${totalAmount.toFixed(2)} ₽`;
+            document.getElementById('invoiceTotal').textContent = total.toFixed(2);
         }
-
-
-        async function submitBonusDebtTransaction() {
-            const statusEl = document.getElementById('bonusDebtStatus');
+        async function doFetch(url, payload, statusElId) {
+            const statusEl = document.getElementById(statusElId);
             statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Обработка...';
-
+            try {
+                const response = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
+                const result = await response.json();
+                if (!response.ok) throw new Error(result.message || 'Произошла ошибка');
+                statusEl.style.color = 'var(--admin-success)';
+                statusEl.textContent = result.message || 'Успешно!';
+                setTimeout(() => location.reload(), 1500);
+            } catch (error) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = `Ошибка: ${error.message}`;
+            }
+        }
+        function submitTransaction() {
             const payload = {
                 user_id: document.getElementById('modalUserId').value,
                 purchase_amount: parseFloat(document.getElementById('purchaseAmount').value) || 0,
@@ -1333,324 +915,75 @@ ADMIN_TEMPLATE = """
                 add_debt_amount: parseFloat(document.getElementById('addDebtAmount').value) || 0,
                 repay_debt_amount: parseFloat(document.getElementById('repayDebtAmount').value) || 0,
             };
-
-             if (payload.purchase_amount <= 0 && payload.deduct_amount <= 0 && payload.add_debt_amount <= 0 && payload.repay_debt_amount <= 0) {
-                 statusEl.style.color = 'var(--admin-danger)';
-                 statusEl.textContent = 'Введите сумму для любой из операций с бонусами/долгом.';
-                 return;
-             }
-
-            try {
-                const response = await fetch('/admin/add_transaction', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(payload)
-                });
-                const result = await response.json();
-                if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
-                    statusEl.textContent = 'Операции с бонусами/долгом успешно проведены!';
-                     // Update current user data and history display without full reload for responsiveness
-                    currentUserData.bonuses = result.new_balance;
-                    currentUserData.debts = result.new_debt;
-                     if (result.history_entries) {
-                          // Add new history entries to current user data
-                          if (!currentUserData.history) currentUserData.history = [];
-                          if (!currentUserData.debt_history) currentUserData.debt_history = [];
-                          result.history_entries.forEach(entry => {
-                              if (entry.transaction_type === 'bonus') currentUserData.history.push(entry);
-                              if (entry.transaction_type === 'debt') currentUserData.debt_history.push(entry);
-                          });
-                           displayCombinedHistory(currentUserData); // Refresh history display
-                     }
-                    updateBonusDebtCalculations(); // Refresh calculations with new balance/debt
-                     // Clear bonus/debt form after successful transaction
-                    document.getElementById('purchaseAmount').value = '';
-                    document.getElementById('deductAmount').value = '';
-                    document.getElementById('addDebtAmount').value = '';
-                    document.getElementById('repayDebtAmount').value = '';
-
-                } else {
-                    throw new Error(result.message || 'Произошла ошибка');
-                }
-            } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = `Ошибка: ${error.message}`;
+            if (Object.values(payload).slice(1).every(v => v <= 0)) {
+                document.getElementById('modalStatus').textContent = 'Введите сумму для операции.';
+                return;
             }
+            doFetch('/admin/add_transaction', payload, 'modalStatus');
         }
-
-         async function submitInvoice() {
-             const statusEl = document.getElementById('invoiceStatus');
-             statusEl.style.color = 'var(--admin-secondary)';
-             statusEl.textContent = 'Сохранение накладной...';
-
-             if (currentInvoiceItems.length === 0) {
-                 statusEl.style.color = 'var(--admin-danger)';
-                 statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
-                 return;
-             }
-
-             const payload = {
-                 user_id: document.getElementById('modalUserId').value,
-                 description: document.getElementById('invoiceDescription').value.trim(),
-                 items: currentInvoiceItems,
-             };
-
-             try {
-                 const response = await fetch('/admin/add_invoice', {
-                     method: 'POST',
-                     headers: { 'Content-Type': 'application/json' },
-                     body: JSON.stringify(payload)
-                 });
-                 const result = await response.json();
-                 if (response.ok) {
-                     statusEl.style.color = 'var(--admin-success)';
-                     statusEl.textContent = 'Накладная успешно сохранена!';
-                      // Add new invoice entry to current user data and history display
-                     if (!currentUserData.invoices) currentUserData.invoices = [];
-                     currentUserData.invoices.push(result.invoice_entry);
-                      displayCombinedHistory(currentUserData); // Refresh history display
-
-                     // Clear invoice form after successful save
-                     currentInvoiceItems = [];
-                     renderInvoiceItems();
-                     document.getElementById('newItemName').value = '';
-                     document.getElementById('newItemQty').value = '1';
-                     document.getElementById('newItemPrice').value = '0.00';
-                     document.getElementById('invoiceDescription').value = '';
-                     updateInvoiceCalculations();
-
-                 } else {
-                     throw new Error(result.message || 'Произошла ошибка');
-                 }
-             } catch (error) {
-                 statusEl.style.color = 'var(--admin-danger)';
-                 statusEl.textContent = `Ошибка: ${error.message}`;
-             }
-         }
-
-
-        function displayCombinedHistory(userData) {
-            const historyList = document.getElementById('modalHistoryList');
-            historyList.innerHTML = '';
-
-            const bonusHistory = (userData.history || []).map(h => ({...h, transaction_type: 'bonus'}));
-            const debtHistory = (userData.debt_history || []).map(h => ({...h, transaction_type: 'debt'}));
-             const invoiceHistory = (userData.invoices || []).map(inv => ({
-                 date: inv.date,
-                 date_str: inv.date_str,
-                 description: inv.description || `Накладная #${inv.invoice_id}`,
-                 total_amount: inv.total_amount,
-                 transaction_type: 'invoice'
-             }));
-
-
-            const combinedHistory = [...bonusHistory, ...debtHistory, ...invoiceHistory].sort((a, b) => new Date(b.date) - new Date(a.date));
-
-            if (combinedHistory.length > 0) {
-                combinedHistory.forEach(item => {
-                    const li = document.createElement('li');
-                    li.className = 'history-item';
-                    let amountText, amountClass;
-
-                    if (item.transaction_type === 'bonus') {
-                        amountText = `${item.type === 'accrual' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`;
-                        amountClass = item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction';
-                    } else if (item.transaction_type === 'debt') {
-                        amountText = `${item.type === 'payment' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`; // Payment increases bonus view, accrual decreases
-                        amountClass = item.type === 'payment' ? 'debt-payment' : 'debt-accrual';
-                    } else if (item.transaction_type === 'invoice') {
-                         amountText = `${parseFloat(item.total_amount).toFixed(2)} ₽`;
-                         amountClass = 'invoice';
-                    }
-
-
-                    li.innerHTML = `
-                        <div class="desc">${item.description}</div>
-                        <div class="date">${item.date_str}</div>
-                        <div class="amount ${amountClass}">${amountText}</div>
-                    `;
-                    historyList.appendChild(li);
-                });
-            } else {
-                historyList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет истории</li>';
+        function saveInvoice() {
+            if (currentInvoiceItems.length === 0) {
+                document.getElementById('invoiceStatus').textContent = 'Добавьте хотя бы один товар.';
+                return;
             }
+            const payload = { user_id: document.getElementById('modalUserId').value, items: currentInvoiceItems };
+            doFetch('/admin/add_invoice', payload, 'invoiceStatus');
         }
-
-
-        async function submitNewClient() {
-            const statusEl = document.getElementById('addClientStatus');
-            statusEl.style.color = 'var(--admin-secondary)';
-            statusEl.textContent = 'Сохранение...';
-
-            const payload = {
-                first_name: document.getElementById('newClientFirstName').value.trim(),
-                phone_number: document.getElementById('newClientPhone').value.trim(),
-            };
-
+        function submitNewClient() {
+            const payload = { first_name: document.getElementById('newClientFirstName').value.trim(), phone_number: document.getElementById('newClientPhone').value.trim() };
             if (!payload.first_name || !payload.phone_number) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = 'Имя и номер телефона обязательны.';
+                document.getElementById('addClientStatus').textContent = 'Имя и номер телефона обязательны.';
                 return;
             }
-
-            try {
-                const response = await fetch('/admin/add_client', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(payload)
-                });
-                const result = await response.json();
-                if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
-                    statusEl.textContent = 'Клиент успешно добавлен!';
-                    setTimeout(() => { location.reload(); }, 1500);
-                } else {
-                    throw new Error(result.message || 'Произошла ошибка');
-                }
-            } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = `Ошибка: ${error.message}`;
-            }
+            doFetch('/admin/add_client', payload, 'addClientStatus');
         }
-
-         async function submitContactInfo() {
-             const statusEl = document.getElementById('contactInfoStatus');
-             statusEl.style.color = 'var(--admin-secondary)';
-             statusEl.textContent = 'Сохранение...';
-
-             const payload = {
-                 name: document.getElementById('orgName').value.trim(),
-                 phone: document.getElementById('orgPhone').value.trim(),
-                 telegram: document.getElementById('orgTelegram').value.trim(),
-                 address: document.getElementById('orgAddress').value.trim(),
-                 website: document.getElementById('orgWebsite').value.trim(),
-             };
-
-             try {
-                 const response = await fetch('/admin/save_contact_info', {
-                     method: 'POST',
-                     headers: { 'Content-Type': 'application/json' },
-                     body: JSON.stringify(payload)
-                 });
-                 const result = await response.json();
-                 if (response.ok) {
-                     statusEl.style.color = 'var(--admin-success)';
-                     statusEl.textContent = 'Реквизиты успешно обновлены!';
-                     // No reload needed, data is saved
-                 } else {
-                     throw new Error(result.message || 'Произошла ошибка');
-                 }
-             } catch (error) {
-                 statusEl.style.color = 'var(--admin-danger)';
-                 statusEl.textContent = `Ошибка: ${error.message}`;
-             }
-         }
-
-
         async function deleteClient(userId) {
-            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
-                return;
-            }
-            try {
-                const response = await fetch('/admin/delete_client', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ user_id: userId })
-                });
-                const result = await response.json();
-                if (response.ok) {
-                    location.reload();
-                } else {
-                    throw new Error(result.message || 'Не удалось удалить клиента.');
-                }
-            } catch (error) {
-                alert(`Ошибка: ${error.message}`);
-            }
+            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) return;
+            await doFetch('/admin/delete_client', { user_id: userId }, 'modalStatus');
         }
-
         window.onclick = function(event) {
-            if (event.target == transactionModal) {
-                //closeModal('transactionModal'); // Keep open for now to avoid losing context
-            }
-            if (event.target == addClientModal) {
-                closeModal('addClientModal');
-            }
-             if (event.target == contactInfoModal) {
-                closeModal('contactInfoModal');
-            }
+            if (event.target == transactionModal) closeModal('transactionModal');
+            if (event.target == addClientModal) closeModal('addClientModal');
         }
     </script>
 </body>
 </html>
 """
 
-
 @app.route('/')
 def index():
+    page = request.args.get('page', 'home')
     user_id_str = request.args.get('user_id_for_test')
-
-    full_data = load_full_data()
-    visitor_data = full_data.get('users', {})
-    contact_info = full_data.get('org_contact_info', {})
-
+    
+    current_data = load_visitor_data()
     user_data = {}
 
-    if user_id_str and user_id_str in visitor_data:
-        user_data = visitor_data[user_id_str]
+    if user_id_str and user_id_str in current_data:
+        user_data = current_data[user_id_str]
         user_data['id'] = user_id_str
-
-        # Prepare bonus history
-        bonus_history = user_data.get('history', [])
-        # Ensure type is correctly set for older data
-        for item in bonus_history:
-            if 'type' not in item: item['type'] = 'accrual' if item.get('description', '').startswith('Начисление') else 'deduction'
-            item['transaction_type'] = 'bonus'
-
-        # Prepare debt history
-        debt_history = user_data.get('debt_history', [])
-        # Ensure type is correctly set for older data
-        for item in debt_history:
-             if 'type' not in item: item['type'] = 'accrual' if item.get('description', '') == 'Добавление долга' else 'payment'
-             item['transaction_type'] = 'debt'
-
-        # Prepare invoice history (simplified for combined display)
-        invoice_history = user_data.get('invoices', [])
-        invoice_history_for_display = []
-        for invoice in invoice_history:
-            invoice_history_for_display.append({
-                "date": invoice.get('date', datetime.now(BISHKEK_TZ).isoformat()), # Use creation date or fallback
-                "date_str": invoice.get('date_str', datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')),
-                "description": invoice.get('description', f"Накладная #{invoice.get('invoice_id', 'N/A')}"),
-                "total_amount": invoice.get('total_amount', 0),
-                "transaction_type": 'invoice',
-                # Optional: Add invoice ID or link if needed
-                "invoice_id": invoice.get('invoice_id')
-            })
-
-
-        combined_history = sorted(
-            bonus_history + debt_history + invoice_history_for_display,
-            key=lambda x: x.get('date', ''), # Sort by date
-            reverse=True
-        )
-        user_data['combined_history'] = combined_history
-        user_data['invoices'] = user_data.get('invoices', []) # Ensure invoices list exists
-
     else:
-        # Default data for unverified/new users or if ID not found
         user_data = {
-            "id": "N/A", # Or some placeholder
-            "first_name": "Гость",
-            "bonuses": 0,
-            "debts": 0,
-            "history": [],
-            "debt_history": [],
-            "invoices": [],
-            "combined_history": []
+            "id": "N/A", "bonuses": 0, "debts": 0, "first_name": "Гость",
+            "history": [], "debt_history": [], "invoices": []
         }
 
-    return render_template_string(TEMPLATE, user=user_data, contact_info=contact_info)
+    if page == 'card':
+        org_info = load_org_info()
+        return render_template_string(CARD_TEMPLATE, user=user_data, org_info=org_info, clean_phone=clean_phone_number)
+    
+    elif page == 'history':
+        bonus_history = [dict(item, transaction_type='bonus') for item in user_data.get('history', [])]
+        debt_history = [dict(item, transaction_type='debt') for item in user_data.get('debt_history', [])]
+        user_data['combined_history'] = sorted(bonus_history + debt_history, key=lambda x: x['date'], reverse=True)
+        return render_template_string(HISTORY_TEMPLATE, user=user_data)
+
+    elif page == 'invoices':
+        if 'invoices' in user_data and user_data['invoices']:
+            user_data['invoices'] = sorted(user_data['invoices'], key=lambda x: x['date'], reverse=True)
+        return render_template_string(INVOICES_TEMPLATE, user=user_data)
+        
+    else: # home
+        return render_template_string(MAIN_TEMPLATE, user=user_data)
 
 @app.route('/verify', methods=['POST'])
 def verify_data():
@@ -1661,455 +994,187 @@ def verify_data():
             return jsonify({"status": "error", "message": "Missing initData"}), 400
 
         user_data_parsed, is_valid = verify_telegram_data(init_data_str)
-
-        user_info_dict = {}
-        if user_data_parsed and 'user' in user_data_parsed:
-            try:
-                user_json_str = unquote(user_data_parsed['user'][0])
-                user_info_dict = json.loads(user_json_str)
-            except Exception as e:
-                logging.error(f"Could not parse user JSON: {e}")
-                user_info_dict = {}
-
-        if is_valid:
-            tg_user_id = user_info_dict.get('id')
-            if tg_user_id:
-                now_bishkek = datetime.now(BISHKEK_TZ)
-                all_data = load_full_data().get('users', {}) # Load only user data for lookup
-
-                existing_user_key = None
-                for key, user_data_item in all_data.items():
-                    if str(user_data_item.get('telegram_id')) == str(tg_user_id):
-                        existing_user_key = key
-                        break
-
-                user_id_to_return = None
-                user_entry = None
-
-                if existing_user_key:
-                    user_entry = all_data[existing_user_key]
-                    # Update Telegram info if it exists and is different
-                    if user_entry.get('telegram_id') is not None:
-                         user_entry.update({
-                            'first_name': user_info_dict.get('first_name', user_entry.get('first_name')),
-                            'last_name': user_info_dict.get('last_name', user_entry.get('last_name')),
-                            'username': user_info_dict.get('username', user_entry.get('username')),
-                            'photo_url': user_info_dict.get('photo_url', user_entry.get('photo_url')),
-                            'language_code': user_info_dict.get('language_code', user_entry.get('language_code')),
-                            'is_premium': user_info_dict.get('is_premium', user_entry.get('is_premium', False)),
-                            'visited_at': now_bishkek.timestamp(),
-                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
-                         })
-                    user_id_to_return = existing_user_key
-                else:
-                    # Check if a user with this phone number already exists (added manually)
-                    phone_number = user_info_dict.get('phone_number')
-                    if phone_number:
-                        for key, user_data_item in all_data.items():
-                             if user_data_item.get('phone_number') == phone_number:
-                                  existing_user_key = key
-                                  break
-
-                    if existing_user_key:
-                        # Link existing phone user to Telegram
-                        user_entry = all_data[existing_user_key]
-                        user_entry.update({
-                            'telegram_id': tg_user_id,
-                            'first_name': user_info_dict.get('first_name', user_entry.get('first_name')),
-                            'last_name': user_info_dict.get('last_name', user_entry.get('last_name')),
-                            'username': user_info_dict.get('username', user_entry.get('username')),
-                            'photo_url': user_info_dict.get('photo_url', user_entry.get('photo_url')),
-                            'language_code': user_info_dict.get('language_code', user_entry.get('language_code')),
-                             'is_premium': user_info_dict.get('is_premium', user_entry.get('is_premium', False)),
-                            'visited_at': now_bishkek.timestamp(),
-                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
-                        })
-                        user_id_to_return = existing_user_key
-
-                    else:
-                        # Create a brand new user
-                        new_user_id = generate_unique_id(all_data)
-                        user_entry = {
-                            'id': new_user_id,
-                            'telegram_id': tg_user_id,
-                            'first_name': user_info_dict.get('first_name'),
-                            'last_name': user_info_dict.get('last_name'),
-                            'username': user_info_dict.get('username'),
-                            'photo_url': user_info_dict.get('photo_url'),
-                            'language_code': user_info_dict.get('language_code', 'ru'),
-                            'is_premium': user_info_dict.get('is_premium', False),
-                            'phone_number': user_info_dict.get('phone_number'), # Save phone if available from TG
-                            'visited_at': now_bishkek.timestamp(),
-                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
-                            'bonuses': 0,
-                            'history': [],
-                            'debts': 0,
-                            'debt_history': [],
-                            'invoices': [] # Initialize invoices list
-                        }
-                        user_id_to_return = new_user_id
-
-                if user_id_to_return and user_entry:
-                     save_visitor_data({user_id_to_return: user_entry}) # Use save_visitor_data to trigger full save
-                     return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_return})
-                else:
-                     # Should not happen if tg_user_id is present, but safety check
-                    return jsonify({"status": "error", "verified": True, "message": "Could not create or find user entry"}), 500
-
+        user_info_dict = json.loads(unquote(user_data_parsed['user'][0])) if user_data_parsed and 'user' in user_data_parsed else {}
+
+        if is_valid and user_info_dict.get('id'):
+            tg_user_id = str(user_info_dict['id'])
+            now = datetime.now(BISHKEK_TZ)
+            all_data = load_visitor_data()
+            
+            existing_user_key = next((k for k, v in all_data.items() if str(v.get('telegram_id')) == tg_user_id), None)
+            
+            if existing_user_key:
+                user_entry = all_data[existing_user_key]
+                user_entry.update({
+                    'first_name': user_info_dict.get('first_name'), 'last_name': user_info_dict.get('last_name'),
+                    'username': user_info_dict.get('username'), 'photo_url': user_info_dict.get('photo_url'),
+                    'visited_at': now.timestamp(), 'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S')
+                })
+                user_id_to_save = existing_user_key
             else:
-                 return jsonify({"status": "error", "verified": True, "message": "User ID not found in parsed data"}), 400
+                new_user_id = generate_unique_id(all_data)
+                user_entry = {
+                    'id': new_user_id, 'telegram_id': tg_user_id, 'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': [],
+                    'first_name': user_info_dict.get('first_name'), 'last_name': user_info_dict.get('last_name'),
+                    'username': user_info_dict.get('username'), 'photo_url': user_info_dict.get('photo_url'),
+                    'phone_number': None, 'visited_at': now.timestamp(), 'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S')
+                }
+                user_id_to_save = new_user_id
+            
+            save_visitor_data({user_id_to_save: user_entry})
+            return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_save})
         else:
-            logging.warning(f"Verification failed for initData: {init_data_str}")
-            # Optionally return a specific ID for "unverified" view or an error
-            # For now, return invalid response
-            return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
-
+            return jsonify({"status": "error", "verified": is_valid, "message": "Invalid data or missing user ID"}), 403
     except Exception as e:
-        logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
 @app.route('/admin')
 def admin_panel():
-    full_data = load_full_data()
-    visitor_data = full_data.get('users', {})
-    contact_info = full_data.get('org_contact_info', {})
-
-    users_list = []
-    for user_id, user_data in visitor_data.items():
-        user_data_copy = user_data.copy() # Avoid modifying cache directly
-        user_data_copy['id'] = user_id
-        users_list.append(user_data_copy)
-
-    total_users = len(users_list)
-    total_bonuses = sum(u.get('bonuses', 0) for u in users_list)
-    total_debts = sum(u.get('debts', 0) for u in users_list)
-    users_with_debt = sum(1 for u in users_list if u.get('debts', 0) > 0.01) # Account for float errors
-
+    current_data = load_visitor_data()
+    org_info = load_org_info()
+    users_list = [dict(v, id=k) for k, v in current_data.items()]
     summary_stats = {
-        "total_users": total_users,
-        "total_bonuses": total_bonuses,
-        "total_debts": total_debts,
-        "users_with_debt": users_with_debt
+        "total_users": len(users_list),
+        "total_bonuses": sum(u.get('bonuses', 0) for u in users_list),
+        "total_debts": sum(u.get('debts', 0) for u in users_list),
+        "users_with_debt": sum(1 for u in users_list if u.get('debts', 0) > 0)
     }
+    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, org_info=org_info)
 
-    # Need a Jinja filter to_json to pass complex objects to JS
-    def to_json(obj):
-        return json.dumps(obj)
-    app.jinja_env.filters['tojson'] = to_json
-
-    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, contact_info=contact_info)
-
-@app.route('/admin/save_contact_info', methods=['POST'])
-def save_contact_info_route():
+@app.route('/admin/update_organization_info', methods=['POST'])
+def update_organization_info():
     try:
-        data = request.get_json()
-        # Basic validation/cleaning
-        contact_info = {
-            'name': data.get('name', '').strip(),
-            'phone': data.get('phone', '').strip(),
-            'whatsapp': data.get('phone', '').strip(), # Use phone for whatsapp link
-            'telegram': data.get('telegram', '').strip(),
-            'address': data.get('address', '').strip(),
-            'website': data.get('website', '').strip(),
+        data = request.form
+        phones = [p.strip() for p in data.get('phones', '').splitlines() if p.strip()]
+        links_raw = [p.strip() for p in data.get('links', '').splitlines() if p.strip()]
+        links = []
+        for line in links_raw:
+            parts = [p.strip() for p in line.split(',', 1)]
+            if len(parts) == 2:
+                links.append({"label": parts[0], "url": parts[1]})
+
+        org_info = {
+            "name": data.get('name', ''),
+            "phones": phones,
+            "address": data.get('address', ''),
+            "links": links
         }
-        save_org_contact_info(contact_info)
-        return jsonify({"status": "ok", "message": "Contact info updated successfully"}), 200
-    except Exception as e:
-        logging.exception("Error in /admin/save_contact_info endpoint")
-        return jsonify({"status": "error", "message": str(e)}), 500
-
-
+        save_org_info(org_info)
+        return redirect(url_for('admin_panel'))
+    except Exception:
+        return "Error", 500
+        
 @app.route('/admin/add_client', methods=['POST'])
 def add_client():
     try:
         data = request.get_json()
-        phone_number = data.get('phone_number', '').strip()
-        first_name = data.get('first_name', '').strip()
-
+        phone_number = data.get('phone_number')
+        first_name = data.get('first_name')
         if not phone_number or not first_name:
             return jsonify({"status": "error", "message": "Имя и номер телефона обязательны."}), 400
-
-        all_data = load_full_data().get('users', {})
-
-        # Check for existing client with this phone number
-        for user in all_data.values():
-            if user.get('phone_number') == phone_number:
-                return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
-            # Also check if this phone number is already linked to a Telegram user
-            if user.get('telegram_id') is not None and user.get('phone_number') == phone_number:
-                 return jsonify({"status": "error", "message": "Этот номер телефона уже привязан к клиенту Telegram."}), 409
-
-
-        now_bishkek = datetime.now(BISHKEK_TZ)
+        all_data = load_visitor_data()
+        if any(u.get('phone_number') == phone_number for u in all_data.values()):
+            return jsonify({"status": "error", "message": "Клиент с таким номером уже существует."}), 409
+        now = datetime.now(BISHKEK_TZ)
         new_id = generate_unique_id(all_data)
-
         new_client = {
-            'id': new_id,
-            'telegram_id': None, # Manually added clients have no TG ID initially
-            'first_name': first_name,
-            'last_name': None,
-            'username': None,
-            'photo_url': None,
-            'language_code': 'ru', # Default language
-            'is_premium': False,
-            'phone_number': phone_number,
-            'created_at': now_bishkek.timestamp(), # Track creation date
-            'created_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
-            'visited_at': now_bishkek.timestamp(), # Same as created initially
-            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
-            'bonuses': 0,
-            'history': [],
-            'debts': 0,
-            'debt_history': [],
-            'invoices': [] # Initialize invoices list
+            'id': new_id, 'telegram_id': None, 'first_name': first_name, 'phone_number': phone_number,
+            'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': [],
+            'visited_at': now.timestamp(), 'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
+            'last_name': None, 'username': None, 'photo_url': None
         }
-
         save_visitor_data({new_id: new_client})
-
-        return jsonify({"status": "ok", "message": "Client added successfully"}), 201
-
+        return jsonify({"status": "ok", "message": "Клиент успешно добавлен!"}), 201
     except Exception as e:
-        logging.exception("Error in /admin/add_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
     try:
         data = request.get_json()
-        user_id = data.get('user_id')
-        purchase_amount = float(data.get('purchase_amount', 0))
-        deduct_amount = float(data.get('deduct_amount', 0))
-        add_debt_amount = float(data.get('add_debt_amount', 0))
-        repay_debt_amount = float(data.get('repay_debt_amount', 0))
-
-        if not user_id:
-            return jsonify({"status": "error", "message": "User ID is required"}), 400
-
-        user_id_str = str(user_id)
-        all_data = load_full_data().get('users', {})
-
-        if user_id_str not in all_data:
-            return jsonify({"status": "error", "message": "User not found"}), 404
-
-        user = all_data[user_id_str]
-        now_bishkek = datetime.now(BISHKEK_TZ)
-        now_iso = now_bishkek.isoformat()
-        now_str = now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
-
-        current_bonuses = user.get('bonuses', 0)
-        current_debts = user.get('debts', 0)
-
-        if deduct_amount > (current_bonuses + 0.001): # Allow for minor float inaccuracies
-             return jsonify({"status": "error", "message": f"Недостаточно бонусов для списания. Доступно: {current_bonuses:.2f}"}), 400
-
-        if repay_debt_amount > (current_debts + 0.001): # Allow for minor float inaccuracies
-            return jsonify({"status": "error", "message": f"Сумма погашения ({repay_debt_amount:.2f}) превышает текущий долг ({current_debts:.2f})."}), 400
-
-        # Bonus operations
-        accrual_amount = purchase_amount * 0.02
-        user['bonuses'] = current_bonuses + accrual_amount - deduct_amount
-
-        if 'history' not in user or not isinstance(user['history'], list):
-            user['history'] = []
-
-        new_bonus_debt_history = []
-
-        if accrual_amount > 0.001: # Only add if significant amount
-            entry = {
-                "type": "accrual", "amount": round(accrual_amount, 2),
-                "description": f"Начисление с покупки {round(purchase_amount, 2)} ₽",
-                "date": now_iso, "date_str": now_str,
-                "transaction_type": "bonus"
-            }
-            user['history'].append(entry)
-            new_bonus_debt_history.append(entry)
-
-        if deduct_amount > 0.001: # Only add if significant amount
-            entry = {
-                "type": "deduction", "amount": round(deduct_amount, 2),
-                "description": "Списание бонусов",
-                "date": now_iso, "date_str": now_str,
-                "transaction_type": "bonus"
-            }
-            user['history'].append(entry)
-            new_bonus_debt_history.append(entry)
-
-        # Debt operations
-        user['debts'] = current_debts + add_debt_amount - repay_debt_amount
-
-        if 'debt_history' not in user or not isinstance(user['debt_history'], list):
-            user['debt_history'] = []
-
-        if add_debt_amount > 0.001: # Only add if significant amount
-            entry = {
-                "type": "accrual", "amount": round(add_debt_amount, 2),
-                "description": "Добавление долга",
-                "date": now_iso, "date_str": now_str,
-                "transaction_type": "debt"
-            }
-            user['debt_history'].append(entry)
-            new_bonus_debt_history.append(entry)
-
-        if repay_debt_amount > 0.001: # Only add if significant amount
-            entry = {
-                "type": "payment", "amount": round(repay_debt_amount, 2),
-                "description": "Погашение долга",
-                "date": now_iso, "date_str": now_str,
-                 "transaction_type": "debt"
-            }
-            user['debt_history'].append(entry)
-            new_bonus_debt_history.append(entry)
-
-        # Ensure bonuses and debts are rounded for storage
-        user['bonuses'] = round(user.get('bonuses', 0), 2)
-        user['debts'] = round(user.get('debts', 0), 2)
-
-
-        save_visitor_data({user_id_str: user}) # Use save_visitor_data to trigger full save
-
-        return jsonify({
-            "status": "ok", "message": "Transaction successful",
-            "new_balance": user['bonuses'], "new_debt": user['debts'],
-            "history_entries": new_bonus_debt_history # Return new entries to update UI
-        }), 200
+        user_id, purchase, deduct = str(data.get('user_id')), float(data.get('purchase_amount', 0)), float(data.get('deduct_amount', 0))
+        add_debt, repay_debt = float(data.get('add_debt_amount', 0)), float(data.get('repay_debt_amount', 0))
+        all_data = load_visitor_data()
+        if user_id not in all_data: return jsonify({"status": "error", "message": "User not found"}), 404
+        user = all_data[user_id]
+        now = datetime.now(BISHKEK_TZ)
+        
+        accrual_amount = purchase * 0.02
+        new_balance = user.get('bonuses', 0) + accrual_amount
+        if deduct > new_balance: return jsonify({"status": "error", "message": "Недостаточно бонусов для списания"}), 400
+        user['bonuses'] = new_balance - deduct
+        
+        if accrual_amount > 0: user.setdefault('history', []).append({"type": "accrual", "amount": accrual_amount, "description": f"Начисление с покупки {purchase}", "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S')})
+        if deduct > 0: user.setdefault('history', []).append({"type": "deduction", "amount": deduct, "description": "Списание бонусов", "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S')})
+        
+        if repay_debt > user.get('debts', 0): return jsonify({"status": "error", "message": "Сумма погашения превышает долг"}), 400
+        user['debts'] = user.get('debts', 0) + add_debt - repay_debt
 
+        if add_debt > 0: user.setdefault('debt_history', []).append({"type": "accrual", "amount": add_debt, "description": "Добавление долга", "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S')})
+        if repay_debt > 0: user.setdefault('debt_history', []).append({"type": "payment", "amount": repay_debt, "description": "Погашение долга", "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S')})
+        
+        save_visitor_data({user_id: user})
+        return jsonify({"status": "ok", "message": "Операция успешна"}), 200
     except Exception as e:
-        logging.exception("Error in /admin/add_transaction endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/admin/add_invoice', methods=['POST'])
 def add_invoice():
     try:
         data = request.get_json()
-        user_id = data.get('user_id')
-        description = data.get('description', '').strip()
+        user_id = str(data.get('user_id'))
         items = data.get('items', [])
-
-        if not user_id:
-            return jsonify({"status": "error", "message": "User ID is required"}), 400
-        if not items:
-             return jsonify({"status": "error", "message": "Invoice must contain at least one item."}), 400
-
-        user_id_str = str(user_id)
-        all_data = load_full_data().get('users', {})
-
-        if user_id_str not in all_data:
+        if not user_id or not items:
+            return jsonify({"status": "error", "message": "Требуется ID пользователя и товары"}), 400
+        
+        all_data = load_visitor_data()
+        if user_id not in all_data:
             return jsonify({"status": "error", "message": "User not found"}), 404
-
-        user = all_data[user_id_str]
-        now_bishkek = datetime.now(BISHKEK_TZ)
-        now_iso = now_bishkek.isoformat()
-        now_str = now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
-
-        total_amount = 0
-        processed_items = []
-        for item in items:
-            name = item.get('name', '').strip()
-            quantity = float(item.get('quantity', 0))
-            price_per_unit = float(item.get('price_per_unit', 0))
-
-            if not name or quantity <= 0 or price_per_unit < 0:
-                 # Log invalid item but maybe continue or return error? Let's return error for data integrity.
-                 logging.warning(f"Invalid item data for user {user_id}: {item}")
-                 return jsonify({"status": "error", "message": "Invalid item data detected."}), 400
-
-            item_total = quantity * price_per_unit
-            total_amount += item_total
-            processed_items.append({
-                "name": name,
-                "quantity": round(quantity, 2),
-                "price_per_unit": round(price_per_unit, 2)
-            })
-
-        if 'invoices' not in user or not isinstance(user['invoices'], list):
-             user['invoices'] = []
-
-        invoice_id = len(user['invoices']) + 1 # Simple sequential ID per user
-
+        
+        user = all_data[user_id]
+        now = datetime.now(BISHKEK_TZ)
+        invoice_id = f"{int(now.timestamp()) % 100000}{random.randint(10,99)}"
+        
+        total_amount = sum(float(item.get('quantity', 0)) * float(item.get('price_per_unit', 0)) for item in items)
+        
         new_invoice = {
-            "invoice_id": invoice_id,
-            "date": now_iso,
-            "date_str": now_str,
-            "description": description,
-            "items": processed_items,
-            "total_amount": round(total_amount, 2)
+            "id": invoice_id,
+            "date": now.isoformat(),
+            "date_str": now.strftime('%Y-%m-%d %H:%M:%S'),
+            "items": items,
+            "total_amount": total_amount
         }
-
-        user['invoices'].append(new_invoice)
-
-        save_visitor_data({user_id_str: user}) # Use save_visitor_data to trigger full save
-
-        # Return the new invoice entry formatted for history display
-        invoice_entry_for_history = {
-            "date": new_invoice["date"],
-            "date_str": new_invoice["date_str"],
-            "description": new_invoice["description"] or f"Накладная #{new_invoice['invoice_id']}",
-            "total_amount": new_invoice["total_amount"],
-            "transaction_type": 'invoice'
-        }
-
-
-        return jsonify({
-            "status": "ok",
-            "message": "Invoice added successfully",
-            "invoice_entry": new_invoice, # Return full invoice data
-             "history_entry": invoice_entry_for_history # Return entry formatted for history list
-            }), 201
-
+        
+        user.setdefault('invoices', []).append(new_invoice)
+        save_visitor_data({user_id: user})
+        
+        return jsonify({"status": "ok", "message": "Накладная успешно сохранена!"}), 201
     except Exception as e:
-        logging.exception("Error in /admin/add_invoice endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-
 @app.route('/admin/delete_client', methods=['POST'])
 def delete_client():
     try:
-        data = request.get_json()
-        user_id = data.get('user_id')
-
-        if not user_id:
-            return jsonify({"status": "error", "message": "User ID is required"}), 400
-
-        user_id_str = str(user_id)
-        load_full_data() # Ensure cache is loaded
-
+        user_id = str(request.get_json().get('user_id'))
+        if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
+        load_visitor_data()
         with _data_lock:
-            if user_id_str not in visitor_data_cache:
-                return jsonify({"status": "error", "message": "User not found"}), 404
-
-            user_to_delete = visitor_data_cache[user_id_str]
-            # Prevent deletion of users linked to Telegram accounts
-            if user_to_delete.get('telegram_id') is not None:
-                return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
-
-            del visitor_data_cache[user_id_str]
-
-        save_full_data() # Save locally and trigger HF upload
-
-        return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
-
+            if user_id not in visitor_data_cache: return jsonify({"status": "error", "message": "User not found"}), 404
+            if visitor_data_cache[user_id].get('telegram_id') is not None: return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
+            del visitor_data_cache[user_id]
+            with open(DATA_FILE, 'w', encoding='utf-8') as f:
+                json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+            upload_data_to_hf_async()
+        return jsonify({"status": "ok", "message": "Клиент удален"}), 200
     except Exception as e:
-        logging.exception("Error in /admin/delete_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 if __name__ == '__main__':
-    print("--- BONUS SYSTEM SERVER ---")
-    print(f"Server starting on http://{HOST}:{PORT}")
-    if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
-         print("WARNING: Hugging Face token(s) not set. Backup/restore functionality will be limited.")
-    else:
-         print("Attempting initial data download from Hugging Face...")
-         download_data_from_hf()
-
-    load_full_data() # Initial load into cache
-
-    print("WARNING: The /admin route is NOT protected. Implement proper authentication for production.")
-
+    if HF_TOKEN_READ:
+        download_files_from_hf()
+    load_visitor_data()
+    load_org_info()
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
-        print("Periodic backup thread started (every hour).")
-
-    print("--- Server Ready ---")
-    app.run(host=HOST, port=PORT, debug=False)
+    app.run(host=HOST, port=PORT, debug=False)
\ No newline at end of file