diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css
index a76aa4a..aab64a4 100644
--- a/admin/themes/default/css/default.css
+++ b/admin/themes/default/css/default.css
@@ -4,11 +4,7 @@ styles.css
 *************************************
   CONTENTS
   1. GENERAL
-  2. HEADER
-  3. CONTENT
-  4. LEFT MENU
-  5. AUTHORIZATION
-  6. MEDIA QUERIES
+  2. MEDIA QUERIES
 
 *************************************
 1. GENERAL
@@ -24,19 +20,19 @@ styles.css
 }
 
 body {
-  background: #FAFAFA;
+    background: #FAFAFA;
 }
 
 .navbar-inverse {
-  background: #252525;
+    background: #252525;
 }
 
 .navbar-brand {
-  font-size: 24px;
+    font-size: 24px;
 }
 
 h1,h2,h3,h4,h5 {
-  color: #222;
+    color: #222;
 }
 
 td, th {
@@ -45,15 +41,15 @@ td, th {
 }
 
 .navbar-default {
-  border-radius: 0px;
+    border-radius: 0px;
 }
 
-.nav-tabs>li>a {
-  border-radius: 0px;
+.nav-tabs > li > a {
+    border-radius: 0px;
 }
 
 .tab-page {
-  background: #fff;
+    background: #fff;
 }
 
 .form-control,
@@ -68,67 +64,75 @@ code {
 }
 .badge,
 .label {
-  font-weight: normal;
-  text-shadow:none;
+    font-weight: normal;
+    text-shadow: none;
 }
 
-  /* Tabs */
+.datapicker {
+    width: 200px;
+}
 
-  .tab-pane > table {
-      margin-top:-20px;
-  }
+.breadcrumb {
+    background: #fff;
+    border-radius: 0px;
+}
 
-  .tab-pane > table {
-      border-top:none!important;
-  }
+/* Tabs */
+.tab-pane > table {
+    margin-top:-20px;
+}
 
-  .tab-content {
+.tab-pane > table {
+    border-top:none!important;
+}
+
+.tab-content {
     overflow: visible;
-  }
+}
 
-  .tab-page {
-      border-bottom: 1px solid #DDDDDD;
-      border-left: 1px solid #DDDDDD;
-      border-right: 1px solid #DDDDDD;
-      padding: 20px 10px 10px;
-  }
+.tab-page {
+    border-bottom: 1px solid #DDDDDD;
+    border-left: 1px solid #DDDDDD;
+    border-right: 1px solid #DDDDDD;
+    padding: 20px 10px 10px;
+}
 
-  .small-grey-text {
-      color:#333;
-      font-size: 10px;
-  }
+.small-grey-text {
+    color:#333;
+    font-size: 10px;
+}
 
-  .small-grey-text:hover {
-      color:#000;
-  }
+.small-grey-text:hover {
+    color:#000;
+}
 
-  .small-white-text {
-      color:#fff;
-      font-size: 10px;
-  }
+.small-white-text {
+    color:#fff;
+    font-size: 10px;
+}
 
-  .small-white-text:hover {
-      color:#fdfdfd;
-  }
+.small-white-text:hover {
+    color:#fdfdfd;
+}
 
-  .error-none {display:none;}
-  .error-field {border:1px solid red!important;}
-  .container-fluid {padding-left:0px;}
-  img {max-width:none;}
+.error-none {display:none;}
+.error-field {border:1px solid red!important;}
+.container-fluid {padding-left:0px;}
+img {max-width:none;}
 
-  a.btn-expand{
+a.btn-expand{
     color: #333;
     font-weight:bold; 
     font-size:14px;  
     text-decoration: none;
     padding-left:4px;
     padding-right:4px;
-  }
+}
 
-  footer a , footer{
+footer a , footer{
     color:#333;
     font-size:10px;
-  }
+}
 
 
 /* Inputs */
@@ -283,10 +287,5 @@ td, th {
 }
 
 footer {
-  margin-top: 40px;
+    margin-top: 40px;
 }
-
-
-.datapicker {
-  width: 200px;
-}
\ No newline at end of file
diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php
index 242a37c..1a44af3 100644
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -9,18 +9,18 @@
     <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" />
-    <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.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/chocolat.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); ?>
     <?php Stylesheet::load(); ?>
 
     <!-- JavaScripts -->
-    <script src="<?php echo Site::url(); ?>public/assets/js/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/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>
     
     <?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
     <?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>
diff --git a/engine/Plugin/Javascript.php b/engine/Plugin/Javascript.php
index 086c40c..c38adba 100644
--- a/engine/Plugin/Javascript.php
+++ b/engine/Plugin/Javascript.php
@@ -126,9 +126,9 @@ class Javascript
 
             // Render
             if (BACKEND) {
-                echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/backend_site.minify.js"></script>';
+                echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.js"></script>';
             } else {
-                echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.js"></script>'."\n";
+                echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.js"></script>'."\n";
             }
         }
     }
diff --git a/engine/Plugin/Stylesheet.php b/engine/Plugin/Stylesheet.php
index e730790..b216dbc 100644
--- a/engine/Plugin/Stylesheet.php
+++ b/engine/Plugin/Stylesheet.php
@@ -128,9 +128,9 @@ class Stylesheet
 
             // Render
             if (BACKEND) {
-                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/backend_site.minify.css'.'" type="text/css" />';
+                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.css'.'" type="text/css" />';
             } else {
-                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
+                echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
             }
         }
     }
@@ -144,8 +144,8 @@ class Stylesheet
                                  '@theme_site_url',
                                  '@theme_admin_url'),
                            array(Option::get('siteurl'),
-                                 Option::get('siteurl').'public/themes/'.Option::get('theme_site_name'),
-                                 Option::get('siteurl').'admin/themes/'.Option::get('theme_admin_name')),
+                                 Option::get('siteurl').'/public/themes/'.Option::get('theme_site_name'),
+                                 Option::get('siteurl').'/admin/themes/'.Option::get('theme_admin_name')),
                            $frontend_buffer);
     }
 
diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php
index d085edf..5693339 100755
--- a/plugins/box/system/system.admin.php
+++ b/plugins/box/system/system.admin.php
@@ -121,9 +121,6 @@ class SystemAdmin extends Backend
 
                     // Add trailing slashes
                     $_site_url = Request::post('system_url');
-                    if ($_site_url[strlen($_site_url)-1] !== '/') {
-                        $_site_url = $_site_url.'/';
-                    }
 
                     Option::update(array('sitename'          => Request::post('site_name'),
                                        'keywords'            => Request::post('site_keywords'),