diff --git a/static/css/time-tracking.css b/static/css/time-tracking.css
index 14a042c..77b6639 100644
--- a/static/css/time-tracking.css
+++ b/static/css/time-tracking.css
@@ -1,6 +1,6 @@
 /* Time Tracking Styles */
 
-/* Container */
+/* Container - Legacy support for old pages */
 .time-tracking-container {
     max-width: 1400px;
     margin: 0 auto;
diff --git a/templates/_time_tracking_interface.html b/templates/_time_tracking_interface.html
index eb9a6e2..67a8b39 100644
--- a/templates/_time_tracking_interface.html
+++ b/templates/_time_tracking_interface.html
@@ -1,5 +1,5 @@
 <!-- Time Tracking Interface - Shared Component -->
-<div class="time-tracking-container">
+<div class="page-container">
     <!-- Header Section -->
     <div class="page-header">
         <div class="header-content">
diff --git a/templates/analytics.html b/templates/analytics.html
index 78a6c4b..3c19253 100644
--- a/templates/analytics.html
+++ b/templates/analytics.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="page-container timetrack-container">
+<div class="page-container">
     <div class="page-header">
         <div class="header-content">
             <div class="header-left">
diff --git a/templates/create_project.html b/templates/create_project.html
index fa03b90..f30934e 100644
--- a/templates/create_project.html
+++ b/templates/create_project.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="timetrack-container">
+<div class="page-container">
     <h2>Create New Project</h2>
     
     <form method="POST" action="{{ url_for('projects.create_project') }}" class="project-form">
diff --git a/templates/edit_project.html b/templates/edit_project.html
index b9f2e99..2c1a4b0 100644
--- a/templates/edit_project.html
+++ b/templates/edit_project.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="timetrack-container">
+<div class="page-container">
     <h2>Edit Project: {{ project.name }}</h2>
     
     <form method="POST" action="{{ url_for('projects.edit_project', project_id=project.id) }}" class="project-form">
diff --git a/templates/export.html b/templates/export.html
index af00cb4..f429c0d 100644
--- a/templates/export.html
+++ b/templates/export.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="timetrack-container">
+<div class="page-container">
     <h2>Export Time Entries</h2>
     
     <div class="export-options">
diff --git a/templates/index_old.html b/templates/index_old.html
index 3fd73c5..5f6fbb8 100644
--- a/templates/index_old.html
+++ b/templates/index_old.html
@@ -146,7 +146,7 @@
 {% else %}
 
 <!-- Include the modern time tracking interface from time_tracking.html -->
-<div class="time-tracking-container">
+<div class="page-container">
     <!-- Header Section -->
     <div class="page-header">
         <div class="header-content">
diff --git a/templates/manage_project_tasks.html b/templates/manage_project_tasks.html
index 20b5c96..f82f6ff 100644
--- a/templates/manage_project_tasks.html
+++ b/templates/manage_project_tasks.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="page-container timetrack-container">
+<div class="page-container">
     <div class="page-header task-header">
         <div class="project-info">
             <h2>Tasks for Project: {{ project.code }} - {{ project.name }}</h2>
diff --git a/templates/timetrack.html b/templates/timetrack.html
index 567d09f..c7c7cf3 100644
--- a/templates/timetrack.html
+++ b/templates/timetrack.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 
 {% block content %}
-<div class="timetrack-container">
+<div class="page-container">
     <h1>Time Tracking</h1>
 
     <div class="timer-section">