diff --git a/config/routes/activity.yaml b/config/routes/activity.yaml
new file mode 100644
index 0000000..e671ae5
--- /dev/null
+++ b/config/routes/activity.yaml
@@ -0,0 +1,3 @@
+activity_activities:
+    path: /activities
+    controller: App\Controller\ActivityController::activities
\ No newline at end of file
diff --git a/config/routes/actor.yaml b/config/routes/actor.yaml
new file mode 100644
index 0000000..eae4f0b
--- /dev/null
+++ b/config/routes/actor.yaml
@@ -0,0 +1,6 @@
+actor_actors:
+    path: /actors
+    controller: App\Controller\ActorController::actors
+actor_actor:
+    path: /actors/edit/{id}
+    controller: App\Controller\ActorController::actor
\ No newline at end of file
diff --git a/config/routes/actors.yaml b/config/routes/actors.yaml
deleted file mode 100644
index 5e166d0..0000000
--- a/config/routes/actors.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-actors_actors:
-    path: /actors
-    controller: App\Controller\ActorsController::actors
-actors_actor:
-    path: /actors/edit/{id}
-    controller: App\Controller\ActorsController::actor
\ No newline at end of file
diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
new file mode 100644
index 0000000..0a43b01
--- /dev/null
+++ b/src/Controller/ActivityController.php
@@ -0,0 +1,21 @@
+<?php
+namespace App\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Controller for activity related pages
+ */
+class ActivityController extends AbstractExtendedController
+{
+
+    /**
+     * Page for the list of activities
+     *
+     * @return Response
+     */
+    public function activities(): Response
+    {
+        return $this->render('activity/activities.html.twig');
+    }
+}
\ No newline at end of file
diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php
new file mode 100644
index 0000000..8b63454
--- /dev/null
+++ b/src/Controller/ActorController.php
@@ -0,0 +1,160 @@
+<?php
+namespace App\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use App\Form\Actors\ActorAddForm;
+use App\Repository\ActorRepository;
+use App\Entity\ActorEntity;
+use App\Form\Actors\ActorDeleteForm;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use App\Form\Actors\ActorEditForm;
+
+class ActorController extends AbstractExtendedController
+{
+
+    /**
+     * Actors management page
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function actors(Request $request): Response
+    {
+        // Get repositories
+        $entityManager = $this->getDoctrine()->getManager();
+        /** @var ActorRepository $actorRepository */
+        $actorRepository = $entityManager->getRepository(ActorEntity::class);
+
+        // Actor add form
+        /** @var ActorAddForm $actorAddFom */
+        $actorAddFom = $this->createNamedCustomForm('actorAdd', ActorAddForm::class);
+        $actorAddFom->handleRequest($request);
+        if ($actorAddFom->isSubmitted() && $actorAddFom->isValid()) {
+            $errors = $actorAddFom->validate();
+            if (empty($errors)) {
+                $actor = $actorAddFom->getActor();
+                $entityManager->persist($actor);
+                $entityManager->flush();
+
+                return $this->ajaxFormAnswer([
+                    'refresh' => true,
+                    'reset' => true,
+                    'message' => 'Acteur ajouté',
+                ]);
+            } else {
+                return $this->ajaxFormAnswer([
+                    'error' => join('<br/>', $errors),
+                    'code' => Response::HTTP_BAD_REQUEST,
+                ]);
+            }
+        }
+
+        // Actor delete form
+        /** @var ActorDeleteForm $actorDeleteForm */
+        $actorDeleteForm = $this->createNamedCustomForm('actorDelete', ActorDeleteForm::class);
+        $actorDeleteForm->handleRequest($request);
+        if ($actorDeleteForm->isSubmitted() && $actorDeleteForm->isValid()) {
+            $errors = $actorDeleteForm->validate();
+            if (empty($errors)) {
+                $actor = $actorDeleteForm->getActor($actorRepository);
+                if (!is_null($actor)) {
+                    $entityManager->remove($actor);
+                    $entityManager->flush();
+                    return $this->ajaxFormAnswer([
+                        'refresh' => true,
+                    ]);
+                } else {
+                    return $this->ajaxFormAnswer([
+                        'error' => 'Utilisateur non trouvé',
+                        'code' => Response::HTTP_BAD_REQUEST,
+                    ]);
+                }
+            } else {
+                return $this->ajaxFormAnswer([
+                    'error' => join('<br/>', $errors),
+                    'code' => Response::HTTP_BAD_REQUEST,
+                ]);
+            }
+        }
+
+        // Get actors
+        $actors = $actorRepository->findAll();
+
+        return $this->render('actor/actors.html.twig', [
+            'actorAddForm' => $actorAddFom,
+            'actorDeleteForm' => $actorDeleteForm,
+            'actors' => $actors,
+        ]);
+    }
+
+    /**
+     * Actor edition page
+     *
+     * @param Request $request
+     * @param string $id
+     * @return Response
+     */
+    public function actor(Request $request, string $id): Response
+    {
+        // Get repositories
+        $entityManager = $this->getDoctrine()->getManager();
+        /** @var ActorRepository $actorRepository */
+        $actorRepository = $entityManager->getRepository(ActorEntity::class);
+
+        // Get actor
+        $actor = $actorRepository->find($id);
+
+        // Actor edit form
+        /** @var ActorEditForm $actorEditForm */
+        $actorEditForm = $this->createNamedCustomForm('edit', ActorEditForm::class);
+        $actorEditForm->handleRequest($request);
+        if ($actorEditForm->isSubmitted() && $actorEditForm->isValid()) {
+            $errors = $actorEditForm->validate();
+            if (empty($errors)) {
+                $actorEditForm->updateActor($actor);
+                $entityManager->persist($actor);
+                $entityManager->flush();
+                return $this->ajaxFormAnswer([
+                    'message' => 'Modification enregistrées',
+                    'refresh' => true,
+                ]);
+            } else {
+                return $this->ajaxFormAnswer([
+                    'error' => join('<br/>', $errors),
+                    'code' => Response::HTTP_BAD_REQUEST,
+                ]);
+            }
+        }
+
+        // Actor delete form
+        /** @var ActorDeleteForm $actorDeleteForm */
+        $actorDeleteForm = $this->createNamedCustomForm('delete', ActorDeleteForm::class);
+        $actorDeleteForm->handleRequest($request);
+        if ($actorDeleteForm->isSubmitted() && $actorDeleteForm->isValid()) {
+            $errors = $actorDeleteForm->validate();
+            if (empty($errors)) {
+                $entityManager->remove($actor);
+                $entityManager->flush();
+                return $this->ajaxFormAnswer([
+                    'redirect' => $this->generateUrl('actors_actors', [], UrlGenerator::ABSOLUTE_PATH),
+                ]);
+            } else {
+                return $this->ajaxFormAnswer([
+                    'error' => join('<br/>', $errors),
+                    'code' => Response::HTTP_BAD_REQUEST,
+                ]);
+            }
+        }
+        
+        // Update fields        
+        $actorEditForm->updateFields($actor);
+
+        return $this->render('actor/actor.html.twig', [
+            'actor' => $actor,
+            'editForm' => $actorEditForm,
+            'deleteForm' => $actorDeleteForm,
+        ]);
+    }
+}
+
diff --git a/src/Controller/ActorsController.php b/src/Controller/ActorsController.php
deleted file mode 100644
index 8695895..0000000
--- a/src/Controller/ActorsController.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-namespace App\Controller;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use App\Form\Actors\ActorAddForm;
-use App\Repository\ActorRepository;
-use App\Entity\ActorEntity;
-use App\Form\Actors\ActorDeleteForm;
-use Symfony\Component\Routing\Generator\UrlGenerator;
-use App\Form\Actors\ActorEditForm;
-
-class ActorsController extends AbstractExtendedController
-{
-
-    /**
-     * Actors management page
-     *
-     * @param Request $request
-     * @return Response
-     */
-    public function actors(Request $request): Response
-    {
-        // Get repositories
-        $entityManager = $this->getDoctrine()->getManager();
-        /** @var ActorRepository $actorRepository */
-        $actorRepository = $entityManager->getRepository(ActorEntity::class);
-
-        // Actor add form
-        /** @var ActorAddForm $actorAddFom */
-        $actorAddFom = $this->createNamedCustomForm('actorAdd', ActorAddForm::class);
-        $actorAddFom->handleRequest($request);
-        if ($actorAddFom->isSubmitted() && $actorAddFom->isValid()) {
-            $errors = $actorAddFom->validate();
-            if (empty($errors)) {
-                $actor = $actorAddFom->getActor();
-                $entityManager->persist($actor);
-                $entityManager->flush();
-
-                return $this->ajaxFormAnswer([
-                    'refresh' => true,
-                    'reset' => true,
-                    'message' => 'Acteur ajouté',
-                ]);
-            } else {
-                return $this->ajaxFormAnswer([
-                    'error' => join('<br/>', $errors),
-                    'code' => Response::HTTP_BAD_REQUEST,
-                ]);
-            }
-        }
-
-        // Actor delete form
-        /** @var ActorDeleteForm $actorDeleteForm */
-        $actorDeleteForm = $this->createNamedCustomForm('actorDelete', ActorDeleteForm::class);
-        $actorDeleteForm->handleRequest($request);
-        if ($actorDeleteForm->isSubmitted() && $actorDeleteForm->isValid()) {
-            $errors = $actorDeleteForm->validate();
-            if (empty($errors)) {
-                $actor = $actorDeleteForm->getActor($actorRepository);
-                if (!is_null($actor)) {
-                    $entityManager->remove($actor);
-                    $entityManager->flush();
-                    return $this->ajaxFormAnswer([
-                        'refresh' => true,
-                    ]);
-                } else {
-                    return $this->ajaxFormAnswer([
-                        'error' => 'Utilisateur non trouvé',
-                        'code' => Response::HTTP_BAD_REQUEST,
-                    ]);
-                }
-            } else {
-                return $this->ajaxFormAnswer([
-                    'error' => join('<br/>', $errors),
-                    'code' => Response::HTTP_BAD_REQUEST,
-                ]);
-            }
-        }
-
-        // Get actors
-        $actors = $actorRepository->findAll();
-
-        return $this->render('actors/actors.html.twig', [
-            'actorAddForm' => $actorAddFom,
-            'actorDeleteForm' => $actorDeleteForm,
-            'actors' => $actors,
-        ]);
-    }
-
-    /**
-     * Actor edition page
-     *
-     * @param Request $request
-     * @param string $id
-     * @return Response
-     */
-    public function actor(Request $request, string $id): Response
-    {
-        // Get repositories
-        $entityManager = $this->getDoctrine()->getManager();
-        /** @var ActorRepository $actorRepository */
-        $actorRepository = $entityManager->getRepository(ActorEntity::class);
-
-        // Get actor
-        $actor = $actorRepository->find($id);
-
-        // Actor edit form
-        /** @var ActorEditForm $actorEditForm */
-        $actorEditForm = $this->createNamedCustomForm('edit', ActorEditForm::class);
-        $actorEditForm->handleRequest($request);
-        if ($actorEditForm->isSubmitted() && $actorEditForm->isValid()) {
-            $errors = $actorEditForm->validate();
-            if (empty($errors)) {
-                $actorEditForm->updateActor($actor);
-                $entityManager->persist($actor);
-                $entityManager->flush();
-                return $this->ajaxFormAnswer([
-                    'message' => 'Modification enregistrées',
-                    'refresh' => true,
-                ]);
-            } else {
-                return $this->ajaxFormAnswer([
-                    'error' => join('<br/>', $errors),
-                    'code' => Response::HTTP_BAD_REQUEST,
-                ]);
-            }
-        }
-
-        // Actor delete form
-        /** @var ActorDeleteForm $actorDeleteForm */
-        $actorDeleteForm = $this->createNamedCustomForm('delete', ActorDeleteForm::class);
-        $actorDeleteForm->handleRequest($request);
-        if ($actorDeleteForm->isSubmitted() && $actorDeleteForm->isValid()) {
-            $errors = $actorDeleteForm->validate();
-            if (empty($errors)) {
-                $entityManager->remove($actor);
-                $entityManager->flush();
-                return $this->ajaxFormAnswer([
-                    'redirect' => $this->generateUrl('actors_actors', [], UrlGenerator::ABSOLUTE_PATH),
-                ]);
-            } else {
-                return $this->ajaxFormAnswer([
-                    'error' => join('<br/>', $errors),
-                    'code' => Response::HTTP_BAD_REQUEST,
-                ]);
-            }
-        }
-        
-        // Update fields        
-        $actorEditForm->updateFields($actor);
-
-        return $this->render('actors/actor.html.twig', [
-            'actor' => $actor,
-            'editForm' => $actorEditForm,
-            'deleteForm' => $actorDeleteForm,
-        ]);
-    }
-}
-
diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig
new file mode 100644
index 0000000..7f016ad
--- /dev/null
+++ b/templates/_includes/html/arrays/activity.html.twig
@@ -0,0 +1,14 @@
+<table>
+	<thead>
+		<tr>
+			<td>Nom</td>
+			<td>Status</td>
+			<td>Acteur</td>
+			<td>Début planifié</td>
+			<td>Début réél</td>
+			<td>Fin planifiée</td>
+			<td>Fin rééle</td>
+			<td><span class="d-none">Actions</span></td>
+		</tr>
+	</thead>
+</table>
\ No newline at end of file
diff --git a/templates/_includes/html/arrays/actor.html.twig b/templates/_includes/html/arrays/actor.html.twig
index fba6d89..ba46627 100644
--- a/templates/_includes/html/arrays/actor.html.twig
+++ b/templates/_includes/html/arrays/actor.html.twig
@@ -5,7 +5,7 @@
 			<td>Prénom</td>
 			<td>Surnom</td>
 			<td>Actif</td>
