diff --git a/app/plates/board.php b/app/plates/board.php
index 31ac0d7..46f7a0b 100644
--- a/app/plates/board.php
+++ b/app/plates/board.php
@@ -1,7 +1,7 @@
-<?= $layout->load('main', compact('link', 'plate')) ?>
+<?php echo $layout->load('main', compact('link', 'plate')) ?>
 
-<?= $block->body() ?>
-  <?= $plate->add('navbar', compact('link')) ?>
+<?php echo $block->body() ?>
+  <?php echo $plate->add('navbar', compact('link')) ?>
 
   <div class="p-5 bg-body-tertiary">
     <div class="container">
@@ -19,7 +19,7 @@
                 <span class="fw-bold">Creating a new Page</span>
             </div>
             <div class="card-body">
-              <p>Kindly select the <a href="<?= $link->set('/pages') ?>">Pages</a> link from the navigation bar on top then select the <code class="p-1 bg-dark text-white rounded">Create New Page</code> button to create a new page.</p>
+              <p>Kindly select the <a href="<?php echo $link->set('/pages') ?>">Pages</a> link from the navigation bar on top then select the <code class="p-1 bg-dark text-white rounded">Create New Page</code> button to create a new page.</p>
             </div>
           </div>
         </div>
@@ -36,4 +36,4 @@
       </div>
     </div>
   </div>
-<?= $block->end() ?>
\ No newline at end of file
+<?php echo $block->end() ?>
\ No newline at end of file
diff --git a/app/plates/editor.php b/app/plates/editor.php
index dcf588c..44d6b40 100644
--- a/app/plates/editor.php
+++ b/app/plates/editor.php
@@ -1,15 +1,15 @@
-<?= $layout->load('main', compact('link', 'plate')) ?>
+<?php echo $layout->load('main', compact('link', 'plate')) ?>
 
-<?= $block->set('styles') ?>
+<?php echo $block->set('styles') ?>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
-<?= $block->end() ?>
+<?php echo $block->end() ?>
 
-<?= $block->body() ?>
-  <?= $plate->add('navbar', compact('link')) ?>
+<?php echo $block->body() ?>
+  <?php echo $plate->add('navbar', compact('link')) ?>
 
   <div x-data="editor">
     <div class="container my-3">
-      <a href="<?= $link->set('/pages') ?>" class="btn btn-outline-dark shadow-lg" :disabled="loading">Back to Pages</a>
+      <a href="<?php echo $link->set('/pages') ?>" class="btn btn-outline-dark shadow-lg" :disabled="loading">Back to Pages</a>
       <button type="button" class="btn btn-dark shadow-lg" @click="save()" :disabled="loading">Save Details</button>
     </div>
 
@@ -19,10 +19,10 @@
           <div class="row">
             <?php foreach ($fields as $field): ?>
               <div class="col-sm-3 mb-3">
-                <label for="<?= $field ?>" class="form-label mb-0"><?= ucfirst($field) ?></label>
-                <input type="text" name="<?= $field ?>" class="form-control" x-model="input.<?= $field ?>" :disabled="loading">
-                <template x-if="error.<?= $field ?>">
-                  <p class="text-danger small mb-0" x-text="error.<?= $field ?>[0]"></p>
+                <label for="<?php echo $field ?>" class="form-label mb-0"><?= ucfirst($field) ?></label>
+                <input type="text" name="<?php echo $field ?>" class="form-control" x-model="input.<?php echo $field ?>" :disabled="loading">
+                <template x-if="error.<?php echo $field ?>">
+                  <p class="text-danger small mb-0" x-text="error.<?php echo $field ?>[0]"></p>
                 </template>
               </div>
             <?php endforeach ?>
@@ -69,15 +69,15 @@
       </div>
     </div>
   </div>
-<?= $block->end() ?>
+<?php echo $block->end() ?>
 
-<?= $block->set('scripts') ?>
+<?php echo $block->set('scripts') ?>
   <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
 
   <script>
