diff --git a/Procfile b/Procfile
index 207d22f..fa48714 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: node app.js
\ No newline at end of file
+web: node heartbit.js
\ No newline at end of file
diff --git a/app.js b/app.js
deleted file mode 100644
index 279acce..0000000
--- a/app.js
+++ /dev/null
@@ -1,41 +0,0 @@
-(function() {
-  var app, express;
-
-  express = require('express');
-
-  app = module.exports = express.createServer();
-
-  app.configure(function() {
-    app.set('views', __dirname + '/views');
-    app.set('view engine', 'coffee');
-    app.register('.coffee', require('coffeekup').adapters.express);
-    app.use(express.bodyParser());
-    app.use(express.methodOverride());
-    return app.use(express.static(__dirname + '/public'));
-  });
-
-  app.configure('development', function() {
-    return app.use(express.errorHandler({
-      dumpExceptions: true,
-      showStack: true
-    }));
-  });
-
-  app.configure('production', function() {
-    app.use(express.errorHandler());
-    return app.use(require('./middleware/host_redirect')({
-      "www.heartb.it": "http://heartb.it/"
-    }));
-  });
-
-  app.get('/', function(req, res) {
-    return res.render('index', {
-      format: true
-    });
-  });
-
-  app.listen(process.env.PORT || 3000);
-
-  console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);
-
-}).call(this);
diff --git a/heartbit.js b/heartbit.js
new file mode 100644
index 0000000..4b1058f
--- /dev/null
+++ b/heartbit.js
@@ -0,0 +1,47 @@
+(function() {
+  var express, server;
+
+  express = require('express');
+
+  server = module.exports = express.createServer();
+
+  server.configure(function() {
+    server.set('views', __dirname + '/views');
+    server.set('view engine', 'coffee');
+    server.register('.coffee', require('coffeekup').adapters.express);
+    server.use(express.bodyParser());
+    server.use(express.methodOverride());
+    return server.use(express.static(__dirname + '/public'));
+  });
+
+  server.configure('development', function() {
+    return server.use(express.errorHandler({
+      dumpExceptions: true,
+      showStack: true
+    }));
+  });
+
+  server.configure('production', function() {
+    server.use(express.errorHandler());
+    return server.use(require('./middleware/host_redirect')({
+      "www.heartb.it": "http://heartb.it/"
+    }));
+  });
+
+  server.get('/', function(req, res) {
+    return res.render('index', {
+      format: true
+    });
+  });
+
+  server.get('*', function(req, res) {
+    return res.render('404', {
+      format: true
+    });
+  });
+
+  server.listen(process.env.PORT || 3000);
+
+  console.log("Express server listening on port %d in %s mode", server.address().port, server.settings.env);
+
+}).call(this);
diff --git a/public/css/style.css b/public/css/style.css
index ca26ec8..3e7eca5 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,29 +1,39 @@
 body {
-	font-family: helvetica, arial, sans-serif;
-	padding: 0;
-	margin: 0;
+  font-family: helvetica, arial, sans-serif;
+  padding: 0;
+  margin: 0;
 }
 
 #logo {
-	background: url("../images/heartb.it.png") center center no-repeat;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin: -15px 0px 0px -75px;
-	height: 30px;
-	width: 150px;
+  background: url("../images/heartb.it.png") center center no-repeat;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -15px 0px 0px -75px;
+  height: 30px;
+  width: 150px;
 }
 
 #contact {
-	font-size: 12px;
-	position: absolute;
-	right: 8px;
-	bottom: 5px;
+  font-size: 12px;
+  position: absolute;
+  right: 8px;
+  bottom: 5px;
 }
-	#contact a {
-		color: #aaa;
-		text-decoration: none;
-	}
-	#contact a:hover {
-		text-decoration: underline;
-	}
\ No newline at end of file
+  #contact a {
+    color: #aaa;
+    text-decoration: none;
+  }
+  #contact a:hover {
+    text-decoration: underline;
+  }
+
+#not-found {
+  background: url("../images/404-dead-link.png") center center no-repeat;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -150px 0px 0px -250px;
+  height: 300px;
+  width: 500px;
+}
\ No newline at end of file
diff --git a/public/images/404-dead-link.png b/public/images/404-dead-link.png
new file mode 100644
index 0000000..cfacb1f
Binary files /dev/null and b/public/images/404-dead-link.png differ
diff --git a/src/app.coffee b/src/app.coffee
deleted file mode 100644
index 1b0f30a..0000000
--- a/src/app.coffee
+++ /dev/null
@@ -1,33 +0,0 @@
-# Module Dependencies
-express = require 'express'
-app = module.exports = express.createServer()
-
-
-# Configuration
-app.configure ->
-  app.set 'views', __dirname + '/views'
-  app.set 'view engine', 'coffee'
-  app.register '.coffee', require('coffeekup').adapters.express
-  app.use express.bodyParser()
-  app.use express.methodOverride()
-  app.use express.static(__dirname + '/public')
-
-app.configure 'development', ->
-  app.use express.errorHandler(dumpExceptions: true, showStack: true)
-
-app.configure 'production', ->
-  app.use express.errorHandler()
-  app.use require('./middleware/host_redirect')
-    "www.heartb.it": "http://heartb.it/"
-
-
-# Routes
-app.get '/', (req, res) ->
-  res.render 'index', format: true
-
-
-# Set port and start server.
-app.listen process.env.PORT || 3000
-
-console.log "Express server listening on port %d in %s mode",
-  app.address().port, app.settings.env
diff --git a/src/heartbit.coffee b/src/heartbit.coffee
new file mode 100644
index 0000000..1bab051
--- /dev/null
+++ b/src/heartbit.coffee
@@ -0,0 +1,38 @@
+# Module Dependencies.
+express = require 'express'
+
+# Create server instance.
+server = module.exports = express.createServer()
+
+# Configuration.
+server.configure ->
+  server.set 'views', __dirname + '/views'
+  server.set 'view engine', 'coffee'
+  server.register '.coffee', require('coffeekup').adapters.express
+  server.use express.bodyParser()
+  server.use express.methodOverride()
+  server.use express.static(__dirname + '/public')
+
+server.configure 'development', ->
+  server.use express.errorHandler(dumpExceptions: true, showStack: true)
+
+server.configure 'production', ->
+  server.use express.errorHandler()
+  server.use require('./middleware/host_redirect')
+    "www.heartb.it": "http://heartb.it/"
+
+
+# Routes
+server.get '/', (req, res) ->
+  res.render 'index', format: true
+
+# 404 Fallback
+server.get '*', (req, res) ->
+  res.render '404', format: true
+
+# Set port and start server.
+server.listen process.env.PORT || 3000
+
+# Print debug
+console.log "Express server listening on port %d in %s mode",
+  server.address().port, server.settings.env
diff --git a/views/404.coffee b/views/404.coffee
new file mode 100644
index 0000000..3f1dc0f
--- /dev/null
+++ b/views/404.coffee
@@ -0,0 +1 @@
+div id: 'not-found'