diff --git a/src/app/accounts/page.tsx b/src/app/accounts/page.tsx
index fdb58d9..e1a4c25 100644
--- a/src/app/accounts/page.tsx
+++ b/src/app/accounts/page.tsx
@@ -442,7 +442,7 @@ export default function AccountsPage() {
                     <div style={{ display: 'flex', alignItems: 'center', gap: '4px' }}>
                       <button
                         className="btn-ghost"
-                        onClick={() => openTransactionModal('transfer', undefined)}
+                        onClick={() => openTransactionModal('transfer', card.id)}
                         title="Pay credit card bill"
                         style={{ fontSize: '0.75rem', color: 'var(--brand-primary)', fontWeight: 600 }}
                       >
diff --git a/src/app/api/transfers/route.ts b/src/app/api/transfers/route.ts
index 0fdc02d..69b4d2b 100644
--- a/src/app/api/transfers/route.ts
+++ b/src/app/api/transfers/route.ts
@@ -25,6 +25,7 @@ export async function POST(req: Request) {
       date: body.date,
       destinationAccountId: body.toAccountId,
       notes: body.notes,
+      tags: body.tags,
     });
 
     return NextResponse.json({ transfer: result }, { status: 201 });
diff --git a/src/app/loans/page.tsx b/src/app/loans/page.tsx
index 50f20f3..2dcb542 100644
--- a/src/app/loans/page.tsx
+++ b/src/app/loans/page.tsx
@@ -445,9 +445,9 @@ export default function LoansPage() {
                   </div>
                   <div>
                     <div style={{ fontSize: '0.72rem', fontWeight: 600, color: 'var(--text-muted)', letterSpacing: '0.04em' }}>
-                      {isEmi ? 'REMAINING BALANCE' : 'OUTSTANDING PRINCIPAL'}
+                      {isEmi ? 'REMAINING BALANCE' : 'OUTSTANDING BALANCE'}
                     </div>
-                    <MoneyDisplay amount={loan.outstanding_principal} size="lg" weight="bold" colored />
+                    <MoneyDisplay amount={loan.remainingBalance ?? loan.outstanding_principal} size="lg" weight="bold" colored />
                   </div>
                   <div>
                     <div style={{ fontSize: '0.72rem', fontWeight: 600, color: 'var(--text-muted)', letterSpacing: '0.04em' }}>
@@ -469,8 +469,8 @@ export default function LoansPage() {
                 <div>
                   <div style={{ display: 'flex', justifyContent: 'space-between', fontSize: '0.75rem', marginBottom: '0.25rem' }}>
                     <span>
-                      Principal Repaid: ₹{Math.round(loan.paidPrincipal / 100).toLocaleString('en-IN')} of ₹
-                      {Math.round(loan.principal / 100).toLocaleString('en-IN')}
+                      Repaid: ₹{Math.round((loan.totalPaid ?? loan.paidPrincipal) / 100).toLocaleString('en-IN')} of ₹
+                      {Math.round((loan.totalPayable ?? loan.principal) / 100).toLocaleString('en-IN')}
                     </span>
                     <span style={{ fontWeight: 600, color: 'var(--color-income)' }}>{loan.progressPercent}% Completed</span>
                   </div>
@@ -517,8 +517,8 @@ export default function LoansPage() {
                               <td style={{ padding: '0.4rem 0.75rem', textAlign: 'right', color: 'var(--color-expense)' }}>
                                 ₹{Math.round(row.interestComponent / 100).toLocaleString('en-IN')}
                               </td>
-                              <td style={{ padding: '0.4rem 0.75rem', textAlign: 'right' }}>
-                                ₹{Math.round(row.remainingPrincipal / 100).toLocaleString('en-IN')}
+                              <td style={{ padding: '0.4rem 0.75rem', textAlign: 'right', fontWeight: 600 }}>
+                                ₹{Math.round((row.remainingBalance ?? row.remainingPrincipal) / 100).toLocaleString('en-IN')}
                               </td>
                             </tr>
                           ))}
