diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php
index 1a44af3..7453f84 100644
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -5,8 +5,8 @@
     <title>Monstra :: <?php echo __('Administration', 'system'); ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Monstra admin area" />
-    <link rel="icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
 
     <!-- Styles -->
     <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.css" type="text/css" />
@@ -33,10 +33,10 @@
         $(document).ready(function(){
           $('.chocolat').Chocolat({
               overlayColor          : '#f2f2f2',
-              leftImg               : "<?php echo Option::get('siteurl'); ?>public/assets/img/chocolat/left.gif",  
-              rightImg              : "<?php echo Option::get('siteurl'); ?>public/assets/img/chocolat/right.gif", 
-              closeImg              : "<?php echo Option::get('siteurl'); ?>public/assets/img/chocolat/close.gif",   
-              loadingImg            : "<?php echo Option::get('siteurl'); ?>public/assets/img/chocolat/loading.gif", 
+              leftImg               : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/left.gif",  
+              rightImg              : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/right.gif", 
+              closeImg              : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/close.gif",   
+              loadingImg            : "<?php echo Option::get('siteurl'); ?>/public/assets/img/chocolat/loading.gif", 
           });
         });
 
@@ -66,7 +66,7 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="<?php echo Option::get('siteurl'); ?>admin">MONSTRA</a>
+            <a class="navbar-brand" href="<?php echo Option::get('siteurl'); ?>/admin">MONSTRA</a>
           </div>
 
           <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">      
diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php
index e8db073..8f27beb 100644
--- a/admin/themes/default/login.template.php
+++ b/admin/themes/default/login.template.php
@@ -5,13 +5,13 @@
         <title>Monstra :: <?php echo __('Administration', 'system'); ?></title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Monstra Admin Area">
-        <link rel="icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
-        <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
+        <link rel="icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
+        <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
 
         <!-- Styles -->
-        <link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.min.css" type="text/css" />
-        <link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger.css" type="text/css" />
-        <link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger-theme-flat.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.min.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger-theme-flat.css" type="text/css" />
         <?php Stylesheet::add('public/assets/css/bootstrap-lightbox.css', 'backend', 2); ?>
         <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
         <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
@@ -19,9 +19,9 @@
 
         <!-- JavaScripts -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-        <script src="<?php echo Site::url(); ?>public/assets/js/bootstrap.min.js"></script>
-        <script src="<?php echo Site::url(); ?>public/assets/js/messenger.min.js"></script>
-        <script src="<?php echo Site::url(); ?>public/assets/js/messenger-theme-flat.js"></script>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/bootstrap.min.js"></script>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/messenger.min.js"></script>
+        <script src="<?php echo Site::url(); ?>/public/assets/js/messenger-theme-flat.js"></script>
         
         <?php Javascript::add('public/assets/js/bootstrap-lightbox.js', 'backend', 3); ?>
         <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>