diff --git a/railshosting/static/railshosting/css/landing-page.css b/railshosting/static/railshosting/css/landing-page.css
index 1d016d7f..6698c5ec 100644
--- a/railshosting/static/railshosting/css/landing-page.css
+++ b/railshosting/static/railshosting/css/landing-page.css
@@ -17,7 +17,7 @@ h3,
 h4,
 h5,
 h6 {
-    font-family: "Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: 'Raleway',"Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
     font-weight: 700;
 }
 
@@ -67,7 +67,7 @@ h6 {
 
 .intro-message > h1 {
     margin: 0;
-    text-shadow: 2px 2px 3px rgba(0,0,0,0.6);
+    font-weight: 400;
     font-size: 5em;
 }
 
@@ -78,7 +78,7 @@ h6 {
 }
 
 .intro-message > h3 {
-    text-shadow: 2px 2px 3px rgba(0,0,0,0.6);
+    font-weight: 300;
 }
 
 @media(max-width:767px) {
@@ -142,7 +142,7 @@ h6 {
 
 .banner h2 {
     margin: 0;
-    text-shadow: 2px 2px 3px rgba(0,0,0,0.6);
+    font-weight: 400;
     font-size: 3em;
 }
 
@@ -192,5 +192,12 @@ p.copyright {
 
 a#forgotpassword {
 	color: #ffffff;
-	
+	}
+
+.content-404 h1 {
+  margin: 0 0 15px;
+  font-size: 200px;
+  line-height: 1;
+  font-weight: 700;
+  color: #6db97c;
 }
\ No newline at end of file
diff --git a/railshosting/static/railshosting/img/deluxeroom.jpg b/railshosting/static/railshosting/img/deluxeroom.jpg
index 34fccb66..7158e612 100644
Binary files a/railshosting/static/railshosting/img/deluxeroom.jpg and b/railshosting/static/railshosting/img/deluxeroom.jpg differ
diff --git a/railshosting/static/railshosting/img/economy.jpg b/railshosting/static/railshosting/img/economy.jpg
index 9749afe0..e7c5f286 100644
Binary files a/railshosting/static/railshosting/img/economy.jpg and b/railshosting/static/railshosting/img/economy.jpg differ
diff --git a/railshosting/static/railshosting/img/presidentialroom.jpg b/railshosting/static/railshosting/img/presidentialroom.jpg
index 4fb1e2d4..bafde5d3 100644
Binary files a/railshosting/static/railshosting/img/presidentialroom.jpg and b/railshosting/static/railshosting/img/presidentialroom.jpg differ
diff --git a/railshosting/static/railshosting/img/standardroom.jpg b/railshosting/static/railshosting/img/standardroom.jpg
index 28ef7063..5ed82753 100644
Binary files a/railshosting/static/railshosting/img/standardroom.jpg and b/railshosting/static/railshosting/img/standardroom.jpg differ
diff --git a/railshosting/templates/railshosting/beta.html b/railshosting/templates/railshosting/beta.html
index 2940c2f9..7f774b31 100644
--- a/railshosting/templates/railshosting/beta.html
+++ b/railshosting/templates/railshosting/beta.html
@@ -20,6 +20,7 @@
     <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
 
     <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
     <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
diff --git a/railshosting/templates/railshosting/checkout.html b/railshosting/templates/railshosting/checkout.html
index 4a345148..90ff2bc7 100644
--- a/railshosting/templates/railshosting/checkout.html
+++ b/railshosting/templates/railshosting/checkout.html
@@ -18,6 +18,7 @@
     <link href="css/landing-page.css" rel="stylesheet">
 
     <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
     <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
diff --git a/railshosting/templates/railshosting/error404.html b/railshosting/templates/railshosting/error404.html
new file mode 100644
index 00000000..dc819a9d
--- /dev/null
+++ b/railshosting/templates/railshosting/error404.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>Rails Hosting.ch - Ruby on Rails as easy as possible |   Page not found</title>
+    
+    <!-- Bootstrap Core CSS -->
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="css/landing-page.css" rel="stylesheet">
+
+    <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
+    <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+    <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
+    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+</head>
+
+<body>
+ <body class="error404">
+  <div class="content-404">
+   <div class="container">
+    <div class="text-center">
+      <h1>&nbsp;</h1>
+      <h1>404</h1>
+      <p class-"lead">
+       "Sorry, we could not find the page you are looking for!"
+       </p>
+     </div>
+    </div>
+     </div>
+
+    <!-- Footer --><!-- jQuery -->
+    <script src="js/jquery.js"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="js/bootstrap.min.js"></script>
+
+</body>
+
+</html>
diff --git a/railshosting/templates/railshosting/index.html b/railshosting/templates/railshosting/index.html
index 3aa415c6..0956b500 100644
--- a/railshosting/templates/railshosting/index.html
+++ b/railshosting/templates/railshosting/index.html
@@ -20,6 +20,7 @@
     <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
 
     <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
     <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
@@ -95,7 +96,7 @@
     
                     <div class="intro-message">
                     <img class="responsive" src="{% static 'railshosting/img/Beta.png' %}">
-                        <h1>Rails-Hosting.ch</h1>
+                        <h1>rails-hosting.ch</h1>
                         <h3>Ruby on Rails as easy as possible</h3>
                         <hr class="intro-divider">
                         <ul class="list-inline intro-social-buttons">
diff --git a/railshosting/templates/railshosting/login.html b/railshosting/templates/railshosting/login.html
index 49ebd2a5..3a00b83e 100644
--- a/railshosting/templates/railshosting/login.html
+++ b/railshosting/templates/railshosting/login.html
@@ -18,6 +18,7 @@
     <link href="css/landing-page.css" rel="stylesheet">
 
     <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
     <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
diff --git a/railshosting/templates/railshosting/signup.html b/railshosting/templates/railshosting/signup.html
index f90540ac..b7dc3239 100644
--- a/railshosting/templates/railshosting/signup.html
+++ b/railshosting/templates/railshosting/signup.html
@@ -18,6 +18,7 @@
     <link href="css/landing-page.css" rel="stylesheet">
 
     <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
     <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />