diff --git a/ezmlm-web/trunk/TODO b/ezmlm-web/trunk/TODO
index a09d11f..3e60c10 100644
--- a/ezmlm-web/trunk/TODO
+++ b/ezmlm-web/trunk/TODO
@@ -6,3 +6,5 @@ TODO - ezmlm-web 2.2
 -  Some nice install method. But then I use FreeBSD and ported it
    so that might just count as my nice install method :)
 -  Option for a css-stylesheet
+ - migrate header and footer in ezmlmwebrc to css
+ - improve css-design
diff --git a/ezmlm-web/trunk/css/default.css b/ezmlm-web/trunk/css/default.css
index ff52259..2311365 100644
--- a/ezmlm-web/trunk/css/default.css
+++ b/ezmlm-web/trunk/css/default.css
@@ -19,43 +19,8 @@ a:visited {
 	color: #8888ff;
 	}
 
-strong.big {
-	font-size: large;
-	}
 
-font.helper {
-	font-size: -1;
-	}
-
-.center {
-	text-align: center;
-	}
-
-table	{
-	margin-left: auto;
-	margin-right: auto;
-	}
-
-table.left {
-	margin-left: 0px;
-	}
-
-table hr {
-	text-align: center;
-	width: 25%;
-	}
-
-table.big-pad td {
-	padding: 10px;
-	}
-
-
-table.small-pad td {
-	padding: 5px;
-	}
-
-
-/*********************** general **************************/
+/*********************** general **************************
 
 used classes for containers:
 	title		- heading of most pages (except main)
@@ -86,18 +51,30 @@ div.container {
 div.add_remove span.button {
 	width: auto;
 	margin-top: 0px;
+	margin-right: auto;
 	}
 
 div.add_remove span.formfield {
 	width: auto;
 	margin: 0px;
+	margin-right: auto;
 	padding: 0px;
 	}
 
+div.add_remove span.formfield:before {
+	content: attr("<br>");
+	}
+
 div.list {
-	padding: 10px;
+	margin: 1%;
+	margin-right: 3%;
 	text-align: center;
 	float: left;
+	margin-bottom: auto;
+	}
+
+div.question {
+	text-align: center;
 	}
 
 p.warning {
@@ -107,7 +84,16 @@ p.warning {
 	}
 
 span.help {
-	font-size: -1;
+	font-size: small;
+	}
+
+span.button {
+	margin-left: 3px;
+	margin-right: 3px;
+	}
+
+span.formfield {
+	margin-right: auto;
 	}
 
 /************************ main page ***********************
@@ -152,8 +138,8 @@ available classes:	title input question
 ***********************************************************/
 
 #create div.input span.formfield {
-	text-weight: bold;
-	text-size: large;
+	font-weight: bold;
+	font-size: large;
 	margin-left: 0px;
 	margin-right: auto;
 	}
@@ -166,12 +152,12 @@ available classes:	title info input question
 ***********************************************************/
 
 #config div.info {
-	text-size: large;
-	text-weight: bold;
+	font-size: large;
+	font-weight: bold;
 	}
 
 #config div.input span.formfield {
-	text-weight: bold;
+	font-weight: bold;
 	margin-left: 0px;
 	margin-right: auto;
 	}
