diff --git a/docker/database/start-scripts/1-seed.sql b/docker/database/start-scripts/1-seed.sql
index d18efacf..5cff1847 100644
--- a/docker/database/start-scripts/1-seed.sql
+++ b/docker/database/start-scripts/1-seed.sql
@@ -3,10 +3,10 @@ INSERT INTO roles (name) VALUES
 ('Administrador'),
 ('Gerente'),
 ('Trabajador');
-INSERT INTO workers (company, name, dni, password, email, role_id, created_at, updated_at, deleted_at) VALUES
-('TechCorp', 'Carlos García', '12345678A', 'hashedpassword1', 'carlos.garcia@example.com', 1, NOW(), NOW(), NULL),
-('InnovaTech', 'Ana Martínez', '23456789B', 'hashedpassword2', 'ana.martinez@example.com', 2, NOW(), NOW(), NULL),
-('DesignWorks', 'José Rodríguez', '34567890C', 'hashedpassword3', 'jose.rodriguez@example.com', 3, NOW(), NOW(), NULL);
+INSERT INTO workers (company, name, dni, password, email, role_id) VALUES
+('TechCorp', 'Carlos García', '12345678A', 'hashedpassword1', 'carlos.garcia@example.com', 1),
+('InnovaTech', 'Ana Martínez', '23456789B', 'hashedpassword2', 'ana.martinez@example.com', 2),
+('DesignWorks', 'José Rodríguez', '34567890C', 'hashedpassword3', 'jose.rodriguez@example.com', 3);
 INSERT INTO contracts (name, start_date, end_date, invoice_proposed, invoice_agreed, invoice_paid) VALUES
 ('Ayuntamiento de Valencia', '2021-01-01', '2021-12-31', 1000.00, 900.00, 900.00),
 ('Administración General del Estado', '2021-01-01', '2021-12-31', 2000.00, 1800.00, 1800.00),
@@ -50,7 +50,7 @@ INSERT INTO incidences (name, element_id, description) VALUES
 ('Banco pintado', 2, 'Banco pintado con grafitis'),
 ('Fuente con fuga', 3, 'Fuente con fuga de agua');
 --TODO: tasks, routes and works
-INSERT INTO work_orders (contract_id) VALUES 
+INSERT INTO work_orders (contract_id) VALUES
 (1),
 (2),
 (3);
