diff --git a/static/css/style.css b/static/css/style.css
index 0f0ca6f..7f83b0f 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -326,6 +326,8 @@ button {
     padding: 2rem;
     min-height: 100vh;
     transition: margin-left 0.3s ease;
+    max-width: 1400px;
+    margin-right: auto;
 }
 
 /* Full width when no user (no sidebar) */
@@ -1034,7 +1036,7 @@ input[type="time"]::-webkit-datetime-edit {
 
 /* Admin Dashboard Styles */
 .admin-container {
-    max-width: 1200px;
+    max-width: 1600px;
     margin: 0 auto 2rem auto;
     padding: 1.5rem;
     background-color: white;
@@ -1042,6 +1044,337 @@ input[type="time"]::-webkit-datetime-edit {
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
 }
 
+/* Common admin page containers - all use same width for consistency */
+.company-admin-container,
+.organization-admin-container,
+.projects-admin-container,
+.companies-admin-container,
+.system-dashboard-container {
+    max-width: 1600px;
+    margin: 0 auto;
+    padding: 2rem;
+}
+
+/* Common Admin Page Styles */
+
+/* Page Headers */
+.page-header {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    border-radius: 16px;
+    padding: 2rem;
+    margin-bottom: 2rem;
+    color: white;
+    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
+}
+
+.header-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 2rem;
+}
+
+.page-title {
+    font-size: 2rem;
+    font-weight: 700;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+}
+
+.page-icon {
+    font-size: 2.5rem;
+    display: inline-block;
+    animation: float 3s ease-in-out infinite;
+}
+
+@keyframes float {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-10px); }
+}
+
+.page-subtitle {
+    font-size: 1.1rem;
+    opacity: 0.9;
+    margin: 0.5rem 0 0 0;
+}
+
+/* Stat Cards */
+.stats-section,
+.stats-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+    gap: 1.5rem;
+    margin-bottom: 2rem;
+}
+
+.stat-card {
+    background: white;
+    padding: 1.5rem;
+    border-radius: 12px;
+    text-align: center;
+    border: 1px solid #e5e7eb;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    transition: all 0.3s ease;
+}
+
+.stat-card:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
+
+.stat-value {
+    font-size: 2.5rem;
+    font-weight: 700;
+    margin-bottom: 0.5rem;
+    color: #667eea;
+}
+
+.stat-label {
+    font-size: 0.9rem;
+    color: #6b7280;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    font-weight: 600;
+}
+
+/* Content Cards */
+.content-card {
+    background: white;
+    border-radius: 12px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    padding: 2rem;
+    margin-bottom: 2rem;
+}
+
+/* Control Sections */
+.controls-section {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 2rem;
+    margin-bottom: 2rem;
+    flex-wrap: wrap;
+}
+
+.search-container {
+    position: relative;
+    flex: 1;
+    max-width: 500px;
+}
+
+.search-icon {
+    position: absolute;
+    left: 1rem;
+    top: 50%;
+    transform: translateY(-50%);
+    color: #6b7280;
+}
+
+.search-input {
+    width: 100%;
+    padding: 0.75rem 1rem 0.75rem 3rem;
+    border: 2px solid #e5e7eb;
+    border-radius: 8px;
+    font-size: 1rem;
+    transition: all 0.3s ease;
+}
+
+.search-input:focus {
+    outline: none;
+    border-color: #667eea;
+    box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+}
+
+/* Button Styles */
+.btn {
+    padding: 0.75rem 1.5rem;
+    border: none;
+    border-radius: 8px;
+    font-weight: 600;
+    font-size: 1rem;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    display: inline-flex;
+    align-items: center;
+    gap: 0.5rem;
+    text-decoration: none;
+}
+
+.btn-primary {
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    color: white;
+}
+
+.btn-primary:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
+}
+
+.btn-secondary {
+    background: white;
+    color: #6b7280;
+    border: 2px solid #e5e7eb;
+}
+
+.btn-secondary:hover {
+    background: #f3f4f6;
+}
+
+.btn-sm {
+    padding: 0.5rem 1rem;
+    font-size: 0.875rem;
+}
+
+/* Badge Styles */
+.status-badge {
+    padding: 0.25rem 0.75rem;
+    border-radius: 20px;
+    font-size: 0.75rem;
+    font-weight: 600;
+    text-transform: uppercase;
+}
+
+.status-active {
+    background: #d1fae5;
+    color: #059669;
+}
+
+.status-inactive {
+    background: #fee2e2;
+    color: #dc2626;
+}
+
+/* Empty States */
+.empty-state {
+    text-align: center;
+    padding: 4rem 2rem;
+    background: white;
+    border-radius: 12px;
+    border: 2px dashed #e5e7eb;
+}
+
+.empty-icon {
+    font-size: 4rem;
+    margin-bottom: 1rem;
+    opacity: 0.3;
+}
+
+/* Grid Layouts */
+.content-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 2rem;
+}
+
+.action-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 1rem;
+}
+
+/* Admin Table Styles */
+.table-container {
+    background: white;
+    border-radius: 12px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    overflow: hidden;
+}
+
+.users-table,
+.projects-table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.users-table thead,
+.projects-table thead {
+    background: #f8f9fa;
+}
+
+.users-table th,
+.projects-table th {
+    padding: 1rem;
+    text-align: left;
+    font-weight: 600;
+    color: #374151;
+    font-size: 0.875rem;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    border-bottom: 2px solid #e5e7eb;
+}
+
+.users-table td,
+.projects-table td {
+    padding: 1rem;
+    border-bottom: 1px solid #e5e7eb;
+}
+
+/* Modern Form Styles */
+.modern-form {
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+.form-group {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.form-label {
+    font-weight: 600;
+    color: #374151;
+    font-size: 0.95rem;
+}
+
+/* Responsive Admin Styles */
+@media (max-width: 1024px) {
+    .content-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
+@media (max-width: 768px) {
+    .company-admin-container,
+    .organization-admin-container,
+    .projects-admin-container,
+    .companies-admin-container,
+    .system-dashboard-container {
+        padding: 1rem;
+    }
+
+    .page-header {
+        padding: 1.5rem;
+    }
+
+    .page-title {
+        font-size: 1.75rem;
+    }
+
+    .header-content {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+
+    .controls-section {
+        flex-direction: column;
+    }
+
+    .search-container {
+        max-width: none;
+        width: 100%;
+    }
+
+    .stats-section,
+    .stats-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
 .admin-header {
     display: flex;
     justify-content: space-between;
diff --git a/templates/admin_company.html b/templates/admin_company.html
index 3d80f35..1fda36d 100644
--- a/templates/admin_company.html
+++ b/templates/admin_company.html
@@ -309,94 +309,8 @@
 
 <style>
 /* Container */
-.company-admin-container {
-    max-width: 1400px;
-    margin: 0 auto;
-    padding: 2rem;
-}
 
-/* Page Header */
-.page-header {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px;
-    padding: 2rem;
-    margin-bottom: 2rem;
-    color: white;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
-}
-
-.header-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 2rem;
-}
-
-.page-title {
-    font-size: 2rem;
-    font-weight: 700;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-}
-
-.page-icon {
-    font-size: 2.5rem;
-    display: inline-block;
-    animation: float 3s ease-in-out infinite;
-}
-
-@keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
-}
-
-.page-subtitle {
-    font-size: 1.1rem;
-    opacity: 0.9;
-    margin: 0.5rem 0 0 0;
-}
-
-/* Stats Section */
-.stats-section {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1.5rem;
-    margin-bottom: 2rem;
-}
-
-.stat-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 12px;
-    text-align: center;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    transition: all 0.3s ease;
-    position: relative;
-}
-
-.stat-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-}
-
-.stat-value {
-    font-size: 2.5rem;
-    font-weight: 700;
-    margin-bottom: 0.5rem;
-    color: #667eea;
-}
-
-.stat-label {
-    font-size: 0.9rem;
-    color: #6b7280;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
+/* Company Admin specific styles */
 
 .stat-link {
     position: absolute;
@@ -414,72 +328,14 @@
     text-decoration: underline;
 }
 
-/* Content Grid */
-.content-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-@media (max-width: 1024px) {
-    .content-grid {
-        grid-template-columns: 1fr;
-    }
-}
-
-/* Cards */
-.card {
-    background: white;
-    border-radius: 12px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    border: 1px solid #e5e7eb;
-    margin-bottom: 1.5rem;
-    overflow: hidden;
-    transition: all 0.3s ease;
-}
-
-.card:hover {
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-    transform: translateY(-2px);
-}
-
-.card-header {
-    background: #f8f9fa;
-    padding: 1.5rem;
-    border-bottom: 1px solid #e5e7eb;
-}
-
-.card-title {
-    font-size: 1.25rem;
-    font-weight: 600;
-    margin: 0;
-    color: #1f2937;
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-}
+/* Company-specific content grid - already defined in common styles */
 
+/* Company-specific card styles */
 .card-title .icon {
     font-size: 1.5rem;
 }
 
-.card-body {
-    padding: 1.5rem;
-}
-
-/* Forms */
-.modern-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
-.form-group {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-}
-
+/* Company-specific form styles */
 .form-row {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -492,12 +348,6 @@
     gap: 1rem;
 }
 
-.form-label {
-    font-weight: 600;
-    color: #374151;
-    font-size: 0.95rem;
-}
-
 .form-control {
     padding: 0.75rem 1rem;
     border: 2px solid #e5e7eb;
@@ -647,30 +497,7 @@ input:checked + .toggle-slider:before {
     max-width: 300px;
 }
 
-/* Buttons */
-.btn {
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 8px;
-    font-weight: 600;
-    font-size: 1rem;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    text-decoration: none;
-}
-
-.btn-primary {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
-}
-
-.btn-primary:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
-}
+/* Company-specific button styles */
 
 .btn-copy {
     background: white;
@@ -690,12 +517,7 @@ input:checked + .toggle-slider:before {
     border-color: #10b981;
 }
 
-/* Quick Actions */
-.action-grid {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 1rem;
-}
+/* Company-specific action grid - already defined in common styles */
 
 .action-item {
     display: flex;
@@ -801,34 +623,17 @@ input:checked + .toggle-slider:before {
     margin: 0;
 }
 
-/* Responsive Design */
+/* Company-specific responsive styles */
 @media (max-width: 768px) {
     .company-admin-container {
         padding: 1rem;
     }
     
-    .page-header {
-        padding: 1.5rem;
-    }
-    
-    .page-title {
-        font-size: 1.75rem;
-    }
-    
-    .header-content {
-        flex-direction: column;
-        text-align: center;
-    }
-    
     .form-row,
     .form-grid {
         grid-template-columns: 1fr;
     }
     
-    .action-grid {
-        grid-template-columns: 1fr;
-    }
-    
     .code-input {
         max-width: 100%;
     }
diff --git a/templates/admin_organization.html b/templates/admin_organization.html
index e2aa7eb..ecd277f 100644
--- a/templates/admin_organization.html
+++ b/templates/admin_organization.html
@@ -466,138 +466,13 @@
 
 <style>
 /* Container */
-.organization-admin-container {
-    max-width: 1600px;
-    margin: 0 auto;
-    padding: 2rem;
-}
-
-/* Page Header */
-.page-header {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px;
-    padding: 2rem;
-    color: white;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
-    margin-bottom: 2rem;
-}
-
-.header-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 2rem;
-}
-
-.page-title {
-    font-size: 2rem;
-    font-weight: 700;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-}
-
-.page-icon {
-    font-size: 2.5rem;
-    display: inline-block;
-    animation: float 3s ease-in-out infinite;
-}
-
-@keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
-}
-
-.page-subtitle {
-    font-size: 1.1rem;
-    opacity: 0.9;
-    margin: 0.5rem 0 0 0;
-}
 
+/* Organization-specific header actions */
 .header-actions {
     display: flex;
     gap: 1rem;
 }
 
-/* Stats Section */
-.stats-section {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1.5rem;
-    margin-bottom: 2rem;
-}
-
-.stat-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 12px;
-    text-align: center;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    transition: all 0.3s ease;
-}
-
-.stat-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-}
-
-.stat-value {
-    font-size: 2.5rem;
-    font-weight: 700;
-    margin-bottom: 0.5rem;
-    color: #667eea;
-}
-
-.stat-label {
-    font-size: 0.9rem;
-    color: #6b7280;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
-
-/* Controls Section */
-.controls-section {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 2rem;
-    margin-bottom: 2rem;
-    flex-wrap: wrap;
-}
-
-.search-container {
-    position: relative;
-    flex: 1;
-    max-width: 500px;
-}
-
-.search-icon {
-    position: absolute;
-    left: 1rem;
-    top: 50%;
-    transform: translateY(-50%);
-    color: #6b7280;
-}
-
-.search-input {
-    width: 100%;
-    padding: 0.75rem 1rem 0.75rem 3rem;
-    border: 2px solid #e5e7eb;
-    border-radius: 8px;
-    font-size: 1rem;
-    transition: all 0.3s ease;
-}
-
-.search-input:focus {
-    outline: none;
-    border-color: #667eea;
-    box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
-}
-
 .view-controls {
     display: flex;
     gap: 0.5rem;
@@ -1078,31 +953,7 @@
     background: #fee2e2;
 }
 
-/* Buttons */
-.btn {
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 8px;
-    font-weight: 600;
-    font-size: 1rem;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    text-decoration: none;
-}
-
-.btn-primary {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
-}
-
-.btn-primary:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
-}
-
+/* Organization-specific button styles */
 .btn-secondary {
     background: white;
     color: #4b5563;
@@ -1124,15 +975,6 @@
     color: white;
 }
 
-.btn-danger {
-    background: #ef4444;
-    color: white;
-}
-
-.btn-danger:hover {
-    background: #dc2626;
-}
-
 .btn-ghost {
     background: transparent;
     color: #6b7280;
@@ -1143,11 +985,6 @@
     background: #f3f4f6;
 }
 
-.btn-sm {
-    padding: 0.5rem 1rem;
-    font-size: 0.875rem;
-}
-
 .btn-icon,
 .btn-icon-sm {
     padding: 0.5rem;
@@ -1186,21 +1023,7 @@
     border-color: #dc2626;
 }
 
-/* Empty State */
-.empty-state {
-    text-align: center;
-    padding: 4rem 2rem;
-    background: white;
-    border-radius: 12px;
-    border: 2px dashed #e5e7eb;
-}
-
-.empty-icon {
-    font-size: 4rem;
-    margin-bottom: 1rem;
-    opacity: 0.3;
-}
-
+/* Organization-specific empty state */
 .empty-state h3 {
     font-size: 1.5rem;
     font-weight: 600;
@@ -1295,25 +1118,7 @@
     gap: 1rem;
 }
 
-/* Forms */
-.modern-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
-.form-group {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-}
-
-.form-label {
-    font-weight: 600;
-    color: #374151;
-    font-size: 0.95rem;
-}
-
+/* Organization-specific form styles */
 .form-control {
     padding: 0.75rem 1rem;
     border: 2px solid #e5e7eb;
@@ -1341,7 +1146,7 @@
     margin-top: 0.5rem;
 }
 
-/* Responsive */
+/* Organization-specific responsive styles */
 @media (max-width: 1024px) {
     .teams-grid {
         grid-template-columns: 1fr;
@@ -1353,14 +1158,6 @@
         padding: 1rem;
     }
     
-    .controls-section {
-        flex-direction: column;
-    }
-    
-    .search-container {
-        max-width: 100%;
-    }
-    
     .view-controls {
         width: 100%;
         justify-content: center;
@@ -1379,15 +1176,6 @@
         grid-template-columns: 1fr;
     }
     
-    .users-table {
-        font-size: 0.875rem;
-    }
-    
-    .users-table th,
-    .users-table td {
-        padding: 0.5rem;
-    }
-    
     .table-actions {
         flex-direction: column;
     }
diff --git a/templates/admin_projects.html b/templates/admin_projects.html
index cd3bbd9..f25a220 100644
--- a/templates/admin_projects.html
+++ b/templates/admin_projects.html
@@ -345,56 +345,7 @@
 </div>
 
 <style>
-/* Container */
-.projects-admin-container {
-    max-width: 1400px;
-    margin: 0 auto;
-    padding: 2rem;
-}
-
-/* Page Header */
-.page-header {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px;
-    padding: 2rem;
-    margin-bottom: 2rem;
-    color: white;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
-}
-
-.header-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 2rem;
-}
-
-.page-title {
-    font-size: 2rem;
-    font-weight: 700;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-}
-
-.page-icon {
-    font-size: 2.5rem;
-    display: inline-block;
-    animation: float 3s ease-in-out infinite;
-}
-
-@keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
-}
-
-.page-subtitle {
-    font-size: 1.1rem;
-    opacity: 0.9;
-    margin: 0.5rem 0 0 0;
-}
+/* Projects admin specific styles */
 
 .header-actions {
     display: flex;
@@ -402,43 +353,7 @@
     flex-wrap: wrap;
 }
 
-/* Stats Section */
-.stats-section {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1.5rem;
-    margin-bottom: 2rem;
-}
-
-.stat-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 12px;
-    text-align: center;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    transition: all 0.3s ease;
-}
-
-.stat-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-}
-
-.stat-value {
-    font-size: 2.5rem;
-    font-weight: 700;
-    margin-bottom: 0.5rem;
-    color: #667eea;
-}
-
-.stat-label {
-    font-size: 0.9rem;
-    color: #6b7280;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
+/* Stats section styles already in common style.css */
 
 /* Categories Section */
 .categories-section {
@@ -542,23 +457,13 @@
     margin-bottom: 2rem;
 }
 
-.search-container {
-    position: relative;
-    flex: 1;
-    max-width: 500px;
-}
-
+/* Project specific search styles */
 .search-icon {
-    position: absolute;
-    left: 1rem;
-    top: 50%;
-    transform: translateY(-50%);
     font-size: 1.25rem;
     opacity: 0.6;
 }
 
 .search-input {
-    width: 100%;
     padding: 1rem 1rem 1rem 3rem;
     border: 2px solid #e5e7eb;
     border-radius: 12px;
@@ -716,38 +621,7 @@
     margin: 0;
 }
 
-/* List View */
-.table-container {
-    background: white;
-    border-radius: 12px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    overflow: hidden;
-}
-
-.projects-table {
-    width: 100%;
-    border-collapse: collapse;
-}
-
-.projects-table thead {
-    background: #f8f9fa;
-}
-
-.projects-table th {
-    padding: 1rem;
-    text-align: left;
-    font-weight: 600;
-    color: #374151;
-    font-size: 0.875rem;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    border-bottom: 2px solid #e5e7eb;
-}
-
-.projects-table td {
-    padding: 1rem;
-    border-bottom: 1px solid #e5e7eb;
-}
+/* Projects table styles already in common style.css */
 
 .projects-table tbody tr:hover {
     background: #f9fafb;
@@ -794,25 +668,9 @@
     margin: 0;
 }
 
-/* Status Badges */
-.status-badge {
-    padding: 0.25rem 0.75rem;
-    border-radius: 20px;
-    font-size: 0.75rem;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-
-.status-active {
-    background: #d1fae5;
-    color: #059669;
-}
-
-.status-inactive {
-    background: #fee2e2;
-    color: #dc2626;
-}
+/* Status badges already in common style.css */
 
+<<<<<<< HEAD
 /* Buttons */
 .btn {
     padding: 0.75rem 1.5rem;
@@ -848,6 +706,34 @@
     background: #f3f4f6;
     border-color: #d1d5db;
 }
+=======
+/* Billing Badges */
+.billing-badge {
+    padding: 0.25rem 0.75rem;
+    border-radius: 20px;
+    font-size: 0.75rem;
+    font-weight: 600;
+    display: inline-flex;
+    align-items: center;
+    gap: 0.25rem;
+}
+
+.billing-badge.hourly {
+    background: #dbeafe;
+    color: #1e40af;
+}
+
+.billing-badge.fixed {
+    background: #fef3c7;
+    color: #92400e;
+}
+
+.billing-badge i {
+    font-size: 0.875rem;
+}
+
+/* Project-specific button styles */
+>>>>>>> 66d261a (Streamline common CSS styles.)
 
 .btn-edit {
     background: white;
@@ -883,10 +769,7 @@
     color: white;
 }
 
-.btn-sm {
-    padding: 0.5rem 1rem;
-    font-size: 0.875rem;
-}
+/* btn-sm already in common style.css */
 
 .btn-action {
     padding: 0.5rem;
@@ -1002,31 +885,13 @@
     justify-content: flex-end;
 }
 
-/* Modern Form in Modal */
-.modern-form {
-    display: flex;
-    flex-direction: column;
-    gap: 1.5rem;
-}
-
-.form-group {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
-}
-
+/* Project-specific form styles */
 .form-row {
     display: grid;
     grid-template-columns: 1fr 1fr;
     gap: 1rem;
 }
 
-.form-label {
-    font-weight: 600;
-    color: #374151;
-    font-size: 0.95rem;
-}
-
 .form-control {
     padding: 0.75rem 1rem;
     border: 2px solid #e5e7eb;
@@ -1066,15 +931,7 @@
     flex: 1;
 }
 
-/* Empty State */
-.empty-state {
-    text-align: center;
-    padding: 4rem 2rem;
-    background: white;
-    border-radius: 12px;
-    border: 2px dashed #e5e7eb;
-}
-
+/* Project-specific empty state */
 .empty-icon {
     font-size: 4rem;
     margin-bottom: 1.5rem;
@@ -1105,25 +962,12 @@
     padding: 3rem;
 }
 
-/* Responsive Design */
+/* Project-specific responsive design */
 @media (max-width: 768px) {
     .projects-admin-container {
         padding: 1rem;
     }
     
-    .page-header {
-        padding: 1.5rem;
-    }
-    
-    .page-title {
-        font-size: 1.75rem;
-    }
-    
-    .header-content {
-        flex-direction: column;
-        text-align: center;
-    }
-    
     .header-actions {
         width: 100%;
     }
@@ -1136,10 +980,6 @@
         flex-direction: column;
     }
     
-    .search-container {
-        max-width: 100%;
-    }
-    
     .projects-grid {
         grid-template-columns: 1fr;
     }
diff --git a/templates/system_admin_companies.html b/templates/system_admin_companies.html
index 107d3ee..ce2192e 100644
--- a/templates/system_admin_companies.html
+++ b/templates/system_admin_companies.html
@@ -175,99 +175,14 @@
 </div>
 
 <style>
-/* Container */
-.companies-admin-container {
-    max-width: 1400px;
-    margin: 0 auto;
-    padding: 2rem;
-}
-
-/* Page Header */
-.page-header {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px;
-    padding: 2rem;
-    margin-bottom: 2rem;
-    color: white;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
-}
-
-.header-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 2rem;
-}
-
-.page-title {
-    font-size: 2rem;
-    font-weight: 700;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-}
-
-.page-icon {
-    font-size: 2.5rem;
-    display: inline-block;
-    animation: float 3s ease-in-out infinite;
-}
-
-@keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
-}
-
-.page-subtitle {
-    font-size: 1.1rem;
-    opacity: 0.9;
-    margin: 0.5rem 0 0 0;
-}
+/* System admin companies specific styles */
 
 .header-actions {
     display: flex;
     gap: 1rem;
 }
 
