diff --git a/application/configs/navigation.xml b/application/configs/navigation.xml
index b3b20c3..e5d0554 100644
--- a/application/configs/navigation.xml
+++ b/application/configs/navigation.xml
@@ -9,17 +9,24 @@
             <pages>
                 <blog>
                     <label>u:blog</label>
+                    <route>default</route>
+                    <module>blog</module>
                     <controller>index</controller>
                     <action>index</action>
-                    <module>blog</module>
-                    <route>default</route>
                 </blog>
+                <portfolio>
+                    <label>u:portfolio</label>
+                    <route>default</route>
+                    <moudule>default</moudule>
+                    <controller>portfolio</controller>
+                    <action>index</action>
+                </portfolio>
                 <about>
                     <label>uw:about</label>
+                    <route>default</route>
+                    <module>default</module>
                     <controller>index</controller>
                     <action>about</action>
-                    <module>default</module>
-                    <route>default</route>
                 </about>
             </pages>
         </start>
diff --git a/application/languages/en.ini b/application/languages/en.ini
index 0ffd8f4..b81a5aa 100644
--- a/application/languages/en.ini
+++ b/application/languages/en.ini
@@ -10,4 +10,8 @@ LOGIN_TXT = "Fill out your information below to login.<br /><p class="yellow">Th
 
 START_TXT = "Welcome to fiktivkod.org. ...."
 ABOUT_TXT = "Fiktiv (fiktivkod.org) is ... that started ..."
-BLOG_TXT = "We at fiktivkod use this blog to tell our stories about happy times and maybe not so happy experience ... "
\ No newline at end of file
+BLOG_TXT = "We at fiktivkod use this blog to tell our stories about happy times and maybe not so happy experience ... "
+
+
+ERROR_404 = "Oops, something went wrong"
+ERROR_TXT_WHAT = "The following went wrong"
\ No newline at end of file
diff --git a/application/languages/se.ini b/application/languages/se.ini
index c83bee5..ffc2d64 100644
--- a/application/languages/se.ini
+++ b/application/languages/se.ini
@@ -10,4 +10,11 @@ LOGIN_TXT = "Ange dina uppgifter nedan för att logga in.<br /><p class="yellow"
 
 START_TXT = "Välkommen till fiktivkod.org. ...."
 ABOUT_TXT = "Fiktiv (fiktivkod.org) är ... som startade ..."
-BLOG_TXT = "Här på bloggen delar vi med oss av våra erfarenheter och andra dumheter ... "
\ No newline at end of file
+BLOG_TXT = "Här på bloggen delar vi med oss av våra erfarenheter och andra dumheter ... "
+
+ERROR_404 = "Oops, något blev fel"
+ERROR_TXT_WHAT = "Följande har gått fel"
+
+class = klass
+function = funktion
+line = rad
\ No newline at end of file
diff --git a/application/modules/default/controllers/AuthController.php b/application/modules/default/controllers/AuthController.php
index 108fee7..999cb3c 100644
--- a/application/modules/default/controllers/AuthController.php
+++ b/application/modules/default/controllers/AuthController.php
@@ -11,6 +11,11 @@ class AuthController extends Fiktiv_Controller_Action
      */
     public function loginAction()
     {
+        // Redirect if user is logged in
+        if (Zend_Auth::getInstance()->hasIdentity())
+            $this->_redirect('/');
+
+
         // Do authentication magic
         $form = new Zend_Form();
 
@@ -62,7 +67,8 @@ class AuthController extends Fiktiv_Controller_Action
         // Destroy the magic!
         $auth = Zend_Auth::getInstance();
 
-        $auth->clearIdentity();
+        if ($auth->hasIdentity())
+            $auth->clearIdentity();
 
         $this->_redirect('/');
     }
diff --git a/application/modules/default/controllers/ErrorController.php b/application/modules/default/controllers/ErrorController.php
index e8d89ea..c66fbf1 100644
--- a/application/modules/default/controllers/ErrorController.php
+++ b/application/modules/default/controllers/ErrorController.php
@@ -6,9 +6,9 @@ class ErrorController extends Zend_Controller_Action
     {
         $this->view->args = $this->_request->getParams();
 
-        $error = $this->_request->getParam('error_handler');
+        $this->view->error = $this->_request->getParam('error_handler');
 
-        var_dump($error->exception->getTrace());
+        
 
     }
 }
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/auth/login.phtml b/application/modules/default/views/scripts/auth/login.phtml
index 5a9691c..2e4a2ea 100644
--- a/application/modules/default/views/scripts/auth/login.phtml
+++ b/application/modules/default/views/scripts/auth/login.phtml
@@ -2,5 +2,4 @@
 
 <p><?=$this->translate('LOGIN_TXT') ?></p>
 
-<?=$this->form ?>
-
+<?=$this->form ?>
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/error/error.phtml b/application/modules/default/views/scripts/error/error.phtml
index 852cd8c..34a0bd1 100644
--- a/application/modules/default/views/scripts/error/error.phtml
+++ b/application/modules/default/views/scripts/error/error.phtml
@@ -1,5 +1,20 @@
-<?php
+<h1><?=$this->translate('ERROR_404') ?></h1>
 
-var_dump($this->args);
+<p>
+    <?=$this->translate('ERROR_TXT_WHAT') ?>: <strong><?=$this->error->exception->getMessage() ?></strong>
+</p>
 
-?>
\ No newline at end of file
+<table>
+    <tr>
+        <th><?=$this->translate('u:class') ?></th>
+        <th><?=$this->translate('u:function') ?></th>
+        <th><?=$this->translate('u:line') ?></th>
+    </tr>
+<?php foreach ($this->error->exception->getTrace() as $call): ?>
+   <tr>
+       <td><?=$call['class'] ?></td>
+       <td><?=$call['function'] ?></td>
+       <td><?=$call['line'] ?></td>
+   </tr>
+<?php endforeach; ?>
+</table>
\ No newline at end of file