diff --git a/lib/class.AddressDB.php b/lib/class.AddressDB.php
index d17fda02dbf88d7f5861acac6f4d11ed04ed9ba0..c40eb80c2a2d8f74d000031ead84f18b92c9ae82 100644
--- a/lib/class.AddressDB.php
+++ b/lib/class.AddressDB.php
@@ -3,7 +3,7 @@
 class AddressDB {
   private static $instance;
   private $PDB;
-  private $database = 'addresses';
+  private $database = 'NyAdresser';
  
   private function __construct() {
     global $gCms;
diff --git a/templates/adminpanel.tpl b/templates/adminpanel.tpl
index 24ce61f51112da86a027be7765edb2e2a12f2179..9185aa910a1573d5eb776c4c06d720d6f5e897ff 100644
--- a/templates/adminpanel.tpl
+++ b/templates/adminpanel.tpl
@@ -4,7 +4,7 @@
 <table>
 <tbody>
 {foreach $fields as $key=>$val}
-<tr ><td style="text-align:right;padding-right:1em;">{$title_{$key}}</td>
+<tr ><td style="text-align:right;padding-right:1em;font-weight:bold;">{$title_{$key}}:</td>
     <td>{$input_{$key}}</td></tr>
 {/foreach}
 </tbody></table>
diff --git a/templates/editpanel.tpl b/templates/editpanel.tpl
index 119ca49bf836c7792b667f6c61f1b7d939dbf875..01f270db5abf2656c450268d208670f53ac4d20e 100644
--- a/templates/editpanel.tpl
+++ b/templates/editpanel.tpl
@@ -5,25 +5,43 @@
    font-size: 200%; font-weight:bold; color: white;">{$headline}</td></tr>
    </thead>
 <tbody>
-<tr><td>{$title_Fornamn}</td><td>{$input_Fornamn}</td>
-    <td>{$title_Efternamn}</td><td>{$input_Efternamn}</td></tr>
-<tr><td>{$title_Personnummer}</td><td>{$input_Personnummer}</td>
-  <td>{$title_Titel}</td><td>{$input_Titel}</td></tr>
-<tr><td>{$title_SkolaForetag}</td><td>{$input_SkolaForetag}</td>
-  <td>{$title_Avdelning}</td><td>{$input_Avdelning}</td></tr>
-<tr><td>{$title_Epost}</td><td>{$input_Epost}</td>
-  <td>{$title_URL}</td><td>{$input_URL}</td></tr>
-<tr><td>{$title_Telefon}</td><td>{$input_Telefon}</td>
-  <td>{$title_TelefonMobil}</td><td>{$input_TelefonMobil}</td></tr>
-<tr><td>{$title_TelefonHem}</td><td>{$input_TelefonHem}</td>
-  <td>{$title_AnknytningTillInst}</td><td>{$input_AnknytningTillInst}</td></tr>
-<tr><td>{$title_Adress}</td><td>{$text_Adress}</td>
-  <td>{$title_Hem}</td><td>{$text_Hem}</td></tr>
-<tr><td>{$title_Besok}</td><td>{$text_Besok}</td>
-  <td>{$title_DiverseInfo}</td><td>{$text_DiverseInfo}</td></tr>
-<tr><td>{$title_Grupper}</td><td><table><tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+    {$title_Fornamn}:</td><td>{$input_Fornamn}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_Efternamn}:</td><td>{$input_Efternamn}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_Personnummer}:</td><td>{$input_Personnummer}</td>
+  <td style="text-align:right;padding-right:1em;font-weight:bold;">
+    {$title_Titel}:</td><td>{$input_Titel}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+     {$title_SkolaForetag}:</td><td>{$input_SkolaForetag}</td>
+  <td style="text-align:right;padding-right:1em;font-weight:bold;">
+  {$title_Avdelning}</td><td>{$input_Avdelning}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+     {$title_Epost}:</td><td>{$input_Epost}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_URL}:</td><td>{$input_URL}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_Telefon}:</td><td>{$input_Telefon}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_TelefonMobil}:</td><td>{$input_TelefonMobil}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+    {$title_TelefonHem}</td><td>{$input_TelefonHem}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_AnknytningTillInst}:</td><td>{$input_AnknytningTillInst}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_Adress}:</td><td>{$text_Adress}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+    {$title_Hem}:</td><td>{$text_Hem}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+     {$title_Besok}</td><td>{$text_Besok}</td>
+    <td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_DiverseInfo}:</td><td>{$text_DiverseInfo}</td></tr>
+<tr><td style="text-align:right;padding-right:1em;font-weight:bold;">
+      {$title_Grupper}:</td><td><table><tr>
    <td>{$select_Grupper}</td><td>{$groupsButton}</td></tr></table></td>
-  <td>{$title_Andrad}</td><td>{$value_Andrad}</td></tr>
+  <td style="text-align:right;padding-right:1em;font-weight:bold;">
+     {$title_Andrad}:</td><td>{$value_Andrad}</td></tr>
   <td colspan = "4" style="text-align: center;">
      {$submitButton}{$cancelButton}</td><td></td></tr>