diff --git a/backend/data/photo_sharing.db b/backend/data/photo_sharing.db
index c765d91..2c7fa89 100644
Binary files a/backend/data/photo_sharing.db and b/backend/data/photo_sharing.db differ
diff --git a/backend/src/database/db.js b/backend/src/database/db.js
index f55e870..750362d 100644
--- a/backend/src/database/db.js
+++ b/backend/src/database/db.js
@@ -100,8 +100,10 @@ async function initializeDatabase() {
     const hasUpdatedAt = await db.schema.hasColumn('admin_users', 'updated_at');
     if (!hasUpdatedAt) {
       await db.schema.table('admin_users', (table) => {
-        table.datetime('updated_at').defaultTo(db.fn.now());
+        table.datetime('updated_at');
       });
+      // Set default value for existing rows
+      await db('admin_users').update({ updated_at: new Date() });
     }
   }
 
diff --git a/frontend/src/config/api.ts b/frontend/src/config/api.ts
index 388f5ca..4acd2b1 100644
--- a/frontend/src/config/api.ts
+++ b/frontend/src/config/api.ts
@@ -7,7 +7,7 @@ export const GALLERY_TOKEN_KEY = 'gallery_token';
 
 // Create axios instance
 export const api = axios.create({
-  baseURL: import.meta.env.VITE_API_URL || 'http://localhost:3002',
+  baseURL: import.meta.env.VITE_API_URL || 'http://localhost:3001',
   headers: {
     'Content-Type': 'application/json',
   },
diff --git a/frontend/src/contexts/AdminAuthContext.tsx b/frontend/src/contexts/AdminAuthContext.tsx
index 3117109..c00e6f8 100644
--- a/frontend/src/contexts/AdminAuthContext.tsx
+++ b/frontend/src/contexts/AdminAuthContext.tsx
@@ -51,8 +51,11 @@ export const AdminAuthProvider: React.FC<AdminAuthProviderProps> = ({ children }
   const login = (_token: string, user: AdminUser) => {
     // Token is already stored in cookie by authService
     setUser(user);
-    setIsAuthenticated(true);
     setError(null);
+    // Small delay to ensure state is properly updated
+    setTimeout(() => {
+      setIsAuthenticated(true);
+    }, 100);
   };
 
   const logout = () => {
diff --git a/frontend/src/pages/admin/AdminDashboard.tsx b/frontend/src/pages/admin/AdminDashboard.tsx
index 80f46c0..c28df2b 100644
--- a/frontend/src/pages/admin/AdminDashboard.tsx
+++ b/frontend/src/pages/admin/AdminDashboard.tsx
@@ -163,7 +163,7 @@ export const AdminDashboard: React.FC = () => {
       <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
         {/* Expiring Events */}
         <div className="lg:col-span-2">
-          <Card className="p-6">
+          <Card padding="md">
             <div className="flex items-center justify-between mb-4">
               <h2 className="text-lg font-semibold text-neutral-900">Events Expiring Soon</h2>
               <AlertTriangle className="w-5 h-5 text-orange-600" />
@@ -214,7 +214,7 @@ export const AdminDashboard: React.FC = () => {
         </div>
 
         {/* Recent Activity */}
-        <Card className="p-6">
+        <Card padding="md">
           <div className="flex items-center justify-between mb-4">
             <h2 className="text-lg font-semibold text-neutral-900">Recent Activity</h2>
             <Clock className="w-5 h-5 text-neutral-500" />
@@ -272,7 +272,7 @@ export const AdminDashboard: React.FC = () => {
       </div>
 
       {/* Quick Actions */}
-      <Card className="p-6 mt-6">
+      <Card padding="md" className="mt-6">
         <h2 className="text-lg font-semibold text-neutral-900 mb-4">Quick Actions</h2>
         <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
           <Button
diff --git a/frontend/src/pages/admin/AdminLoginPage.tsx b/frontend/src/pages/admin/AdminLoginPage.tsx
index c43a8ca..86d103f 100644
--- a/frontend/src/pages/admin/AdminLoginPage.tsx
+++ b/frontend/src/pages/admin/AdminLoginPage.tsx
@@ -6,6 +6,7 @@ import { toast } from 'react-toastify';
 import { Button, Input, Card } from '../../components/common';
 import { useAdminAuth } from '../../contexts';
 import { authService } from '../../services/auth.service';
+import { getAuthToken } from '../../config/api';
 
 export const AdminLoginPage: React.FC = () => {
   const navigate = useNavigate();
@@ -57,11 +58,26 @@ export const AdminLoginPage: React.FC = () => {
       const response = await authService.adminLogin(formData);
       login(response.token, response.user);
       toast.success('Login successful!');
-      navigate('/admin/dashboard');
+      // Add a small delay to ensure auth state is updated
+      setTimeout(() => {
+        navigate('/admin/dashboard');
+      }, 200);
     } catch (error: any) {
       console.error('Login error:', error);
       
-      if (error.response?.status === 429) {
+      // Handle network errors gracefully
+      if (error.code === 'ERR_NETWORK' || error.code === 'ERR_CONNECTION_RESET') {
+        // Check if we actually got logged in despite the error
+        const token = getAuthToken(true);
+        if (token) {
+          // Login was successful, just had a connection issue
+          setTimeout(() => {
+            navigate('/admin/dashboard');
+          }, 200);
+          return;
+        }
+        toast.error('Network error. Please check your connection and try again.');
+      } else if (error.response?.status === 429) {
         toast.error('Too many login attempts. Please try again later.');
       } else if (error.response?.status === 401) {
         setErrors({ form: 'Invalid email or password' });
@@ -94,7 +110,7 @@ export const AdminLoginPage: React.FC = () => {
         </div>
 
         {/* Login Form */}
-        <Card className="p-8">
+        <Card padding="lg">
           <form onSubmit={handleSubmit} className="space-y-6">
             {/* Form Error */}
             {errors.form && (
diff --git a/frontend/src/pages/admin/AnalyticsPage.tsx b/frontend/src/pages/admin/AnalyticsPage.tsx
index a882590..a9c91ea 100644
--- a/frontend/src/pages/admin/AnalyticsPage.tsx
+++ b/frontend/src/pages/admin/AnalyticsPage.tsx
@@ -181,7 +181,7 @@ export const AnalyticsPage: React.FC = () => {
           </Button>
         </div>
         
-        <Card className="p-0 overflow-hidden" style={{ height: '800px' }}>
+        <Card padding="none" className="overflow-hidden" style={{ height: '800px' }}>
           <iframe
             src={umamiShareUrl}
             className="w-full h-full border-0"
@@ -231,7 +231,7 @@ export const AnalyticsPage: React.FC = () => {
 
       {/* Key Metrics */}
       <div className="grid grid-cols-1 md:grid-cols-3 gap-6 mb-6">
-        <Card className="p-6">
+        <Card padding="md">
           <div className="flex items-start justify-between mb-4">
             <div>
               <p className="text-sm text-neutral-600">Page Views</p>
@@ -248,7 +248,7 @@ export const AnalyticsPage: React.FC = () => {
           )}
         </Card>
 
-        <Card className="p-6">
+        <Card padding="md">
           <div className="flex items-start justify-between mb-4">
             <div>
               <p className="text-sm text-neutral-600">Unique Visitors</p>
@@ -265,7 +265,7 @@ export const AnalyticsPage: React.FC = () => {
           )}
         </Card>
 
-        <Card className="p-6">
+        <Card padding="md">
           <div className="flex items-start justify-between mb-4">
             <div>
               <p className="text-sm text-neutral-600">Total Downloads</p>
@@ -288,7 +288,7 @@ export const AnalyticsPage: React.FC = () => {
       <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
         {/* Top Pages */}
         <div className="lg:col-span-2">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Top Pages</h2>
             <div className="space-y-3">
               {analytics?.topPages.map((page, index) => (
@@ -309,7 +309,7 @@ export const AnalyticsPage: React.FC = () => {
           </Card>
 
           {/* Top Downloads */}
-          <Card className="p-6 mt-6">
+          <Card padding="md" className="mt-6">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Top Downloads by Gallery</h2>
             <div className="space-y-3">
               {analytics?.downloads.topGalleries.map((gallery, index) => (
@@ -339,7 +339,7 @@ export const AnalyticsPage: React.FC = () => {
         {/* Right Column */}
         <div className="space-y-6">
           {/* Device Breakdown */}
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Device Breakdown</h2>
             <div className="space-y-4">
               <div className="flex items-center justify-between">
@@ -368,7 +368,7 @@ export const AnalyticsPage: React.FC = () => {
 
           {/* Storage Information */}
           {dashboardStats && (
-            <Card className="p-6">
+            <Card padding="md">
               <h2 className="text-lg font-semibold text-neutral-900 mb-4">Storage Usage</h2>
               <div className="space-y-4">
                 <div>
@@ -404,7 +404,7 @@ export const AnalyticsPage: React.FC = () => {
 
       {/* Configuration Notice */}
       {!umamiUrl && (
-        <Card className="p-6 mt-6 bg-amber-50 border-amber-200">
+        <Card padding="md" className="mt-6 bg-amber-50 border-amber-200">
           <div className="flex items-start gap-3">
             <Activity className="w-5 h-5 text-amber-600 flex-shrink-0" />
             <div>
diff --git a/frontend/src/pages/admin/ArchivesPage.tsx b/frontend/src/pages/admin/ArchivesPage.tsx
index 28fefe0..6528a10 100644
--- a/frontend/src/pages/admin/ArchivesPage.tsx
+++ b/frontend/src/pages/admin/ArchivesPage.tsx
@@ -129,7 +129,7 @@ export const ArchivesPage: React.FC = () => {
 
       {/* Statistics Cards */}
       <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-        <Card className="p-4">
+        <Card padding="sm">
           <div className="flex items-center justify-between">
             <div>
               <p className="text-sm text-neutral-600">Total Archives</p>
@@ -139,7 +139,7 @@ export const ArchivesPage: React.FC = () => {
           </div>
         </Card>
         
-        <Card className="p-4">
+        <Card padding="sm">
           <div className="flex items-center justify-between">
             <div>
               <p className="text-sm text-neutral-600">Storage Used</p>
@@ -149,7 +149,7 @@ export const ArchivesPage: React.FC = () => {
           </div>
         </Card>
         
-        <Card className="p-4">
+        <Card padding="sm">
           <div className="flex items-center justify-between">
             <div>
               <p className="text-sm text-neutral-600">Total Photos</p>
@@ -161,7 +161,7 @@ export const ArchivesPage: React.FC = () => {
           </div>
         </Card>
         
-        <Card className="p-4">
+        <Card padding="sm">
           <div className="flex items-center justify-between">
             <div>
               <p className="text-sm text-neutral-600">Avg Archive Size</p>
@@ -178,7 +178,7 @@ export const ArchivesPage: React.FC = () => {
       </div>
 
       {/* Filters and Search */}
-      <Card className="p-4 mb-6">
+      <Card padding="sm" className="mb-6">
         <div className="flex flex-col lg:flex-row gap-4">
           <div className="flex-1">
             <Input
diff --git a/frontend/src/pages/admin/BrandingPage.tsx b/frontend/src/pages/admin/BrandingPage.tsx
index 280cf5b..98d3c6f 100644
--- a/frontend/src/pages/admin/BrandingPage.tsx
+++ b/frontend/src/pages/admin/BrandingPage.tsx
@@ -91,7 +91,7 @@ export const BrandingPage: React.FC = () => {
         </div>
 
         {/* Company Branding */}
-        <Card className="p-6 mb-6">
+        <Card padding="md" className="mb-6">
           <h2 className="text-lg font-semibold text-neutral-900 mb-4">Company Information</h2>
           <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
             <Input
@@ -172,7 +172,7 @@ export const BrandingPage: React.FC = () => {
         </div>
 
         {/* Event-Specific Themes Info */}
-        <Card className="p-6 bg-blue-50 border-blue-200">
+        <Card padding="md" className="bg-blue-50 border-blue-200">
           <div className="flex items-start gap-3">
             <Palette className="w-5 h-5 text-blue-600 flex-shrink-0 mt-0.5" />
             <div>
diff --git a/frontend/src/pages/admin/CreateEventPage.tsx b/frontend/src/pages/admin/CreateEventPage.tsx
index aad89de..3a6225d 100644
--- a/frontend/src/pages/admin/CreateEventPage.tsx
+++ b/frontend/src/pages/admin/CreateEventPage.tsx
@@ -170,7 +170,7 @@ export const CreateEventPage: React.FC = () => {
 
       <form onSubmit={handleSubmit}>
         {/* Event Details */}
-        <Card className="p-6 mb-6">
+        <Card padding="md" className="mb-6">
           <h2 className="text-lg font-semibold text-neutral-900 mb-4">Event Details</h2>
           
           <div className="space-y-4">
@@ -246,7 +246,7 @@ export const CreateEventPage: React.FC = () => {
         </Card>
 
         {/* Contact Information */}
-        <Card className="p-6 mb-6">
+        <Card padding="md" className="mb-6">
           <h2 className="text-lg font-semibold text-neutral-900 mb-4">Contact Information</h2>
           
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
@@ -291,7 +291,7 @@ export const CreateEventPage: React.FC = () => {
         </Card>
 
         {/* Security & Access */}
-        <Card className="p-6 mb-6">
+        <Card padding="md" className="mb-6">
           <h2 className="text-lg font-semibold text-neutral-900 mb-4">Security & Access</h2>
           
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
@@ -344,7 +344,7 @@ export const CreateEventPage: React.FC = () => {
         </Card>
 
         {/* Gallery Settings */}
-        <Card className="p-6 mb-6">
+        <Card padding="md" className="mb-6">
           <h2 className="text-lg font-semibold text-neutral-900 mb-4">Gallery Settings</h2>
           
           <div className="space-y-4">
diff --git a/frontend/src/pages/admin/EmailConfigPage.tsx b/frontend/src/pages/admin/EmailConfigPage.tsx
index 0aebd73..060411e 100644
--- a/frontend/src/pages/admin/EmailConfigPage.tsx
+++ b/frontend/src/pages/admin/EmailConfigPage.tsx
@@ -268,7 +268,7 @@ export const EmailConfigPage: React.FC = () => {
       {/* SMTP Settings Tab */}
       {activeTab === 'smtp' && (
         <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">SMTP Configuration</h2>
             
             <div className="space-y-4">
@@ -385,7 +385,7 @@ export const EmailConfigPage: React.FC = () => {
             </div>
           </Card>
 
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Test Email</h2>
             
             <div className="mb-4 p-4 bg-amber-50 border border-amber-200 rounded-lg">
@@ -447,7 +447,7 @@ export const EmailConfigPage: React.FC = () => {
       {/* Email Templates Tab */}
       {activeTab === 'templates' && (
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
-          <Card className="p-4">
+          <Card padding="sm">
             <h3 className="text-lg font-semibold text-neutral-900 mb-4">Templates</h3>
             <div className="space-y-2">
               {templates.map(template => {
@@ -476,7 +476,7 @@ export const EmailConfigPage: React.FC = () => {
           </Card>
 
           <div className="lg:col-span-2">
-            <Card className="p-6">
+            <Card padding="md">
               <div className="flex items-center justify-between mb-4">
                 <h3 className="text-lg font-semibold text-neutral-900">Edit Template</h3>
                 <Button
diff --git a/frontend/src/pages/admin/EventDetailsPage.tsx b/frontend/src/pages/admin/EventDetailsPage.tsx
index 9121bcd..5477989 100644
--- a/frontend/src/pages/admin/EventDetailsPage.tsx
+++ b/frontend/src/pages/admin/EventDetailsPage.tsx
@@ -15,7 +15,7 @@ import {
   Copy,
   CheckCircle
 } from 'lucide-react';
-import { format, parseISO, differenceInDays, addDays } from 'date-fns';
+import { format, parseISO, differenceInDays } from 'date-fns';
 import { toast } from 'react-toastify';
 
 import { Button, Input, Card, Loading } from '../../components/common';
@@ -249,7 +249,7 @@ export const EventDetailsPage: React.FC = () => {
         {/* Left Column - Details */}
         <div className="lg:col-span-2 space-y-6">
           {/* Event Information */}
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Event Information</h2>
             
             {isEditing ? (
@@ -325,7 +325,7 @@ export const EventDetailsPage: React.FC = () => {
           </Card>
 
           {/* Share Link */}
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Share Link</h2>
             
             <div className="flex items-center gap-2">
@@ -352,7 +352,7 @@ export const EventDetailsPage: React.FC = () => {
 
           {/* Actions */}
           {!event.is_archived && (
-            <Card className="p-6">
+            <Card padding="md">
               <h2 className="text-lg font-semibold text-neutral-900 mb-4">Actions</h2>
               
               <div className="space-y-3">
@@ -380,7 +380,7 @@ export const EventDetailsPage: React.FC = () => {
 
         {/* Right Column - Statistics */}
         <div className="space-y-6">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Statistics</h2>
             
             {stats ? (
@@ -419,7 +419,7 @@ export const EventDetailsPage: React.FC = () => {
 
           {/* Archive Status */}
           {event.is_archived && (
-            <Card className="p-6">
+            <Card padding="md">
               <h2 className="text-lg font-semibold text-neutral-900 mb-4">Archive Status</h2>
               
               <div className="space-y-3">
diff --git a/frontend/src/pages/admin/EventsListPage.tsx b/frontend/src/pages/admin/EventsListPage.tsx
index aa85974..1747e65 100644
--- a/frontend/src/pages/admin/EventsListPage.tsx
+++ b/frontend/src/pages/admin/EventsListPage.tsx
@@ -169,7 +169,7 @@ export const EventsListPage: React.FC = () => {
         </div>
 
       {/* Filters and Search */}
-      <Card className="p-4 mb-6">
+      <Card padding="sm" className="mb-6">
         <div className="flex flex-col lg:flex-row gap-4">
           {/* Search */}
           <div className="flex-1">
diff --git a/frontend/src/pages/admin/SettingsPage.tsx b/frontend/src/pages/admin/SettingsPage.tsx
index 167d4a6..9872122 100644
--- a/frontend/src/pages/admin/SettingsPage.tsx
+++ b/frontend/src/pages/admin/SettingsPage.tsx
@@ -172,7 +172,7 @@ export const SettingsPage: React.FC = () => {
       {/* General Settings Tab */}
       {activeTab === 'general' && (
         <div className="space-y-6">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Site Configuration</h2>
             
             <div className="space-y-4">
@@ -236,7 +236,7 @@ export const SettingsPage: React.FC = () => {
             </div>
           </Card>
 
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Feature Toggles</h2>
             
             <div className="space-y-3">
@@ -298,7 +298,7 @@ export const SettingsPage: React.FC = () => {
       {/* Storage Tab */}
       {activeTab === 'storage' && storageInfo && (
         <div className="space-y-6">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Storage Overview</h2>
             
             <div className="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
@@ -354,7 +354,7 @@ export const SettingsPage: React.FC = () => {
             </div>
           </Card>
 
-          <Card className="p-6">
+          <Card padding="md">
             <div className="flex items-start gap-3">
               <Database className="w-5 h-5 text-amber-600 flex-shrink-0" />
               <div>
@@ -372,7 +372,7 @@ export const SettingsPage: React.FC = () => {
       {/* Security Tab */}
       {activeTab === 'security' && (
         <div className="space-y-6">
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Password Settings</h2>
             
             <div className="space-y-4">
@@ -401,7 +401,7 @@ export const SettingsPage: React.FC = () => {
             </div>
           </Card>
 
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">Session & Authentication</h2>
             
             <div className="space-y-4">
@@ -444,7 +444,7 @@ export const SettingsPage: React.FC = () => {
             </div>
           </Card>
 
-          <Card className="p-6">
+          <Card padding="md">
             <h2 className="text-lg font-semibold text-neutral-900 mb-4">reCAPTCHA Settings</h2>
             
             <div className="space-y-4">
diff --git a/frontend/src/services/settings.service.ts b/frontend/src/services/settings.service.ts
index 02f071f..0b0c169 100644
--- a/frontend/src/services/settings.service.ts
+++ b/frontend/src/services/settings.service.ts
@@ -72,6 +72,11 @@ export const settingsService = {
     await api.put('/api/admin/settings/theme', settings);
   },
 
+  // Update multiple settings at once
+  async updateSettings(settings: Record<string, any>): Promise<void> {
+    await api.put('/api/admin/settings', settings);
+  },
+
   // Get storage information
   async getStorageInfo(): Promise<StorageInfo> {
     const response = await api.get<StorageInfo>('/api/admin/settings/storage/info');