diff --git a/.gitignore b/.gitignore
index 9048853..7da00c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 */cache/*
 */cache/!index.html
 *.sublime-*
+*/cards/*
diff --git a/application/config/constants.php b/application/config/constants.php
index 4a879d3..37c71bb 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -1,4 +1,8 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
+
+if (! defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
 
 /*
 |--------------------------------------------------------------------------
@@ -38,4 +42,4 @@ define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
 
 
 /* End of file constants.php */
-/* Location: ./application/config/constants.php */
\ No newline at end of file
+/* Location: ./application/config/constants.php */
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index eb9a33a..85b3a6e 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -94,7 +94,7 @@ class Welcome extends CI_Controller
             $this->load->view('_footer', $data);
 
         }
-        # code...
+
     }
 
     public function upload()
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index fc90c5b..ef56692 100644
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
@@ -1,5 +1,4 @@
 <?php
-
 $ci = &get_instance();
 
 $data = array(
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index b396cda..ef56692 100644
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
@@ -1,62 +1,29 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Database Error</title>
-<style type="text/css">
+<?php
+$ci = &get_instance();
 
-::selection{ background-color: #E13300; color: white; }
-::moz-selection{ background-color: #E13300; color: white; }
-::webkit-selection{ background-color: #E13300; color: white; }
+$data = array(
+    "user" => $ci->erkana->getUser()
+);
 
-body {
-	background-color: #fff;
-	margin: 40px;
-	font: 13px/20px normal Helvetica, Arial, sans-serif;
-	color: #4F5155;
+$ci->load->view("_header", $data);
+
+if (!isset($heading)) {
+    $heading = "Otsikko";
+}
+if (!isset($message)) {
+    $message = "Viesti";
 }
 
-a {
-	color: #003399;
-	background-color: transparent;
-	font-weight: normal;
-}
+?>
 
-h1 {
-	color: #444;
-	background-color: transparent;
-	border-bottom: 1px solid #D0D0D0;
-	font-size: 19px;
-	font-weight: normal;
-	margin: 0 0 14px 0;
-	padding: 14px 15px 10px 15px;
-}
+<div class="row">
+    <div class="small-12 large-12 columns" id="adminmenu">
+        <div class="panel">
 
-code {
-	font-family: Consolas, Monaco, Courier New, Courier, monospace;
-	font-size: 12px;
-	background-color: #f9f9f9;
-	border: 1px solid #D0D0D0;
-	color: #002166;
-	display: block;
-	margin: 14px 0 14px 0;
-	padding: 12px 10px 12px 10px;
-}
+            <h2><?php echo $heading; ?></h2>
+            <?php echo $message; ?>
+        </div>
+    </div>
+</div>
 
-#container {
-	margin: 10px;
-	border: 1px solid #D0D0D0;
-	-webkit-box-shadow: 0 0 8px #D0D0D0;
-}
-
-p {
-	margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
-	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
-	</div>
-</body>
-</html>
\ No newline at end of file
+<?php $ci->load->view("_footer", $data);
\ No newline at end of file
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index fd63ce2..17d72ea 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,62 +1,19 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Error</title>
-<style type="text/css">
-
-::selection{ background-color: #E13300; color: white; }
-::moz-selection{ background-color: #E13300; color: white; }
-::webkit-selection{ background-color: #E13300; color: white; }
-
-body {
-	background-color: #fff;
-	margin: 40px;
-	font: 13px/20px normal Helvetica, Arial, sans-serif;
-	color: #4F5155;
+<?php
+if (!isset($heading)) {
+    $heading = "Otsikko";
+}
+if (!isset($message)) {
+    $message = "Viesti";
 }
 
-a {
-	color: #003399;
-	background-color: transparent;
-	font-weight: normal;
-}
+?>
 
-h1 {
-	color: #444;
-	background-color: transparent;
-	border-bottom: 1px solid #D0D0D0;
-	font-size: 19px;
-	font-weight: normal;
-	margin: 0 0 14px 0;
-	padding: 14px 15px 10px 15px;
-}
+<div class="row">
+    <div class="small-12 large-12 columns" id="adminmenu">
+        <div class="panel">
 
-code {
-	font-family: Consolas, Monaco, Courier New, Courier, monospace;
-	font-size: 12px;
-	background-color: #f9f9f9;
-	border: 1px solid #D0D0D0;
-	color: #002166;
-	display: block;
-	margin: 14px 0 14px 0;
-	padding: 12px 10px 12px 10px;
-}
-
-#container {
-	margin: 10px;
-	border: 1px solid #D0D0D0;
-	-webkit-box-shadow: 0 0 8px #D0D0D0;
-}
-
-p {
-	margin: 12px 15px 12px 15px;
-}
-</style>
-</head>
-<body>
-	<div id="container">
-		<h1><?php echo $heading; ?></h1>
-		<?php echo $message; ?>
-	</div>
-</body>
-</html>
\ No newline at end of file
+            <h2><?php echo $heading; ?></h2>
+            <?php echo $message; ?>
+        </div>
+    </div>
+</div>
diff --git a/application/views/new.php b/application/views/new.php
index c6b893e..17785cd 100644
--- a/application/views/new.php
+++ b/application/views/new.php
@@ -9,8 +9,6 @@
                 Suunnittele oma eKorttisi ja lähetä se ystävällesi!
                 Samalla voit osallistua arvontaan josta voit voittaa huikean hienoja palkintoja.
             </p>
-
-
         </div>
     </div>
 </div>
diff --git a/application/views/yllapito/dashboard.php b/application/views/yllapito/dashboard.php
index 9a8ba30..c2ff031 100644
--- a/application/views/yllapito/dashboard.php
+++ b/application/views/yllapito/dashboard.php
@@ -3,9 +3,11 @@
     <div class="large-12 columns">
         <div class="panel">
             <pre><?php
+
 if (empty($user)) {
     $user = new stdClass();
 }
+
 var_export($user);
 
 ?></pre>
