diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/404.html b/platform/avr-raven/apps/raven-webserver/httpd-fs/404.html
index a17711d02..394788cfc 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/404.html
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/404.html
@@ -1,8 +1 @@
-<html>
-  <body bgcolor="white">
-    <center>
-      <h1>404 - file not found</h1>
-      <h3>Go <a href="/">here</a> instead.</h3>
-    </center>
-  </body>
-</html>
\ No newline at end of file
+<html><body bgcolor="white"><center><h1>404 - file not found</h1><h3>Go <a href="/">here</a> instead.</h3></center></body></html>
\ No newline at end of file
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/files.shtml b/platform/avr-raven/apps/raven-webserver/httpd-fs/files.shtml
index c2051f6bc..8ef7b6ad7 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/files.shtml
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/files.shtml
@@ -1,20 +1,5 @@
 %!: /header.html
-<h1>File statistics</h1><br><table width="100%">
-<tr><td><a href="/index.html">/index.html</a></td><td>
-%! file-stats /index.html
-</td></tr><tr><td><a href="/files.shtml">/files.shtml</a></td><td>
-%! file-stats /files.shtml
-</td></tr><tr><td><a href="/tcp.shtml">/tcp.shtml</a></td><td>
-%! file-stats /tcp.shtml
-</td></tr><tr><td><a href="/processes.shtml">/processes.shtml</a></td><td>
-%! file-stats /processes.shtml
-</td></tr><tr><td><a href="/style.css">/style.css</a></td><td>
-%! file-stats /contiki.css
-</td></tr><tr><td><a href="/404.html">/404.html</a></td><td>
-%! file-stats /404.html
-</td></tr><tr><td><a href="/robots.txt">/robots.txt</a></td><td>
-%! file-stats /robots.txt
-</td></tr><tr><td><a href="/img/screenshot.png">/img/screenshot.png</a></td><td>
-%! file-stats /img/screenshot.png
-</td></tr></table>
+<h1>File statistics</h1><br><table width="100%"><tr align="left"><th>Name</th><th>Accesses</th></tr>
+%! file-stats *
+</table>
 %!: /footer.html
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/footer.html b/platform/avr-raven/apps/raven-webserver/httpd-fs/footer.html
index 1fd5f4f29..d655f2e51 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/footer.html
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/footer.html
@@ -1,2 +1 @@
-  </body>
-</html>
\ No newline at end of file
+</div></body></html>
\ No newline at end of file
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/header.html b/platform/avr-raven/apps/raven-webserver/httpd-fs/header.html
index 6949b07c7..304a5065b 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/header.html
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/header.html
@@ -1,14 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html><head><title>Welcome to the Contiki-demo server!</title>
-<link rel="stylesheet" type="text/css" href="/style.css">  
-<link rel="icon" href="favicon.png" type="image/png">
+<link rel="stylesheet" type="text/css" href="/style.css"><link rel="icon" href="favicon.png" type="image/png">
 </head><body bgcolor="#fffeec" text="black">
-<div class="menublock"><div class="menu">
-<p class="border-title">Menu</p><p class="menu">
-<a href="/">Front page</a><br>
-<a href="files.shtml">File statistics</a><br>
-<a href="tcp.shtml">Network connections</a><br>
-<a href="processes.shtml">System processes</a><br>
-<a href="sensor.shtml">Sensor Readings</a>
-</p></div></div><div class="contentblock">
-<p class="border-title">Welcome to the <a href="http://www.sics.se/contiki/">Contiki</a> web server!</p>
+<div class="menublock"><div class="menu"><p class="border-title">Menu</p><p class="menu"><a href="/">Front page</a><br><a href="files.shtml">File statistics</a><br><a href="tcp.shtml">Network connections</a><br><a href="processes.shtml">System processes</a><br><a href="sensor.shtml">Sensor Readings</a></p></div></div>
+<div class="contentblock"><p class="border-title">Welcome to the <a href="http://www.sics.se/contiki/">Contiki</a> web server!</p>
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/index.html b/platform/avr-raven/apps/raven-webserver/httpd-fs/index.html
index 337cec718..695a8555f 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/index.html
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/index.html
@@ -1,7 +1,3 @@
 %!: /header.html
-<p class="intro">
-These pages are from a webserver running under the <a href="http://www.sics.se/contiki/">Contiki operating system</a>.
-</p><br><br><i>This page has been sent
-%! file-stats /index.html
- times.</i>
-%!: /footer.html
\ No newline at end of file
+<p class="intro">These pages are from a webserver running under the <a href="http://www.sics.se/contiki/">Contiki operating system</a>.
+%! file-stats .
\ No newline at end of file
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/processes.shtml b/platform/avr-raven/apps/raven-webserver/httpd-fs/processes.shtml
index e1cb48451..0f620fbde 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/processes.shtml
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/processes.shtml
@@ -1,5 +1,5 @@
 %!: /header.html
-<h1>System processes</h1><br><table width="100%">
-<tr><th>ID</th><th>Name</th><th>Thread</th><th>Process state</th></tr>
+<h1>System processes</h1><br><table width="100%"><tr><th>ID</th><th>Name</th><th>Thread</th><th>Process state</th></tr>
 %! processes
-%!: /footer.html
+</table>
+%! file-stats .
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/sensor.shtml b/platform/avr-raven/apps/raven-webserver/httpd-fs/sensor.shtml
index 6233d01b4..1e5066be8 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/sensor.shtml
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/sensor.shtml
@@ -1,5 +1,4 @@
 %!: /header.html
 <h1>Sensor Readings</h1><br>
 %! sensors
-%!: /footer.html
-
+%! file-stats .
\ No newline at end of file
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/tcp.shtml b/platform/avr-raven/apps/raven-webserver/httpd-fs/tcp.shtml
index 4c4bffe97..635d958f2 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/tcp.shtml
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/tcp.shtml
@@ -1,5 +1,5 @@
 %!: /header.html
-<h1>Current connections</h1><br><table width="100%">
-<tr><th>Local</th><th>Remote</th><th>State</th><th>Retransmissions</th><th>Timer</th><th>Flags</th></tr>
+<h1>Current connections</h1><br><table width="100%"><tr><th>Local</th><th>Remote</th><th>State</th><th>Retransmissions</th><th>Timer</th><th>Flags</th></tr>
 %! tcp-connections
-%!: /footer.html
\ No newline at end of file
+</table>
+%! file-stats .
\ No newline at end of file
diff --git a/platform/avr-raven/apps/raven-webserver/httpd-fs/upload.html b/platform/avr-raven/apps/raven-webserver/httpd-fs/upload.html
index 575dbf8f1..a8cdca901 100644
--- a/platform/avr-raven/apps/raven-webserver/httpd-fs/upload.html
+++ b/platform/avr-raven/apps/raven-webserver/httpd-fs/upload.html
@@ -1,8 +1 @@
-<html>
-<body>
-<form action="upload.html" enctype="multipart/form-data" method="post">
-<input name="userfile" type="file" size="50" />
-<input value="Upload" type="submit" />
-</form>
-</body>
-</html>
\ No newline at end of file
+<html><body><form action="upload.html" enctype="multipart/form-data" method="post"><input name="userfile" type="file" size="50" /><input value="Upload" type="submit" /></form></body></html>
\ No newline at end of file

/index.html	-%! file-stats /index.html -
/files.shtml	-%! file-stats /files.shtml -
/tcp.shtml	-%! file-stats /tcp.shtml -
/processes.shtml	-%! file-stats /processes.shtml -
/style.css	-%! file-stats /contiki.css -
/404.html	-%! file-stats /404.html -
/robots.txt	-%! file-stats /robots.txt -
/img/screenshot.png	-%! file-stats /img/screenshot.png -