diff --git a/content/details/02_top b/content/details/02_top
new file mode 100644
index 0000000..48bce20
--- /dev/null
+++ b/content/details/02_top
@@ -0,0 +1,31 @@
+<div class="centercontent">
+	<h2>What does the CryptoBox do?</h2>
+	<p>Usually all your files like phone numbers, love letters, bank
+	account data etc. are stored in plaintext on your computers
+	harddisk. All the data is accessable by anyone who has access to the
+	harddisk. This is very bad in case someone you don't trust has
+	your harddisk. E.g. a thief that steals your notebook, or breaks
+	in your house or company. If the thief has your disk he/she can
+	also read all the files that where saved on it, no matter if you
+	have a login password - the files are always stored in
+	plaintext.</p>
+
+	<p>The <b>CryptoBox</b> brings easy to use data encryption to your
+	computer. This works out of the box and doesn't need complicated
+	configuration steps.</p>
+
+	<p>Here comes a small usage example for the CryptoBox with a discarded
+	PC as fileserver:</p>
+
+	<p>You boot up the old PC with the CryptoBox live-CD. After the
+	completed boot process you can access it with your browser via
+	network. Then you partition and reformat the harddisk of the old
+	PC with encryption support. Therefore you provide a passphrase.
+	This is all done through the user friendly webinterface. You can
+	also plug in an external harddisk and use this for encrypted data
+	storage. Afterwards you copy your sensitive data over the local
+	network to the CryptoBox. It is stored on its harddisk in a
+	secure way. Nobody can access the data, without giving the right
+	passphrase before.</p>
+</div>
+
diff --git a/content/details/05_left b/content/details/05_left
index fd94124..2b36dc7 100644
--- a/content/details/05_left
+++ b/content/details/05_left
@@ -1,27 +1,10 @@
 <div class="left">
 	<div class="leftcontent">
-		<h2>Thank you!</h2>
-		<p>The CryptoBox project heavily depends on the following Free Software
-		projects. Thanks for your hard work!</p>
-		<ul>
-			<li><a href="http://kernel.org">Linux kernel</a></li>
-			<li><a href="http://debian.org">Debian GNU/Linux</a></li>
-			<li><a href="http://python.org">Python</a></li>
-			<li><a href="http://cherrypy.org">CherryPy</a></li>
-			<li><a href="http://clearsilver.net">ClearSilver</a></li>
-			<li><a href="http://www.saout.de/misc/dm-crypt">DM-crypt</a></li>
-			<li><a href="http://luks.endorphin.org">CryptSetup LUKS</a></li>
-			<li>...</li>
-		</ul>
-		<p>This list is by far incomplete - so: thanks to everyone involved in
-		improving Free Software!</p>
-	</div>
-
-	<div class="leftcontent">
-		<h2>You need more details?</h2>
+		<h2>You are admin?</h2>
 		<p>Take a look at the <a
 			href="http://devel.cryptobox.org/file/trunk/README">README file</a>
-			for more detailed installation and usage instructions.</p>
+			for more detailed installation and usage instructions for
+			the CryptoBox server.</p>
 	</div>
 </div>
 
diff --git a/content/details/10_content b/content/details/10_content
index a5d3236..2084933 100644
--- a/content/details/10_content
+++ b/content/details/10_content
@@ -1,13 +1,6 @@
 <div class="content">
-	<h2>Requirements</h2>
-	<p>The <i>CryptoBox-Server</i> package can be installed on every system with at least:</p>
-	<ul>
-		<li>Linux kernel 2.6</li>
-		<li>cryptsetup with LUKS support</li>
-		<li>kernel support for the <i>crypt</i> target of the <i>device mapper</i></li>
-		<li>Python 2.4</li>
-	</ul>
-	<p>The <i>CryptoBox-CD</i> can run on any PC with:</p>
+	<h2>Requirements CryptoBox live-CD</h2>
+	<p>The <i>CryptoBox live-CD</i> runs on any x86 compatible PC with:</p>
 	<ul>
 		<li>CPU: min. 100MHz</li>
 		<li>RAM: 64 MB</li>
@@ -16,7 +9,21 @@
 		<li>a harddisk for your data</li>
 	</ul>
 	<p>All drives supported by the linux kernel can be used: IDE, SCSI, USB, FireWire,
-	SATA, ...</p>
+	SATA, RAID, ...</p>
+</div>
+
+<div class="content">
+	<h2>Requirements CryptoBox-server</h2>
+	<p>The <i>CryptoBox-server</i> package can be installed on every system with at least:</p>
+	<ul>
+		<li>Linux kernel 2.6</li>
+		<li>cryptsetup with LUKS support</li>
+		<li>kernel support for the <i>crypt</i> target of the <i>device mapper</i></li>
+		<li>Python 2.4</li>
+	</ul>
+	<p>In principle the server package runs on any Linux
+	distribution, but we just provide Debian packages. So you have to
+	install the necessary files on your own.</p>
 </div>
 
 <div class="content">
diff --git a/content/development/02_top b/content/development/02_top
index ea109ac..6af3075 100644
--- a/content/development/02_top
+++ b/content/development/02_top
@@ -1,17 +1,7 @@
 <div class="centercontent">
 	<h2>Contribute</h2>
 	<p>You are not just a consumer. At least not in the Open Source world.</p>
-	<p>There are various ways to take part in improving the <i>CryptoBox</i>
-		for all of us:</p>
-	<ul>
-		<li><a href="http://translate.cryptobox.org">Translate</a>
-				it into your native language</li>
-		<li>Review the documentation</li>
-		<li><a href="http://devel.cryptobox.org/newticket">Submit</a>
-				bug reports or feature requests</li>
-		<li>Develop plugins</li>
-		<li>...</li>
-		<li>Spread the word ... :)</li>
-	</ul>
+	<p>There are various ways to take part in improving the CryptoBox
+		for all of us ...</p>
 </div>
 
diff --git a/content/development/05_left b/content/development/05_left
index 56d7aba..712e957 100644
--- a/content/development/05_left
+++ b/content/development/05_left
@@ -1,7 +1,20 @@
 <div class="left">
+	<div class="leftcontent">
+		<h2>Overview</h2>
+		<ul>
+		<li><a href="http://translate.cryptobox.org/projects/cryptobox/">Translation</a></li>
+		<li><a href="http://devel.cryptobox.org/newticket">Bug Reports</a></li>
+		<li><a href="http://devel.cryptobox.org/wiki/CryptoBoxUser">User Documentation</a></li>
+		<li><a href="http://devel.cryptobox.org/">Development corner</a></li>
+		<li><a href="https://systemausfall.org/mail-archive/?0">Mailing list archive</a>
+		<li><a href="http://devel.cryptobox.org/file/trunk/README">README</a></li>
+		</ul>
+	</div>
+	
 	<div class="leftcontent">
 		<h2>Recent changes</h2>
 		%(rss_content)s
 	</div>
 </div>
 
+
diff --git a/content/development/10_center b/content/development/10_center
index 62124b7..42594fe 100644
--- a/content/development/10_center
+++ b/content/development/10_center
@@ -32,7 +32,7 @@
 </div>
 
 <div class="content">
-	<h2>Acknowledgements</h2>
+	<h2>Thank you!</h2>
 	<p>The whole is nothing without its parts. We would like to thank
 	all the people for their help (in order of appearance). So, thank you!
 	:)</p>
@@ -43,3 +43,24 @@
 	</ul>
 </div>
 
+<div class="content">
+		<h2>Acknowledgements</h2>
+		<p>The CryptoBox project heavily depends on the following Free Software
+		projects. Thanks for your hard work!</p>
+		<ul>
+			<li><a href="http://kernel.org">Linux kernel</a></li>
+			<li><a href="http://debian.org">Debian GNU/Linux</a></li>
+			<li><a href="http://python.org">Python</a></li>
+			<li><a href="http://cherrypy.org">CherryPy</a></li>
+			<li><a href="http://clearsilver.net">ClearSilver</a></li>
+			<li><a href="http://www.saout.de/misc/dm-crypt">DM-crypt</a></li>
+			<li><a href="http://luks.endorphin.org">CryptSetup LUKS</a></li>
+			<li>...</li>
+		</ul>
+		<p>This list is by far incomplete - so: thanks to everyone involved in
+		improving Free Software!</p>
+	</div>
+
+
+</div>
+
diff --git a/content/download/10_center b/content/download/10_center
index cd3b619..efc6069 100644
--- a/content/download/10_center
+++ b/content/download/10_center
@@ -1,7 +1,7 @@
 <div class="content">
 	<h2>CryptoBox-CD</h2>
 	<p>Get the latest <i>CryptoBox-CD</i> image and burn the bootable live-CD.</p>