-			<td colspan="2"><span class="d-none">Actions</span></i></td>
+			<td colspan="2"><span class="d-none">Actions</span></td>
 		</tr>
 	</thead>
 	<tbody>
@@ -16,7 +16,7 @@
 			<td>{{ actor.nickname }}</td>
 			<td>{% if actor.active %}<i class="icofont-checked color-green"><span
 					class="d-none">Actif</span></i> {% endif %}</td>
-			<td><a href="{{ url('actors_actor', {id: actor.id}, false) }}"
+			<td><a href="{{ url('actor_actor', {id: actor.id}, false) }}"
 				title="Editer l'acteur"
 				<i class="icofont-pencil-alt-2"><span class="d-none">Editer</span></i></i></a></td>
 			<td>{% if actorDeleteForm is defined %}
diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig
index 86df7bb..f2b1acd 100644
--- a/templates/_includes/html/base.html.twig
+++ b/templates/_includes/html/base.html.twig
@@ -38,8 +38,7 @@
 		<li>{% include '_includes/html/component/navLink.html.twig' with {route: 'main_home', icon: 'icofont-home', name: 'Accueil'} %}</li>
 		<p class="nav-category">Activités</p>
 		<li>
-			<ul>
-				<i class="icofont-listing-box icon"></i>Activités
+			<ul>{% include '_includes/html/component/navLink.html.twig' with {route: 'activity_activities', icon: 'icofont-listing-box', name: 'Activités'} %}
 			</ul>
 			<ul>
 				<i class="icofont-clock-time icon"></i>Timeline
