diff --git a/site/themes/default/partials/head.php b/site/themes/default/partials/head.php
index c0ca14e2..cfad5c37 100755
--- a/site/themes/default/partials/head.php
+++ b/site/themes/default/partials/head.php
@@ -13,12 +13,13 @@
     <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700' rel='stylesheet' type='text/css'>
 
     <!-- Bootstrap core CSS -->
-	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link href="<?php echo Flextype\Component\Url\Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
-	<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
+	<link href="<?php echo Flextype\Component\Url\Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
 	<?php Flextype\Events::dispatch('onThemeHeader'); ?>
   </head>
   <body>
   <?php Flextype\Templates::display('partials/navigation'); ?>
   <main role="main" class="container content">
+<?php Flextype\Component\Http\Request\Request::redirect('test'); ?>
diff --git a/site/themes/default/partials/navigation.php b/site/themes/default/partials/navigation.php
index 1abdc44f..c653e617 100755
--- a/site/themes/default/partials/navigation.php
+++ b/site/themes/default/partials/navigation.php
@@ -1,13 +1,13 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
 <div class="container">
-  <a class="navbar-brand" href="<?php echo Url::getBase(); ?>"><?php echo Flextype\Config::get('site.title'); ?></a>
+  <a class="navbar-brand" href="<?php echo Flextype\Component\Url\Url::getBase(); ?>"><?php echo Flextype\Config::get('site.title'); ?></a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
   <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
     <ul class="navbar-nav">
       <li class="nav-item">
-        <a class="nav-link <?php if (Url::getUriSegment(0) == 'home' || Url::getUriSegment(0) == '') echo 'active'; ?>" href="<?php echo Url::getBase(); ?>">Home</a>
+        <a class="nav-link <?php if (Flextype\Component\Url\Url::getUriSegment(0) == 'home' || Flextype\Component\Url\Url::getUriSegment(0) == '') echo 'active'; ?>" href="<?php echo Flextype\Component\Url\Url::getBase(); ?>">Home</a>
       </li>
     </ul>
   </div>
diff --git a/site/themes/default/partials/tail.php b/site/themes/default/partials/tail.php
index a10fe1ac..7c1c2ee2 100755
--- a/site/themes/default/partials/tail.php
+++ b/site/themes/default/partials/tail.php
@@ -1,3 +1,3 @@
-<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
-<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="<?php echo Flextype\Component\Url\Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
+<script src="<?php echo Flextype\Component\Url\Url::getBase(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <?php Flextype\Events::dispatch('onThemeFooter'); ?>