-	<p><a href="%(current-cd-url)s">Download it now!</a></p>
+	<p><a href="%(current-cd-url)s">download CryptoBox-CD</a></p>
 	<p>We would like to thank <a href="http://codecoop.org">codecoop.org</a> for
 	providing the necessary bandwidth.</p>
 	<p>Alternatively you can buy a live-CD at <a href="http://www.opensoft.nl/cdshop/product_info.php/manufacturers_id/28/products_id/71">OpenSoft.nl</a>
@@ -10,15 +10,22 @@
 </div>
 
 <div class="content">
-	<h2>CryptoBox-Server</h2>
-	<p>Install the <i>CryptoBox-Server</i> package in your favourite linux system.</p>
-	<p><a href="%(current-server-url)s">Download it now!</a></p>
-	<p>If you are a Debian/Ubuntu/... Linux user, then we strongly recommend to use
-		the <i>cryptobox-server</i> package of our (inofficial) <a
-		href="http://systemausfall.org/toolforge/debian/">debian package repository</a>
-		to stay up to date.</p>
-	<p><a
-		href="http://devel.cryptobox.org/wiki/RepositoryNotes">Read more ...</a></p>
+	<h2>CryptoBox-Server Debian package</h2>
+	<p>Install the <i>CryptoBox-Server</i> package in your Debian/Ubuntu Linux distribution.</p>
+	<p><a href="%(current-server-url)s">download CryptoBox-Server</a></p>
+	<p>Then install it: <tt>dpkg -i cryptobox-server.deb</tt></p>
+	<p>We strongly recommend to use the server package of our
+		(inofficial) debian package repository, which comes in handier. <a
+		href="http://devel.cryptobox.org/wiki/RepositoryNotes">Read
+		more ...</a></p>
+</div>
+
+<div class="content">
+	<h2>CryptoBox-Server source files</h2>
+	<p>As user of a non-debian-based Linux distribution you're a bit
+	out of luck. You may try to install the source package, but you
+	have to adapt some pathes manally.</p>
+	<p><a href="%(current-server-url)s">download cryptobox-server.tar.gz</a></p>
 </div>
 
 <div class="content">