@@ -49,7 +48,7 @@
 			</ul>
 		</li>
 		<p class="nav-category">Paramètres</p>
-		<li>{% include '_includes/html/component/navLink.html.twig' with {route: 'actors_actors', icon: 'icofont-people', name: 'Acteurs'} %}
+		<li>{% include '_includes/html/component/navLink.html.twig' with {route: 'actor_actors', icon: 'icofont-people', name: 'Acteurs'} %}
 		</li>
 	</nav>
 	<header>
diff --git a/templates/activity/activities.html.twig b/templates/activity/activities.html.twig
new file mode 100644
index 0000000..2d805ea
--- /dev/null
+++ b/templates/activity/activities.html.twig
@@ -0,0 +1,15 @@
+{% extends '_includes/html/base.html.twig' %}
+
+{% set page='Activités' %}
+
+{% block pageContent %}
+<div class="col-12">
+	<div class="card">
+		<div class="card-header">
+			<h2>Activités</h2>
+		</div>
+		<div class="card-body">
+		{% include "_includes/html/arrays/activity.html.twig" %}</div>
+	</div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/actor/actor.html.twig b/templates/actor/actor.html.twig
new file mode 100644
index 0000000..f351706
--- /dev/null
+++ b/templates/actor/actor.html.twig
@@ -0,0 +1,23 @@
+{% extends '_includes/html/base.html.twig' %}
+
+{% set page="Edition de l'acteur "~actor.displayName %}
+{% set returnLink=url("actor_actors", {}, false) %}
+
+{% block pageContent %}
+<div class="col-6">
+	<div class="card-header">
+		<h2>Editer</h2>
+	</div>
+	<div class="card-body">
+		{% include '_includes/html/genericForm.html.twig' with {'form': editForm} only %}
+	</div>
+</div>
+<div class="col-6">
+	<div class="card-header">
+		<h2>Supprimer l'acteur</h2>
+	</div>
+	<div class="card-body">
+		{% include '_includes/html/genericForm.html.twig' with {'form': deleteForm, 'data': {actor: actor, variant: 'full'}} only %}
+	</div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/actor/actors.html.twig b/templates/actor/actors.html.twig
new file mode 100644
index 0000000..01853bf
--- /dev/null
+++ b/templates/actor/actors.html.twig
@@ -0,0 +1,26 @@
+{% extends '_includes/html/base.html.twig' %}
+
+{% set page='Acteurs' %}
+
+{% block pageContent %}
+<div class="col-9">
+	<div class="card">
+		<div class="card-header">
+			<h2>Acteurs</h2>
+		</div>
+		<div class="card-body">
+			{% include "_includes/html/arrays/actor.html.twig" with {actors: actors, actorDeleteForm: actorDeleteForm} only %}
+		</div>
+	</div>
+</div>
+<div class="col-3">
+	<div class="card">
+		<div class="card-header">
+			<h2>Ajouter un acteur</h2>
+		</div>
+		<div class="card-body">
+			{% include '_includes/html/genericForm.html.twig' with {form: actorAddForm} only %}
+		</div>
+	</div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/actors/actor.html.twig b/templates/actors/actor.html.twig
deleted file mode 100644
index 0fd67b3..0000000
--- a/templates/actors/actor.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends '_includes/html/base.html.twig' %}
-
-{% set page="Edition de l'acteur "~actor.displayName %}
-{% set returnLink=url("actors_actors", {}, false) %}
-
-{% block pageContent %}
-<div class="col-6">
-	<div class="card-header">
-		<h2>Editer</h2>
-	</div>
-	<div class="card-body">
-		{% include '_includes/html/genericForm.html.twig' with {'form': editForm} only %}
-	</div>
-</div>
-<div class="col-6">
-	<div class="card-header">
-		<h2>Supprimer l'acteur</h2>
-	</div>
-	<div class="card-body">
-		{% include '_includes/html/genericForm.html.twig' with {'form': deleteForm, 'data': {actor: actor, variant: 'full'}} only %}
-	</div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/actors/actors.html.twig b/templates/actors/actors.html.twig
deleted file mode 100644
index 01853bf..0000000
--- a/templates/actors/actors.html.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends '_includes/html/base.html.twig' %}
-
-{% set page='Acteurs' %}
-
-{% block pageContent %}
-<div class="col-9">
-	<div class="card">
-		<div class="card-header">
-			<h2>Acteurs</h2>
-		</div>
-		<div class="card-body">
-			{% include "_includes/html/arrays/actor.html.twig" with {actors: actors, actorDeleteForm: actorDeleteForm} only %}
-		</div>
-	</div>
-</div>
-<div class="col-3">
-	<div class="card">
-		<div class="card-header">
-			<h2>Ajouter un acteur</h2>
-		</div>
-		<div class="card-body">
-			{% include '_includes/html/genericForm.html.twig' with {form: actorAddForm} only %}
-		</div>
-	</div>
-</div>
-{% endblock %}
\ No newline at end of file