diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index fe662ba5..a8ed5f79 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -6,7 +6,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		<link href='//fonts.googleapis.com/css?family=Roboto:400,100,300,500,700,900,300italic&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+		<link href='//fonts.googleapis.com/css?family=Roboto:300&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
 		<link rel="stylesheet" type="text/css" href="<?= PHPCI_URL ?>assets/css/bootstrap.min.css">
 		<link rel="stylesheet" type="text/css" href="<?= PHPCI_URL ?>assets/css/phpci.css">
 		<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
diff --git a/bootstrap.php b/bootstrap.php
index 88435d15..4db3815e 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -32,6 +32,13 @@ if (!defined('APPLICATION_PATH')) {
     define('APPLICATION_PATH', dirname(__FILE__) . '/');
 }
 
+
+if (!file_exists(APPLICATION_PATH . 'PHPCI/config.yml')) {
+    header('Location: install.php');
+    die;
+}
+
+
 // Load Composer autoloader:
 require_once(APPLICATION_PATH . 'vendor/autoload.php');
 
@@ -42,12 +49,9 @@ $conf['b8']['app']['default_controller'] = 'Home';
 $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
 
 $config = new b8\Config($conf);
+$config->loadYaml(APPLICATION_PATH . 'PHPCI/config.yml');
 
-if (file_exists(APPLICATION_PATH . 'PHPCI/config.yml')) {
-    $config->loadYaml(APPLICATION_PATH . 'PHPCI/config.yml');
-
-    // Define our PHPCI_URL, if not already defined:
-    if (!defined('PHPCI_URL')) {
-        define('PHPCI_URL', $config->get('phpci.url', '') . '/');
-    }
+// Define our PHPCI_URL, if not already defined:
+if (!defined('PHPCI_URL')) {
+    define('PHPCI_URL', $config->get('phpci.url', '') . '/');
 }