diff --git a/Activity_PHP/calculatrice/calculatrice.jpg b/Activity_PHP/calculator/calculator.jpg
similarity index 100%
rename from Activity_PHP/calculatrice/calculatrice.jpg
rename to Activity_PHP/calculator/calculator.jpg
diff --git a/Activity_PHP/calculator/index.php b/Activity_PHP/calculator/index.php
new file mode 100644
index 0000000..fcf1dd7
--- /dev/null
+++ b/Activity_PHP/calculator/index.php
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Calculator</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <h1>Calculator</h1>
+    <img src="calculator.jpg" alt="Calculator Image">
+    <form method="post">
+        <input type="number" name="num1" placeholder="Number 1" required>
+        <select name="operator">
+            <option value="+">+</option>
+            <option value="-">-</option>
+            <option value="*">*</option>
+            <option value="/">/</option>
+        </select>
+        <input type="number" name="num2" placeholder="Number 2" required>
+        <button type="submit" name="calculate">Calculate</button>
+    </form>
+    <?php
+    if (isset($_POST['calculate'])) {
+        $num1 = $_POST['num1'];
+        $num2 = $_POST['num2'];
+        $operator = $_POST['operator'];
+
+        switch ($operator) {
+            case '+':
+                $result = $num1 + $num2;
+                break;
+            case '-':
+                $result = $num1 - $num2;
+                break;
+            case '*':
+                $result = $num1 * $num2;
+                break;
+            case '/':
+                if ($num2 == 0) {
+                    echo "Cannot divide by zero.";
+                } else {
+                    $result = $num1 / $num2;
+                }
+                break;
+            default:
+                echo "Invalid operator.";
+        }
+
+        if (isset($result)) {
+            echo "Result: " . $num1 . ' ' . $operator . ' ' . $num2 . " = " . $result;
+        }
+    }
+    ?>
+</body>
+</html>
diff --git a/Activity_PHP/calculator/style.css b/Activity_PHP/calculator/style.css
new file mode 100644
index 0000000..efd1016
--- /dev/null
+++ b/Activity_PHP/calculator/style.css
@@ -0,0 +1,33 @@
+body {
+    font-family: Arial, sans-serif;
+    text-align: center;
+    margin: 20px;
+}
+
+h1 {
+    margin-bottom: 20px;
+}
+
+form {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: wrap;
+    margin-bottom: 20px;
+}
+
+form input[type="number"],
+form select,
+form button {
+    margin: 5px;
+    padding: 8px;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+}
+
+img {
+    display: block;
+    margin: 20px auto;
+    max-width: 300px;
+    height: auto;
+}
diff --git a/Activity_PHP/calculatrice/calculatrice.php b/Activity_PHP/calculatrice/calculatrice.php
deleted file mode 100644
index 133a36f..0000000
--- a/Activity_PHP/calculatrice/calculatrice.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<html lang="fr">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Calculatrice</title>
-    <link rel="stylesheet" href="styles.css">
-</head>
-<body>
-    <h1>Calculatrice 4 operation</h1>
-    <img src="calculatrice.jpg" alt="">
-    <h2>Saisir un nombre, choisir un signe, saisir un second nombre puis cliquer sur =</h2>
-    
-    <form method="post" action="calculatrice2.php">
-        <input type="text" name="nbr1">
-        <select name="jour_du_mois">
-        <option value="+">+</option>
-        <option value="-">-</option>
-        <option value="*">*</option>
-        <option value="/">/</option>
-        <input type="text" name="nbr2">
-        <button type="submit">=</button>
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/Activity_PHP/calculatrice/calculatrice2.php b/Activity_PHP/calculatrice/calculatrice2.php
deleted file mode 100644
index b7431bd..0000000
--- a/Activity_PHP/calculatrice/calculatrice2.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<html lang="fr">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Calculatrice</title>
-    <link rel="stylesheet" href="styles.css">
-</head>
-<body>
-    <h1>Calculatrice 4 operation, resultat :</h1>
-    <h2>
-    <?php 
-    if (strcmp($_POST['jour_du_mois'], "+") == 0)
-        {$resultat = $_POST['nbr1'] + $_POST['nbr2'];
-        print ("résultat = $resultat");
-    }
-
-    if (strcmp($_POST['jour_du_mois'], "-") == 0)
-        {$resultat = $_POST['nbr1'] - $_POST['nbr2'];
-        print ("résultat = $resultat");
-    }
-
-    if (strcmp($_POST['jour_du_mois'], "/") == 0)
-        {$resultat = $_POST['nbr1'] / $_POST['nbr2'];
-        print ("résultat = $resultat");
-    }
-
-    if (strcmp($_POST['jour_du_mois'], "*") == 0)
-        {$resultat = $_POST['nbr1'] * $_POST['nbr2'];
-        print ("résultat = $resultat");
-    }
-
-    ?>
-    </h2>
-</body>
-</html>
\ No newline at end of file
diff --git a/Activity_PHP/calculatrice/styles.css b/Activity_PHP/calculatrice/styles.css
deleted file mode 100644
index cd6de90..0000000
--- a/Activity_PHP/calculatrice/styles.css
+++ /dev/null
@@ -1,7 +0,0 @@
-body {
-    background-color: yellow;
-}
-
-img {
-    width: 150px;
-}
\ No newline at end of file
