diff --git a/action.add_edit.php b/action.add_edit.php
index ee043c33099b4270adb6665b56a16a6ba861a516..698e8ca75053b664fe35833c77a53d45b3ee2556 100644
--- a/action.add_edit.php
+++ b/action.add_edit.php
@@ -1,6 +1,6 @@
 <?php
 if (!isset($gCms)) exit;
-echo '<pre>'; print_r($params); echo '</pre>';
+//echo '<pre>'; print_r($params); echo '</pre>';
 
 if (! $this->CheckPermission('Use ReglerAddress')) {
   return $this->DisplayErrorPage($id, $params, $returnid,
@@ -41,12 +41,13 @@ if (isset($params['ID'])) {
   $person = new Person($ID);
 } else {
   $person = new Person();
+  $ID = null;
 }
 $smarty = $this->smarty;
 
 $headline = $person->Fornamn . ' ' .$person->Efternamn;
 if (strlen($headline) == 1) $headline = $person->SkolaForetag;
-$headline = 'Redigera post: ' . $headline;
+$headline = 'Redigera adress: ' . $headline;
 
 $smarty->assign('headline',$headline);
 
@@ -74,10 +75,17 @@ foreach ($areaFields as $key => $name) {
 
 $smarty->assign('title_Grupper', 'Medlem av grupper');
 $name = 'Grupper';
-$place = $this->CreateInputSelectList($id, $name, $person->Grupper,
+$grupper = array();
+if ($ID) $grupper = $person->Grupper;
+$place = $this->CreateInputSelectList($id, $name, $grupper,
 				      array(), 5, '', false);
 $smarty->assign('select_Grupper', $place);
-$place = $this->CreateInputSubmit($id, 'doGroups', 'Ändra grupper');
+
+if ($ID) {
+  $place = $this->CreateInputSubmit($id, 'doGroups', 'Ändra grupper');
+} else {
+  $place = '';
+}
 $smarty->assign('groupsButton', $place);
 
 
@@ -104,7 +112,7 @@ $smarty->assign('cancelButton',$place);
 
 $smarty->assign('person',$person);
 
-echo '<pre>'; print_r($person); echo '</pre>';
+//echo '<pre>'; print_r($person); echo '</pre>';
 
 
 
diff --git a/action.changeGroups.php b/action.changeGroups.php
index 9d42a78c2de405bdd47ffdfec8dda96fa18b60ca..5c4251bf7598468549cb7791e42c229c0b568d9d 100644
--- a/action.changeGroups.php
+++ b/action.changeGroups.php
@@ -1,6 +1,6 @@
 <?php
 if (!isset($gCms)) exit;
-echo '<pre>'; print_r($params); echo '</pre>';
+//echo '<pre>'; print_r($params); echo '</pre>';
 
 if (! $this->CheckPermission('Use ReglerAddress')) {
   return $this->DisplayErrorPage($id, $params, $returnid,
@@ -20,6 +20,12 @@ if (isset($params['back'])) {
 }
 
 $ID = $params['ID'];
+$person = new Person($ID);
+$headline = $person->Fornamn . ' ' .$person->Efternamn;
+if (strlen($headline) == 1) $headline = $person->SkolaForetag;
+$headline = 'Grupper: ' . $headline;
+
+$smarty->assign('headline',$headline);
 
 if (isset($params['setMember']))  {
   $GroupID = $params['nonmembers'];
diff --git a/action.defaultadmin.php b/action.defaultadmin.php
index 2c10ea4d063cca26e52ffc0db9f7899271adff2a..0a0f6709b6b9762eea1567313f539ac846f61462 100644
--- a/action.defaultadmin.php
+++ b/action.defaultadmin.php
@@ -13,7 +13,7 @@
 require_once 'lib/class.Group.php';
 if (!isset($gCms)) exit;
 
-echo '<pre>'; print_r($params); echo '</pre>';
+//echo '<pre>'; print_r($params); echo '</pre>';
 
 /** 
  * For separated methods, you won't be able to do permission checks in
diff --git a/lib/class.Person.php b/lib/class.Person.php
index 0bebc217aec3fd75c837de09a2d780722649a54e..95ce49b5a42db15e655b81f789d6f7aa4737bde8 100644
--- a/lib/class.Person.php
+++ b/lib/class.Person.php
@@ -91,9 +91,9 @@ EOT;
 
   private function createRecord() {
     $db = AddressDB::getDB();
-    $query = 'insert into Adresser set Fornamn=?';
-    $values = array('Förnamn');
-    $result = $db->Execute($query,$values);
+    $query = 'insert into Adresser set Andrad=null';
+    //    $values = array('Förnamn');
+    $result = $db->Execute($query,array());
     if ($result === false) {die("Database error!<br>" . $publDB->ErrorMsg()); }
     $this->ID = $db->Insert_ID();
   }
@@ -111,6 +111,7 @@ EOT;
       if (!isset($this->$field)) $this->field = 'null';
       $val = trim($this->$field);
       if (strlen($val) == 0) $val = null;
+      if ($field == 'Andrad') $val = null;
       $qfields[] = sprintf('%s = ?',$field);
       $values[] = $val;
     }
@@ -159,9 +160,6 @@ EOT;
       $query = self::$queryPersons .' ' . join(' and ', $andQuery);
       $values = $andValues;
     }
-    //     echo '<pre>'; echo $query; echo '</pre>';
-    //    echo '<pre>'; print_r($values); echo '</pre>';
-    //     return array();
     $db = AddressDB::getDB();
     $class = __CLASS__;
     $records = array();
diff --git a/templates/adminpanel.tpl b/templates/adminpanel.tpl
index 783dce86981105c1d68e06d42424aff722cd1e69..24ce61f51112da86a027be7765edb2e2a12f2179 100644
--- a/templates/adminpanel.tpl
+++ b/templates/adminpanel.tpl
@@ -1,7 +1,8 @@
 {$start_form}
-<table align="center" bgcolor="#f0f0ff"><thead><tr><td colspan="2" style="text-align: center; font-size: 300%;">Adressregister</td></tr></thead><tbody>
+<table align="center" bgcolor="#f0f0ff"><thead><tr><td colspan="2" bgcolor="#000080" style="text-align: center; font-weight:bold; font-size: 200%; color: white;">Adressregister</td></tr></thead><tbody>
 <tr><td style="vertical-align:top;">
-<table><tbody>
+<table>
+<tbody>
 {foreach $fields as $key=>$val}
 <tr ><td style="text-align:right;padding-right:1em;">{$title_{$key}}</td>
     <td>{$input_{$key}}</td></tr>
@@ -14,9 +15,24 @@
 </tr></tbody></table>
 {$end_form}
 
-<table CELLPADDING="3" align="center"><tbody>
+{if !empty($Persons)}
+
+<table CELLPADDING="3" align="center">
+<thead><tr>
+<td style="background-color:#000080; font-weight:bold; font-size: 130%; color: white;">
+  Namn</td>
+<td style="background-color:#000080; font-weight:bold; font-size: 130%; color: white;">
+  Företag/Adress</td>
+<td style="background-color:#000080; font-weight:bold; font-size: 130%; color: white;">
+  Avdelning</td>
+<td style="background-color:#000080; font-weight:bold; font-size: 130%; color: white;">
+  &nbsp;</td>
+</tr></thead> 
+<tbody>
 {foreach $Persons as $person}
   <tr><td>{$person->Namn}</td><td>{$person->ForetagAdress}</td>
   <td>{$person->Avdelning}</td><td>{$person->link}</td></tr>
 {/foreach}
-</tbody></table>
\ No newline at end of file
+</tbody></table>
+
+{/if}
\ No newline at end of file
diff --git a/templates/groupMembers.tpl b/templates/groupMembers.tpl
index 545632e6e7e46a9a9c54bf50afc72224a3c30569..73b817f49a73054426c27e4d0d5aae36f98a848a 100644
--- a/templates/groupMembers.tpl
+++ b/templates/groupMembers.tpl
@@ -1,8 +1,15 @@
 {$start_form}
-<table CELLPADDING="3" align="center"><tbody>
-<tr><td>Medlem av</td><td></td><td>Icke medlem av</td></tr>
-<tr><td> {$members}</td><td style="font-weiht:bold;">{$setMember}<br />{$setNonmember}</td><td> {$nonmembers}</td></tr>
+<table CELLPADDING="3" align="center"  bgcolor="#f0f0ff">
+<thead><tr><td bgcolor="#000080" colspan="3" style="text-align: center;
+   font-size: 200%; font-weight:bold; color: white;">{$headline}</td></tr>
+   <tr><td colspan="3"><td>&nbsp;</td></tr>
+   </thead>
+<tbody>
+<tr><td with="33%">Medlem av</td><td width="33%"></td>
+   <td width="33%">Icke medlem av</td></tr>
+<tr><td> {$members}</td><td style="font-weight:bold;">{$setMember}<br />{$setNonmember}</td><td> {$nonmembers}</td></tr>
 <tr><td colspan="3" style="text-align: center;">{$back}</td></tr>
 </tbody></table>
 {$hidden}
 {$end_form}
+