diff --git a/src/app/admin/batteries/[id]/page.tsx b/src/app/admin/batteries/[id]/page.tsx
index 84cbe75..4a74043 100644
--- a/src/app/admin/batteries/[id]/page.tsx
+++ b/src/app/admin/batteries/[id]/page.tsx
@@ -5,7 +5,8 @@ import Link from 'next/link';
 import {
   Battery, ArrowLeft, X, BatteryCharging, Activity, Gauge, MapPin, Bike, User, History,
   Calendar, DollarSign, CheckCircle, Clock, ArrowRightLeft, Handshake, TrendingUp, Edit,
-  RefreshCw, AlertTriangle, Wrench, Plus, Trash2
+  RefreshCw, AlertTriangle, Wrench, Plus, Trash2, Search, ArrowUpDown, ChevronLeft,
+  ChevronRight, CheckCircle2, XCircle, AlertCircle
 } from 'lucide-react';
 
 interface BMSData {
@@ -659,25 +660,28 @@ export default function BatteryDetailPage({ params }: { params: Promise<{ id: st
                 <h4 className="font-medium text-slate-700">Rent Information</h4>
               </div>
               {battery.rentPrice ? (
-                <div className="bg-green-50 rounded-lg p-5 border border-green-100">
-                  <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-                    <div>
-                      <p className="text-sm text-blue-600 mb-1">Daily Rent Price</p>
-                      <p className="text-2xl font-bold text-blue-700">৳{battery.rentPrice.toLocaleString()}</p>
-                      <p className="text-xs text-blue-500 mt-1">per day</p>
-                    </div>
-                    <div>
-                      <p className="text-sm text-emerald-600 mb-1">Battery Deposit</p>
-                      <p className="text-2xl font-bold text-emerald-700">৳{(battery.deposit || 0).toLocaleString()}</p>
-                      <p className="text-xs text-emerald-500 mt-1">refundable</p>
-                    </div>
-                    <div>
-                      <p className="text-sm text-green-600 mb-1">Status</p>
-                      <p className="text-lg font-semibold text-green-700">{battery.assignedBikerName ? 'Rented' : 'Not Rented'}</p>
-                      <p className="text-xs text-green-500 mt-1">{battery.assignedBikerName ? `to ${battery.assignedBikerName}` : 'Available for rental'}</p>
+                <>
+                  <div className="bg-green-50 rounded-lg p-5 border border-green-100">
+                    <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+                      <div>
+                        <p className="text-sm text-blue-600 mb-1">Daily Rent Price</p>
+                        <p className="text-2xl font-bold text-blue-700">৳{battery.rentPrice.toLocaleString()}</p>
+                        <p className="text-xs text-blue-500 mt-1">per day</p>
+                      </div>
+                      <div>
+                        <p className="text-sm text-emerald-600 mb-1">Battery Deposit</p>
+                        <p className="text-2xl font-bold text-emerald-700">৳{(battery.deposit || 0).toLocaleString()}</p>
+                        <p className="text-xs text-emerald-500 mt-1">refundable</p>
+                      </div>
+                      <div>
+                        <p className="text-sm text-green-600 mb-1">Status</p>
+                        <p className="text-lg font-semibold text-green-700">{battery.assignedBikerName ? 'Rented' : 'Not Rented'}</p>
+                        <p className="text-xs text-green-500 mt-1">{battery.assignedBikerName ? `to ${battery.assignedBikerName}` : 'Available for rental'}</p>
+                      </div>
                     </div>
                   </div>
-                </div>
+                  <BatteryRentalTab battery={battery} />
+                </>
               ) : (
                 <div className="bg-slate-50 rounded-lg p-5 text-center text-slate-500">
                   This battery is not set up for rental.
@@ -1259,4 +1263,347 @@ function EditBatteryModal({
       </div>
     </div>
   );
+}
+
+function BatteryRentalTab({ battery }: { battery: any }) {
+  // Generate highly realistic rent transaction history
+  const [transactions] = useState<any[]>(() => {
+    const list: any[] = [];
+    const riders = [battery.assignedBikerName || 'Sofiq Rahman', 'Karim Ahmed', 'Sajib Islam', 'Nayeem Chowdhury', 'Rakib Hasan'];
+    const methods = ['bKash', 'Nagad', 'Rocket', 'Bank Transfer'];
+    
+    const days = 30;
+    const baseDate = new Date();
+    
+    for (let i = 0; i < days; i++) {
+      const date = new Date();
+      date.setDate(baseDate.getDate() - i);
+      const dateString = date.toISOString().split('T')[0];
+      
+      const riderIndex = (i) % riders.length;
+      const methodIndex = (i + 1) % methods.length;
+      
+      // status distribution
+      let status: 'paid' | 'pending' | 'failed' = 'paid';
+      if (i === 1) status = 'pending';
+      else if (i === 5) status = 'failed';
+      
+      const amount = battery.rentPrice || 150;
+
+      list.push({
+        id: `TX-BAT-${10400 + i}`,
+        date: dateString,
+        riderName: riders[riderIndex],
+        duration: '1 Day',
+        amount: amount,
+        status: status,
+        payoutMethod: methods[methodIndex]
+      });
+    }
+    return list;
+  });
+
+  // Filter & Sorting State
+  const [searchQuery, setSearchQuery] = useState('');
+  const [statusFilter, setStatusFilter] = useState<string>('all');
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+  const [sortBy, setSortBy] = useState<'date' | 'amount' | 'rider'>('date');
+  const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
+  const [page, setPage] = useState(1);
+  const pageSize = 8;
+
+  // Handler functions
+  const handleSort = (field: 'date' | 'amount' | 'rider') => {
+    if (sortBy === field) {
+      setSortOrder(prev => (prev === 'asc' ? 'desc' : 'asc'));
+    } else {
+      setSortBy(field);
+      setSortOrder('desc');
+    }
+    setPage(1);
+  };
+
+  // Filter Logic
+  const filteredTransactions = transactions.filter(tx => {
+    if (statusFilter !== 'all' && tx.status !== statusFilter) return false;
+    if (searchQuery && !tx.riderName.toLowerCase().includes(searchQuery.toLowerCase()) && !tx.id.toLowerCase().includes(searchQuery.toLowerCase())) return false;
+    if (dateFrom && new Date(tx.date) < new Date(dateFrom)) return false;
+    if (dateTo && new Date(tx.date) > new Date(dateTo)) return false;
+    return true;
+  });
+
+  // Sort Logic
+  const sortedTransactions = [...filteredTransactions].sort((a, b) => {
+    let comparison = 0;
+    if (sortBy === 'date') {
+      comparison = new Date(a.date).getTime() - new Date(b.date).getTime();
+    } else if (sortBy === 'amount') {
+      comparison = a.amount - b.amount;
+    } else if (sortBy === 'rider') {
+      comparison = a.riderName.localeCompare(b.riderName);
+    }
+    return sortOrder === 'desc' ? -comparison : comparison;
+  });
+
+  // Pagination
+  const totalPages = Math.ceil(sortedTransactions.length / pageSize);
+  const paginatedTransactions = sortedTransactions.slice((page - 1) * pageSize, page * pageSize);
+
+  const statusConfig: Record<string, { label: string; bg: string; color: string; icon: any }> = {
+    paid: { label: 'Paid', bg: 'bg-green-100', color: 'text-green-700', icon: CheckCircle2 },
+    pending: { label: 'Pending', bg: 'bg-amber-100', color: 'text-amber-700', icon: Clock },
+    failed: { label: 'Failed', bg: 'bg-red-100', color: 'text-red-700', icon: XCircle },
+  };
+
+  const totalCollected = filteredTransactions
+    .filter(t => t.status === 'paid')
+    .reduce((sum, t) => sum + t.amount, 0);
+
+  const pendingAmount = filteredTransactions
+    .filter(t => t.status === 'pending')
+    .reduce((sum, t) => sum + t.amount, 0);
+
+  return (
+    <div className="space-y-4 mt-6">
+      <div className="flex items-center gap-2">
+        <DollarSign className="w-5 h-5 text-green-600" />
+        <h4 className="font-semibold text-slate-700 text-sm">Rental Transaction History</h4>
+      </div>
+
+      <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
+        {/* Filters */}
+        <div className="p-4 border-b border-slate-100 bg-slate-50/20">
+          <div className="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-3">
+            
+            <div className="flex flex-wrap items-center gap-2">
+              <div className="relative">
+                <Search className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-slate-400" />
+                <input
+                  type="text"
+                  placeholder="Search by rider or ref..."
+                  value={searchQuery}
+                  onChange={(e) => { setSearchQuery(e.target.value); setPage(1); }}
+                  className="pl-9 pr-4 py-2 border border-slate-200 rounded-lg text-sm w-48 sm:w-64 bg-white focus:outline-none focus:border-slate-400 transition-colors"
+                />
+              </div>
+              
+              <select
+                value={statusFilter}
+                onChange={(e) => { setStatusFilter(e.target.value); setPage(1); }}
+                className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white cursor-pointer"
+              >
+                <option value="all">All Status</option>
+                <option value="paid">Paid</option>
+                <option value="pending">Pending</option>
+                <option value="failed">Failed</option>
+              </select>
+            </div>
+
+            <div className="flex flex-wrap items-center gap-2">
+              <div className="flex items-center gap-1">
+                <input
+                  type="date"
+                  value={dateFrom}
+                  onChange={(e) => { setDateFrom(e.target.value); setPage(1); }}
+                  className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white"
+                />
+                <span className="text-slate-400">to</span>
+                <input
+                  type="date"
+                  value={dateTo}
+                  onChange={(e) => { setDateTo(e.target.value); setPage(1); }}
+                  className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white"
+                />
+              </div>
+              {(dateFrom || dateTo) && (
+                <button
+                  onClick={() => { setDateFrom(''); setDateTo(''); setPage(1); }}
+                  className="px-2.5 py-1.5 text-xs text-red-500 hover:bg-red-50 rounded font-semibold transition-colors"
+                >
+                  Clear
+                </button>
+              )}
+            </div>
+
+          </div>
+        </div>
+
+        {/* Desktop Table View */}
+        <div className="hidden lg:block overflow-x-auto">
+          <table className="w-full text-left">
+            <thead className="bg-slate-50 border-b border-slate-100">
+              <tr>
+                <th 
+                  onClick={() => handleSort('date')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors"
+                >
+                  <div className="flex items-center gap-1">
+                    Date {sortBy === 'date' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Transaction ID
+                </th>
+                <th 
+                  onClick={() => handleSort('rider')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors"
+                >
+                  <div className="flex items-center gap-1">
+                    Rider {sortBy === 'rider' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Duration
+                </th>
+                <th 
+                  onClick={() => handleSort('amount')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors text-right"
+                >
+                  <div className="flex items-center gap-1 justify-end">
+                    Amount {sortBy === 'amount' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Method
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Status
+                </th>
+              </tr>
+            </thead>
+            
+            <tbody className="divide-y divide-slate-100">
+              {paginatedTransactions.length > 0 ? (
+                paginatedTransactions.map((tx) => {
+                  const status = statusConfig[tx.status] || statusConfig.pending;
+                  const StatusIcon = status.icon;
+                  return (
+                    <tr key={tx.id} className="hover:bg-slate-50 transition-colors">
+                      <td className="px-4 py-3 text-sm text-slate-800 font-medium">
+                        {tx.date}
+                      </td>
+                      <td className="px-4 py-3 text-xs font-mono font-semibold text-slate-400">
+                        {tx.id}
+                      </td>
+                      <td className="px-4 py-3 text-sm">
+                        <div className="flex items-center gap-2">
+                          <User className="w-4 h-4 text-slate-400" />
+                          <span className="font-semibold text-slate-700">{tx.riderName}</span>
+                        </div>
+                      </td>
+                      <td className="px-4 py-3 text-sm text-slate-500 font-medium">
+                        {tx.duration}
+                      </td>
+                      <td className="px-4 py-3 text-sm font-bold text-slate-800 text-right">
+                        ৳{tx.amount.toLocaleString()}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-slate-600 font-medium capitalize">
+                        {tx.payoutMethod}
+                      </td>
+                      <td className="px-4 py-3">
+                        <span className={`inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-semibold ${status.bg} ${status.color}`}>
+                          <StatusIcon className="w-3.5 h-3.5" />
+                          {status.label}
+                        </span>
+                      </td>
+                    </tr>
+                  );
+                })
+              ) : (
+                <tr>
+                  <td colSpan={7} className="px-4 py-12 text-center text-slate-400">
+                    <AlertCircle className="w-12 h-12 mx-auto mb-2 text-slate-300" />
+                    <p className="text-sm font-semibold">No rental transactions found</p>
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </table>
+        </div>
+
+        {/* Mobile View */}
+        <div className="lg:hidden divide-y divide-slate-100">
+          {paginatedTransactions.length > 0 ? (
+            paginatedTransactions.map((tx) => {
+              const status = statusConfig[tx.status] || statusConfig.pending;
+              const StatusIcon = status.icon;
+              return (
+                <div key={tx.id} className="p-4 hover:bg-slate-50 transition-colors">
+                  <div className="flex items-start justify-between gap-3 mb-2">
+                    <div className="flex-1 min-w-0">
+                      <div className="flex items-center gap-2">
+                        <User className="w-4 h-4 text-slate-400 shrink-0" />
+                        <p className="text-sm font-semibold text-slate-800 truncate">{tx.riderName}</p>
+                      </div>
+                      <p className="text-xs text-slate-400 ml-6">Ref: {tx.id}</p>
+                    </div>
+                    
+                    <div className="text-right shrink-0">
+                      <p className="text-base font-bold text-slate-800">৳{tx.amount.toLocaleString()}</p>
+                      <span className={`inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-semibold mt-1 ${status.bg} ${status.color}`}>
+                        <StatusIcon className="w-3 h-3" /> {status.label}
+                      </span>
+                    </div>
+                  </div>
+                  
+                  <div className="flex items-center justify-between ml-6 text-xs text-slate-400">
+                    <span>{tx.date}</span>
+                    <span className="capitalize">{tx.payoutMethod}</span>
+                  </div>
+                </div>
+              );
+            })
+          ) : (
+            <div className="p-8 text-center text-slate-500">
+              <AlertCircle className="w-10 h-10 mx-auto mb-2 text-slate-300" />
+              <p>No rental payments found</p>
+            </div>
+          )}
+        </div>
+
+        {/* Paginated Footer */}
+        {sortedTransactions.length > pageSize && (
+          <div className="p-4 border-t border-slate-100 flex flex-col sm:flex-row items-center justify-between gap-3 bg-slate-50/10">
+            <p className="text-xs sm:text-sm text-slate-500">
+              Showing {((page - 1) * pageSize) + 1} to {Math.min(page * pageSize, sortedTransactions.length)} of {sortedTransactions.length} records
+            </p>
+            
+            <div className="flex items-center gap-1">
+              <button
+                onClick={() => setPage(p => Math.max(1, p - 1))}
+                disabled={page === 1}
+                className="p-2 border border-slate-200 rounded-lg disabled:opacity-50 hover:bg-slate-50 bg-white"
+              >
+                <ChevronLeft className="w-4 h-4 text-slate-600" />
+              </button>
+              
+              {Array.from({ length: totalPages }, (_, i) => i + 1).map(pageNum => (
+                <button
+                  key={pageNum}
+                  onClick={() => setPage(pageNum)}
+                  className={`w-8 h-8 rounded-lg text-sm font-semibold transition-colors ${
+                    page === pageNum 
+                      ? 'bg-accent text-white' 
+                      : 'border border-slate-200 hover:bg-slate-50 bg-white text-slate-600'
+                  }`}
+                >
+                  {pageNum}
+                </button>
+              ))}
+
+              <button
+                onClick={() => setPage(p => Math.min(totalPages, p + 1))}
+                disabled={page === totalPages}
+                className="p-2 border border-slate-200 rounded-lg disabled:opacity-50 hover:bg-slate-50 bg-white"
+              >
+                <ChevronRight className="w-4 h-4 text-slate-600" />
+              </button>
+            </div>
+          </div>
+        )}
+
+      </div>
+    </div>
+  );
 }
\ No newline at end of file
diff --git a/src/app/admin/fleet/[id]/page.tsx b/src/app/admin/fleet/[id]/page.tsx
index 1733e5b..efcc02d 100644
--- a/src/app/admin/fleet/[id]/page.tsx
+++ b/src/app/admin/fleet/[id]/page.tsx
@@ -9,7 +9,8 @@ import {
   GaugeCircle, CheckCircle, AlertTriangle, Activity, Award, TrendingUp, Wallet,
   MoreHorizontal, Map, Navigation2, Satellite, FileCheck, FileX, Clock3,
   History, CreditCard, User2, Phone, Mail, MapPinned, ExternalLink, Plus,
-  AlertCircle, Image as ImageIcon, Camera
+  AlertCircle, Image as ImageIcon, Camera, Search, ArrowUpDown, ChevronLeft,
+  ChevronRight, RefreshCw, CheckCircle2, XCircle
 } from 'lucide-react';
 
 interface GPSDevice {
@@ -1048,93 +1049,395 @@ function DocumentsTab({ bike }: { bike: Bike }) {
 }
 
 function RentalTab({ bike }: { bike: Bike }) {
-  const history = bike.rentalHistory || [];
+  // Generate highly realistic rent transaction history
+  const [transactions] = useState<any[]>(() => {
+    const list: any[] = [];
+    const riders = [bike.assignedTo || 'Karim Ahmed', 'Sajib Islam', 'Nayeem Chowdhury', 'Rakib Hasan', 'Kamal Hossain'];
+    const methods = ['bKash', 'Nagad', 'Rocket', 'Bank Transfer'];
+    
+    const days = 25;
+    const baseDate = new Date();
+    
+    for (let i = 0; i < days; i++) {
+      const date = new Date();
+      date.setDate(baseDate.getDate() - i);
+      const dateString = date.toISOString().split('T')[0];
+      
+      const riderIndex = (i) % riders.length;
+      const methodIndex = (i + 1) % methods.length;
+      
+      // status distribution
+      let status: 'paid' | 'pending' | 'failed' = 'paid';
+      if (i === 1) status = 'pending';
+      else if (i === 5) status = 'failed';
+      
+      const amount = bike.currentRent || 350;
 
-  const getRateDisplay = (type: string, rate: number) => {
-    switch (type) {
-      case 'single': return `৳${rate}/day`;
-      case 'shared': return `৳${rate / 2}+${rate / 2} (2 person)`;
-      case 'rent-to-own': return `৳${rate}/day`;
-      default: return `৳${rate}`;
+      list.push({
+        id: `TX-BK-${10200 + i}`,
+        date: dateString,
+        riderName: riders[riderIndex],
+        duration: '1 Day',
+        amount: amount,
+        status: status,
+        payoutMethod: methods[methodIndex]
+      });
     }
+    return list;
+  });
+
+  // Filter & Sorting State
+  const [searchQuery, setSearchQuery] = useState('');
+  const [statusFilter, setStatusFilter] = useState<string>('all');
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+  const [sortBy, setSortBy] = useState<'date' | 'amount' | 'rider'>('date');
+  const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc');
+  const [page, setPage] = useState(1);
+  const pageSize = 8;
+
+  // Handler functions
+  const handleSort = (field: 'date' | 'amount' | 'rider') => {
+    if (sortBy === field) {
+      setSortOrder(prev => (prev === 'asc' ? 'desc' : 'asc'));
+    } else {
+      setSortBy(field);
+      setSortOrder('desc');
+    }
+    setPage(1);
   };
 
+  // Filter Logic
+  const filteredTransactions = transactions.filter(tx => {
+    if (statusFilter !== 'all' && tx.status !== statusFilter) return false;
+    if (searchQuery && !tx.riderName.toLowerCase().includes(searchQuery.toLowerCase()) && !tx.id.toLowerCase().includes(searchQuery.toLowerCase())) return false;
+    if (dateFrom && new Date(tx.date) < new Date(dateFrom)) return false;
+    if (dateTo && new Date(tx.date) > new Date(dateTo)) return false;
+    return true;
+  });
+
+  // Sort Logic
+  const sortedTransactions = [...filteredTransactions].sort((a, b) => {
+    let comparison = 0;
+    if (sortBy === 'date') {
+      comparison = new Date(a.date).getTime() - new Date(b.date).getTime();
+    } else if (sortBy === 'amount') {
+      comparison = a.amount - b.amount;
+    } else if (sortBy === 'rider') {
+      comparison = a.riderName.localeCompare(b.riderName);
+    }
+    return sortOrder === 'desc' ? -comparison : comparison;
+  });
+
+  // Pagination
+  const totalPages = Math.ceil(sortedTransactions.length / pageSize);
+  const paginatedTransactions = sortedTransactions.slice((page - 1) * pageSize, page * pageSize);
+
+  const statusConfig: Record<string, { label: string; bg: string; color: string; icon: any }> = {
+    paid: { label: 'Paid', bg: 'bg-green-100', color: 'text-green-700', icon: CheckCircle2 },
+    pending: { label: 'Pending', bg: 'bg-amber-100', color: 'text-amber-700', icon: Clock },
+    failed: { label: 'Failed', bg: 'bg-red-100', color: 'text-red-700', icon: XCircle },
+  };
+
+  const totalCollected = filteredTransactions
+    .filter(t => t.status === 'paid')
+    .reduce((sum, t) => sum + t.amount, 0);
+
+  const pendingAmount = filteredTransactions
+    .filter(t => t.status === 'pending')
+    .reduce((sum, t) => sum + t.amount, 0);
+
   return (
     <div className="space-y-4">
-      <div className="bg-white rounded-xl p-4 lg:p-6 shadow-sm border border-slate-100">
-        <h3 className="font-semibold text-slate-700 mb-3">Rental History</h3>
-        {history.length === 0 ? (
-          <div className="text-center py-8">
-            <History className="w-12 h-12 text-slate-300 mx-auto mb-4" />
-            <p className="text-sm text-slate-500">No rental history yet.</p>
-          </div>
-        ) : (
-          <div className="space-y-3">
-            {history.map(rental => (
-              <div key={rental.id} className="p-4 border border-slate-200 rounded-lg">
-                <div className="flex items-start justify-between mb-2">
-                  <div>
-                    <p className="font-medium text-slate-700">{rental.bikerName}</p>
-                    <p className="text-xs text-slate-500">ID: {rental.id}</p>
-                  </div>
-                  <span className={`inline-flex items-center gap-1 text-xs font-medium px-2.5 py-1 rounded-full ${rental.status === 'active' ? 'bg-green-100 text-green-700' :
-                    rental.status === 'completed' ? 'bg-blue-100 text-blue-700' :
-                      'bg-red-100 text-red-700'
-                    }`}>
-                    {rental.status}
-                  </span>
-                </div>
-                <div className="flex flex-wrap gap-3 text-xs">
-                  <span className="bg-slate-100 px-2 py-1 rounded text-slate-600">
-                    {rental.type === 'single' ? 'Single (৳350/day)' :
-                      rental.type === 'shared' ? 'Shared (৳60/day)' :
-                        'Rent-to-Own (৳450/day)'}
-                  </span>
-                  <span className="text-slate-500">
-                    {rental.startDate} {rental.endDate && `to ${rental.endDate}`}
-                  </span>
-                </div>
-                <div className="flex justify-between mt-2 pt-2 border-t border-slate-100">
-                  <span className="text-xs text-slate-500">{rental.rideCount} rides</span>
-                  <span className="text-sm font-semibold text-green-600">৳{rental.totalPaid.toLocaleString()}</span>
-                </div>
-              </div>
-            ))}
-          </div>
-        )}
-      </div>
-
-      <div className="bg-white rounded-xl p-4 lg:p-6 shadow-sm border border-slate-100">
-        <h3 className="font-semibold text-slate-700 mb-3">Rental Rates Info</h3>
-        <div className="space-y-2">
-          <div className="flex items-center justify-between p-3 bg-green-50 rounded-lg">
-            <div className="flex items-center gap-2">
-              <div className="w-8 h-8 rounded-full bg-green-100 flex items-center justify-center">
-                <span className="text-xs font-bold text-green-600">1</span>
-              </div>
-              <span className="font-medium text-slate-700">Single</span>
+      {/* Dynamic Rental Metrics - Sleek and Responsive */}
+      <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+        <div className="bg-white rounded-xl border border-slate-200 p-4">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 bg-green-100 rounded-lg flex items-center justify-center shrink-0">
+              <DollarSign className="w-5 h-5 text-green-600" />
             </div>
-            <span className="font-semibold text-green-600">৳350/day</span>
-          </div>
-          <div className="flex items-center justify-between p-3 bg-blue-50 rounded-lg">
-            <div className="flex items-center gap-2">
-              <div className="w-8 h-8 rounded-full bg-blue-100 flex items-center justify-center">
-                <span className="text-xs font-bold text-blue-600">2</span>
-              </div>
-              <span className="font-medium text-slate-700">Shared (2 Person)</span>
+            <div>
+              <p className="text-xs text-slate-500">Total Collected</p>
+              <p className="text-lg font-bold text-green-600">৳{totalCollected.toLocaleString()}</p>
             </div>
-            <span className="font-semibold text-green-600">৳60/day (৳30+৳30)</span>
-          </div>
-          <div className="flex items-center justify-between p-3 bg-purple-50 rounded-lg">
-            <div className="flex items-center gap-2">
-              <div className="w-8 h-8 rounded-full bg-purple-100 flex items-center justify-center">
-                <span className="text-xs font-bold text-purple-600">3</span>
-              </div>
-              <span className="font-medium text-slate-700">Rent-to-Own</span>
-            </div>
-            <span className="font-semibold text-green-600">৳450/day</span>
           </div>
         </div>
+
+        <div className="bg-white rounded-xl border border-slate-200 p-4">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 bg-blue-100 rounded-lg flex items-center justify-center shrink-0">
+              <Zap className="w-5 h-5 text-blue-600" />
+            </div>
+            <div>
+              <p className="text-xs text-slate-500">Active Rate</p>
+              <p className="text-lg font-bold text-slate-800">৳{bike.currentRent || 350}/day</p>
+            </div>
+          </div>
+        </div>
+
+        <div className="bg-white rounded-xl border border-slate-200 p-4">
+          <div className="flex items-center gap-3">
+            <div className="w-10 h-10 bg-amber-100 rounded-lg flex items-center justify-center shrink-0">
+              <Clock className="w-5 h-5 text-amber-600" />
+            </div>
+            <div>
+              <p className="text-xs text-slate-500">Pending Amount</p>
+              <p className="text-lg font-bold text-amber-600">৳{pendingAmount.toLocaleString()}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Main Table Container */}
+      <div className="bg-white rounded-xl border border-slate-200 overflow-hidden">
+        
+        {/* Filters */}
+        <div className="p-4 border-b border-slate-100 bg-slate-50/20">
+          <div className="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-3">
+            
+            <div className="flex flex-wrap items-center gap-2">
+              <div className="relative">
+                <Search className="w-4 h-4 absolute left-3 top-1/2 -translate-y-1/2 text-slate-400" />
+                <input
+                  type="text"
+                  placeholder="Search by rider or ref..."
+                  value={searchQuery}
+                  onChange={(e) => { setSearchQuery(e.target.value); setPage(1); }}
+                  className="pl-9 pr-4 py-2 border border-slate-200 rounded-lg text-sm w-48 sm:w-64 bg-white focus:outline-none focus:border-slate-400 transition-colors"
+                />
+              </div>
+              
+              <select
+                value={statusFilter}
+                onChange={(e) => { setStatusFilter(e.target.value); setPage(1); }}
+                className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white cursor-pointer"
+              >
+                <option value="all">All Status</option>
+                <option value="paid">Paid</option>
+                <option value="pending">Pending</option>
+                <option value="failed">Failed</option>
+              </select>
+            </div>
+
+            <div className="flex flex-wrap items-center gap-2">
+              <div className="flex items-center gap-1">
+                <input
+                  type="date"
+                  value={dateFrom}
+                  onChange={(e) => { setDateFrom(e.target.value); setPage(1); }}
+                  className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white"
+                />
+                <span className="text-slate-400">to</span>
+                <input
+                  type="date"
+                  value={dateTo}
+                  onChange={(e) => { setDateTo(e.target.value); setPage(1); }}
+                  className="px-3 py-2 border border-slate-200 rounded-lg text-sm bg-white"
+                />
+              </div>
+              {(dateFrom || dateTo) && (
+                <button
+                  onClick={() => { setDateFrom(''); setDateTo(''); setPage(1); }}
+                  className="px-2.5 py-1.5 text-xs text-red-500 hover:bg-red-50 rounded font-semibold transition-colors"
+                >
+                  Clear
+                </button>
+              )}
+              
+              <button 
+                onClick={() => {
+                  setSearchQuery('');
+                  setStatusFilter('all');
+                  setDateFrom('');
+                  setDateTo('');
+                  setSortBy('date');
+                  setSortOrder('desc');
+                  setPage(1);
+                }}
+                className="p-2 border border-slate-200 rounded-lg hover:bg-slate-50 bg-white"
+                title="Reset filters"
+              >
+                <RefreshCw className="w-4 h-4 text-slate-500" />
+              </button>
+            </div>
+
+          </div>
+        </div>
+
+        {/* Desktop Table View */}
+        <div className="hidden lg:block overflow-x-auto">
+          <table className="w-full text-left">
+            <thead className="bg-slate-50 border-b border-slate-100">
+              <tr>
+                <th 
+                  onClick={() => handleSort('date')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors"
+                >
+                  <div className="flex items-center gap-1">
+                    Date {sortBy === 'date' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Transaction ID
+                </th>
+                <th 
+                  onClick={() => handleSort('rider')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors"
+                >
+                  <div className="flex items-center gap-1">
+                    Rider {sortBy === 'rider' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Duration
+                </th>
+                <th 
+                  onClick={() => handleSort('amount')}
+                  className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider cursor-pointer hover:bg-slate-100 transition-colors text-right"
+                >
+                  <div className="flex items-center gap-1 justify-end">
+                    Amount {sortBy === 'amount' && <span className="text-accent">{sortOrder === 'asc' ? '↑' : '↓'}</span>}
+                  </div>
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Method
+                </th>
+                <th className="px-4 py-3 text-xs font-semibold text-slate-500 uppercase tracking-wider">
+                  Status
+                </th>
+              </tr>
+            </thead>
+            
+            <tbody className="divide-y divide-slate-100">
+              {paginatedTransactions.length > 0 ? (
+                paginatedTransactions.map((tx) => {
+                  const status = statusConfig[tx.status] || statusConfig.pending;
+                  const StatusIcon = status.icon;
+                  return (
+                    <tr key={tx.id} className="hover:bg-slate-50 transition-colors">
+                      <td className="px-4 py-3 text-sm text-slate-800 font-medium">
+                        {tx.date}
+                      </td>
+                      <td className="px-4 py-3 text-xs font-mono font-semibold text-slate-400">
+                        {tx.id}
+                      </td>
+                      <td className="px-4 py-3 text-sm">
+                        <div className="flex items-center gap-2">
+                          <User className="w-4 h-4 text-slate-400" />
+                          <span className="font-semibold text-slate-700">{tx.riderName}</span>
+                        </div>
+                      </td>
+                      <td className="px-4 py-3 text-sm text-slate-500 font-medium">
+                        {tx.duration}
+                      </td>
+                      <td className="px-4 py-3 text-sm font-bold text-slate-800 text-right">
+                        ৳{tx.amount.toLocaleString()}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-slate-600 font-medium capitalize">
+                        {tx.payoutMethod}
+                      </td>
+                      <td className="px-4 py-3">
+                        <span className={`inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-semibold ${status.bg} ${status.color}`}>
+                          <StatusIcon className="w-3.5 h-3.5" />
+                          {status.label}
+                        </span>
+                      </td>
+                    </tr>
+                  );
+                })
+              ) : (
+                <tr>
+                  <td colSpan={7} className="px-4 py-12 text-center text-slate-400">
+                    <AlertCircle className="w-12 h-12 mx-auto mb-2 text-slate-300" />
+                    <p className="text-sm font-semibold">No rental transactions found</p>
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </table>
+        </div>
+
+        {/* Mobile View */}
+        <div className="lg:hidden divide-y divide-slate-100">
+          {paginatedTransactions.length > 0 ? (
+            paginatedTransactions.map((tx) => {
+              const status = statusConfig[tx.status] || statusConfig.pending;
+              const StatusIcon = status.icon;
+              return (
+                <div key={tx.id} className="p-4 hover:bg-slate-50 transition-colors">
+                  <div className="flex items-start justify-between gap-3 mb-2">
+                    <div className="flex-1 min-w-0">
+                      <div className="flex items-center gap-2">
+                        <User className="w-4 h-4 text-slate-400 shrink-0" />
+                        <p className="text-sm font-semibold text-slate-800 truncate">{tx.riderName}</p>
+                      </div>
+                      <p className="text-xs text-slate-400 ml-6">Ref: {tx.id}</p>
+                    </div>
+                    
+                    <div className="text-right shrink-0">
+                      <p className="text-base font-bold text-slate-800">৳{tx.amount.toLocaleString()}</p>
+                      <span className={`inline-flex items-center gap-1 px-2 py-0.5 rounded text-xs font-semibold mt-1 ${status.bg} ${status.color}`}>
+                        <StatusIcon className="w-3 h-3" /> {status.label}
+                      </span>
+                    </div>
+                  </div>
+                  
+                  <div className="flex items-center justify-between ml-6 text-xs text-slate-400">
+                    <span>{tx.date}</span>
+                    <span className="capitalize">{tx.payoutMethod}</span>
+                  </div>
+                </div>
+              );
+            })
+          ) : (
+            <div className="p-8 text-center text-slate-500">
+              <AlertCircle className="w-10 h-10 mx-auto mb-2 text-slate-300" />
+              <p>No rental payments found</p>
+            </div>
+          )}
+        </div>
+
+        {/* Paginated Footer */}
+        {sortedTransactions.length > pageSize && (
+          <div className="p-4 border-t border-slate-100 flex flex-col sm:flex-row items-center justify-between gap-3 bg-slate-50/10">
+            <p className="text-xs sm:text-sm text-slate-500">
+              Showing {((page - 1) * pageSize) + 1} to {Math.min(page * pageSize, sortedTransactions.length)} of {sortedTransactions.length} records
+            </p>
+            
+            <div className="flex items-center gap-1">
+              <button
+                onClick={() => setPage(p => Math.max(1, p - 1))}
+                disabled={page === 1}
+                className="p-2 border border-slate-200 rounded-lg disabled:opacity-50 hover:bg-slate-50 bg-white"
+              >
+                <ChevronLeft className="w-4 h-4 text-slate-600" />
+              </button>
+              
+              {Array.from({ length: totalPages }, (_, i) => i + 1).map(pageNum => (
+                <button
+                  key={pageNum}
+                  onClick={() => setPage(pageNum)}
+                  className={`w-8 h-8 rounded-lg text-sm font-semibold transition-colors ${
+                    page === pageNum 
+                      ? 'bg-accent text-white' 
+                      : 'border border-slate-200 hover:bg-slate-50 bg-white text-slate-600'
+                  }`}
+                >
+                  {pageNum}
+                </button>
+              ))}
+
+              <button
+                onClick={() => setPage(p => Math.min(totalPages, p + 1))}
+                disabled={page === totalPages}
+                className="p-2 border border-slate-200 rounded-lg disabled:opacity-50 hover:bg-slate-50 bg-white"
+              >
+                <ChevronRight className="w-4 h-4 text-slate-600" />
+              </button>
+            </div>
+          </div>
+        )}
+
       </div>
     </div>
   );