diff --git a/ezmlm-web/trunk/ezmlm-web.cgi b/ezmlm-web/trunk/ezmlm-web.cgi
index c3e9a65..cd9b18f 100755
--- a/ezmlm-web/trunk/ezmlm-web.cgi
+++ b/ezmlm-web/trunk/ezmlm-web.cgi
@@ -317,7 +317,7 @@ sub confirm_delete {
    print $q->hidden(-name=>'state', -default=>'confirm_delete');
    print $q->hidden(-name=>'list', -default=>$q->param('list'));
 
-   print '<div class="title">";
+   print '<div class="title">';
    print '<h2>', $LANGUAGE{'confirmdelete'}, ' ', $q->param('list'), '</h2>';
    print '</div>';	# end of delete->title
 
@@ -368,10 +368,10 @@ sub display_list {
    print '</div>';	# end of edit->list
    
    print '<div class="add_remove">';
-   print ($#subscribers + 1), ' ', $LANGUAGE{'subscribers'} if defined(@subscribers);
+   print '<p>', ($#subscribers + 1), ' ', $LANGUAGE{'subscribers'}, '</p>' if defined(@subscribers);
    print '<span class="button">', $q->submit(-name=>'action', -value=>"[$BUTTON{'deleteaddress'}]"), '</span>' if defined(@subscribers);
-   print '<span class="button">', $q->textfield(-name=>'addsubscriber', -size=>'40'), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddress'}, '"></span>';
-   print '<span class="button">', $q->filefield(-name=>'addfile', -size=>20, -maxlength=>100), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddressfile'}, '"></span>' if ($FILE_UPLOAD);
+   print '<span class="formfield">', $q->textfield(-name=>'addsubscriber', -size=>'40'), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddress'}, '"></span>';
+   print '<span class="formfield">', $q->filefield(-name=>'addfile', -size=>20, -maxlength=>100), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddressfile'}, '"></span>' if ($FILE_UPLOAD);
    print '<span class="button">', $q->submit(-name=>'action', -value=>"[$BUTTON{'addaddress'}]"), '</span>';
    print '</div>';	# end of edit->add_remove
 
@@ -609,7 +609,7 @@ sub part_subscribers {
       $divclass = ($remotepath)? 'warning' : 'ok';
       $moderated .= "<p class=\"$divclass\">[$LANGUAGE{'remoteadmin'}]" if($list->isremote);
       $moderated .= '<img src="' . $HELP_ICON_URL . '" title="Remote Administrators are stored in a non-standard location (' . $remotepath . '). You will have to edit them manually">' if ($remotepath);
-      $moderated .= '</p> if ($list->isremote);
+      $moderated .= '</p> if ($list->isremote)';
      
    }
 
@@ -622,7 +622,7 @@ sub part_subscribers {
    # Keep selection box a resonable size - suggested by Sebastian Andersson 
    $scrollsize = 25 if(($scrollsize = $#subscribers + 1) > 25);
 
-   # container for the content
+   # Begin of content
    print '<div id="parts" class="container">';
    
    # Print out a form of options ...
@@ -630,7 +630,7 @@ sub part_subscribers {
 
    print '<div class="title">';
    print "<h2>$type $LANGUAGE{'for'} $listaddress</h2>";
-   print '<hr>':
+   print '<hr>';
    print '</div>';	# end of parts_title
 
    print '<div class="info">', "$moderated", '</div>' if(defined($moderated));
@@ -641,7 +641,7 @@ sub part_subscribers {
 
    print '<div class="list">', $q->scrolling_list(-name=>'delsubscriber', -size=>$scrollsize, -values=>\@subscribers, -multiple=>'true', -labels=>&pretty_names), '</div>' if defined(@subscribers);
 
-   print '<div class="add_remove">':
+   print '<div class="add_remove">';
    print '<span class="button">', $q->submit(-name=>'action', -value=>"[$BUTTON{'deleteaddress'}]"), '</span>' if defined(@subscribers);
    print '<span class="formfield">', $q->textfield(-name=>'addsubscriber', -size=>'40'), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddress'}, '"></span>';
    print '<span class="formfield">', $q->filefield(-name=>'addfile', -size=>20, -maxlength=>100), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'addaddressfile'}, '"></span>' if ($FILE_UPLOAD);
@@ -683,7 +683,7 @@ sub allow_create_list {
 
    print '<div class="title">';
    print '<h2>', $LANGUAGE{'createnew'}, '</h2>';
-   print '<hr'>;
+   print '<hr>';
    print '</div>';	# end of create->title
 
    print $q->startform;
@@ -691,7 +691,7 @@ sub allow_create_list {
 
    print '<div class="input">';
    print '<span class="formfield">', $LANGUAGE{'listname'}, ': ', $q->textfield(-name=>'list', -size=>'20'), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'listname'}, '"></span>';
-   print '<span class="formfield">', $LANGUAGE{'listaddress'}, ': ', $q->textfield(-name=>'inlocal', -default=>$username, -size=>'10')';
+   print '<span class="formfield">', $LANGUAGE{'listaddress'}, ': ', $q->textfield(-name=>'inlocal', -default=>$username, -size=>'10');
    print ' @ ', $q->textfield(-name=>'inhost', -default=>$hostname, -size=>'30'), ' <img src="', $HELP_ICON_URL, '" title="', $HELPER{'listadd'}, '"></span>';
    
    print '<span class="formfield">', $LANGUAGE{'listoptions'}, ':</span>';
@@ -741,7 +741,7 @@ sub create_list {
    # Sanity Checks ...
    return 1 if ($listname eq '' || $qmail eq '');
    if(-e ("$LIST_DIR/$listname/lock") || -e ("$HOME_DIR/.qmail-$qmail")) {
-      print "<h1 class="warning">List '$listname' already exists :(</h1>";
+      print '<h1 class="warning">', "List '$listname' already exists :(</h1>";
       return 1;
    }
   
@@ -798,7 +798,7 @@ sub list_config {
    $listaddress = &this_listaddress;
 
    # Begin of content
-   print '<div id="config">';
+   print '<div id="config" class="container">';
     
    # Print a form of options ...
    $q->delete_all;
@@ -953,7 +953,7 @@ sub list_text {
    closedir DIR;
 
    # Begin of content
-   print '<div id="textfiles">';
+   print '<div id="textfiles" class="container">';
 
    # Print a form ...
    $q->delete('state');
@@ -961,7 +961,7 @@ sub list_text {
    print $q->hidden(-name=>'state', -default=>'list_text');
    print $q->hidden(-name=>'list', -default=>$q->param('list'));
 
-   print '<div class="list">;
+   print '<div class="list">';
    print $q->scrolling_list(-name=>'file', -values=>\@files);
    print '</div>';	# end of textfiles->list
 
@@ -990,7 +990,7 @@ sub edit_text {
    $content = $list->getpart("text/$Q::file");
 
    # Begin of content
-   print '<div id="edittext">';
+   print '<div id="edittext" class="container">';
 
    # Print a form ...
    $q->delete('state');
@@ -1086,7 +1086,7 @@ sub display_options {
    print '<p>';
    foreach $i (grep {/\D/} keys %EZMLM_LABELS) {
       if ($opts =~ /^\w*$i\w*\s*/) {
-         print '<span class="checkbox">', $q->checkbox(-name=>$i, -value=>$i, -label=>$EZMLM_LABELS{$i}[0], -on=>'1')';
+         print '<span class="checkbox">', $q->checkbox(-name=>$i, -value=>$i, -label=>$EZMLM_LABELS{$i}[0], -on=>'1');
       } else {
          print '<span class="checkbox">', $q->checkbox(-name=>$i, -value=>$i, -label=>$EZMLM_LABELS{$i}[0]);
       }