-    let editor = <?= $data ?>
+    let editor = <?php echo $data ?>
 
-    const link = '<?= $link->set('/pages/' . $page['id']) ?>'
+    const link = '<?php echo $link->set('/pages/' . $page['id']) ?>'
 
     editor.error = {}
 
@@ -123,4 +123,4 @@
         })
     }
   </script>
-<?= $block->end() ?>
\ No newline at end of file
+<?php echo $block->end() ?>
\ No newline at end of file
diff --git a/app/plates/main.php b/app/plates/main.php
index dbb5aa0..6a16b6f 100644
--- a/app/plates/main.php
+++ b/app/plates/main.php
@@ -9,21 +9,21 @@
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Roboto" rel="stylesheet">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-  <?= $block->add('styles') ?>
+  <?php echo $block->add('styles') ?>
   <style type="text/css">
     html, body { font-family: 'Roboto'; }
     .ex-pointer { cursor: pointer; }
   </style>
 </head>
 <body>
-  <?= $block->content() ?>
+  <?php echo $block->content() ?>
 
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
   <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
   <script defer src="https://unpkg.com/axios/dist/axios.min.js"></script>
 
-  <?= $plate->add('modal/build', compact('link')) ?>
+  <?php echo $plate->add('modal/build', compact('link')) ?>
 