-/* Stats Section */
-.stats-section {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1.5rem;
-    margin-bottom: 2rem;
-}
-
-.stat-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 12px;
-    text-align: center;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    transition: all 0.3s ease;
-}
-
-.stat-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-}
-
-.stat-value {
-    font-size: 2.5rem;
-    font-weight: 700;
-    margin-bottom: 0.5rem;
-    color: #667eea;
-}
-
-.stat-label {
-    font-size: 0.9rem;
-    color: #6b7280;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
+/* Stats section styles already in common style.css */
 
 /* Content Section */
 .content-section {
@@ -372,24 +287,7 @@
     color: #065f46;
 }
 
-/* Status Badges */
-.status-badge {
-    padding: 0.25rem 0.75rem;
-    border-radius: 20px;
-    font-size: 0.75rem;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-
-.status-active {
-    background: #d1fae5;
-    color: #065f46;
-}
-
-.status-inactive {
-    background: #fee2e2;
-    color: #991b1b;
-}
+/* Status badges already in common style.css */
 
 /* Table Actions */
 .table-actions {
@@ -473,18 +371,7 @@
     font-size: 0.875rem;
 }
 
-/* Empty State */
-.empty-state {
-    text-align: center;
-    padding: 4rem 2rem;
-}
-
-.empty-icon {
-    font-size: 4rem;
-    margin-bottom: 1.5rem;
-    opacity: 0.3;
-}
-
+/* System admin companies specific empty state */
 .empty-title {
     font-size: 1.75rem;
     font-weight: 700;
@@ -498,31 +385,7 @@
     margin-bottom: 2rem;
 }
 
-/* Buttons */
-.btn {
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 8px;
-    font-weight: 600;
-    font-size: 1rem;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    text-decoration: none;
-}
-
-.btn-primary {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
-}
-
-.btn-primary:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
-}
-
+/* System admin companies specific button styles */
 .btn-secondary {
     background: white;
     color: #667eea;
@@ -534,21 +397,12 @@
     border-color: rgba(255, 255, 255, 0.5);
 }
 
-/* Responsive Design */
+/* System admin companies specific responsive styles */
 @media (max-width: 768px) {
     .companies-admin-container {
         padding: 1rem;
     }
     
-    .page-header {
-        padding: 1.5rem;
-    }
-    
-    .header-content {
-        flex-direction: column;
-        text-align: center;
-    }
-    
     .header-actions {
         width: 100%;
         flex-direction: column;
diff --git a/templates/system_admin_dashboard.html b/templates/system_admin_dashboard.html
index b3153f4..900202f 100644
--- a/templates/system_admin_dashboard.html
+++ b/templates/system_admin_dashboard.html
@@ -276,100 +276,14 @@
 </div>
 
 <style>
-/* Container */
-.system-dashboard-container {
-    max-width: 1400px;
-    margin: 0 auto;
-    padding: 2rem;
-}
-
-/* Page Header */
-.page-header {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px;
-    padding: 2rem;
-    margin-bottom: 2rem;
-    color: white;
-    box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
-}
-
-.header-content {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 2rem;
-}
-
-.page-title {
-    font-size: 2rem;
-    font-weight: 700;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-}
-
-.page-icon {
-    font-size: 2.5rem;
-    display: inline-block;
-    animation: float 3s ease-in-out infinite;
-}
-
-@keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
-}
-
-.page-subtitle {
-    font-size: 1.1rem;
-    opacity: 0.9;
-    margin: 0.5rem 0 0 0;
-}
+/* System dashboard specific styles */
 
 .header-actions {
     display: flex;
     gap: 1rem;
 }
 
-/* Stats Section */
-.stats-section {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 1.5rem;
-    margin-bottom: 2rem;
-}
-
-.stat-card {
-    background: white;
-    padding: 1.5rem;
-    border-radius: 12px;
-    text-align: center;
-    border: 1px solid #e5e7eb;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    transition: all 0.3s ease;
-    position: relative;
-}
-
-.stat-card:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-}
-
-.stat-value {
-    font-size: 2.5rem;
-    font-weight: 700;
-    margin-bottom: 0.5rem;
-    color: #667eea;
-}
-
-.stat-label {
-    font-size: 0.9rem;
-    color: #6b7280;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-    font-weight: 600;
-}
+/* Stats section styles already in common style.css */
 
 .stat-link {
     position: absolute;
@@ -426,18 +340,7 @@
     font-size: 0.95rem;
 }
 
-/* Content Grid */
-.content-grid {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-@media (max-width: 1024px) {
-    .content-grid {
-        grid-template-columns: 1fr;
-    }
-}
+/* Content grid styles already in common style.css */
 
 /* Cards */
 .card {
@@ -576,12 +479,7 @@
     color: #6b7280;
 }
 
-/* Action Grid */
-.action-grid {
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 1rem;
-}
+/* Action grid styles already in common style.css */
 
 .action-item {
     display: flex;
@@ -686,31 +584,7 @@
     color: #065f46;
 }
 
-/* Buttons */
-.btn {
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 8px;
-    font-weight: 600;
-    font-size: 1rem;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    text-decoration: none;
-}
-
-.btn-primary {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
-}
-
-.btn-primary:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
-}
-
+/* System dashboard specific button styles */
 .btn-secondary {
     background: white;
     color: #667eea;
@@ -745,10 +619,7 @@
     border-color: #667eea;
 }
 
-.btn-sm {
-    font-size: 0.875rem;
-    padding: 0.5rem 1rem;
-}
+/* btn-sm already in common style.css */
 
 /* Empty State */
 .empty-message {
@@ -758,34 +629,17 @@
     font-style: italic;
 }
 
-/* Responsive Design */
+/* System dashboard specific responsive styles */
 @media (max-width: 768px) {
     .system-dashboard-container {
         padding: 1rem;
     }
     
-    .page-header {
-        padding: 1.5rem;
-    }
-    
-    .page-title {
-        font-size: 1.75rem;
-    }
-    
-    .header-content {
-        flex-direction: column;
-        text-align: center;
-    }
-    
     .header-actions {
         width: 100%;
         flex-direction: column;
     }
     
-    .action-grid {
-        grid-template-columns: 1fr;
-    }
-    
     .alert-banner {
         flex-direction: column;
         text-align: center;