diff --git a/prestatic/general.css b/prestatic/general.css
index f2166d3..5138a12 100644
--- a/prestatic/general.css
+++ b/prestatic/general.css
@@ -81,7 +81,6 @@ a:hover {
 h1, h2, h3, h4, h5, h6 {
     font-family: 'Dejavu Serif', FreeSerif, 'Nimbus Roman', Georgia, serif;
     font-weight: normal;
-    clear: both;
 }
 
 h1 {
@@ -388,6 +387,10 @@ div.left-float, img.left-float, video.left-float, audio.left-float  {
     display: inline;
 }
 
+.clear {
+   clear: both;
+}
+
 .noclear, div.caption.noclear {
     clear: none !important;
 }
diff --git a/site/about/index.org b/site/about/index.org
index 0e62f4b..f06f883 100644
--- a/site/about/index.org
+++ b/site/about/index.org
@@ -66,7 +66,7 @@ Get the subsites:
 ** History
 
 #+caption: This alien wonders why 'metanohi' was picked.
-#&img;url=/img/aliens/makrh.png, float=right, width=100
+#&img;url=/img/aliens/makrh.png, float=right,noclear, width=100
 
 metanohi was created in 2009 as a spinoff of earlier projects with equally
 undefined purposes.
@@ -93,6 +93,7 @@ Click to go to fullsize image.
 #&img;url=img/scr1.png,width=300,float=left,noclear,medlink,caption=Start page
 #&img;url=img/scr2.png,width=300,float=left,noclear,medlink,caption=Projects page
 #&img;url=img/scr3.png,width=300,float=left,noclear,medlink,caption=CSS fun
+#&clear
 
 ** Language
 
diff --git a/site/about/niels.org b/site/about/niels.org
index 6f15a39..87b69e8 100644
--- a/site/about/niels.org
+++ b/site/about/niels.org
@@ -92,20 +92,19 @@ Facebook. That's not me. I don't use PhageBook. I do, however, use [[http://frie
 
 *** SSH
 
-#+BEGIN_SRC
+#&pre
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0JbXv5uILGhIWrY9695Djfx9ooQ/vBlhUxMe2yCqI645sWim8QvYNllc94jkKkOkNUGCurHlselXI+wribIKbbv2ZHr7exioZrlxwjVw9V9XeL+Rvewrbb1kBQFsuzsJVZzjfx3mggn+DOW0PN+qFfrjlh0jXGC0sYYQmYSBMCjemDhWv4WkbuH7fpqjY+wpoJpmtj1Ch+5rbxoTDdhNfk+WOtLQ9mAYYrAdBvajSzDuveoTQtTeJ66alT6ii+yyODuzsm46mlbLSfNKxy7a+1Do3ZYePiB6bhLf7+huC7OGjRZ3i+1zMHP5y3ypzQGKzcCU+5f+TpMfA+8A3Ep2qw== niels@gustace
-#+END_SRC
+#&
 
 *** PGP
 
-#+BEGIN_SRC
+#&pre
 pub   2048R/225C568A 2011-08-12
 uid                  Niels Serup (nqpz) <ns@metanohi.name>
 sub   2048R/AB41DB54 2011-08-12
+#&
 
-#+END_SRC
-
-#+BEGIN_SRC
+#&pre
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
@@ -136,7 +135,7 @@ EoIaI4j9T6iYit5+nSYKcOc1F3ANGOjHSHaLXQo2TAR7O0HYu2NXF7UwO9j0l0bV
 2G3YOYxZU4UNiKHo6irbwKVolJ5A0fZHR5bz7MJyOGKP64kH
 =O8Gy
 -----END PGP PUBLIC KEY BLOCK-----
-#+END_SRC
+#&
 
 
 ** Misc.
diff --git a/site/projects/mege/tests/basics.org b/site/projects/mege/tests/basics.org
index a4bdaf7..b56d1b3 100644
--- a/site/projects/mege/tests/basics.org
+++ b/site/projects/mege/tests/basics.org
@@ -76,6 +76,7 @@ Another list:
 A test picture
 #&
 #&img;url=test0.png, width=210, float=right
+#&clear
 
 ** Links