-  <?= $block->add('scripts') ?>
+  <?php echo $block->add('scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/plates/modal/build.php b/app/plates/modal/build.php
index 945272c..7ca4e5c 100644
--- a/app/plates/modal/build.php
+++ b/app/plates/modal/build.php
@@ -13,7 +13,7 @@
 
       self.loading = true
 
-      const link = '<?= $link->set('/build') ?>'
+      const link = '<?php echo $link->set('/build') ?>'
 
       self.error = null
 
diff --git a/app/plates/modal/script.php b/app/plates/modal/script.php
index bccc437..f71429f 100644
--- a/app/plates/modal/script.php
+++ b/app/plates/modal/script.php
@@ -1,5 +1,5 @@
 <script>
-  const link = '<?= $link->set('/pages') ?>'
+  const link = '<?php echo $link->set('/pages') ?>'
 
   const modal =
   {
diff --git a/app/plates/navbar.php b/app/plates/navbar.php
index bb529ea..5005835 100644
--- a/app/plates/navbar.php
+++ b/app/plates/navbar.php
@@ -7,14 +7,14 @@
           <?php if ($link->isCurrent('/')): ?>
             <div class="nav-link active">Dashboard</div>
           <?php else: ?>
-            <a class="nav-link" href="<?= $link->set('/') ?>">Dashboard</a>
+            <a class="nav-link" href="<?php echo $link->set('/') ?>">Dashboard</a>
           <?php endif ?>
         </li>
         <li class="nav-item">
           <?php if ($link->isCurrent('pages')): ?>
             <div class="nav-link active">Pages</div>
           <?php else: ?>
-            <a class="nav-link" href="<?= $link->set('/pages') ?>">Pages</a>
+            <a class="nav-link" href="<?php echo $link->set('/pages') ?>">Pages</a>
           <?php endif ?>
         </li>
       </ul>
diff --git a/app/plates/pages.php b/app/plates/pages.php
index 1773802..0394ffe 100644
--- a/app/plates/pages.php
+++ b/app/plates/pages.php
@@ -1,14 +1,14 @@
-<?= $layout->load('main', compact('link', 'plate')) ?>
+<?php echo $layout->load('main', compact('link', 'plate')) ?>
 
-<?= $block->body() ?>
-  <?= $plate->add('navbar', compact('block', 'link')) ?>
+<?php echo $block->body() ?>
+  <?php echo $plate->add('navbar', compact('block', 'link')) ?>
 
   <div class="container my-3">
     <button type="button" class="btn btn-dark shadow-lg" data-bs-toggle="modal" data-bs-target="#create-page-modal">
       Create New Page
     </button>
 
-    <?= $plate->add('modal/plate') ?>
+    <?php echo $plate->add('modal/plate') ?>
   </div>
 
   <div class="container mb-5">
@@ -29,12 +29,12 @@
               <?php foreach ($items as $item): ?>
                 <tr>
                   <td>
-                    <a href="<?= $link->set('/pages/' . $item['id']) ?>"><?= $item['name'] ?></a>
+                    <a href="<?php echo $link->set('/pages/' . $item['id']) ?>"><?php echo $item['name'] ?></a>
                   </td>
                   <td>
-                    <a href="<?= $url->set($item['link']) ?>" target="_blank"><?= $item['link'] ?></a>
+                    <a href="<?php echo $url->set($item['link']) ?>" target="_blank"><?php echo $item['link'] ?></a>
                   </td>
-                  <td><?= $str->truncate($item['description']) ?></td>
+                  <td><?php echo $str->truncate($item['description']) ?></td>
                   <td><?= isset($item['tags']) ? $item['tags'] : '' ?></td>
                   <td><?= date('d M Y h:i:s A', $item['created_at']) ?></td>
                 </tr>
@@ -45,8 +45,8 @@
       </div>
     </div>
   </div>
-<?= $block->end() ?>
+<?php echo $block->end() ?>
 
-<?= $block->set('scripts') ?>
-  <?= $plate->add('modal/script', compact('link')) ?>
-<?= $block->end() ?>
\ No newline at end of file
+<?php echo $block->set('scripts') ?>
+  <?php echo $plate->add('modal/script', compact('link')) ?>
+<?php echo $block->end() ?>
\ No newline at end of file
diff --git a/src/Checks/PageCheck.php b/src/Checks/PageCheck.php
index 6b98af2..1be1d60 100644
--- a/src/Checks/PageCheck.php
+++ b/src/Checks/PageCheck.php
@@ -44,7 +44,7 @@ class PageCheck extends Check
      */
     public function __construct(PageDepot $page, $id = null)
     {
-        $this->id = $id;
+        $this->id = $id ? (int) $id : null;
 
         $this->page = $page;
     }
@@ -83,9 +83,9 @@ public function valid(array $data = null)
             $this->setError('link', 'URL Link already exists');
         }
 
-        if ($this->id)
+        if ($this->id && $page)
         {
-            if ($page && $page->getLink() !== $link)
+            if ($page->getId() !== $this->id)
             {
                 $this->setError('link', 'URL Link already exists');
             }
@@ -100,9 +100,7 @@ public function valid(array $data = null)
 
         if ($this->id && $page)
         {
-            $pageName = strtolower((string) $page->getName());
-
-            if ($pageName !== strtolower($name))
+            if ($page->getId() !== $this->id)
             {
                 $this->setError('name', 'Page Title already exists');
             }
diff --git a/tests/Routes/CreateTest.php b/tests/Routes/CreateTest.php
index 4be72a1..80829a4 100644
--- a/tests/Routes/CreateTest.php
+++ b/tests/Routes/CreateTest.php
@@ -3,6 +3,8 @@
 namespace Staticka\Expresso\Routes;
 
 use Staticka\Expresso\Testcase;
+use Staticka\Page;
+use Staticka\Parser;
 
 /**
  * @package Staticka
@@ -26,6 +28,32 @@ public function doSetUp()
         $this->resetPayload();
     }
 
+    /**
+     * @depends test_update_page
+     *
+     * @return integer
+     */
+    public function test_create_another_page()
+    {
+        sleep(1);
+
+        $this->setRequest('POST', '/pages');
+
+        $name = 'Another page!';
+        $link = '/another-page';
+        $this->setPayload(compact('name', 'link'));
+
+        $this->app->run();
+
+        $expected = $this->toJson('Page created!');
+
+        $this->expectOutputString($expected);
+
+        $this->resetPayload();
+
+        return $this->getPageId('another-page');
+    }
+
     /**
      * @return integer
      */
@@ -34,9 +62,7 @@ public function test_create_new_page()
         $this->setRequest('POST', '/pages');
 
         $name = 'Hello world!';
-
         $link = '/hello-world';
-
         $this->setPayload(compact('name', 'link'));
 
         $this->app->run();
@@ -60,7 +86,6 @@ public function test_create_new_page_without_data()
         $this->app->run();
 
         $text = 'Page Title is required';
-
         $errors = array('name' => array($text));
 
         $expected = $this->toJson($errors);
@@ -68,6 +93,40 @@ public function test_create_new_page_without_data()
         $this->expectOutputString($expected);
     }
 
+    /**
+     * @depends test_create_another_page
+     *
+     * @param integer $id
+     *
+     * @return void
+     */
+    public function test_duplicate_error_page($id)
+    {
+        $this->setRequest('POST', '/pages/' . $id);
+
+        $name = 'This is something!';
+        $link = '/hello-world';
+        $this->setPayload(compact('name', 'link'));
+
+        $this->app->run();
+
+        $text = 'URL Link already exists';
+        $errors = array('link' => array($text));
+
+        $text = 'Page Title already exists';
+        $errors['name'] = array($text);
+
+        $expected = $this->toJson($errors);
+
+        $this->expectOutputString($expected);
+
+        $this->resetPayload();
+
+        $this->deleteFile('hello-world');
+
+        $this->deleteFile('another-page');
+    }
+
     /**
      * @depends test_create_new_page
      *
@@ -78,9 +137,7 @@ public function test_error_existing_page()
         $this->setRequest('POST', '/pages');
 
         $name = 'Hello world!';
-
         $link = '/hello-world';
-
         $this->setPayload(compact('name', 'link'));
 
         $this->app->run();
@@ -129,7 +186,7 @@ public function test_pages_page()
      *
      * @param integer $id
      *
-     * @return void
+     * @return integer
      */
     public function test_show_page_details($id)
     {
@@ -141,7 +198,38 @@ public function test_show_page_details($id)
 
         $this->expectOutputRegex('/' . $html . '/');
 
-        $this->deleteFile('hello-world');
+        return $id;
+    }
+
+    /**
+     * @depends test_show_page_details
+     *
+     * @param integer $id
+     *
+     * @return void
+     */
+    public function test_update_page($id)
+    {
+        $this->setRequest('POST', '/pages/' . $id);
+
+        $name = 'This is something!';
+        $link = '/hello-world';
+        $this->setPayload(compact('name', 'link'));
+
+        $this->app->run();
+
+        $page = $this->getActualPage('hello-world');
+
+        $expected = $this->toJson('Page updated!');
+        $this->expectOutputString($expected);
+
+        $expected = 'This is something!';
+
+        $actual = $page->getName();
+
+        $this->assertEquals($expected, $actual);
+
+        // $this->deleteFile('hello-world');
     }
 
     /**
@@ -192,6 +280,26 @@ protected function getActualFile($name)
         return $selected;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return \Staticka\Page
+     * @throws \Exception
+     */
+    protected function getActualPage($name)
+    {
+        $file = $this->getActualFile($name);
+
+        if (! $file)
+        {
+            throw new \Exception('File "' . $name . '" not found');
+        }
+
+        $parser = new Parser;
+
+        return $parser->parsePage(new Page($file));
+    }
+
     /**
      * @param string $name
      *
diff --git a/tests/Testcase.php b/tests/Testcase.php
index 2953175..f3499ba 100644
--- a/tests/Testcase.php
+++ b/tests/Testcase.php
@@ -66,6 +66,7 @@ protected function setRequest($method, $uri)
         $_SERVER['REQUEST_URI'] = $uri;
         $_SERVER['SERVER_NAME'] = 'localhost';
         $_SERVER['SERVER_PORT'] = '8000';
+        $_SERVER['HTTP_HOST'] = 'https';
     }
 
     /**