diff --git a/src/app/Controllers/AuthController.php b/src/app/Controllers/AuthController.php
new file mode 100644
index 00000000..a4bd1bc8
--- /dev/null
+++ b/src/app/Controllers/AuthController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\Session;
+use App\Core\View;
+use App\Models\User;
+
+class AuthController
+{
+    public function index()
+    {
+        View::render([
+            'view' => 'Auth/Login',
+            'title' => 'Login Page',
+            'layout' => 'AuthLayout',
+            'data' => [
+                'error' => Session::get('error'),
+            ],
+        ]);
+
+        // Clear the error message after displaying it
+        Session::remove('error');
+    }
+
+    public function login($postData)
+    {
+        $email = $postData['email'] ?? null;
+        $password = $postData['password'] ?? null;
+
+        if (! $email || ! $password) {
+            // Redirect back with error if fields are missing
+            Session::set('error', 'Email and password are required.');
+            header('Location: /auth/login');
+            exit;
+        }
+
+        // Check if the user exists and password matches
+        $user = User::findBy(['email' => $email, 'password' => $password], true);
+
+        if (! $user || strcmp($user->password, $password) !== 0) { // TODO: Verify hashed password not raw password
+            echo 'Invalid email or password.';
+            // Redirect back with error if authentication fails
+            Session::set('error', 'Invalid email or password.');
+            header('Location: /auth/login');
+            exit;
+        }
+
+        Session::set('user', [
+            'id' => $user->getId(),
+            'name' => $user->name,
+            'email' => $user->email,
+            'role_id' => $user->role_id,
+        ]);
+
+        header('Location: /');
+        exit;
+    }
+
+    public function logout()
+    {
+        Session::destroy();
+        header('Location: /auth/login');
+        exit;
+    }
+}
diff --git a/src/app/Controllers/CAuth.php b/src/app/Controllers/CAuth.php
deleted file mode 100644
index 1725657b..00000000
--- a/src/app/Controllers/CAuth.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-
-class CAuth
-{
-    public function index()
-    {
-        View::render([
-            "view" => "Auth/Login",
-            "title" => "Login Page",
-            "layout" => "AuthLayout",
-            "data" => []
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CContract.php b/src/app/Controllers/CContract.php
deleted file mode 100644
index 3f79c7b1..00000000
--- a/src/app/Controllers/CContract.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MContract;
-
-class CContract
-{
-    public function index()
-    {
-        $contracts = MContract::findAll();
-        View::render([
-            "view" => "Contracts",
-            "title" => "Contracts",
-            "layout" => "MainLayout",
-            "data" => ["contracts" => $contracts]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CElement.php b/src/app/Controllers/CElement.php
deleted file mode 100644
index 563d73f3..00000000
--- a/src/app/Controllers/CElement.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MElement;
-
-class CElement
-{
-    public function index()
-    {
-        $elements = MElement::findAll();
-        View::render([
-            "view" => "Element",
-            "title" => "Element",
-            "layout" => "MainLayout",
-            "data" => ["elements" => $elements]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CHome.php b/src/app/Controllers/CHome.php
deleted file mode 100644
index a67a2fc3..00000000
--- a/src/app/Controllers/CHome.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MWorker;
-
-class CHome
-{
-    public function index()
-    {
-        $workers = MWorker::findAll();
-        View::render([
-            "view" => "Home",
-            "title" => "Home Page",
-            "layout" => "MainLayout",
-            "data" => ["workers" => $workers]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CIncidence.php b/src/app/Controllers/CIncidence.php
deleted file mode 100644
index bb65b3eb..00000000
--- a/src/app/Controllers/CIncidence.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MIncidence;
-use App\Models\MElement;
-
-class CIncidence
-{
-    public function index()
-    {
-        View::render([
-            "view" => "Incidence",
-            "title" => "Incidences",
-            "layout" => "MainLayout",
-        ]);
-    }
-
-    public function findall()
-    {
-        $incidences = MIncidence::findAll();
-
-        View::render([
-            "view" => "Incidence/SeeAllIncidences",
-            "title" => "Incidences",
-            "layout" => "MainLayout",
-            "data" => ["incidences" => $incidences]
-        ]);
-    }
-
-    public function get()
-    {
-        $elements = MElement::findAll();
-
-        View::render([
-            "view" => "Incidence/Create",
-            "title" => "Create Incidence",
-            "layout" => "MainLayout",
-            "data" => [
-                "elements" => $elements,
-            ]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CPruningType.php b/src/app/Controllers/CPruningType.php
deleted file mode 100644
index 854f5721..00000000
--- a/src/app/Controllers/CPruningType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MPruningType;
-
-class CPruningType
-{
-    public function index()
-    {
-        $pruning_types = MPruningType::findAll();
-        View::render([
-            "view" => "PruningType",
-            "title" => "Pruning Types",
-            "layout" => "MainLayout",
-            "data" => ["pruning_types" => $pruning_types]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CTaskType.php b/src/app/Controllers/CTaskType.php
deleted file mode 100644
index 33ed892b..00000000
--- a/src/app/Controllers/CTaskType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MTaskType;
-
-class CTaskType
-{
-    public function index()
-    {
-        $task_types = MTaskType::findAll();
-        View::render([
-            "view" => "TaskTypes/index",
-            "title" => "Task Types",
-            "layout" => "MainLayout",
-            "data" => ["task_types" => $task_types]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CTreeType.php b/src/app/Controllers/CTreeType.php
deleted file mode 100644
index 78632dc5..00000000
--- a/src/app/Controllers/CTreeType.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MTreeType;
-
-class CTreeType
-{
-    public function index()
-    {
-        $tree_types = MTreeType::findAll();
-        View::render([
-            "view" => "TreeType",
-            "title" => "Tree Types",
-            "layout" => "MainLayout",
-            "data" => ["tree_types" => $tree_types]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/CWorkOrder.php b/src/app/Controllers/CWorkOrder.php
deleted file mode 100644
index 6bf06e08..00000000
--- a/src/app/Controllers/CWorkOrder.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MWorkOrder;
-class CWorkOrder
-{
-    public function findAll()
-    {
-        $orders = MWorkOrder::findAll();
-        View::render([
-            "view" => "order/index",
-            "title" => "Order",
-            "layout" => "MainLayout",
-            "data" => ["orders" => $orders]
-        ]);
-    }
-
-    public function find()
-    {
-        $id = $_GET['id'];
-        $order = MWorkOrder::find($id);
-        View::render([
-            "view" => "order",
-            "title" => "Order",
-            "layout" => "MainLayout",
-            "data" => ["order" => $order]
-        ]);
-    }
-
-    public function indexCreate()
-    {
-        $orders = MWorkOrder::findAll();
-        View::render([
-            "view" => "order/create",
-            "title" => "Create Order",
-            "layout" => "MainLayout",
-            "data" => ["orders" => $orders]
-        ]);
-    }
-
-    public function save()
-    {
-        $order = new MWorkOrder();
-
-        $order->save();
-    }
-
-    public function delete()
-    {
-        $id = $_GET['id'];
-        $order = MWorkOrder::find($id);
-        $order->delete();
-    }
-
-    public function update()
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/src/app/Controllers/CZone.php b/src/app/Controllers/CZone.php
deleted file mode 100644
index 07223c97..00000000
--- a/src/app/Controllers/CZone.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Core\View;
-use App\Models\MZone;
-
-class CZone
-{
-    public function index()
-    {
-        $zones = MZone::findAll();
-        View::render([
-            "view" => "Zone",
-            "title" => "Zones",
-            "layout" => "MainLayout",
-            "data" => ["zones" => $zones]
-        ]);
-    }
-}
diff --git a/src/app/Controllers/ContractController.php b/src/app/Controllers/ContractController.php
new file mode 100644
index 00000000..5bc48649
--- /dev/null
+++ b/src/app/Controllers/ContractController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\Contract;
+
+class ContractController
+{
+    public function index()
+    {
+        $contracts = Contract::findAll();
+        View::render([
+            'view' => 'Contracts',
+            'title' => 'Contracts',
+            'layout' => 'MainLayout',
+            'data' => ['contracts' => $contracts],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/DashboardController.php b/src/app/Controllers/DashboardController.php
new file mode 100644
index 00000000..b1dc8389
--- /dev/null
+++ b/src/app/Controllers/DashboardController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+
+class DashboardController
+{
+    public function index()
+    {
+        View::render([
+            'view' => 'Dashboard',
+            'title' => 'Dashboard',
+            'layout' => 'MainLayout',
+            'data' => [],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/ElementController.php b/src/app/Controllers/ElementController.php
new file mode 100644
index 00000000..d88b8416
--- /dev/null
+++ b/src/app/Controllers/ElementController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\Element;
+
+class ElementController
+{
+    public function index()
+    {
+        $elements = Element::findAll();
+        View::render([
+            'view' => 'Elements',
+            'title' => 'Element',
+            'layout' => 'MainLayout',
+            'data' => ['elements' => $elements],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/IncidenceController.php b/src/app/Controllers/IncidenceController.php
new file mode 100644
index 00000000..79115b81
--- /dev/null
+++ b/src/app/Controllers/IncidenceController.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\Element;
+use App\Models\Incidence;
+
+class IncidenceController
+{
+    public function index()
+    {
+        View::render([
+            'view' => 'Incidence',
+            'title' => 'Incidences',
+            'layout' => 'MainLayout',
+        ]);
+    }
+
+    public function findall()
+    {
+        $incidences = Incidence::findAll();
+        View::render([
+            'view' => 'Incidence/SeeAllIncidences',
+            'title' => 'Incidences',
+            'layout' => 'MainLayout',
+            'data' => ['incidences' => $incidences],
+        ]);
+    }
+
+    public function get()
+    {
+        $elements = Element::findAll();
+
+        View::render([
+            'view' => 'Incidence/Create',
+            'title' => 'Create Incidence',
+            'layout' => 'MainLayout',
+            'data' => [
+                'elements' => $elements,
+            ],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/PruningTypeController.php b/src/app/Controllers/PruningTypeController.php
new file mode 100644
index 00000000..24a8ea2e
--- /dev/null
+++ b/src/app/Controllers/PruningTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\PruningType;
+
+class PruningTypeController
+{
+    public function index()
+    {
+        $pruning_types = PruningType::findAll();
+        View::render([
+            'view' => 'PruningType',
+            'title' => 'Pruning Types',
+            'layout' => 'MainLayout',
+            'data' => ['pruning_types' => $pruning_types],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/TaskTypeController.php b/src/app/Controllers/TaskTypeController.php
new file mode 100644
index 00000000..b0629da2
--- /dev/null
+++ b/src/app/Controllers/TaskTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\TaskType;
+
+class TaskTypeController
+{
+    public function index()
+    {
+        $task_types = TaskType::findAll();
+        View::render([
+            'view' => 'TaskTypes/index',
+            'title' => 'Task Types',
+            'layout' => 'MainLayout',
+            'data' => ['task_types' => $task_types],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/TreeTypeController.php b/src/app/Controllers/TreeTypeController.php
new file mode 100644
index 00000000..2d13e2f2
--- /dev/null
+++ b/src/app/Controllers/TreeTypeController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\TreeType;
+
+class TreeTypeController
+{
+    public function index()
+    {
+        $tree_types = TreeType::findAll();
+        View::render([
+            'view' => 'TreeTypes',
+            'title' => 'Tree Types',
+            'layout' => 'MainLayout',
+            'data' => ['tree_types' => $tree_types],
+        ]);
+    }
+}
diff --git a/src/app/Controllers/UserController.php b/src/app/Controllers/UserController.php
new file mode 100644
index 00000000..956f45ec
--- /dev/null
+++ b/src/app/Controllers/UserController.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\Session;
+use App\Core\View;
+use App\Models\User;
+
+class UserController
+{
+    public function index()
+    {
+        $elements = User::findAll();
+        View::render([
+            'view' => 'Users',
+            'title' => 'Manage Users',
+            'layout' => 'MainLayout',
+            'data' => ['users' => $elements],
+        ]);
+
+        Session::remove('success');
+    }
+
+    public function create()
+    {
+        View::render([
+            'view' => 'User/Create',
+            'title' => 'Add User',
+            'layout' => 'MainLayout',
+            'data' => [],
+        ]);
+    }
+
+    public function store($postData)
+    {
+        $user = new User;
+        $user->company = $postData['company'];
+        $user->name = $postData['name'];
+        $user->dni = $postData['dni'];
+        $user->email = $postData['email'];
+
+        // Check if password is not empty before updating
+        if (! empty($postData['password'])) {
+            $user->password = $postData['password'];
+        }
+
+        $user->role_id = $postData['role_id'];
+        $user->save();
+
+        Session::set('success', 'User created successfully');
+
+        header('Location: /users');
+    }
+
+    public function edit($id)
+    {
+        $user = User::find($id);
+        View::render([
+            'view' => 'User/Edit',
+            'title' => 'Edit User',
+            'layout' => 'MainLayout',
+            'data' => ['user' => $user],
+        ]);
+    }
+
+    public function update($id, $postData)
+    {
+        $user = User::find($id);
+        $user->company = $postData['company'];
+        $user->name = $postData['name'];
+        $user->dni = $postData['dni'];
+        $user->email = $postData['email'];
+        $user->role_id = $postData['role_id'];
+        $user->save();
+
+        Session::set('success', 'User updated successfully');
+
+        header('Location: /users');
+    }
+
+    public function destroy($id)
+    {
+        $user = User::find($id);
+        $user->delete();
+
+        Session::set('success', 'User deleted successfully');
+
+        header('Location: /users');
+    }
+}
diff --git a/src/app/Controllers/WorkOrderController.php b/src/app/Controllers/WorkOrderController.php
new file mode 100644
index 00000000..009d209b
--- /dev/null
+++ b/src/app/Controllers/WorkOrderController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\Session;
+use App\Core\View;
+use App\Models\WorkOrder;
+
+class WorkOrderController
+{
+    public function index()
+    {
+        $workOrders = WorkOrder::findAll();
+        View::render([
+            'view' => 'WorkOrders',
+            'title' => 'Manage Orders',
+            'layout' => 'MainLayout',
+            'data' => ['workOrders' => $workOrders],
+        ]);
+        Session::remove('success');
+    }
+
+    public function create()
+    {
+        View::render([
+            'view' => 'Order/Create',
+            'title' => 'Add Order',
+            'layout' => 'MainLayout',
+            'data' => [],
+        ]);
+    }
+
+    public function store($postData) {}
+
+    public function edit($id)
+    {
+        $order = WorkOrder::find($id);
+        View::render([
+            'view' => 'Order/Edit',
+            'title' => 'Edit Order',
+            'layout' => 'MainLayout',
+            'data' => ['order' => $order],
+        ]);
+    }
+
+    public function update($id, $postData)
+    {
+        $order = WorkOrder::find($id);
+
+        $order->save();
+
+        Session::set('success', 'Order updated successfully');
+
+        header('Location: /orders');
+    }
+
+    public function destroy($id)
+    {
+        $order = WorkOrder::find($id);
+        $order->delete();
+
+        Session::set('success', 'Order deleted successfully');
+
+        header('Location: /orders');
+    }
+}
diff --git a/src/app/Controllers/ZoneController.php b/src/app/Controllers/ZoneController.php
new file mode 100644
index 00000000..47bef0a9
--- /dev/null
+++ b/src/app/Controllers/ZoneController.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Core\View;
+use App\Models\Zone;
+
+class ZoneController
+{
+    public function index()
+    {
+        $zones = Zone::findAll();
+        View::render([
+            'view' => 'Zones',
+            'title' => 'Zones',
+            'layout' => 'MainLayout',
+            'data' => ['zones' => $zones],
+        ]);
+    }
+
+    public function create()
+    {
+        View::render([
+            'view' => 'Zone/Create',
+            'title' => 'Add Zone',
+            'layout' => 'MainLayout',
+            'data' => [],
+        ]);
+    }
+
+    public function store($postData)
+    {
+        $zone = new Zone;
+        $zone->name = $postData['name'];
+        $zone->postal_code = $postData['postal_code'];
+        $zone->point_id = $postData['point_id'];
+
+        $zone->save();
+
+        header('Location: /zones');
+    }
+
+    public function edit($id)
+    {
+        $zone = Zone::find($id);
+        View::render([
+            'view' => 'Zone/Edit',
+            'title' => 'Edit Zone',
+            'layout' => 'MainLayout',
+            'data' => ['zone' => $zone],
+        ]);
+    }
+
+    public function update($id, $postData)
+    {
+        $zone = Zone::find($id);
+
+        $zone->name = $postData['name'];
+        $zone->postal_code = $postData['postal_code'];
+        $zone->point_id = $postData['point_id'];
+
+        $zone->save();
+
+        header('Location: /zones');
+    }
+
+    public function destroy($id)
+    {
+        $zone = Zone::find($id);
+        $zone->delete();
+
+        header('Location: /zones');
+    }
+}
diff --git a/src/app/Core/Database.php b/src/app/Core/Database.php
index b4b96ddf..d4ea9581 100755
--- a/src/app/Core/Database.php
+++ b/src/app/Core/Database.php
@@ -2,31 +2,33 @@
 
 namespace App\Core;
 
+use Exception;
 use PDO;
 use PDOException;
 
 class Database
 {
-    private static $instance = null;
+    private static $instance;
 
     public static function connect()
     {
-        if (!self::$instance) {
+        if (! self::$instance) {
             try {
                 // Read the password from the file
                 $db_pass = trim(file_get_contents(getenv('DB_PASS_FILE_PATH')));
 
                 self::$instance = new PDO(
-                    "mysql:host=" . getenv('DB_HOST') . ";dbname=" . getenv('DB_NAME'),
+                    'mysql:host='.getenv('DB_HOST').';dbname='.getenv('DB_NAME'),
                     getenv('DB_USER'),
                     $db_pass
                 );
                 self::$instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             } catch (PDOException $e) {
-                Logger::log("Database connection error: " . $e->getMessage());
-                throw new \Exception("Database connection failed.");
+                Logger::log('Database connection error: '.$e->getMessage());
+                throw new Exception('Database connection failed.');
             }
         }
+
         return self::$instance;
     }
 
@@ -36,10 +38,10 @@ public static function prepareAndExecute($query, $params = [], $fetchMode = PDO:
         try {
             $stmt = $db->prepare($query);
             $stmt->execute($params);
+
             return $stmt->fetchAll($fetchMode);
         } catch (PDOException $e) {
-            Logger::log("Database query error: " . $e->getMessage());
-            throw new \Exception("Query failed.");
+            return null;
         }
     }
 }
diff --git a/src/app/Core/Logger.php b/src/app/Core/Logger.php
index f96ed199..4bdebfc2 100755
--- a/src/app/Core/Logger.php
+++ b/src/app/Core/Logger.php
@@ -6,9 +6,9 @@ class Logger
 {
     public static function log($message, $level = 'info')
     {
-        $logFile = getenv("LOG_FILE_PATH");
-        $logMessage = strtoupper($level) . ' - ' . date('Y-m-d H:i:s') . ' - ' . $message . PHP_EOL;
-        if (!file_exists($logFile)) {
+        $logFile = getenv('LOG_FILE_PATH');
+        $logMessage = strtoupper($level).' - '.date('Y-m-d H:i:s').' - '.$message.PHP_EOL;
+        if (! file_exists($logFile)) {
             touch($logFile);
         }
         file_put_contents($logFile, $logMessage, FILE_APPEND);
diff --git a/src/app/Core/Router.php b/src/app/Core/Router.php
index b3b25c58..cc4a83f5 100755
--- a/src/app/Core/Router.php
+++ b/src/app/Core/Router.php
@@ -2,53 +2,108 @@
 
 namespace App\Core;
 
+use App\Middlewares\MiddlewareInterface;
+use Exception;
+
 class Router
 {
-    protected $routes = [];
+    protected const HTTP_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'];
+
+    protected array $routes = [];
 
-    public function load($file)
+    public function load(string $file): void
     {
-        $routes = include $file;
-        $this->routes = $routes;
+        $this->routes = include $file;
     }
 
-    public function dispatch($requestMethod, $requestUri)
+    public function dispatch(string $requestMethod, string $requestUri, array $postData = []): void
     {
-        // Check for direct match first
+        if (! in_array($requestMethod, self::HTTP_METHODS)) {
+            $this->abort(405, 'Method Not Allowed');
+
+            return;
+        }
+
+        // Match exact route
         if (isset($this->routes[$requestMethod][$requestUri])) {
-            return $this->callRoute($this->routes[$requestMethod][$requestUri], $requestMethod === 'POST' ? $_POST : []);
+            $this->callRoute($this->routes[$requestMethod][$requestUri], $requestMethod === 'POST' ? ['postData' => $postData] : []);
+
+            return;
         }
 
-        // If no direct match, check for dynamic routes with parameters
+        // Match dynamic route with parameters
         foreach ($this->routes[$requestMethod] as $route => $routeInfo) {
-            $routePattern = preg_replace('/:\w+/', '(\w+)', $route);
-            $pattern = '#^' . $routePattern . '$#';
-
-            if (preg_match($pattern, $requestUri, $matches)) {
-                array_shift($matches); // Remove the full match
+            $routePattern = preg_replace('/:\w+/', '([^/]+)', $route);
+            if (preg_match("#^{$routePattern}$#", $requestUri, $matches)) {
+                array_shift($matches);
                 $params = $this->extractParams($route, $matches);
-                return $this->callRoute($routeInfo, $params, $requestMethod === 'POST' ? $_POST : []);
+                $arguments = $requestMethod === 'POST' ? array_merge($params, ['postData' => $postData]) : $params;
+
+                $this->callRoute($routeInfo, $arguments);
+
+                return;
             }
         }
 
-        echo "404 Not Found";
+        $this->abort(404, 'Not Found');
+    }
+
+    public function redirect(string $uri, int $statusCode = 302): void
+    {
+        http_response_code($statusCode);
+        header("Location: {$uri}");
+        exit;
     }
 
-    protected function extractParams($route, $matches)
+    protected function extractParams(string $route, array $matches): array
     {
         preg_match_all('/:(\w+)/', $route, $paramNames);
+
         return array_combine($paramNames[1], $matches);
     }
 
-    protected function callRoute($routeInfo, $params = [], $postData = [])
+    protected function callRoute(array $routeInfo, array $arguments = []): void
+    {
+        if (! class_exists($routeInfo['controller'])) {
+            $this->abort(500, "Controller {$routeInfo['controller']} not found");
+
+            return;
+        }
+
+        if (! method_exists($routeInfo['controller'], $routeInfo['method'])) {
+            $this->abort(500, "Method {$routeInfo['method']} not found in controller {$routeInfo['controller']}");
+
+            return;
+        }
+
+        if (isset($routeInfo['middleware'])) {
+            $this->handleMiddleware($routeInfo['middleware']);
+        }
+
+        $controller = new $routeInfo['controller'];
+        $controller->{$routeInfo['method']}(...$arguments);
+    }
+
+    protected function handleMiddleware(array $middlewares): void
     {
-        $controller = new $routeInfo['controller']();
-        $method = $routeInfo['method'];
+        foreach ($middlewares as $middlewareClass) {
+            if (! class_exists($middlewareClass)) {
+                throw new Exception("Middleware class {$middlewareClass} not found");
+            }
 
-        // Combine route parameters and POST data
-        $arguments = array_merge(array_values($params), [$postData]);
+            $middleware = new $middlewareClass;
+            if (! $middleware instanceof MiddlewareInterface) {
+                throw new Exception("Middleware {$middlewareClass} must implement MiddlewareInterface");
+            }
 
-        // Unpack the combined array into the method call
-        $controller->$method(...$arguments);
+            $middleware->handle($_REQUEST, fn () => null);
+        }
+    }
+
+    protected function abort(int $statusCode, string $message): void
+    {
+        http_response_code($statusCode);
+        echo json_encode(['error' => $message]);
+        exit;
     }
 }
diff --git a/src/app/Core/Session.php b/src/app/Core/Session.php
index 3fd9100b..bc015264 100755
--- a/src/app/Core/Session.php
+++ b/src/app/Core/Session.php
@@ -6,17 +6,12 @@ class Session
 {
     public static function start()
     {
-        if (session_status() === PHP_SESSION_NONE) {
-            session_set_cookie_params([
-                'lifetime' => 0,
-                'path' => '/',
-                'domain' => $_SERVER['HTTP_HOST'],
-                'secure' => isset($_SERVER['HTTPS']),
-                'httponly' => true,
-                'samesite' => 'Strict'
-            ]);
-            session_start();
-        }
+        session_start();
+    }
+
+    public static function has($key)
+    {
+        return isset($_SESSION[$key]);
     }
 
     public static function set($key, $value)
diff --git a/src/app/Core/View.php b/src/app/Core/View.php
index 4f4d04bd..0f8ec4d6 100755
--- a/src/app/Core/View.php
+++ b/src/app/Core/View.php
@@ -6,22 +6,22 @@ class View
 {
     public static function render($options = [])
     {
-        $title = $options['title'] ?? "Default Title";
-        $layout = $options['layout'] ?? "MainLayout";
-        $view = $options['view'] ?? "Home";
+        $title = $options['title'] ?? 'Default Title';
+        $layout = $options['layout'] ?? 'MainLayout';
+        $view = $options['view'] ?? 'Home';
         $data = $options['data'] ?? [];
 
-        if (!file_exists(__DIR__ . "/../Views/{$view}.php")) {
+        if (! file_exists(__DIR__."/../Views/{$view}.php")) {
             throw new \Exception("View file not found: {$view}");
         }
 
         extract($data);
         ob_start();
-        require_once __DIR__ . "/../Views/{$view}.php";
+        require_once __DIR__."/../Views/{$view}.php";
         $content = ob_get_clean();
 
-        if (file_exists(__DIR__ . "/../Layouts/{$layout}.php")) {
-            require_once __DIR__ . "/../Layouts/{$layout}.php";
+        if (file_exists(__DIR__."/../Layouts/{$layout}.php")) {
+            require_once __DIR__."/../Layouts/{$layout}.php";
         } else {
             throw new \Exception("Layout file not found: {$layout}");
         }
diff --git a/src/app/Layouts/AuthLayout.php b/src/app/Layouts/AuthLayout.php
index 9ff89ef6..a9fd08bc 100644
--- a/src/app/Layouts/AuthLayout.php
+++ b/src/app/Layouts/AuthLayout.php
@@ -4,24 +4,28 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title><?php echo $title . ' - ' . getenv('APP_NAME'); ?></title>
+    <title>
+        <?php echo htmlspecialchars($title).' - '.htmlspecialchars(getenv('APP_NAME')); ?>
+    </title>
     <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet">
 </head>
 
 <body class="bg-gray-100 font-sans leading-normal tracking-normal flex items-center justify-center h-screen">
 
     <!-- Auth content area -->
-    <div class="w-full max-w-md bg-white shadow-md rounded p-6">
-        <header class="text-center mb-6">
-            <h1 class="text-2xl font-bold"><?php echo $title; ?></h1>
+    <div class="w-full max-w-md bg-white shadow-lg rounded-lg p-8">
+        <!-- Header -->
+        <header class="text-center mb-8">
+            <h1 class="text-2xl font-extrabold text-gray-800">
+                <?php echo htmlspecialchars($title); ?></h1>
         </header>
 
-        <!-- Main content area for auth forms -->
+        <!-- Main content -->
         <main>
-            <?= $content ?>
+            <?php echo $content; ?>
         </main>
     </div>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/app/Layouts/MainLayout.php b/src/app/Layouts/MainLayout.php
index 38ae4e11..fee21822 100755
--- a/src/app/Layouts/MainLayout.php
+++ b/src/app/Layouts/MainLayout.php
@@ -4,7 +4,9 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title><?php echo $title . ' - ' . getenv('APP_NAME'); ?></title>
+    <title>
+        <?php echo $title . ' - ' . getenv('APP_NAME'); ?>
+    </title>
     <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet">
 </head>
 
@@ -17,30 +19,107 @@
                 <?php echo getenv('APP_NAME'); ?>
             </div>
             <nav class="mt-4">
-                <a href="/" class="block py-2 px-4 text-white hover:bg-gray-700">Home</a>
-                <a href="#" class="block py-2 px-4 text-white hover:bg-gray-700">Example 1</a>
-                <a href="#" class="block py-2 px-4 text-white hover:bg-gray-700">Example 2</a>
+                <?php
+                // Get the current path
+                $currentPath = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+        ?>
+                <a href="/"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="m3.75 13.5 10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75Z" />
+                    </svg>
+
+                    Dashboard
+                </a>
+                <a href="/users"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/users' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M15 19.128a9.38 9.38 0 0 0 2.625.372 9.337 9.337 0 0 0 4.121-.952 4.125 4.125 0 0 0-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 0 1 8.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0 1 11.964-3.07M12 6.375a3.375 3.375 0 1 1-6.75 0 3.375 3.375 0 0 1 6.75 0Zm8.25 2.25a2.625 2.625 0 1 1-5.25 0 2.625 2.625 0 0 1 5.25 0Z" />
+                    </svg>
+
+                    Manage Users
+                </a>
+                <a href="/work-orders"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/work-orders' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M9 12h3.75M9 15h3.75M9 18h3.75m3 .75H18a2.25 2.25 0 0 0 2.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48.424 48.424 0 0 0-1.123-.08m-5.801 0c-.065.21-.1.433-.1.664 0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75 2.25 2.25 0 0 0-.1-.664m-5.8 0A2.251 2.251 0 0 1 13.5 2.25H15c1.012 0 1.867.668 2.15 1.586m-5.8 0c-.376.023-.75.05-1.124.08C9.095 4.01 8.25 4.973 8.25 6.108V8.25m0 0H4.875c-.621 0-1.125.504-1.125 1.125v11.25c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V9.375c0-.621-.504-1.125-1.125-1.125H8.25ZM6.75 12h.008v.008H6.75V12Zm0 3h.008v.008H6.75V15Zm0 3h.008v.008H6.75V18Z" />
+                    </svg>
+
+                    Manage Work Orders
+                </a>
+                <a href="/zones"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/zones' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M9 6.75V15m6-6v8.25m.503 3.498 4.875-2.437c.381-.19.622-.58.622-1.006V4.82c0-.836-.88-1.38-1.628-1.006l-3.869 1.934c-.317.159-.69.159-1.006 0L9.503 3.252a1.125 1.125 0 0 0-1.006 0L3.622 5.689C3.24 5.88 3 6.27 3 6.695V19.18c0 .836.88 1.38 1.628 1.006l3.869-1.934c.317-.159.69-.159 1.006 0l4.994 2.497c.317.158.69.158 1.006 0Z" />
+                    </svg>
+
+                    Manage Zones
+                </a>
+                <a href="/tree-types"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/tree-types' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
+                    </svg>
+
+                    Manage Tree Types
+                </a>
+                <a href="/elements"
+                    class="block py-2 px-4 text-white hover:bg-gray-700 <?php echo $currentPath === '/elements' ? 'bg-gray-700' : ''; ?>">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 inline">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" />
+                    </svg>
+
+                    Manage Elements
+                </a>
             </nav>
         </aside>
 
+
         <!-- Main content area -->
         <div class="flex-1 flex flex-col">
             <!-- Top bar -->
             <header class="bg-white shadow p-4 flex justify-between items-center">
-                <div class="text-xl font-bold"><?php echo $title; ?></div>
+                <div class="text-xl font-bold"><?php echo $title; ?>
+                </div>
                 <div class="flex items-center space-x-4">
-                    <span class="text-gray-600">Welcome, User</span>
-                    <button class="px-3 py-1 bg-blue-600 text-white rounded">Logout</button>
+                    <span class="text-gray-600">Welcome,
+                        <?php echo $_SESSION['user']['name']; ?></span>
+                    <a href="/logout"
+                        class="bg-gray-700 hover:bg-gray-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+                        Logout</a>
                 </div>
             </header>
 
             <!-- Content area -->
-            <main class="flex-grow p-6">
-                <?= $content ?>
+            <main class="flex-grow p-6 overflow-auto">
+                <?php echo $content; ?>
             </main>
         </div>
     </div>
 
+    <!-- Javascript, add class d-none to alert-msg after 5 seconds if it exists -->
+    <script>
+        setTimeout(() => {
+            console.log('Hide alert message');
+            const alertMsg = document.getElementById('alert-msg');
+            if (alertMsg) {
+                alertMsg.classList.add('hidden');
+            }
+        }, 3500);
+    </script>
+
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/app/Middlewares/AuthMiddleware.php b/src/app/Middlewares/AuthMiddleware.php
new file mode 100644
index 00000000..702636ed
--- /dev/null
+++ b/src/app/Middlewares/AuthMiddleware.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Middlewares;
+
+use App\Core\Session;
+
+class AuthMiddleware implements MiddlewareInterface
+{
+    public function handle($request, $next)
+    {
+        if (! Session::get('user')) {
+            header('Location: /auth/login');
+            exit;
+        }
+
+        return $next($request);
+    }
+}
diff --git a/src/app/Middlewares/GuestMiddleware.php b/src/app/Middlewares/GuestMiddleware.php
new file mode 100644
index 00000000..59f6dc82
--- /dev/null
+++ b/src/app/Middlewares/GuestMiddleware.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Middlewares;
+
+use App\Core\Session;
+
+class GuestMiddleware implements MiddlewareInterface
+{
+    public function handle($request, $next)
+    {
+        if (Session::get('user') && $request['uri'] === '/auth/login') {
+            header('Location: /');
+            exit;
+        }
+
+        return $next($request);
+    }
+}
diff --git a/src/app/Middlewares/MiddlewareInterface.php b/src/app/Middlewares/MiddlewareInterface.php
new file mode 100644
index 00000000..3137c11c
--- /dev/null
+++ b/src/app/Middlewares/MiddlewareInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Middlewares;
+
+interface MiddlewareInterface
+{
+    public function handle($request, $next);
+}
diff --git a/src/app/Models/BaseModel.php b/src/app/Models/BaseModel.php
index 62cd51b0..02d08b5f 100644
--- a/src/app/Models/BaseModel.php
+++ b/src/app/Models/BaseModel.php
@@ -4,41 +4,52 @@
 
 use App\Core\Database;
 
-use function PHPSTORM_META\type;
-
 abstract class BaseModel
 {
     protected int $id;
+
     protected ?string $created_at;
 
     // One-to-one relationship
-    public function belongsTo($relatedModel, $foreignKey, $ownerKey = 'id')
+    public function belongsTo(string $relatedModel, string $foreignKey, string $ownerKey = 'id'): ?object
     {
         $relatedTable = $relatedModel::getTableName();
         $foreignKeyValue = $this->{$foreignKey};
 
-        $query = "SELECT * FROM $relatedTable WHERE $ownerKey = :foreignKeyValue LIMIT 1";
+        if ($foreignKeyValue === null)
+            return null;
+
+        $query = "SELECT * FROM {$relatedTable} WHERE {$ownerKey} = :foreignKeyValue LIMIT 1";
         $results = Database::prepareAndExecute($query, ['foreignKeyValue' => $foreignKeyValue]);
 
-        return !empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
+        return ! empty($results) ? $relatedModel::mapDataToModel($results[0]) : null;
     }
 
 
     // Many-to-Many relationship
-    public function belongsToMany($relatedModel, $pivotTable, $foreignKey, $relatedKey, $ownerKey = 'id', $relatedOwnerKey = 'id')
-    {
+    public function belongsToMany(
+        string $relatedModel,
+        string $pivotTable,
+        string $foreignKey,
+        string $relatedKey,
+        string $ownerKey = 'id',
+        string $relatedOwnerKey = 'id'
+    ): array {
         $relatedTable = $relatedModel::getTableName();
         $localKeyValue = $this->{$ownerKey};
 
         $query = "
-            SELECT $relatedTable.*
-            FROM $relatedTable
-            INNER JOIN $pivotTable ON $pivotTable.$relatedKey = $relatedTable.$relatedOwnerKey
-            WHERE $pivotTable.$foreignKey = :localKeyValue
+            SELECT {$relatedTable}.*
+            FROM {$relatedTable}
+            INNER JOIN {$pivotTable} ON {$pivotTable}.{$relatedKey} = {$relatedTable}.{$relatedOwnerKey}
+            WHERE {$pivotTable}.{$foreignKey} = :localKeyValue
         ";
 
         $results = Database::prepareAndExecute($query, ['localKeyValue' => $localKeyValue]);
 
+        if (! is_array($results))
+            $results = [];
+
         return array_map(fn($row) => $relatedModel::mapDataToModel($row), $results);
     }
 
@@ -47,10 +58,10 @@ public function delete(): void
         $table = static::getTableName();
 
         if (static::hasSoftDelete()) {
-            $query = "UPDATE $table SET deleted_at = NOW() WHERE id = :id";
+            $query = "UPDATE {$table} SET deleted_at = NOW() WHERE id = :id";
             Database::prepareAndExecute($query, ['id' => $this->id]);
         } else {
-            $query = "DELETE FROM $table WHERE id = :id";
+            $query = "DELETE FROM {$table} WHERE id = :id";
             Database::prepareAndExecute($query, ['id' => $this->id]);
         }
     }
@@ -58,10 +69,16 @@ public function delete(): void
     public static function find($id)
     {
         $table = static::getTableName();
-        $query = "SELECT * FROM $table WHERE id = :id LIMIT 1";
+
+        // Check if the table supports soft deletes
+        $query = "SELECT * FROM {$table} WHERE id = :id";
+        if (static::hasSoftDelete())
+            $query .= ' AND deleted_at IS NULL'; // Only fetch records that are not soft deleted
+
+        $query .= ' LIMIT 1';
         $results = Database::prepareAndExecute($query, ['id' => $id]);
 
-        if (!empty($results))
+        if (! empty($results))
             return static::mapDataToModel($results[0]);
 
         return null;
@@ -70,46 +87,87 @@ public static function find($id)
     public static function findAll($conditions = [])
     {
         $table = static::getTableName();
-        $query = "SELECT * FROM $table";
+        $query = "SELECT * FROM {$table}";
         $params = [];
 
-        if (!empty($conditions)) {
+        // Add conditions for WHERE clause
+        if (! empty($conditions)) {
             $clauses = [];
             foreach ($conditions as $key => $value) {
-                $clauses[] = "$key = :$key";
+                $clauses[] = "{$key} = :{$key}";
                 $params[$key] = $value;
             }
-            $query .= " WHERE " . implode(" AND ", $clauses);
+            $query .= ' WHERE '.implode(' AND ', $clauses);
+        }
+
+        // Check if the table supports soft deletes and exclude soft-deleted records
+        if (static::hasSoftDelete()) {
+            $query .= empty($conditions) ? ' WHERE' : ' AND';
+            $query .= ' deleted_at IS NULL'; // Exclude soft-deleted records by default
         }
 
         $results = Database::prepareAndExecute($query, $params);
 
-        return array_map(fn($row) => static::mapDataToModel($row), $results);
+        return array_map(fn ($row) => static::mapDataToModel($row), $results);
+    }
+
+    public static function findBy($conditions, $single = false)
+    {
+        $table = static::getTableName();
+
+        // Build the WHERE clause dynamically
+        $whereClauses = [];
+        $parameters = [];
+        foreach ($conditions as $column => $value) {
+            $whereClauses[] = "{$column} = :{$column}";
+            $parameters[$column] = $value;
+        }
+        $whereClause = implode(' AND ', $whereClauses);
+
+        // Construct the SQL query
+        $query = "SELECT * FROM {$table} WHERE {$whereClause}";
+
+        if ($single)
+            $query .= ' LIMIT 1';
+
+        $results = Database::prepareAndExecute($query, $parameters);
+
+        if ($single)
+            return ! empty($results) ? static::mapDataToModel($results[0]) : null;
+
+        if (empty($results))
+            return [];
+
+        return array_map(fn ($row) => static::mapDataToModel($row), $results);
     }
 
     // Fetch all soft deleted records
     public static function findSoftDeleted()
     {
-        if (!static::hasSoftDelete())
+        if (! static::hasSoftDelete())
             return [];
 
         $table = static::getTableName();
-        $query = "SELECT * FROM $table WHERE deleted_at IS NOT NULL";
+        $query = "SELECT * FROM {$table} WHERE deleted_at IS NOT NULL";
         $results = Database::prepareAndExecute($query);
 
         return array_map(fn($row) => static::mapDataToModel($row), $results);
     }
 
     // Dynamically relationship fetching
-    public function hasMany($relatedModel, $foreignKey, $localKey = 'id')
+    public function hasMany(string $relatedModel, string $foreignKey, string $localKey = 'id'): array
     {
         $relatedTable = $relatedModel::getTableName();
         $localKeyValue = $this->{$localKey};
 
-        $query = "SELECT * FROM $relatedTable WHERE $foreignKey = :localKeyValue";
+        $query = "SELECT * FROM {$relatedTable} WHERE {$foreignKey} = :localKeyValue";
         $results = Database::prepareAndExecute($query, ['localKeyValue' => $localKeyValue]);
 
-        return array_map(fn($row) => $relatedModel::mapDataToModel($row), $results);
+        // Ensure $results is an array
+        if (! is_array($results))
+            $results = [];
+
+        return array_map(fn ($row) => $relatedModel::mapDataToModel($row), $results);
     }
 
     // Dynamically check if a table has the deleted_at column
@@ -118,10 +176,10 @@ protected static function hasSoftDelete(): bool
         static $softDeleteCache = [];
         $table = static::getTableName();
 
-        if (!isset($softDeleteCache[$table])) {
-            $query = "SHOW COLUMNS FROM $table LIKE 'deleted_at'";
+        if (! isset($softDeleteCache[$table])) {
+            $query = "SHOW COLUMNS FROM {$table} LIKE 'deleted_at'";
             $result = Database::prepareAndExecute($query);
-            $softDeleteCache[$table] = !empty($result); // Cache the result
+            $softDeleteCache[$table] = ! empty($result); // Cache the result
         }
 
         return $softDeleteCache[$table];
@@ -131,7 +189,7 @@ public function restore(): void
     {
         if (static::hasSoftDelete()) {
             $table = static::getTableName();
-            $query = "UPDATE $table SET deleted_at = NULL WHERE id = :id";
+            $query = "UPDATE {$table} SET deleted_at = NULL WHERE id = :id";
             Database::prepareAndExecute($query, ['id' => $this->id]);
         }
     }
@@ -146,20 +204,20 @@ public function save(): void
             // Update logic
             $fields = [];
             foreach ($properties as $key => $value) {
-                $fields[] = "$key = :$key";
+                $fields[] = "{$key} = :{$key}";
             }
-            $query = "UPDATE $table SET " . implode(", ", $fields) . " WHERE id = :id";
+            $query = "UPDATE {$table} SET ".implode(", ", $fields)." WHERE id = :id";
             $properties['id'] = $this->id;
         } else {
             // Insert logic
             $fields = array_keys($properties);
-            $placeholders = array_map(fn($field) => ":$field", $fields);
-            $query = "INSERT INTO $table (" . implode(", ", $fields) . ") VALUES (" . implode(", ", $placeholders) . ")";
+            $placeholders = array_map(fn($field) => ":{$field}", $fields);
+            $query = "INSERT INTO {$table} (".implode(", ", $fields).") VALUES (".implode(", ", $placeholders).")";
         }
 
         Database::prepareAndExecute($query, $properties);
 
-        if (!$this->id)
+        if (! $this->id)
             $this->id = Database::connect()->lastInsertId();
     }
 
diff --git a/src/app/Models/MContract.php b/src/app/Models/Contract.php
similarity index 88%
rename from src/app/Models/MContract.php
rename to src/app/Models/Contract.php
index 47145a0c..e0fdd023 100644
--- a/src/app/Models/MContract.php
+++ b/src/app/Models/Contract.php
@@ -2,13 +2,18 @@
 
 namespace App\Models;
 
-class MContract extends BaseModel
+class Contract extends BaseModel
 {
     public string $name;
+
     public string $start_date;
+
     public ?string $end_date;
+
     public ?float $invoice_proposed;
+
     public ?float $invoice_agreed;
+
     public ?float $invoice_paid;
 
     protected static function getTableName(): string
@@ -16,7 +21,7 @@ protected static function getTableName(): string
         return 'contracts';
     }
 
-    protected static function mapDataToModel($data): MContract
+    protected static function mapDataToModel($data): Contract
     {
         $contract = new self();
         $contract->id = $data['id'];
@@ -27,6 +32,7 @@ protected static function mapDataToModel($data): MContract
         $contract->invoice_agreed = $data['invoice_agreed'];
         $contract->invoice_paid = $data['invoice_paid'];
         $contract->created_at = $data['created_at'];
+
         return $contract;
     }
 }
diff --git a/src/app/Models/MElement.php b/src/app/Models/Element.php
similarity index 55%
rename from src/app/Models/MElement.php
rename to src/app/Models/Element.php
index 6a698168..cefcf495 100644
--- a/src/app/Models/MElement.php
+++ b/src/app/Models/Element.php
@@ -2,19 +2,22 @@
 
 namespace App\Models;
 
-class MElement extends BaseModel
+class Element extends BaseModel
 {
     public string $name;
+
     public int $zone_id;
+
     public int $point_id;
+
     public int $tree_type_id;
 
-    protected static function getTableName(): string
+    protected static function getTableName()
     {
         return 'elements';
     }
 
-    protected static function mapDataToModel($data): MElement
+    protected static function mapDataToModel($data): Element
     {
         $element = new self();
         $element->id = $data['id'];
@@ -23,21 +26,22 @@ protected static function mapDataToModel($data): MElement
         $element->point_id = $data['point_id'];
         $element->tree_type_id = $data['tree_type_id'];
         $element->created_at = $data['created_at'];
+
         return $element;
     }
 
-    public function zone(): MZone
+    public function zone()
     {
-        return $this->belongsTo(MZone::class, 'zone_id');
+        return $this->belongsTo(Zone::class, 'zone_id');
     }
 
-    public function point(): MPoint
+    public function point()
     {
-        return $this->belongsTo(MPoint::class, 'point_id');
+        return $this->belongsTo(Point::class, 'point_id');
     }
 
-    public function treeType(): MTreeType
+    public function treeType()
     {
-        return $this->belongsTo(MTreeType::class, 'tree_type_id');
+        return $this->belongsTo(TreeType::class, 'tree_type_id');
     }
 }
diff --git a/src/app/Models/MIncidence.php b/src/app/Models/Incidence.php
similarity index 76%
rename from src/app/Models/MIncidence.php
rename to src/app/Models/Incidence.php
index ef0ea729..36ac0b18 100644
--- a/src/app/Models/MIncidence.php
+++ b/src/app/Models/Incidence.php
@@ -2,11 +2,14 @@
 
 namespace App\Models;
 
-class MIncidence extends BaseModel
+class Incidence extends BaseModel
 {
     public int $element_id;
+
     public string $name;
+
     public ?string $description;
+
     public ?string $photo;
 
     protected static function getTableName(): string
@@ -14,7 +17,7 @@ protected static function getTableName(): string
         return 'incidences';
     }
 
-    public static function mapDataToModel($data): MIncidence
+    public static function mapDataToModel($data): Incidence
     {
         $incidence = new self();
         $incidence->id = $data['id'];
@@ -23,12 +26,13 @@ public static function mapDataToModel($data): MIncidence
         $incidence->description = $data['description'];
         $incidence->photo = $data['photo'];
         $incidence->created_at = $data['created_at'];
+
         return $incidence;
     }
 
     // Fetch the element of the incidence
-    public function element(): MElement
+    public function element(): Element
     {
-        return $this->belongsTo(MElement::class, 'element_id');
+        return $this->belongsTo(Element::class, 'element_id');
     }
 }
diff --git a/src/app/Models/MMachine.php b/src/app/Models/Machine.php
similarity index 82%
rename from src/app/Models/MMachine.php
rename to src/app/Models/Machine.php
index 9e3c6673..c04fa6dc 100644
--- a/src/app/Models/MMachine.php
+++ b/src/app/Models/Machine.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MMachine extends BaseModel
+class Machine extends BaseModel
 {
     public ?string $name;
     public float $max_basket_size;
@@ -12,13 +12,14 @@ protected static function getTableName(): string
         return 'machines';
     }
 
-    protected static function mapDataToModel($data): MMachine
+    protected static function mapDataToModel($data): Machine
     {
         $machine = new self();
         $machine->id = $data['id'];
         $machine->name = $data['name'];
         $machine->max_basket_size = $data['max_basket_size'];
         $machine->created_at = $data['created_at'];
+
         return $machine;
     }
 }
diff --git a/src/app/Models/MPoint.php b/src/app/Models/Point.php
similarity index 81%
rename from src/app/Models/MPoint.php
rename to src/app/Models/Point.php
index c4cd7a84..f434b472 100644
--- a/src/app/Models/MPoint.php
+++ b/src/app/Models/Point.php
@@ -2,9 +2,10 @@
 
 namespace App\Models;
 
-class MPoint extends BaseModel
+class Point extends BaseModel
 {
     public $latitude;
+
     public $longitude;
 
     protected static function getTableName(): string
@@ -12,13 +13,14 @@ protected static function getTableName(): string
         return 'points';
     }
 
-    protected static function mapDataToModel($data): MPoint
+    protected static function mapDataToModel($data): Point
     {
         $point = new self();
         $point->id = $data['id'];
         $point->latitude = $data['latitude'];
         $point->longitude = $data['longitude'];
         $point->created_at = $data['created_at'];
+
         return $point;
     }
 }
diff --git a/src/app/Models/MPruningType.php b/src/app/Models/PruningType.php
similarity index 82%
rename from src/app/Models/MPruningType.php
rename to src/app/Models/PruningType.php
index 51752c1b..24d0468a 100644
--- a/src/app/Models/MPruningType.php
+++ b/src/app/Models/PruningType.php
@@ -2,9 +2,10 @@
 
 namespace App\Models;
 
-class MPruningType extends BaseModel
+class PruningType extends BaseModel
 {
     public string $name;
+
     public ?string $description;
 
     protected static function getTableName(): string
@@ -12,13 +13,14 @@ protected static function getTableName(): string
         return 'pruning_types';
     }
 
-    protected static function mapDataToModel($data): MPruningType
+    protected static function mapDataToModel($data): PruningType
     {
         $pruning_type = new self();
         $pruning_type->id = $data['id'];
         $pruning_type->name = $data['name'];
         $pruning_type->description = $data['description'];
         $pruning_type->created_at = $data['created_at'];
+
         return $pruning_type;
     }
 }
diff --git a/src/app/Models/MRole.php b/src/app/Models/Role.php
similarity index 78%
rename from src/app/Models/MRole.php
rename to src/app/Models/Role.php
index 6d3592bf..016ece72 100644
--- a/src/app/Models/MRole.php
+++ b/src/app/Models/Role.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MRole extends BaseModel
+class Role extends BaseModel
 {
     public string $name;
 
@@ -11,12 +11,13 @@ protected static function getTableName(): string
         return 'roles';
     }
 
-    protected static function mapDataToModel($data): MRole
+    protected static function mapDataToModel($data): Role
     {
         $role = new self();
         $role->id = $data['id'];
         $role->name = $data['name'];
         $role->created_at = $data['created_at'];
+
         return $role;
     }
 }
diff --git a/src/app/Models/MRoute.php b/src/app/Models/Route.php
similarity index 73%
rename from src/app/Models/MRoute.php
rename to src/app/Models/Route.php
index 7acbce2e..6cd17bee 100644
--- a/src/app/Models/MRoute.php
+++ b/src/app/Models/Route.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MRoute extends BaseModel
+class Route extends BaseModel
 {
     public ?float $distance;
     public ?int $point_id;
@@ -13,7 +13,7 @@ protected static function getTableName(): string
         return 'routes';
     }
 
-    protected static function mapDataToModel($data): MRoute
+    protected static function mapDataToModel($data): Route
     {
         $role = new self();
         $role->id = $data['id'];
@@ -21,11 +21,12 @@ protected static function mapDataToModel($data): MRoute
         $role->point_id = $data['point_id'];
         $role->travel_time = $data['travel_time'];
         $role->created_at = $data['created_at'];
+
         return $role;
     }
 
-    public function point(): MPoint
+    public function point(): Point
     {
-        return $this->belongsTo(MPoint::class, 'point_id');
+        return $this->belongsTo(Point::class, 'point_id');
     }
 }
diff --git a/src/app/Models/MSensor.php b/src/app/Models/Sensor.php
similarity index 73%
rename from src/app/Models/MSensor.php
rename to src/app/Models/Sensor.php
index 767b93cd..8929281d 100644
--- a/src/app/Models/MSensor.php
+++ b/src/app/Models/Sensor.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MSensor extends BaseModel
+class Sensor extends BaseModel
 {
     public int $zone_id;
     public ?string $model;
@@ -14,7 +14,7 @@ protected static function getTableName(): string
         return "sensors";
     }
 
-    protected static function mapDataToModel($data): MSensor
+    protected static function mapDataToModel($data): Sensor
     {
         $sensor = new self();
         $sensor->zone_id = $data["zone_id"];
@@ -22,11 +22,12 @@ protected static function mapDataToModel($data): MSensor
         $sensor->class = $data["class"];
         $sensor->is_active = $data["is_active"];
         $sensor->created_at = $data["created_at"];
+
         return $sensor;
     }
 
-    public function zone(): MZone
+    public function zone(): Zone
     {
-        return $this->belongsTo(MZone::class, "zone_id", "id");
+        return $this->belongsTo(Zone::class, "zone_id", "id");
     }
 }
diff --git a/src/app/Models/MSensorHistory.php b/src/app/Models/SensorHistory.php
similarity index 75%
rename from src/app/Models/MSensorHistory.php
rename to src/app/Models/SensorHistory.php
index b469efa5..0b1e1d47 100644
--- a/src/app/Models/MSensorHistory.php
+++ b/src/app/Models/SensorHistory.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MSensorHistory extends BaseModel
+class SensorHistory extends BaseModel
 {
     public int $sensor_id;
     public ?float $temperature;
@@ -14,7 +14,7 @@ protected static function getTableName(): string
         return 'sensor_history';
     }
 
-    protected static function mapDataToModel($data): MSensorHistory
+    protected static function mapDataToModel($data): SensorHistory
     {
         $sensor_history = new self();
         $sensor_history->sensor_id = $data['sensor_id'];
@@ -22,11 +22,12 @@ protected static function mapDataToModel($data): MSensorHistory
         $sensor_history->humidity = $data['humidity'];
         $sensor_history->inclination = $data['inclination'];
         $sensor_history->created_at = $data['created_at'];
+
         return $sensor_history;
     }
 
-    public function sensor(): MSensor
+    public function sensor(): Sensor
     {
-        return $this->belongsTo(MSensor::class, 'sensor_id');
+        return $this->belongsTo(Sensor::class, 'sensor_id');
     }
 }
diff --git a/src/app/Models/MTask.php b/src/app/Models/Task.php
similarity index 54%
rename from src/app/Models/MTask.php
rename to src/app/Models/Task.php
index 62112c97..f0ee4f61 100644
--- a/src/app/Models/MTask.php
+++ b/src/app/Models/Task.php
@@ -4,7 +4,7 @@
 
 use App\Models\MWorkOrder;
 
-class MTask extends BaseModel
+class Task extends BaseModel
 {
     public int $work_order_id;
     public ?string $notes;
@@ -14,33 +14,34 @@ protected static function getTableName(): string
         return 'tasks';
     }
 
-    protected static function mapDataToModel($data): MTask
+    protected static function mapDataToModel($data): Task
     {
         $task = new self();
         $task->id = $data['id'];
         $task->notes = $data['notes'];
         $task->work_order_id = $data['work_order_id'];
         $task->created_at = $data['created_at'];
+
         return $task;
     }
 
-    public function order(): MWorkOrder
+    public function order(): WorkOrder
     {
-        return $this->belongsTo(MWorkOrder::class, 'work_order_id', 'id');
+        return $this->belongsTo(WorkOrder::class, 'work_order_id', 'id');
     }
 
     public function zones()
     {
-        return $this->belongsToMany(MZone::class, 'tasks_zones', 'task_id', 'zone_id');
+        return $this->belongsToMany(Zone::class, 'tasks_zones', 'task_id', 'zone_id');
     }
 
     public function workers()
     {
-        return $this->belongsToMany(MWorker::class, 'tasks_workers', 'task_id', 'worker_id');
+        return $this->belongsToMany(User::class, 'tasks_workers', 'task_id', 'worker_id');
     }
 
     public function taskTypes()
     {
-        return $this->belongsToMany(MTaskType::class, 'tasks_tasktypes', 'task_id', 'tasktype_id');
+        return $this->belongsToMany(TaskType::class, 'tasks_tasktypes', 'task_id', 'tasktype_id');
     }
 }
diff --git a/src/app/Models/MTaskType.php b/src/app/Models/TaskType.php
similarity index 77%
rename from src/app/Models/MTaskType.php
rename to src/app/Models/TaskType.php
index f85586d4..284828f1 100644
--- a/src/app/Models/MTaskType.php
+++ b/src/app/Models/TaskType.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MTaskType extends BaseModel
+class TaskType extends BaseModel
 {
     public string $name;
 
@@ -11,12 +11,13 @@ protected static function getTableName(): string
         return 'task_types';
     }
 
-    protected static function mapDataToModel($data): MTaskType
+    protected static function mapDataToModel($data): TaskType
     {
         $task = new self();
         $task->id = $data['id'];
         $task->name = $data['name'];
         $task->created_at = $data['created_at'];
+
         return $task;
     }
 }
diff --git a/src/app/Models/MTreeType.php b/src/app/Models/TreeType.php
similarity index 83%
rename from src/app/Models/MTreeType.php
rename to src/app/Models/TreeType.php
index ea81aa43..e14a4e31 100644
--- a/src/app/Models/MTreeType.php
+++ b/src/app/Models/TreeType.php
@@ -2,10 +2,12 @@
 
 namespace App\Models;
 
-class MTreeType extends BaseModel
+class TreeType extends BaseModel
 {
     public string $family;
+
     public string $genus;
+
     public string $species;
 
     protected static function getTableName(): string
@@ -13,7 +15,7 @@ protected static function getTableName(): string
         return 'tree_types';
     }
 
-    protected static function mapDataToModel($data): MTreeType
+    protected static function mapDataToModel($data): TreeType
     {
         $tree_type = new self();
         $tree_type->id = $data['id'];
@@ -21,6 +23,7 @@ protected static function mapDataToModel($data): MTreeType
         $tree_type->genus = $data['genus'];
         $tree_type->species = $data['species'];
         $tree_type->created_at = $data['created_at'];
+
         return $tree_type;
     }
 }
diff --git a/src/app/Models/MWorker.php b/src/app/Models/User.php
similarity index 61%
rename from src/app/Models/MWorker.php
rename to src/app/Models/User.php
index 75aefb6e..fa2d6e3c 100644
--- a/src/app/Models/MWorker.php
+++ b/src/app/Models/User.php
@@ -2,22 +2,26 @@
 
 namespace App\Models;
 
-class MWorker extends BaseModel
+class User extends BaseModel
 {
+    public string $company;
+
+    public string $name;
 
-    public ?string $company;
-    public ?string $name;
     public string $dni;
-    public ?string $password;
-    public ?string $email;
-    public ?int $role_id;
+
+    public string $password;
+
+    public string $email;
+
+    public int $role_id;
 
     protected static function getTableName(): string
     {
         return 'workers';
     }
 
-    protected static function mapDataToModel($data): MWorker
+    protected static function mapDataToModel($data): User
     {
         $user = new self();
         $user->id = $data['id'];
@@ -28,11 +32,13 @@ protected static function mapDataToModel($data): MWorker
         $user->email = $data['email'];
         $user->role_id = $data['role_id'];
         $user->created_at = $data['created_at'];
+
         return $user;
     }
 
-    public function role(): MRole
+    // Fetch the user's role
+    public function role(): Role
     {
-        return $this->belongsTo(MRole::class, 'role_id');
+        return $this->belongsTo(Role::class, 'role_id');
     }
 }
diff --git a/src/app/Models/MWorkOrder.php b/src/app/Models/WorkOrder.php
similarity index 52%
rename from src/app/Models/MWorkOrder.php
rename to src/app/Models/WorkOrder.php
index dd27e245..04489af8 100644
--- a/src/app/Models/MWorkOrder.php
+++ b/src/app/Models/WorkOrder.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MWorkOrder extends BaseModel
+class WorkOrder extends BaseModel
 {
     public ?int $contract_id;
 
@@ -11,27 +11,28 @@ protected static function getTableName(): string
         return 'work_orders';
     }
 
-    protected static function mapDataToModel($data): MWorkOrder
+    protected static function mapDataToModel($data): WorkOrder
     {
         $order = new self();
         $order->id = $data['id'];
         $order->contract_id = $data['contract_id'];
         $order->created_at = $data['created_at'];
+
         return $order;
     }
 
-    public function report(): MWorkReport
+    public function report(): WorkReport
     {
-        return $this->hasMany(MWorkReport::class, 'id')[0];
+        return $this->hasMany(WorkReport::class, 'id')[0];
     }
 
-    public function contract(): MContract
+    public function contract(): Contract
     {
-        return $this->belongsTo(MContract::class, 'contract_id', 'id');
+        return $this->belongsTo(Contract::class, 'contract_id', 'id');
     }
 
     public function tasks()
     {
-        return $this->hasMany(MTask::class, 'work_order_id', 'id');
+        return $this->hasMany(Task::class, 'work_order_id', 'id');
     }
 }
diff --git a/src/app/Models/MWorkReport.php b/src/app/Models/WorkReport.php
similarity index 73%
rename from src/app/Models/MWorkReport.php
rename to src/app/Models/WorkReport.php
index 49085bf2..1a557af1 100644
--- a/src/app/Models/MWorkReport.php
+++ b/src/app/Models/WorkReport.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class MWorkReport extends BaseModel
+class WorkReport extends BaseModel
 {
     public ?string $observation;
     public ?float $spent_fuel;
@@ -13,7 +13,7 @@ protected static function getTableName(): string
         return 'work_reports';
     }
 
-    protected static function mapDataToModel($data): MWorkReport
+    protected static function mapDataToModel($data): WorkReport
     {
         $workReport = new self();
         $workReport->id = $data['id'];
@@ -21,11 +21,12 @@ protected static function mapDataToModel($data): MWorkReport
         $workReport->spent_fuel = $data['spent_fuel'];
         $workReport->photo = $data['photo'];
         $workReport->created_at = $data['created_at'];
+
         return $workReport;
     }
 
-    public function workOrder(): MWorkOrder
+    public function workOrder(): WorkOrder
     {
-        return $this->belongsTo(MWorkOrder::class, 'id');
+        return $this->belongsTo(WorkOrder::class, 'id');
     }
 }
diff --git a/src/app/Models/MZone.php b/src/app/Models/Zone.php
similarity index 70%
rename from src/app/Models/MZone.php
rename to src/app/Models/Zone.php
index 31f76af6..65603c6a 100644
--- a/src/app/Models/MZone.php
+++ b/src/app/Models/Zone.php
@@ -2,10 +2,12 @@
 
 namespace App\Models;
 
-class MZone extends BaseModel
+class Zone extends BaseModel
 {
     public string $name;
+
     public int $postal_code;
+
     public int $point_id;
 
     protected static function getTableName(): string
@@ -13,7 +15,7 @@ protected static function getTableName(): string
         return 'zones';
     }
 
-    protected static function mapDataToModel($data): MZone
+    protected static function mapDataToModel($data): Zone
     {
         $zone = new self();
         $zone->id = $data['id'];
@@ -21,11 +23,13 @@ protected static function mapDataToModel($data): MZone
         $zone->postal_code = $data['postal_code'];
         $zone->point_id = $data['point_id'];
         $zone->created_at = $data['created_at'];
+
         return $zone;
     }
 
-    public function point(): MPoint
+    // Fetch the zone's point
+    public function point()
     {
-        return $this->belongsTo(MPoint::class, 'point_id');
+        return $this->belongsTo(Point::class, 'point_id');
     }
 }
diff --git a/src/app/Views/Auth/Login.php b/src/app/Views/Auth/Login.php
index 7128e4ff..1a4605ec 100644
--- a/src/app/Views/Auth/Login.php
+++ b/src/app/Views/Auth/Login.php
@@ -1,30 +1,44 @@
-<?php $title = "Login"; ?>
+<?php
+use App\Core\Session;
 
-<form action="/login" method="POST" class="space-y-6">
+?>
+
+<?php $title = getenv('APP_NAME'); ?>
+
+<?php if (Session::has('error')) { ?>
+<div class="bg-red-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+    <strong class="font-bold">Error: </strong>
+    <span><?php echo htmlspecialchars(Session::get('error')); ?></span>
+</div>
+<?php } ?>
+
+<form action="/auth/login" method="POST" class="space-y-6">
     <div>
         <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-        <input type="email" id="email" name="email" required class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" placeholder="you@example.com">
+        <input type="email" id="email" name="email" required value="jose.rodriguez@example.com"
+            class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+            placeholder="you@example.com">
     </div>
 
     <div>
         <label for="password" class="block text-sm font-medium text-gray-700">Password</label>
-        <input type="password" id="password" name="password" required class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" placeholder="••••••••">
+        <input type="password" id="password" name="password" required value="hashedpassword3"
+            class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+            placeholder="••••••••">
     </div>
 
     <div class="flex items-center justify-between">
         <div class="flex items-center">
-            <input id="remember_me" name="remember_me" type="checkbox" class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
-            <label for="remember_me" class="ml-2 block text-sm text-gray-900">Remember me</label>
-        </div>
-
-        <div class="text-sm">
-            <a href="/forgot-password" class="font-medium text-blue-600 hover:text-blue-500">Forgot your password?</a>
+            <input id="remember_me" name="remember_me" type="checkbox"
+                class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
+            <label for="remember_me" class="ml-2 text-sm text-gray-900">Remember me</label>
         </div>
     </div>
 
     <div>
-        <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+        <button type="submit"
+            class="w-full bg-gray-700 hover:bg-gray-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
             Sign in
         </button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/app/Views/Contracts.php b/src/app/Views/Contracts.php
deleted file mode 100644
index f317278f..00000000
--- a/src/app/Views/Contracts.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Name</th>
-                <th class="px-4 py-2 border-b">Start Date</th>
-                <th class="px-4 py-2 border-b">End Date</th>
-                <th class="px-4 py-2 border-b">Invoice proposed</th>
-                <th class="px-4 py-2 border-b">Invoice agreed</th>
-                <th class="px-4 py-2 border-b">Invoice paid</th>
-                <th class="px-4 py-2 border-b">Created at</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($contracts as $contract): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $contract->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->start_date; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->end_date; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->invoice_proposed; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->invoice_agreed; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->invoice_paid; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $contract->created_at; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/Dashboard.php b/src/app/Views/Dashboard.php
new file mode 100755
index 00000000..83b82b24
--- /dev/null
+++ b/src/app/Views/Dashboard.php
@@ -0,0 +1,37 @@
+<div class="p-6">
+  <!-- Page Title -->
+  <div class="mb-4">
+    <h1 class="text-2xl font-bold text-gray-800">Dashboard</h1>
+    <p class="text-sm text-gray-600">Welcome back,
+      <?php echo $_SESSION['user']['name']; ?>
+      to your dashboard. Here's a quick overview of your data.
+    </p>
+  </div>
+
+  <!-- Scrollable Content -->
+  <div class="overflow-x-auto">
+    <!-- Grid Layout -->
+    <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+      <!-- Widget 1 -->
+      <div class="bg-white shadow rounded-lg p-4">
+        <h2 class="text-lg font-semibold text-gray-700">Example 1</h2>
+        <p class="mt-2 text-3xl font-bold text-gray-900">0</p>
+        <p class="text-sm text-gray-500 mt-1">+0% since last week</p>
+      </div>
+
+      <!-- Widget 2 -->
+      <div class="bg-white shadow rounded-lg p-4">
+        <h2 class="text-lg font-semibold text-gray-700">Example 2</h2>
+        <p class="mt-2 text-3xl font-bold text-gray-600">0</p>
+        <p class="text-sm text-gray-500 mt-1">+0% since last week</p>
+      </div>
+
+      <!-- Widget 3 -->
+      <div class="bg-white shadow rounded-lg p-4">
+        <h2 class="text-lg font-semibold text-gray-700">Example 3</h2>
+        <p class="mt-2 text-3xl font-bold text-gray-500">0</p>
+        <p class="text-sm text-gray-500 mt-1">+0% since week</p>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/Views/Element.php b/src/app/Views/Element.php
deleted file mode 100644
index 4b5b7d0d..00000000
--- a/src/app/Views/Element.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Name</th>
-                <th class="px-4 py-2 border-b">Zone Name</th>
-                <th class="px-4 py-2 border-b">Zone Postal Code</th>
-                <th class="px-4 py-2 border-b">Species</th>
-                <th class="px-4 py-2 border-b">Latitude</th>
-                <th class="px-4 py-2 border-b">Longitude</th>
-                <th class="px-4 py-2 border-b">Created At</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($elements as $element): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $element->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->zone()->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->zone()->postal_code; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->treeType()->species; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->point()->latitude; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->point()->longitude; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $element->getCreatedAt(); ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/Elements.php b/src/app/Views/Elements.php
new file mode 100644
index 00000000..d4dc7a7d
--- /dev/null
+++ b/src/app/Views/Elements.php
@@ -0,0 +1,58 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+    <div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+        <strong class="font-bold">Success: </strong>
+        <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+    </div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="#"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create Element
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="px-4 py-2 border-b">ID</th>
+                <th class="px-4 py-2 border-b">Name</th>
+                <th class="px-4 py-2 border-b">Zone Name</th>
+                <th class="px-4 py-2 border-b">Zone Postal Code</th>
+                <th class="px-4 py-2 border-b">Species</th>
+                <th class="px-4 py-2 border-b">Latitude</th>
+                <th class="px-4 py-2 border-b">Longitude</th>
+                <th class="px-4 py-2 border-b">Created At</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($elements as $element) { ?>
+            <tr class="hover:bg-gray-50">
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->getId(); ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->name; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->zone()->name; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->zone()->postal_code; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->treeType()->species; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->point()->latitude; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->point()->longitude; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $element->getCreatedAt(); ?></td>
+            </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/src/app/Views/Home.php b/src/app/Views/Home.php
deleted file mode 100755
index 875643ff..00000000
--- a/src/app/Views/Home.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Company</th>
-                <th class="px-4 py-2 border-b">Name</th>
-                <th class="px-4 py-2 border-b">DNI</th>
-                <th class="px-4 py-2 border-b">Email</th>
-                <th class="px-4 py-2 border-b">Role Name</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($workers as $worker): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $worker->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $worker->company; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $worker->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $worker->dni; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $worker->email; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $worker->role()->name; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/Incidence.php b/src/app/Views/Incidence.php
index ddc538f8..ee410d8e 100644
--- a/src/app/Views/Incidence.php
+++ b/src/app/Views/Incidence.php
@@ -2,12 +2,20 @@
     <h1 class="text-5xl font-extrabold text-center text-gray-800">Incidencias</h1>
     <h3 class="text-lg mt-2 text-slate-600 font-semibold text-center">Here you can see your incidences 😁</h3>
     <div class="mt-8 flex justify-center space-x-6">
-        <button onclick="window.location.href='/incidence/all'" class="text-white bg-gradient-to-r from-cyan-500 to-blue-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-cyan-300 font-medium rounded-lg text-lg px-6 py-3 transition-transform transform hover:scale-110 duration-200">
-            Ver Incidencias
+        <button onclick="window.location.href='/incidence/all'"
+            class="relative inline-flex items-center justify-center p-0.5 mb-2 me-2 overflow-hidden text-lg font-medium text-gray-900 rounded-lg group bg-gradient-to-br from-cyan-500 to-blue-500 group-hover:from-cyan-500 group-hover:to-blue-500 hover:text-white dark:text-white focus:ring-4 focus:outline-none focus:ring-cyan-300 dark:focus:ring-blue-800 transition-transform transform hover:scale-110 duration-200">
+            <span class="relative px-6 py-3 transition-all ease-in duration-75 bg-white dark:bg-gray-900 rounded-md group-hover:bg-opacity-0">
+                Ver Incidencias
+            </span>
         </button>
 
-        <button onclick="window.location.href='/incidence/create'" class="text-white bg-gradient-to-r from-cyan-500 to-blue-500 hover:bg-gradient-to-bl focus:ring-4 focus:outline-none focus:ring-cyan-300 font-medium rounded-lg text-lg px-6 py-3 transition-transform transform hover:scale-110 duration-200">
-            Crear Incidencia
+
+        <button onclick="window.location.href='/incidence/create'"
+            class="relative inline-flex items-center justify-center p-0.5 mb-2 me-2 overflow-hidden text-lg font-medium text-gray-900 rounded-lg group bg-gradient-to-br from-pink-500 to-orange-400 group-hover:from-pink-500 group-hover:to-orange-400 hover:text-white dark:text-white focus:ring-4 focus:outline-none focus:ring-pink-200 dark:focus:ring-pink-800 transition-transform transform hover:scale-110 duration-200">
+            <span class="relative px-6 py-3 transition-all ease-in duration-75 bg-white dark:bg-gray-900 rounded-md group-hover:bg-opacity-0">
+                Crear Incidencia
+            </span>
         </button>
+
     </div>
 </div>
diff --git a/src/app/Views/Incidence/Create.php b/src/app/Views/Incidence/Create.php
index a47868c8..59c368bc 100644
--- a/src/app/Views/Incidence/Create.php
+++ b/src/app/Views/Incidence/Create.php
@@ -15,7 +15,7 @@
             <label for="name" class="block text-gray-700 text-sm font-bold mb-2">Nombre de la incidencia</label>
             <input type="text" id="name" name="name" class="shadow appearance-none border rounded w-full py-3 px-4 text-gray-700 leading-tight focus:outline-none focus:ring focus:border-blue-500" placeholder="Ejemplo: Rama caída" required>
         </div>
-  
+
         <div class="mb-6">
             <label for="description" class="block text-gray-700 text-sm font-bold mb-2">Descripción</label>
             <textarea id="description" name="description" class="shadow appearance-none border rounded w-full py-3 px-4 text-gray-700 leading-tight focus:outline-none focus:ring focus:border-blue-500" placeholder="Describe la incidencia" rows="6" required></textarea>
diff --git a/src/app/Views/Incidence/SeeAllIncidences.php b/src/app/Views/Incidence/SeeAllIncidences.php
index 2128fca5..be42ad97 100644
--- a/src/app/Views/Incidence/SeeAllIncidences.php
+++ b/src/app/Views/Incidence/SeeAllIncidences.php
@@ -3,7 +3,7 @@
     <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
         <thead>
             <tr class="bg-gradient-to-r from-cyan-500 to-blue-500 text-white">
-                
+
                 <th class="px-6 py-4 text-left font-semibold">Element Name</th>
                 <th class="px-6 py-4 text-left font-semibold">Name</th>
                 <th class="px-6 py-4 text-left font-semibold">Description</th>
@@ -14,7 +14,7 @@
         <tbody>
             <?php foreach ($incidences as $incidence): ?>
                 <tr class="hover:bg-gray-50 transition-all duration-200 ease-in-out">
-                    
+
                     <td class="px-6 py-4 border-b text-sm text-gray-700"><?php echo $incidence->name; ?></td>
                     <td class="px-6 py-4 border-b text-sm text-gray-700"><?php echo $incidence->element()->name; ?></td>
                     <td class="px-6 py-4 border-b text-sm text-gray-700"><?php echo $incidence->description; ?></td>
diff --git a/src/app/Views/PruningType.php b/src/app/Views/PruningType.php
deleted file mode 100644
index 6d9b3de5..00000000
--- a/src/app/Views/PruningType.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Name</th>
-                <th class="px-4 py-2 border-b">Description</th>
-
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($pruning_types as $pruning_type): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $pruning_type->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $pruning_type->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $pruning_type->description; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/TaskTypes/index.php b/src/app/Views/TaskTypes/index.php
deleted file mode 100644
index fdabb7a0..00000000
--- a/src/app/Views/TaskTypes/index.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Type of Task</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($task_types as $task_type): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $task_type->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $task_type->name; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/TreeType.php b/src/app/Views/TreeType.php
deleted file mode 100644
index 5095957a..00000000
--- a/src/app/Views/TreeType.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Family</th>
-                <th class="px-4 py-2 border-b">Genus</th>
-                <th class="px-4 py-2 border-b">Species</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($tree_types as $tree_type): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $tree_type->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $tree_type->family; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $tree_type->genus; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $tree_type->species; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/TreeTypes.php b/src/app/Views/TreeTypes.php
new file mode 100644
index 00000000..d5a9846a
--- /dev/null
+++ b/src/app/Views/TreeTypes.php
@@ -0,0 +1,46 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+    <div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+        <strong class="font-bold">Success: </strong>
+        <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+    </div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="#"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create Tree Type
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="px-4 py-2 border-b">ID</th>
+                <th class="px-4 py-2 border-b">Family</th>
+                <th class="px-4 py-2 border-b">Genus</th>
+                <th class="px-4 py-2 border-b">Species</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($tree_types as $tree_type) { ?>
+            <tr class="hover:bg-gray-50">
+                <td class="px-4 py-2 border-b">
+                    <?php echo $tree_type->getId(); ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $tree_type->family; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $tree_type->genus; ?></td>
+                <td class="px-4 py-2 border-b">
+                    <?php echo $tree_type->species; ?></td>
+            </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/src/app/Views/User/Create.php b/src/app/Views/User/Create.php
new file mode 100644
index 00000000..0759714d
--- /dev/null
+++ b/src/app/Views/User/Create.php
@@ -0,0 +1,53 @@
+<div class="mb-4 flex justify-end">
+    <a href="/zones"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Zones</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Create Zone</h2>
+    <form action="/zone/store" method="POST" class="space-y-6">
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+
+        <!-- Postal Code -->
+        <div>
+            <label for="postal_code" class="block text-sm font-medium text-gray-700 mb-1">Postal Code</label>
+            <input type="text" id="postal_code" name="postal_code"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+
+        <!-- Point ID -->
+        <div>
+            <label for="point_id" class="block text-sm font-medium text-gray-700 mb-1">Point</label>
+            <select id="point_id" name="point_id"
+                    class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                    required>
+                <option value="" disabled selected>Select Point</option>
+                <option value="1">Point 1</option>
+                <option value="2">Point 2</option>
+                <option value="3">Point 3</option>
+            </select>
+        </div>
+
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                    class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Create Zone
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/src/app/Views/User/Edit.php b/src/app/Views/User/Edit.php
new file mode 100644
index 00000000..a305df7d
--- /dev/null
+++ b/src/app/Views/User/Edit.php
@@ -0,0 +1,79 @@
+<div class="mb-4 flex justify-end">
+    <a href="/users"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Users</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit User</h2>
+    <form
+        action="/user/<?php echo htmlspecialchars($user->getId()); ?>/update"
+        method="POST" class="space-y-6">
+
+        <!-- Company -->
+        <div>
+            <label for="company" class="block text-sm font-medium text-gray-700 mb-1">Company</label>
+            <input type="text" id="company" name="company"
+                value="<?php echo htmlspecialchars($user->company); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                value="<?php echo htmlspecialchars($user->name); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- DNI -->
+        <div>
+            <label for="dni" class="block text-sm font-medium text-gray-700 mb-1">DNI</label>
+            <input type="text" id="dni" name="dni"
+                value="<?php echo htmlspecialchars($user->dni); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Email -->
+        <div>
+            <label for="email" class="block text-sm font-medium text-gray-700 mb-1">Email</label>
+            <input type="email" id="email" name="email"
+                value="<?php echo htmlspecialchars($user->email); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Role -->
+        <div>
+            <label for="role_id" class="block text-sm font-medium text-gray-700 mb-1">Role</label>
+            <select id="role_id" name="role_id"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+                <option value="1" <?php echo $user->role_id == 1 ? 'selected' : ''; ?>>Admin
+                </option>
+                <option value="2" <?php echo $user->role_id == 2 ? 'selected' : ''; ?>>User
+                </option>
+                <option value="3" <?php echo $user->role_id == 3 ? 'selected' : ''; ?>>Guest
+                </option>
+            </select>
+        </div>
+
+        <!-- Password -->
+        <div>
+            <label for="password" class="block text-sm font-medium text-gray-700 mb-1">Password</label>
+            <input type="password" id="password" name="password" placeholder="Leave blank to keep current password"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Update User
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/src/app/Views/Users.php b/src/app/Views/Users.php
new file mode 100755
index 00000000..5b9d0d57
--- /dev/null
+++ b/src/app/Views/Users.php
@@ -0,0 +1,76 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+    <div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+        <strong class="font-bold">Success: </strong>
+        <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+    </div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="/user/create"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create User
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="px-4 py-3 border-b">ID</th>
+                <th class="px-4 py-3 border-b">Company</th>
+                <th class="px-4 py-3 border-b">Name</th>
+                <th class="px-4 py-3 border-b">DNI</th>
+                <th class="px-4 py-3 border-b">Email</th>
+                <th class="px-4 py-3 border-b">Role Name</th>
+                <th class="px-4 py-3 border-b text-center">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($users as $user) { ?>
+                <tr class="hover:bg-blue-50">
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->getId()); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->company); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->name); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->dni); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->email); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b">
+                        <?php echo htmlspecialchars($user->role()->name); ?>
+                    </td>
+                    <td class="px-4 py-3 border-b text-center flex justify-center space-x-4">
+                        <!-- Edit Button (Pencil Icon) -->
+                        <a href="/user/<?php echo htmlspecialchars($user->getId()); ?>/edit"
+                            class="text-blue-500 hover:text-blue-700" title="Edit">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                            </svg>
+                        </a>
+                        <!-- Delete Button (Trash Icon) -->
+                        <a href="/user/<?php echo htmlspecialchars($user->getId()); ?>/delete"
+                            onclick="return confirm('Are you sure you want to delete this user?');"
+                            class="text-red-500 hover:text-red-700" title="Delete">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                            </svg>
+                        </a>
+                    </td>
+                </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/src/app/Views/WorkOrders.php b/src/app/Views/WorkOrders.php
new file mode 100644
index 00000000..177939b0
--- /dev/null
+++ b/src/app/Views/WorkOrders.php
@@ -0,0 +1,89 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+    <div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+        <strong class="font-bold">Success: </strong>
+        <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+    </div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="#"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create Work Order
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="py-2 px-4 border-b">ID</th>
+                <th class="py-2 px-4 border-b">Contracte</th>
+                <th class="py-2 px-4 border-b">Data</th>
+                <th class="py-2 px-4 border-b">Zones</th>
+                <th class="py-2 px-4 border-b">Tasques</th>
+                <th class="py-2 px-4 border-b">Operaris</th>
+                <th class="py-2 px-4 border-b">Notes</th>
+                <th class="py-2 px-4 border-b">Accions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($workOrders as $workOrder) { ?>
+                <?php foreach ($workOrder->tasks() as $task) { ?>
+                    <tr class="border-b hover:bg-gray-100">
+                        <td class="py-2 px-4">
+                            <?php echo $workOrder->getId(); ?></td>
+                        <td class="py-2 px-4">
+                            <?php echo $workOrder->contract()->name; ?></td>
+                        <td class="py-2 px-4">
+                            <?php echo $workOrder->getCreatedAt(); ?></td>
+                        <td class="py-2 px-4">
+                            <?php foreach ($task->zones() as $zone) { ?>
+                                <?php echo $zone->name; ?>,
+                            <?php } ?>
+                        </td>
+                        <td class="py-2 px-4">
+                            <?php foreach ($task->taskTypes() as $task_type) { ?>
+                                <?php echo $task_type->name; ?>,
+                            <?php } ?>
+                        </td>
+                        <td class="py-2 px-4">
+                            <?php foreach ($task->workers() as $worker) { ?>
+                                <?php echo $worker->name; ?>,
+                            <?php } ?>
+                        </td>
+                        <td class="py-2 px-4"><?php echo $task->notes; ?>
+                        </td>
+
+                        <td class="px-4 py-3 border-b text-center flex justify-center space-x-4">
+                            <!-- Edit Button (Pencil Icon) -->
+                            <a href="/user/<?php echo htmlspecialchars($workOrder->getId()); ?>/edit"
+                                class="text-blue-500 hover:text-blue-700" title="Edit">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                    stroke="currentColor" class="w-5 h-5">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                                </svg>
+                            </a>
+                            <!-- Delete Button (Trash Icon) -->
+                            <a href="/user/<?php echo htmlspecialchars($workOrder->getId()); ?>/delete"
+                                onclick="return confirm('Are you sure you want to delete this user?');"
+                                class="text-red-500 hover:text-red-700" title="Delete">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                    stroke="currentColor" class="w-5 h-5">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                                </svg>
+                            </a>
+                        </td>
+                    </tr>
+                <?php } ?>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/src/app/Views/Zone.php b/src/app/Views/Zone.php
deleted file mode 100644
index fbc4e8f7..00000000
--- a/src/app/Views/Zone.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="overflow-x-auto">
-    <table class="min-w-full bg-white border border-gray-300 rounded-lg shadow-md">
-        <thead>
-            <tr class="bg-gray-100 text-left">
-                <th class="px-4 py-2 border-b">ID</th>
-                <th class="px-4 py-2 border-b">Name</th>
-                <th class="px-4 py-2 border-b">Postal Code</th>
-                <th class="px-4 py-2 border-b">Latitude</th>
-                <th class="px-4 py-2 border-b">Longitude</th>
-
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($zones as $zone): ?>
-                <tr class="hover:bg-gray-50">
-                    <td class="px-4 py-2 border-b"><?php echo $zone->getId(); ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $zone->name; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $zone->postal_code; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $zone->point()->latitude; ?></td>
-                    <td class="px-4 py-2 border-b"><?php echo $zone->point()->longitude; ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
diff --git a/src/app/Views/Zone/Create.php b/src/app/Views/Zone/Create.php
new file mode 100644
index 00000000..ff5815d8
--- /dev/null
+++ b/src/app/Views/Zone/Create.php
@@ -0,0 +1,46 @@
+<div class="mb-4 flex justify-end">
+    <a href="/zones"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Zones</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Create Zone</h2>
+    <form action="/zone/store" method="POST" class="space-y-6">
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Name</label>
+            <input type="text" id="name" name="name"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+
+        <!-- Postal Code -->
+        <div>
+            <label for="postal_code" class="block text-sm font-medium text-gray-700 mb-1">Postal Code</label>
+            <input type="text" id="postal_code" name="postal_code"
+                   class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500"
+                   required>
+        </div>
+
+        <!-- Point ID -->
+        <div>
+            <label for="point_id" class="block text-sm font-medium text-gray-700 mb-1">Points</label>
+            <p>Editor not implemented</p>
+        </div>
+
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                    class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Create Zone
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/src/app/Views/Zone/Edit.php b/src/app/Views/Zone/Edit.php
new file mode 100644
index 00000000..815e72ab
--- /dev/null
+++ b/src/app/Views/Zone/Edit.php
@@ -0,0 +1,47 @@
+<div class="mb-4 flex justify-end">
+    <a href="/zones"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500 flex items-center space-x-2">
+        <!-- Heroicon for return/back (chevron-left) -->
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+        </svg>
+        <span>Return to Zones</span>
+    </a>
+</div>
+
+<div class="bg-white p-8 border border-gray-300 rounded-lg shadow-md">
+    <h2 class="text-2xl font-semibold text-gray-800 mb-6">Edit Zone</h2>
+    <form
+        action="/zone/<?php echo htmlspecialchars($zone->getId()); ?>/update"
+        method="POST" class="space-y-6">
+
+        <!-- Name -->
+        <div>
+            <label for="name" class="block text-sm font-medium text-gray-700 mb-1">Zone Name</label>
+            <input type="text" id="name" name="name"
+                value="<?php echo htmlspecialchars($zone->name); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <!-- Postal Code -->
+        <div>
+            <label for="postal_code" class="block text-sm font-medium text-gray-700 mb-1">Postal Code</label>
+            <input type="text" id="postal_code" name="postal_code"
+                value="<?php echo htmlspecialchars($zone->postal_code); ?>"
+                class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring focus:ring-blue-500 focus:border-blue-500">
+        </div>
+
+        <div>
+            <label for="point_id" class="block text-sm font-medium text-gray-700 mb-1">Points</label>
+            <p>Editor not implemented</p>
+        </div>
+
+        <!-- Submit Button -->
+        <div class="flex items-center">
+            <button type="submit"
+                class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg focus:outline-none focus:ring focus:ring-blue-500">
+                Update Zone
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/src/app/Views/Zones.php b/src/app/Views/Zones.php
new file mode 100644
index 00000000..ef4bfea7
--- /dev/null
+++ b/src/app/Views/Zones.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Core\Session;
+
+?>
+
+<?php if (Session::has('success')) { ?>
+<div id="alert-msg" class="bg-blue-500 text-white px-4 py-3 rounded-lg mb-6" role="alert">
+    <strong class="font-bold">Success: </strong>
+    <span><?php echo htmlspecialchars(Session::get('success')); ?></span>
+</div>
+<?php } ?>
+
+<div class="mb-4 flex justify-end">
+    <a href="/zone/create"
+        class="bg-blue-500 hover:bg-blue-600 text-white font-medium py-2 px-4 rounded-lg shadow focus:outline-none focus:ring focus:ring-green-500">
+        Create Zone
+    </a>
+</div>
+
+<div class="overflow-x-auto">
+    <table class="min-w-full table-fixed bg-white border border-gray-300 rounded-lg shadow-md">
+        <thead>
+            <tr class="bg-gray-700 text-white text-left h-14">
+                <th class="px-4 py-3 border-b">Zone ID</th>
+                <th class="px-4 py-3 border-b">Name</th>
+                <th class="px-4 py-3 border-b">Postal Code</th>
+                <th class="px-4 py-3 border-b">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($zones as $zone) { ?>
+            <tr class="hover:bg-blue-50">
+                <td class="px-4 py-3 border-b">
+                    <?php echo htmlspecialchars($zone->getId()); ?></td>
+                <td class="px-4 py-3 border-b">
+                    <?php echo htmlspecialchars($zone->name); ?></td>
+                <td class="px-4 py-3 border-b">
+                    <?php echo htmlspecialchars($zone->postal_code); ?>
+                </td>
+                <td class="px-4 py-3 border-b text-center flex justify-center space-x-4">
+                        <!-- Edit Button (Pencil Icon) -->
+                        <a href="/zone/<?php echo htmlspecialchars($zone->getId()); ?>/edit"
+                            class="text-blue-500 hover:text-blue-700" title="Edit">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                            </svg>
+                        </a>
+                        <!-- Delete Button (Trash Icon) -->
+                        <a href="/zone/<?php echo htmlspecialchars($zone->getId()); ?>/delete"
+                            onclick="return confirm('Are you sure you want to delete this user?');"
+                            class="text-red-500 hover:text-red-700" title="Delete">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                            </svg>
+                        </a>
+                    </td>
+            </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
diff --git a/src/app/bootstrap.php b/src/app/bootstrap.php
index 3b7f102f..4afccc78 100644
--- a/src/app/bootstrap.php
+++ b/src/app/bootstrap.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Core\Session;
 use App\Core\Database;
 use App\Core\Logger;
+use App\Core\Session;
 
 // Load environment variables if exists
 if (file_exists('../.env')) {
@@ -18,5 +18,5 @@
 
 // Set up global error handler (optional)
 set_error_handler(function ($severity, $message, $file, $line) {
-    Logger::log("Error: $message in $file on line $line");
+    // Logger::log("Error: $message in $file on line $line"); TODO: Fix Logger
 });
diff --git a/src/app/routes.php b/src/app/routes.php
deleted file mode 100644
index e59458f6..00000000
--- a/src/app/routes.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/***
- * Web Routes are defined here in this file and are loaded in the Router class
- * All routes are defined in the following format:
- *
- * METHOD => [
- *     "URI" => [
- *        "controller" => "ControllerName",
- *        "method" => "methodName"
- *    ]
- * ]
- *
- **/
-
-use App\Controllers\CHome;
-use App\Controllers\CAuth;
-use App\Controllers\CIncidence;
-
-return $routes = [
-    "GET" => [
-        "/" => [
-            "controller" => CHome::class,
-            "method" => "index"
-        ],
-        "/login" => [
-            "controller" => CAuth::class,
-            "method" => "index"
-        ],
-        "/incidence" => [
-            "controller" => CIncidence::class,
-            "method"=> "index"
-        ],
-        "/incidence/create" => [
-            "controller" => CIncidence::class,
-            "method"=> "get"
-        ],
-        "/incidence/all" => [
-            "controller" => CIncidence::class,
-            "method"=> "findall"
-        ]
-    ],
-];
diff --git a/src/public/index.php b/src/public/index.php
index ded6b8f8..6b98b851 100755
--- a/src/public/index.php
+++ b/src/public/index.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../app/bootstrap.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../app/bootstrap.php';
 
 use App\Core\Router;
 
-$router = new Router();
-$router->load('../app/routes.php');
-$router->dispatch($_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI']);
+$router = new Router;
+$router->load('../routes/web.php');
+$router->dispatch($_SERVER['REQUEST_METHOD'], $_SERVER['REQUEST_URI'], $_POST);
diff --git a/src/routes/web.php b/src/routes/web.php
new file mode 100644
index 00000000..0cf6f74a
--- /dev/null
+++ b/src/routes/web.php
@@ -0,0 +1,165 @@
+<?php
+
+// Import controller classes
+use App\Controllers\AuthController;
+use App\Controllers\DashboardController;
+use App\Controllers\ElementController;
+use App\Controllers\IncidenceController;
+use App\Controllers\TreeTypeController;
+use App\Controllers\UserController;
+use App\Controllers\WorkOrderController;
+use App\Controllers\ZoneController;
+// Import middleware classes
+use App\Middlewares\AuthMiddleware;
+use App\Middlewares\GuestMiddleware;
+
+// Define routes in a grouped and structured way
+return [
+    'GET' => [
+        // == Auth GET Routes
+        '/auth/login' => [
+            'controller' => AuthController::class,
+            'method' => 'index',
+            'middleware' => [GuestMiddleware::class],
+        ],
+        '/logout' => [
+            'controller' => AuthController::class,
+            'method' => 'logout',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === App GET Routes
+        '/' => [
+            'controller' => DashboardController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === Users GET Routes
+        '/users' => [
+            'controller' => UserController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/user/create' => [
+            'controller' => UserController::class,
+            'method' => 'create',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/user/:id/edit' => [
+            'controller' => UserController::class,
+            'method' => 'edit',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/user/:id/delete' => [
+            'controller' => UserController::class,
+            'method' => 'destroy',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === WorkOrders GET Routes
+        '/work-orders' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/work-order/create' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'create',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/work-order/:id/edit' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'edit',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/work-order/:id/delete' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'destroy',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === Zones GET Routes
+        '/zones' => [
+            'controller' => ZoneController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/zone/create' => [
+            'controller' => ZoneController::class,
+            'method' => 'create',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/zone/:id/edit' => [
+            'controller' => ZoneController::class,
+            'method' => 'edit',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/zone/:id/delete' => [
+            'controller' => ZoneController::class,
+            'method' => 'destroy',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === TreeTypes GET Routes
+        '/tree-types' => [
+            'controller' => TreeTypeController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === Incidence GET Routes
+        '/incidence' => [
+            'controller' => IncidenceController::class,
+            'method' => 'index',
+        ],
+        '/incidence/create' => [
+            'controller' => IncidenceController::class,
+            'method' => 'get',
+        ],
+        '/incidence/all' => [
+            'controller' => IncidenceController::class,
+            'method' => 'findall',
+        ],
+        // === Elements GET Routes
+        '/elements' => [
+            'controller' => ElementController::class,
+            'method' => 'index',
+            'middleware' => [AuthMiddleware::class],
+        ],
+    ],
+    'POST' => [
+        // == Auth POST Routes
+        '/auth/login' => [
+            'controller' => AuthController::class,
+            'method' => 'login',
+            'middleware' => [GuestMiddleware::class],
+        ],
+        '/user/store' => [
+            'controller' => UserController::class,
+            'method' => 'store',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/user/:id/update' => [
+            'controller' => UserController::class,
+            'method' => 'update',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === WorkOrders POST Routes
+        '/work-order/store' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'store',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/work-order/:id/update' => [
+            'controller' => WorkOrderController::class,
+            'method' => 'update',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        // === Zones POST Routes
+        '/zone/store' => [
+            'controller' => ZoneController::class,
+            'method' => 'store',
+            'middleware' => [AuthMiddleware::class],
+        ],
+        '/zone/:id/update' => [
+            'controller' => ZoneController::class,
+            'method' => 'update',
+            'middleware' => [AuthMiddleware::class],
+        ],
+    ],
+];
diff --git a/src/storage/logs/app.log b/src/storage/logs/app.log
old mode 100644
new mode 100755