diff --git a/content/faq/02_top b/content/faq/02_top
new file mode 100644
index 0000000..ef13a32
--- /dev/null
+++ b/content/faq/02_top
@@ -0,0 +1,15 @@
+<div class="centercontent">
+	<h2>FAQ</h2>
+	<p>Do you have any questions or problems?<ol>
+		<li>Read the 
+			<a href="http://devel.cryptobox.org/wiki/doc/0.3/CryptoBoxUserDailyUse">documentation</a>.</li>
+		<li>Read the FAQ below.</li>
+		<li>Check if your problem is a <a
+				href="http://devel.cryptobox.org/report/2">known issue</a>. Maybe you
+			could add some information.</li>
+		<li>If you think you found a bug submit a <a href="http://devel.cryptobox.org/newticket">bug report</a>.</li>
+		<li>Any questions left? Send a mail to <a
+				href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>!</li>
+	</ol></p>
+</div>
+
diff --git a/content/faq/05_left b/content/faq/05_left
new file mode 100644
index 0000000..cfe58a0
--- /dev/null
+++ b/content/faq/05_left
@@ -0,0 +1,24 @@
+<div class="left">
+	<div class="leftcontent">
+		<h2>Table of content</h2>
+
+		<ol class="toc">
+
+		<li><a href="#access_data">I successfully opened a volume.
+			How can I access the data now?</a></li>
+
+		<li><a href="#plaintext_after_partitioning">Recently I partitioned my harddisk.
+			Now I can open the volume without a password.
+			Isn't it encrypted anymore?</a></li>
+
+		<li><a href="#user_access">How can I restrict access to certain data?</a></li>
+
+		<li><a href="#use_of_users">There is a <i>user manager</i> available
+			via <i>preferences</i>. What is it good for?</a></li>
+
+		<li><a href="#use_repo">How do I use the server package from
+		the Debian Repository?</a></li>
+		</ol>
+	</div>
+</div>
+
diff --git a/content/faq/10_center b/content/faq/10_center
new file mode 100644
index 0000000..7f28b02
--- /dev/null
+++ b/content/faq/10_center
@@ -0,0 +1,55 @@
+<div class="content faq">
+	<a name="access_data"></a>
+		<h3>I successfully opened a volume. How can I access the data now?</h3>
+	<p><i>CryptoBox-Server</i>: you should ask your administrator. In case
+		you are the administrator, then you should take a look at the configuration
+		file for the <i>MountDir</i> setting. Publish this directory via your
+		favourite fileserver (e.g. samba, webdav, nfs, ftp, ...) and tell your
+		users how to reach it.</p>
+	<p><i>CryptoBox-CD</i>: browse the network neighborhood for the CryptoBox server
+		(windows), scan the network (KDE or Gnome) or type something like the
+		following into your favourite terminal to mount a volume:<br/>
+		<tt>smbmount //IP_OF_CRYPTOBOX/VOLUME_NAME /media/FOO</tt></p>
+</div>
+
+<div class="content faq">
+	<a name="plaintext_after_partitioning"></a>
+		<h3>Recently I partitioned my harddisk. Now I can open the volume without a
+			password. Isn't it encrypted anymore?</h3>
+	<p>The partition manager creates non-encrypted volumes by default. If you want
+		to enable encryption for a volume, then you have to format it. Be aware
+		that this will erase all data of the volume.</p>
+</div>
+
+<div class="content faq">
+	<a name="user_access"></a>
+		<h3>How can I restrict access to certain data?</h3>
+	<p>The CryptoBox does not support user and access management for now. Everyone
+		in your local network can access all open volumes for reading and writing.
+		This behavior is based on the assumption, that there are no evil guys in
+		your local network. Please take care for this!</p>
+	<p>For the next major release (v0.4) we plan to implement user and access
+		management.</p>
+</div>
+
+<div class="content faq">
+	<a name="use_of_users"></a>
+		<h3>There is a <i>user manager</i> available via <i>preferences</i>.
+			What is it good for?</h3>
+	<p>These administrative users can access restricted parts of the CryptoBox
+		(e.g. the plugin manager or the network settings).</p>
+	<p>Users who just want to open and close volumes do not need an
+		administrative account.</p>
+</div>
+
+<div class="content faq">
+	<a name="use_repo"></a>
+		<h3>How do I use the server package from the Debian Repository?</h3>
+	<p>The CryptoBox server package is not in the official Debian
+	Repository, for now. But you can use our Repository for the installation.</p>
+	<p>First add the following to your <i>"/etc/apt/sources.list"</i>:
+		<br /><tt>deb http://systemausfall.org/toolforge/debian unstable
+		main</tt></p>
+	<p>Second run: <br /><tt>apt-get update && apt-get install
+		cryptobox-server</tt></p>
+</div>
diff --git a/content/index/02_top b/content/index/02_top
index 8262673..a8244e5 100644
--- a/content/index/02_top
+++ b/content/index/02_top
@@ -1,13 +1,16 @@
 <div class="centercontent">
 	<h2>What is it about?</h2>
-	<p>The CryptoBox project wants to bring data encryption to the masses.</p>
+	<p>The CryptoBox project aims to bring data encryption to the masses.</p>
 	<p>Therefore we develop two Free Software packages:</p>
 	<ul>
-		<li>The <i>CryptoBox-Server package</i> adds harddisk encryption to a fileserver
-		(samba, nfs, dav, ...) without annoying its users.</li>
-		<li>The <i>CryptoBox-CD</i> is targetted at users who want to set up an
-		encrypting fileserver without bothering about complicated administration
-		issues.</li>
+		<li>The <b>CryptoBox-CD</b> is targetted at users who want to set up an
+			encrypting fileserver without bothering about complicated
+			administration issues. A computer which runs the
+			CryptoBox-CD works as a network-attached storage (NAS),
+			with the ability to encrypt all stored data.</li><br />
+		<li>The <b>CryptoBox-Server package</b> adds a user friendly,
+			web-based frontend for harddisk encryption on a fileserver.</li>
 	</ul>
+	<p>Read more <a href="details.html">details</a>.</p>
 </div>
 
diff --git a/content/index/05_left b/content/index/05_left
index 4023a25..18fdc44 100644
--- a/content/index/05_left
+++ b/content/index/05_left
@@ -1,12 +1,4 @@
 <div class="left">
-
-	<div class="leftcontent">
-		<h2>Details</h2>
-		<p>Read more <a href="details.html">detailed information</a>
-		about the CryptoBox.</p>
-		<p>Any questions left? Send a mail to <a href="mailt&#x006F;:%(mailaddress)s">%(mailaddress)s</a>!</p>	
-	</div>
-	
 	<div class="leftcontent">
 		<h2>Planned major releases:</h2>
 		<p>CryptoBox-CD:</p>