diff --git a/src/app/reports/page.tsx b/src/app/reports/page.tsx
index b88b5b9..21e8d36 100644
--- a/src/app/reports/page.tsx
+++ b/src/app/reports/page.tsx
@@ -356,7 +356,7 @@ function ExpenseDonutChart({
           letterSpacing="0.04em"
           style={{ textTransform: 'uppercase' }}
         >
-          {activeSlice ? (activeSlice.name.length > 14 ? activeSlice.name.substring(0, 12) + '…' : activeSlice.name) : 'TOTAL SPENT'}
+          {activeSlice ? (activeSlice.name.length > 14 ? activeSlice.name.substring(0, 12) + '…' : activeSlice.name) : (analyticsLabel === 'Tag' ? 'TOTAL TAGGED' : 'TOTAL SPENT')}
         </text>
 
         <text
@@ -378,7 +378,7 @@ function ExpenseDonutChart({
           fontSize="11"
           fontWeight="600"
         >
-          {activeSlice ? `${activeSlice.percentage}% of total` : `${slices.length} ${analyticsLabel.toLowerCase()}s`}
+          {activeSlice ? `${activeSlice.percentage}% of ${analyticsLabel === 'Tag' ? 'tagged' : 'total'}` : `${slices.length} ${analyticsLabel.toLowerCase()}s`}
         </text>
       </svg>
     </div>
@@ -493,7 +493,9 @@ export default function ReportsPage() {
   const savingsRate = totalMonthIncome > 0 ? Math.round(((totalMonthIncome - totalMonthSpend) / totalMonthIncome) * 100) : 0;
 
   // Active analytics data based on view mode
+  const totalTaggedSpend = useMemo(() => spendingByTag.reduce((acc: number, t: any) => acc + (t.total || 0), 0), [spendingByTag]);
   const activeAnalytics = analyticsView === 'category' ? spendingByCategory : spendingByTag;
+  const activeAnalyticsTotal = analyticsView === 'category' ? totalMonthSpend : totalTaggedSpend;
   const analyticsLabel = analyticsView === 'category' ? 'Category' : 'Tag';
 
   return (
@@ -1101,7 +1103,7 @@ export default function ReportsPage() {
                 >
                   <ExpenseDonutChart
                     items={activeAnalytics}
-                    totalSpend={totalMonthSpend}
+                    totalSpend={activeAnalyticsTotal}
                     analyticsLabel={analyticsLabel}
                     hoveredId={hoveredAnalyticsId}
                     onHover={setHoveredAnalyticsId}
@@ -1156,7 +1158,7 @@ export default function ReportsPage() {
                 <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '1.25rem', padding: '0.5rem 0' }}>
                   <ExpenseDonutChart
                     items={activeAnalytics}
-                    totalSpend={totalMonthSpend}
+                    totalSpend={activeAnalyticsTotal}
                     analyticsLabel={analyticsLabel}
                     hoveredId={hoveredAnalyticsId}
                     onHover={setHoveredAnalyticsId}
diff --git a/src/components/TransactionModal.tsx b/src/components/TransactionModal.tsx
index b2c5d12..b562662 100644
--- a/src/components/TransactionModal.tsx
+++ b/src/components/TransactionModal.tsx
@@ -233,13 +233,28 @@ export const TransactionModal = () => {
             setAccounts(d.accounts);
             if (!editingTransaction) {
               if (preselectedAccountId) {
-                setAccountId(preselectedAccountId);
+                const preselectedAcc = d.accounts.find((a: any) => a.id === preselectedAccountId);
+                if (preselectedAcc && preselectedAcc.type === 'credit_card' && transactionModalType === 'transfer') {
+                  const defaultBank = d.accounts.find((a: any) => a.id !== preselectedAcc.id && a.type !== 'credit_card') || d.accounts.find((a: any) => a.id !== preselectedAcc.id);
+                  if (defaultBank) setAccountId(defaultBank.id);
+                  setDestinationAccountId(preselectedAcc.id);
+                  setSelectedTags(prev => prev.some(t => t.name.toLowerCase() === 'cc-repayment') ? prev : [...prev, { id: 'cc-repayment', name: 'cc-repayment', color: '#3B82F6' }]);
+                } else {
+                  setAccountId(preselectedAccountId);
+                  const otherAcc = d.accounts.find((a: any) => a.id !== preselectedAccountId);
+                  if (otherAcc) setDestinationAccountId(otherAcc.id);
+                }
               } else {
                 const defaultAcc = d.accounts.find((a: any) => Boolean(a.is_default)) || d.accounts[0];
                 if (defaultAcc) {
                   setAccountId(defaultAcc.id);
                   const otherAcc = d.accounts.find((a: any) => a.id !== defaultAcc.id);
-                  if (otherAcc) setDestinationAccountId(otherAcc.id);
+                  if (otherAcc) {
+                    setDestinationAccountId(otherAcc.id);
+                    if (otherAcc.type === 'credit_card' && transactionModalType === 'transfer') {
+                      setSelectedTags(prev => prev.some(t => t.name.toLowerCase() === 'cc-repayment') ? prev : [...prev, { id: 'cc-repayment', name: 'cc-repayment', color: '#3B82F6' }]);
+                    }
+                  }
                 }
               }
             }
@@ -517,6 +532,7 @@ export const TransactionModal = () => {
             amount: minorAmount,
             date,
             notes,
+            tags: selectedTags.map(t => t.name),
           }),
         });
         const data = await res.json();
@@ -1006,7 +1022,14 @@ export const TransactionModal = () => {
                 <select
                   className="form-select"
                   value={destinationAccountId}
-                  onChange={e => setDestinationAccountId(e.target.value)}
+                  onChange={e => {
+                    const newDestId = e.target.value;
+                    setDestinationAccountId(newDestId);
+                    const destAcc = accounts.find(a => a.id === newDestId);
+                    if (destAcc && destAcc.type === 'credit_card') {
+                      setSelectedTags(prev => prev.some(t => t.name.toLowerCase() === 'cc-repayment') ? prev : [...prev, { id: 'cc-repayment', name: 'cc-repayment', color: '#3B82F6' }]);
+                    }
+                  }}
                 >
                   {accounts.map(acc => {
                     const bal = acc.isLiability ? (acc.totalDebt ?? acc.current_balance) : acc.current_balance;
diff --git a/src/lib/db.ts b/src/lib/db.ts
index 00a481e..7cf938f 100644
--- a/src/lib/db.ts
+++ b/src/lib/db.ts
@@ -481,6 +481,24 @@ export function initSchema(db: DatabaseSync) {
   try {
     db.exec(`UPDATE users SET owner_email = email WHERE owner_email IS NULL OR owner_email = ''`);
     db.exec(`CREATE INDEX IF NOT EXISTS idx_users_owner_email ON users(owner_email)`);
+
+    // Ensure cc-repayment tag exists for users who have credit cards
+    db.exec(`
+      INSERT OR IGNORE INTO tags (id, user_id, name, color)
+      SELECT DISTINCT 'tag_' || a.user_id || '_ccrepayment', a.user_id, 'cc-repayment', '#3B82F6'
+      FROM accounts a
+      WHERE a.type = 'credit_card';
+    `);
+
+    // Backfill cc-repayment tag link on credit card transfers
+    db.exec(`
+      INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id)
+      SELECT t.id, tg.id
+      FROM transactions t
+      JOIN accounts a ON a.id = COALESCE(t.destination_account_id, t.transfer_peer_account_id)
+      JOIN tags tg ON tg.user_id = t.user_id AND LOWER(tg.name) = 'cc-repayment'
+      WHERE t.type = 'transfer' AND a.type = 'credit_card';
+    `);
   } catch {
     // Ignore
   }
diff --git a/src/lib/finance-service.ts b/src/lib/finance-service.ts
index 04ec9da..8824e37 100644
--- a/src/lib/finance-service.ts
+++ b/src/lib/finance-service.ts
@@ -604,13 +604,37 @@ export class FinanceService {
         accountId
       );
 
+      // Collect tags: user-provided tags + tags extracted from notes
+      const finalTags: string[] = Array.isArray(tags) ? [...tags] : [];
+
+      if (notes) {
+        const matches = (notes.match(/#[a-zA-Z0-9_\-]+/g) || []).map((t: string) => t.replace(/^#/, ''));
+        finalTags.push(...matches);
+      }
+
+      // Auto-detect Credit Card repayment (destAccount or account is credit card, or notes indicate cc repayment)
+      const isCcRepayment =
+        destAccount.type === 'credit_card' ||
+        account.type === 'credit_card' ||
+        /cc[-_\s]?repay|credit\s*card\s*repay|credit\s*card\s*bill|cc\s*bill|card\s*payment/i.test(notes || '');
+
+      if (isCcRepayment) {
+        const hasCcTag = finalTags.some(t => {
+          const c = t.trim().replace(/^#/, '').toLowerCase();
+          return c === 'cc-repayment' || c === 'cc_repayment' || c === 'ccrepayment';
+        });
+        if (!hasCcTag) {
+          finalTags.push('cc-repayment');
+        }
+      }
+
       // Save tags for transfer legs
-      if (tags.length > 0) {
+      if (finalTags.length > 0) {
         const linkInsert = this.db.prepare(`
           INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id) VALUES (?, ?)
         `);
 
-        for (const tag of tags) {
+        for (const tag of finalTags) {
           const cleanTag = tag.trim().replace(/^#/, '');
           if (!cleanTag) continue;
           const tagObj = this.createTag(userId, cleanTag);
@@ -668,13 +692,19 @@ export class FinanceService {
       }
     }
 
-    // Save tags
-    if (tags.length > 0) {
+    // Save tags (user provided + extracted from notes)
+    const finalTags: string[] = Array.isArray(tags) ? [...tags] : [];
+    if (notes) {
+      const matches = (notes.match(/#[a-zA-Z0-9_\-]+/g) || []).map((t: string) => t.replace(/^#/, ''));
+      finalTags.push(...matches);
+    }
+
+    if (finalTags.length > 0) {
       const linkInsert = this.db.prepare(`
         INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id) VALUES (?, ?)
       `);
 
-      for (const tag of tags) {
+      for (const tag of finalTags) {
         const cleanTag = tag.trim().replace(/^#/, '');
         if (!cleanTag) continue;
         const tagObj = this.createTag(userId, cleanTag);
@@ -787,16 +817,39 @@ export class FinanceService {
         `).run(newDestAccountId, newAmount, newDate, newNotes, newAccountId, newStatus, inLeg.id);
       }
 
-      // Update tags if provided for transfer legs
-      if (data.tags !== undefined) {
-        const txIds = [outLeg?.id, inLeg?.id].filter(Boolean);
+      // Update tags for transfer legs
+      let tagsToApply = data.tags !== undefined ? [...data.tags] : undefined;
+      if (tagsToApply !== undefined && newNotes) {
+        const matches = (newNotes.match(/#[a-zA-Z0-9_\-]+/g) || []).map((t: string) => t.replace(/^#/, ''));
+        tagsToApply.push(...matches);
+      }
+
+      const destAcc = this.getAccountById(newDestAccountId, userId);
+      const srcAcc = this.getAccountById(newAccountId, userId);
+      const isCcRepayment =
+        (destAcc && destAcc.type === 'credit_card') ||
+        (srcAcc && srcAcc.type === 'credit_card') ||
+        /cc[-_\s]?repay|credit\s*card\s*repay|credit\s*card\s*bill|cc\s*bill|card\s*payment/i.test(newNotes || '');
+
+      if (tagsToApply !== undefined && isCcRepayment) {
+        const hasCcTag = tagsToApply.some(t => {
+          const c = t.trim().replace(/^#/, '').toLowerCase();
+          return c === 'cc-repayment' || c === 'cc_repayment' || c === 'ccrepayment';
+        });
+        if (!hasCcTag) {
+          tagsToApply.push('cc-repayment');
+        }
+      }
+
+      const txIds = [outLeg?.id, inLeg?.id].filter(Boolean);
+      if (tagsToApply !== undefined) {
         for (const tid of txIds) {
           this.db.prepare('DELETE FROM transaction_tags WHERE transaction_id = ?').run(tid);
-          if (data.tags.length > 0) {
+          if (tagsToApply.length > 0) {
             const linkInsert = this.db.prepare(`
               INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id) VALUES (?, ?)
             `);
-            for (const tag of data.tags) {
+            for (const tag of tagsToApply) {
               const cleanTag = tag.trim().replace(/^#/, '');
               if (!cleanTag) continue;
               const tagObj = this.createTag(userId, cleanTag);
@@ -804,6 +857,14 @@ export class FinanceService {
             }
           }
         }
+      } else if (isCcRepayment) {
+        const tagObj = this.createTag(userId, 'cc-repayment');
+        const linkInsert = this.db.prepare(`
+          INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id) VALUES (?, ?)
+        `);
+        for (const tid of txIds) {
+          linkInsert.run(tid, tagObj.id);
+        }
       }
 
       oldAccountsToRecalc.add(newAccountId);
@@ -856,12 +917,18 @@ export class FinanceService {
 
     // Update tags if provided
     if (data.tags !== undefined) {
+      const expenseTags = [...data.tags];
+      if (newNotes) {
+        const matches = (newNotes.match(/#[a-zA-Z0-9_\-]+/g) || []).map((t: string) => t.replace(/^#/, ''));
+        expenseTags.push(...matches);
+      }
+
       this.db.prepare('DELETE FROM transaction_tags WHERE transaction_id = ?').run(id);
-      if (data.tags.length > 0) {
+      if (expenseTags.length > 0) {
         const linkInsert = this.db.prepare(`
           INSERT OR IGNORE INTO transaction_tags (transaction_id, tag_id) VALUES (?, ?)
         `);
-        for (const tag of data.tags) {
+        for (const tag of expenseTags) {
           const cleanTag = tag.trim().replace(/^#/, '');
           if (!cleanTag) continue;
           const tagObj = this.createTag(userId, cleanTag);
@@ -1196,7 +1263,7 @@ export class FinanceService {
         principalComponent = remainingPrincipal;
         emi = principalComponent + interestComponent;
       }
-      remainingPrincipal -= principalComponent;
+      remainingPrincipal = Math.max(0, remainingPrincipal - principalComponent);
       totalInterest += interestComponent;
 
       const dateObj = new Date(year, month - 1 + i, 1);
@@ -1212,13 +1279,22 @@ export class FinanceService {
       });
     }
 
+    const totalRepayment = principal + totalInterest;
+
+    // Remaining balance after each installment, subtracted from Principal + Net Interest
+    let cumulativePaid = 0;
+    for (const entry of schedule) {
+      cumulativePaid += entry.emi;
+      (entry as any).remainingBalance = Math.max(0, totalRepayment - cumulativePaid);
+    }
+
     return {
       principal,
       annualInterestRate,
       tenureMonths,
       monthlyEmi: emi,
       totalInterest,
-      totalRepayment: principal + totalInterest,
+      totalRepayment,
       schedule,
     };
   }
@@ -1779,10 +1855,6 @@ export class FinanceService {
     `).all(userId) as any[];
 
     return loans.map(loan => {
-      const paidPrincipal = loan.principal - loan.outstanding_principal;
-      const progressPercent = loan.principal > 0
-        ? Math.round((paidPrincipal / loan.principal) * 100)
-        : 0;
       const amortization = this.calculateLoanAmortization(
         loan.principal,
         loan.interest_rate,
@@ -1790,10 +1862,24 @@ export class FinanceService {
         loan.start_date
       );
 
+      const totalPayable = amortization.totalRepayment; // Principal + Net Interest
+      const remainingRatio = loan.principal > 0 ? (loan.outstanding_principal / loan.principal) : 0;
+      // Remaining total balance (principal + remaining interest)
+      const remainingBalance = Math.round(totalPayable * remainingRatio);
+      const totalPaid = Math.max(0, totalPayable - remainingBalance);
+      const paidPrincipal = loan.principal - loan.outstanding_principal;
+      const progressPercent = totalPayable > 0
+        ? Math.min(100, Math.round((totalPaid / totalPayable) * 100))
+        : 0;
+
       return {
         ...loan,
         type: loan.type || 'loan',
         notes: loan.notes || '',
+        totalPayable,
+        totalInterest: amortization.totalInterest,
+        totalPaid,
+        remainingBalance,
         paidPrincipal,
         progressPercent,
         amortization,
@@ -2063,17 +2149,6 @@ export class FinanceService {
   getSpendingByTag(userId: string, monthStr?: string) {
     const month = monthStr || new Date().toISOString().substring(0, 7);
 
-    // Total expense for the month across all transactions
-    const totalRow = this.db.prepare(`
-      SELECT COALESCE(SUM(amount), 0) as total
-      FROM transactions
-      WHERE user_id = ?
-        AND type = 'expense'
-        AND is_deleted = 0
-        AND date LIKE ?
-    `).get(userId, `${month}%`) as any;
-    const totalExpense = totalRow?.total || 0;
-
     // Tagged transactions
     const taggedRows = this.db.prepare(`
       SELECT tg.id, tg.name, tg.color, SUM(t.amount) as total, COUNT(t.id) as count
@@ -2088,34 +2163,12 @@ export class FinanceService {
       ORDER BY total DESC
     `).all(userId, `${month}%`) as any[];
 
-    // Untagged transactions (expense transactions with no tags in transaction_tags)
-    const untaggedRow = this.db.prepare(`
-      SELECT COALESCE(SUM(t.amount), 0) as total, COUNT(t.id) as count
-      FROM transactions t
-      WHERE t.user_id = ?
-        AND t.type = 'expense'
-        AND t.is_deleted = 0
-        AND t.date LIKE ?
-        AND NOT EXISTS (
-          SELECT 1 FROM transaction_tags tt WHERE tt.transaction_id = t.id
-        )
-    `).get(userId, `${month}%`) as any;
-
-    const allRows = [...taggedRows];
-    if (untaggedRow && untaggedRow.total > 0) {
-      allRows.push({
-        id: 'untagged',
-        name: 'Untagged',
-        color: '#94A3B8',
-        total: untaggedRow.total,
-        count: untaggedRow.count,
-      });
-      allRows.sort((a: any, b: any) => b.total - a.total);
-    }
+    // Total of tagged expenses only
+    const totalTaggedExpense = taggedRows.reduce((sum: number, r: any) => sum + r.total, 0);
 
-    return allRows.map((r: any) => ({
+    return taggedRows.map((r: any) => ({
       ...r,
-      percentage: totalExpense > 0 ? Math.round((r.total / totalExpense) * 100) : 0,
+      percentage: totalTaggedExpense > 0 ? Math.round((r.total / totalTaggedExpense) * 100) : 0,
     }));
   }
 
diff --git a/tests/finance-service.test.ts b/tests/finance-service.test.ts
index 029bee8..d0995b2 100644
--- a/tests/finance-service.test.ts
+++ b/tests/finance-service.test.ts
@@ -596,6 +596,47 @@ describe('Finance Domain Business Logic Tests', () => {
     }
   });
 
+  it('automatically attaches cc-repayment tag to credit card transfers without explicit tags', () => {
+    const sbi = service.createAccount({
+      userId,
+      name: 'SBI Bank',
+      type: 'savings',
+      openingBalance: 10000000,
+    })!;
+
+    const card = service.createAccount({
+      userId,
+      name: 'Axis Bank Credit Card',
+      type: 'credit_card',
+      openingBalance: 0,
+      creditLimit: 5000000,
+    })!;
+
+    // Create transfer to credit card with NO explicit tags passed
+    const transfer = service.createTransaction({
+      userId,
+      accountId: sbi.id,
+      destinationAccountId: card.id,
+      type: 'transfer',
+      amount: 1500000,
+      date: '2026-03-20',
+      notes: 'Monthly Bill payment #march-bill',
+    });
+
+    expect(transfer.type).toBe('transfer');
+
+    // Check that both legs got auto-attached 'cc-repayment' AND '#march-bill' from notes
+    const txList = service.getTransactions(userId, { accountId: card.id });
+    expect(txList.length).toBe(1);
+    expect(txList[0].tags).toContain('cc-repayment');
+    expect(txList[0].tags).toContain('march-bill');
+
+    const sbiTxList = service.getTransactions(userId, { accountId: sbi.id });
+    expect(sbiTxList.length).toBe(1);
+    expect(sbiTxList[0].tags).toContain('cc-repayment');
+    expect(sbiTxList[0].tags).toContain('march-bill');
+  });
+
   it('supports updating tag color, renaming, and merging duplicates safely', () => {
     const bank = service.createAccount({
       userId,