diff --git a/libs/Template.php b/libs/Template.php
index de22fdd..387dd91 100644
--- a/libs/Template.php
+++ b/libs/Template.php
@@ -22,7 +22,6 @@ class Template
     public function render($name, array $data = array())
     {
         $this->engine->addData([
-            'index' => utf8_encode($data['params']['base_page'] . $data['params']['index']->value),
             'base_url' => $data['params']['base_url'],
             'base_page' => $data['params']['base_page'],
             'page' => $data['page'],
diff --git a/templates/home.php b/templates/home.php
index 0d2b5aa..a5ee3cf 100644
--- a/templates/home.php
+++ b/templates/home.php
@@ -1,8 +1,7 @@
 <?php $this->layout('theme::layout/00_layout') ?>
 <div class="navbar navbar-fixed-top hidden-print">
     <div class="container">
-        <a class="brand navbar-brand pull-left" href="<?php echo $index; ?>"><?php echo $params['title']; ?></a>
-        <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
+        <?php $this->insert('partials/navbar_content', ['params' => $params]); ?>
     </div>
 </div>
 <?php if ($params['repo']) { ?>
diff --git a/templates/layout/05_page.php b/templates/layout/05_page.php
index c69d5d9..cc9c02e 100644
--- a/templates/layout/05_page.php
+++ b/templates/layout/05_page.php
@@ -6,8 +6,7 @@
 <div class="container-fluid fluid-height wrapper">
     <div class="navbar navbar-fixed-top hidden-print">
         <div class="container-fluid">
-            <a class="brand navbar-brand pull-left" href="<?php echo $index;?>"><?php echo $params['title']; ?></a>
-            <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
+            <?php $this->insert('partials/navbar_content', ['params' => $params]); ?>
         </div>
     </div>
     <div class="row columns content">
diff --git a/templates/partials/navbar_content.php b/templates/partials/navbar_content.php
new file mode 100644
index 0000000..7932a42
--- /dev/null
+++ b/templates/partials/navbar_content.php
@@ -0,0 +1,2 @@
+<a class="brand navbar-brand pull-left" href="<?= $params['base_page'] . $params['index']->getUri(); ?>"><?php echo $params['title']; ?></a>
+<p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>