diff --git a/sw/cgi/configuration.cgi b/sw/cgi/configuration.cgi
index ba3b921239..17dbfea7ae 100755
--- a/sw/cgi/configuration.cgi
+++ b/sw/cgi/configuration.cgi
@@ -2,76 +2,56 @@
 
 # displays the current configuration
 
-use CGI ':standard';
-
-my $paparazzi_lib;
-BEGIN {
-#  $paparazzi_lib = (defined $ENV{PAPARAZZI_SRC}) ?
-#    $ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
-  $paparazzi_lib = "/home/poine/work/paparazzi_savannah/paparazzi3/sw/lib/perl";
-}
-use lib ($paparazzi_lib);
-
 use strict;
 use warnings;
 
+use Cwd;
+use CGI ':standard', '*table';
+
+my $paparazzi_src;
+my $paparazzi_lib;
+BEGIN {
+  $paparazzi_src = getcwd()."/../..";
+  $paparazzi_lib = $paparazzi_src."/sw/lib/perl";
+}
+use lib ($paparazzi_lib);
+my $paparazzi_home = $paparazzi_src;
+
 use Paparazzi::Environment;
-Paparazzi::Environment::set_env("/home/poine/work/paparazzi_savannah/paparazzi3",
-			       "/home/poine/work/paparazzi_savannah/paparazzi3");
+Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home);
 
 use Paparazzi::Configuration;
-print CGI::header;
-CGI::start_html("Paparazzi configuration");
+
+print
+  header(),
+  start_html("Paparazzi configuration");
 
 my $configuration = Paparazzi::Configuration::read_current();
-
-print "\n<H1> Paparazzi Configuration.</H1>\n";
-print "<H2> Aircrafts.</H2>\n";
-print "<TABLE CELLSPACING=4>\n";
-print_table_header(["Id", "Name", "Airframe", "Radio", "Flight plan"]);
-
+print
+  h1 ("Paparazzi Configuration"),
+  h2 ("Aircrafts");
+print
+  start_table({border => undef}),
+  Tr(th(["Id", "Name", "Airframe", "Radio", "Flight plan"]));
 foreach my $ac (@{$configuration->{aircrafts}}) {
-  print "  <TR>\n";
-  print "    <TD>";
-  print "$ac->{ac_id}";
-  print "</TD>\n";
-  print "    <TD>";
-  print "$ac->{name}";
-  print "</TD>\n";
-  print "    <TD>";
-  print_link("../conf/".$ac->{airframe}, foo($ac->{airframe}));
-  print "</TD>\n";
-  print "    <TD>";
-  print_link("../conf/".$ac->{radio}, foo($ac->{radio}));
-  print "</TD>\n";
-  print "    <TD>";
-  print_link("../conf/".$ac->{flight_plan}, foo($ac->{flight_plan}));
-  print "</TD>\n";
-  print "  </TR>\n";
+  print
+    Tr(td([$ac->{ac_id}, $ac->{name}, 
+	   a({href=>"../conf/$ac->{airframe}"}, foo($ac->{airframe}) ),
+	   a({href=>"../conf/$ac->{radio}"}, foo($ac->{radio}) ),
+	   a({href=>"../conf/$ac->{flight_plan}"}, foo($ac->{flight_plan}) )]));
 }
-print "</TABLE>\n";
-print "<H2> Ground.</H2>\n";
-print "<li>name : ".$configuration->{ground}->{name}."</li>\n";
-print "<li>ivy bus : ".$configuration->{ground}->{ivy_bus}."</li>\n";
-print "<HR>\n";
-print "<a href=\"../index.html\">home</a><BR>\n";
-print "<HR>\n";
-print "<ADDRESS>Poine.</ADDRESS><BR>\n";
+print end_table();
+
+print
+  h2 ("Ground"),
+  ul(li (["name : ".$configuration->{ground}->{name},
+       "ivy bus : ".$configuration->{ground}->{ivy_bus}
+      ])),
+  hr(),
+  a({href=>"../index.html"}, "home"),
+  end_html();
 
-sub print_table_header {
-  my ($headers) = @_;
-  print "  <TR>\n";
-  foreach (@{$headers}) {
-    print "    <TH>$_</TH>\n";
-  }
-  print "  </TR>\n";
-}
 
 sub foo {
   return ($_[0] =~ /([^\/]*)$/ );
 }
-
-sub print_link {
-  my ($link, $text) = @_;
-  print "<a href=\"$link\">$text</a>";
-}
diff --git a/sw/cgi/logs.cgi b/sw/cgi/logs.cgi
index 7979f98f17..17197b8fe2 100755
--- a/sw/cgi/logs.cgi
+++ b/sw/cgi/logs.cgi
@@ -2,30 +2,29 @@
 
 # displays available logs
 
-use CGI::Form;
-
-my $paparazzi_lib;
-BEGIN {
-#  $paparazzi_lib = (defined $ENV{PAPARAZZI_SRC}) ?
-#    $ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
-  $paparazzi_lib = "/home/poine/work/paparazzi_savannah/paparazzi3/sw/lib/perl";
-}
-use lib ($paparazzi_lib);
-
 use strict;
 use warnings;
 
+use Cwd;
+use CGI ":standard";
+my $paparazzi_src;
+my $paparazzi_lib;
+BEGIN {
+  $paparazzi_src = getcwd()."/../..";
+  $paparazzi_lib = $paparazzi_src."/sw/lib/perl";
+}
+use lib ($paparazzi_lib);
+my $paparazzi_home = $paparazzi_src;
+
 use Paparazzi::Environment;
-Paparazzi::Environment::set_env("/home/poine/work/paparazzi_savannah/paparazzi3",
-			       "/home/poine/work/paparazzi_savannah/paparazzi3");
+Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home);
+
 use Paparazzi::Log;
 
-my $query = new CGI::Form();
+my $query = new CGI();
 print $query->header();
 print $query->start_html("Paparazzi Logs");
 
-#my $configuration = Paparazzi::Configuration::read_current();
-
 my @logs = Paparazzi::Log::get_available();
 
 my $log_info = undef;
@@ -43,9 +42,10 @@ print $query->popup_menu('file', \@logs, $logs[0]);
 print $query->submit('Action','Update');
 print $query->endform();
 if (defined $log_info) {
+  print $query->path_info()."<br>";
   Paparazzi::Log::html_print_summary($log_info, $log_data);
-  my $url = Paparazzi::Log::gen_activity_plot($log_info, $log_data);
-  print"<img src=\"$url\">\n"; 
+#  my $url = Paparazzi::Log::gen_activity_plot($log_info, $log_data);
+#  print"<img src=\"$url\">\n"; 
 }
 print "<HR>\n";
 print "<a href=\"../index.html\">home</a><BR>\n";