diff --git a/cafe-management-sys/src/pages/admin/AdminInvoices.jsx b/cafe-management-sys/src/pages/admin/AdminInvoices.jsx
index 3f4047d..135a045 100644
--- a/cafe-management-sys/src/pages/admin/AdminInvoices.jsx
+++ b/cafe-management-sys/src/pages/admin/AdminInvoices.jsx
@@ -44,6 +44,15 @@ const AdminInvoices = () => {
   const [selected, setSelected] = useState(null);
   const [history, setHistory] = useState([]);
   const [historyLoading, setHistoryLoading] = useState(false);
+  const [search, setSearch] = useState('');
+  const [statusFilter, setStatusFilter] = useState('all');
+
+  const visibleInvoices = (invoices || []).filter((inv) => {
+    const q = search.trim().toLowerCase();
+    const matchesSearch = !q || String(inv.invoiceNumber || '').toLowerCase().includes(q);
+    const matchesStatus = statusFilter === 'all' || inv.status === statusFilter;
+    return matchesSearch && matchesStatus;
+  });
 
   const fetchInvoices = useCallback(async () => {
     try {
@@ -128,9 +137,35 @@ const AdminInvoices = () => {
         />
       )}
 
+      <Grid container spacing={2} sx={{ mb: 2 }} alignItems="center">
+        <Grid item xs={12} sm={6} md={4}>
+          <TextField
+            fullWidth
+            size="small"
+            label="Search invoices"
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+          />
+        </Grid>
+        <Grid item xs={12} sm={6} md={3}>
+          <TextField
+            fullWidth
+            select
+            size="small"
+            label="Status"
+            value={statusFilter}
+            onChange={(e) => setStatusFilter(e.target.value)}
+          >
+            <MenuItem value="all">All</MenuItem>
+            <MenuItem value="issued">Issued</MenuItem>
+            <MenuItem value="void">Void</MenuItem>
+          </TextField>
+        </Grid>
+      </Grid>
+
       <Card>
         <ResponsiveTable
-          rows={invoices}
+          rows={visibleInvoices}
           loading={loading}
           emptyMessage="No invoices"
           columns={[
diff --git a/cafe-management-sys/src/pages/admin/AdminStaff.jsx b/cafe-management-sys/src/pages/admin/AdminStaff.jsx
index 6b4e4d9..72bf5d6 100644
--- a/cafe-management-sys/src/pages/admin/AdminStaff.jsx
+++ b/cafe-management-sys/src/pages/admin/AdminStaff.jsx
@@ -16,6 +16,8 @@ const AdminStaff = () => {
   const [loading, setLoading] = useState(true);
   const [searchQuery, setSearchQuery] = useState('');
   const [error, setError] = useState(null);
+  const [roleFilter, setRoleFilter] = useState('all');
+  const [statusFilter, setStatusFilter] = useState('all');
   const [selectedStaff, setSelectedStaff] = useState(null);
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [addDialogOpen, setAddDialogOpen] = useState(false);
@@ -147,11 +149,18 @@ const AdminStaff = () => {
 
   const filteredStaff = staff.filter(member => {
     const name = displayName(member).toLowerCase();
-    return name.includes(searchQuery.toLowerCase()) ||
-      (member.email || '').toLowerCase().includes(searchQuery.toLowerCase()) ||
-      (member.role || '').toLowerCase().includes(searchQuery.toLowerCase());
+    const matchesSearch = name.includes(searchQuery.toLowerCase()) ||
+      (member.email || '').toLowerCase().includes(searchQuery.toLowerCase());
+    const matchesRole = roleFilter === 'all' || member.role === roleFilter;
+    const matchesStatus = statusFilter === 'all' || (member.isActive !== false ? 'active' : 'inactive') === statusFilter;
+    return matchesSearch && matchesRole && matchesStatus;
   });
 
+  const staffRoleCounts = staff.reduce(
+    (acc, m) => ({ ...acc, [m.role || 'staff']: (acc[m.role || 'staff'] || 0) + 1 }),
+    {}
+  );
+
   const [staffPage, setStaffPage] = useState(1);
   const PAGE_STAFF = 15;
   const pagedStart = (staffPage - 1) * PAGE_STAFF;
@@ -210,7 +219,38 @@ const AdminStaff = () => {
                 </InputAdornment>
               ),
             }}
+            sx={{ mb: 2 }}
           />
+          <Grid container spacing={2}>
+            <Grid item xs={6} sm={4}>
+              <TextField
+                fullWidth
+                select
+                label="Role"
+                size="small"
+                value={roleFilter}
+                onChange={(e) => setRoleFilter(e.target.value)}
+              >
+                <MenuItem value="all">All roles</MenuItem>
+                <MenuItem value="staff">Staff ({staffRoleCounts.staff || 0})</MenuItem>
+                <MenuItem value="admin">Admin ({staffRoleCounts.admin || 0})</MenuItem>
+              </TextField>
+            </Grid>
+            <Grid item xs={6} sm={4}>
+              <TextField
+                fullWidth
+                select
+                label="Status"
+                size="small"
+                value={statusFilter}
+                onChange={(e) => setStatusFilter(e.target.value)}
+              >
+                <MenuItem value="all">All</MenuItem>
+                <MenuItem value="active">Active</MenuItem>
+                <MenuItem value="inactive">Inactive</MenuItem>
+              </TextField>
+            </Grid>
+          </Grid>
         </CardContent>
       </Card>