diff --git a/application/controllers/yllapito.php b/application/controllers/yllapito.php
index fe37f36..b80c972 100644
--- a/application/controllers/yllapito.php
+++ b/application/controllers/yllapito.php
@@ -113,7 +113,9 @@ class Yllapito extends CI_Controller
         if (empty($limit)) {
             $data['cards'] = $this->ecard->order_by('created_at')->get_all();
         } else {
-            $data['cards'] = $this->ecard->order_by('created_at')->get_many_by('card_status', $limit);
+            $data['cards'] = $this->ecard
+                                        ->order_by('created_at')
+                                        ->get_many_by('card_status', $limit);
         }
 
         $data['page_title'] = array_merge($page_title, $data['page_title']);
@@ -156,7 +158,6 @@ class Yllapito extends CI_Controller
                 break;
         }
 
-
         $data['page_title'] = array_merge($page_title, $data['page_title']);
         $page = 'yllapito/users_'.$section;
 
diff --git a/application/views/_header.php b/application/views/_header.php
index b843710..139ec23 100644
--- a/application/views/_header.php
+++ b/application/views/_header.php
@@ -118,14 +118,14 @@ if (isset($user) and ! empty($user)) {
                                 <ul class="dropdown">
                                     <?php
         if ($user->can_modusers == "yes") {
-                                        echo "<li>"
-                                            . lnk("yllapito/users/add", "Lisää käyttäjä")
-                                            . "</li>\n";
+            echo "<li>"
+                . lnk("yllapito/users/add", "Lisää käyttäjä")
+                . "</li>\n";
         }
         if ($user->can_seeusers == "yes") {
-                                        echo "<li>"
-                                            . lnk("yllapito/users/list", "Listaa käyttäjät")
-                                            . "</li>\n";
+            echo "<li>"
+                . lnk("yllapito/users", "Listaa käyttäjät")
+                . "</li>\n";
         }
         ?>
                                 </ul>
diff --git a/application/views/yllapito/dashboard.php b/application/views/yllapito/dashboard.php
index 8c37cbb..9fb5f1a 100644
--- a/application/views/yllapito/dashboard.php
+++ b/application/views/yllapito/dashboard.php
@@ -21,7 +21,7 @@ if ($all > 0) {
 if ($p_queue > 0) { ?>
         <span   data-tooltip
                 class="has-tip left queue meter"
-                data-width="210"
+                data-width="230"
                 title="Kortteja jonossa <?=$count->queue; ?> kpl"
                 style="width: <?=$p_queue;?>%"></span>
     <?php
@@ -29,7 +29,7 @@ if ($p_queue > 0) { ?>
 if ($p_public > 0) { ?>
         <span   data-tooltip
                 class="has-tip left public meter"
-                data-width="210"
+                data-width="230"
                 title="Kortteja julkaistuna <?=$count->public; ?> kpl"
                 style="width: <?=$p_public;?>%"></span>
     <?php
@@ -37,15 +37,15 @@ if ($p_public > 0) { ?>
 if ($p_private > 0) { ?>
         <span   data-tooltip
                 class="has-tip left private meter"
-                data-width="210"
-                title="Kortteja piilotettuna <?=$count->private; ?> kpl"
+                data-width="230"
+                title="Yksityisiä kortteja <?=$count->private; ?> kpl"
                 style="width: <?=$p_private;?>%"></span>
     <?php
 }
 if ($p_hidden > 0) { ?>
         <span   data-tooltip
                 class="has-tip left hidden meter"
-                data-width="210"
+                data-width="230"
                 title="Poistettuja kortteja <?=$count->hidden; ?> kpl"
                 style="width: <?=$p_hidden;?>%"></span>
     <?php
@@ -54,15 +54,15 @@ if ($p_hidden > 0) { ?>
 
             </div>
 
-            <pre><?php
+            <h4>Kortit</h4>
 
-if (empty($user)) {
-    $user = new stdClass();
-}
-
-var_export($user);
-
-?></pre>
+            <ul class="inline-list">
+                <li><?php echo lnk("yllapito/ecards/queue", "Jonossa"); ?></li>
+                <li><?php echo lnk("yllapito/ecards/public", "Julkaistut"); ?></li>
+                <li><?php echo lnk("yllapito/ecards/private", "Yksityiset"); ?></li>
+                <li><?php echo lnk("yllapito/ecards/hidden", "Piilotetut"); ?></li>
+                <li><?php echo lnk("yllapito/ecards/", "Kaikki"); ?></li>
+            </ul>
 
         </div>
     </div>
diff --git a/application/views/yllapito/list_cards.php b/application/views/yllapito/list_cards.php
index 7250c0d..d575cba 100644
--- a/application/views/yllapito/list_cards.php
+++ b/application/views/yllapito/list_cards.php
@@ -92,9 +92,9 @@ if (!empty($cards)) {
 
         $checkboxes = array(
             'queue' => 'Jonossa',
-            'public' => 'Julkaise',
-            'private' => 'Piilota',
-            'hidden' => 'Hylkää'
+            'public' => 'Julkaistu',
+            'private' => 'Piilotettu',
+            'hidden' => 'Hylätty'
         );
 
 
diff --git a/application/views/yllapito/users_show.php b/application/views/yllapito/users_show.php
index 9bfea2d..82c6a56 100644
--- a/application/views/yllapito/users_show.php
+++ b/application/views/yllapito/users_show.php
@@ -3,7 +3,12 @@
 if (empty($userdata)) {
     $userdata = array();
 }
-
+if (empty($user)) {
+    $user = new stdClass();
+}
+if (empty($userid)) {
+    $userid = 0;
+}
 ?>
 
 <div class="row">
diff --git a/assets/css/style.css b/assets/css/style.css
index b2ca254..843d2a9 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -133,7 +133,7 @@ table thead th button {
     font-size: 11px;
 }
 
-#ecard_form label.error {
+form label.error {
     margin-top: -10px;
     padding-bottom: 20px;
     clear: both;