diff --git a/browser/common.py b/browser/common.py
index d710383..051c734 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -412,8 +412,8 @@ class BaseView(GenericView, I18NView):
         cm.register('js-execute', jsCall, jsCall=jsCall)
         cm.register('css', identifier='tundra.css', position=0,
                     resourceName='ajax.dojo/dijit/themes/tundra/tundra.css', media='all')
-        cm.register('css', identifier='dojo.css', position=1,
-                    resourceName='ajax.dojo/dojo/resources/dojo.css', media='all')
+        #cm.register('css', identifier='dojo.css', position=1,
+        #            resourceName='ajax.dojo/dojo/resources/dojo.css', media='all')
 
     def registerDojoDateWidget(self):
         self.registerDojo()
diff --git a/browser/loops.css b/browser/loops.css
index d272f81..0e483b4 100644
--- a/browser/loops.css
+++ b/browser/loops.css
@@ -5,12 +5,15 @@
 
 */
 
+/* general */
+
 a[href]:hover {
     text-decoration: none;
     color: #803000;
 }
 
 pre {
+    font-size: 100%;
     background-color: #f4f4f4;
     overflow: scroll;
     max-height: 35em;
@@ -21,6 +24,12 @@ ul, p {
     margin-bottom: 0.5em;
 }
 
+ol li, ul li {
+    line-height: 1.5em;
+}
+
+/* class-specific */
+
 table.listing td {
     white-space: normal;
 }
@@ -63,31 +72,30 @@ fieldset.box td {
 }
 
 .content-1 h1, h1 {
-    font-size: 160%;
+    font-size: 180%;
     margin-top: 0.8em;
-    padding-bottom: 3px;
 }
 
 .content-2 h1, .content-1 h2, h2 {
-    font-size: 140%;
+    font-size: 160%;
     font-weight: normal;
     margin-top: 0.7em;
 }
 
 .content-3 h1, .content-2 h2, .content-1 h3, h3 {
-    font-size: 130%;
+    font-size: 145%;
     font-weight: normal;
     margin-top: 0.7em;
 }
 
 .content-4 h1, .content-3 h2, .content-2 h3, .content-1 h4, h4 {
-    font-size: 120%;
+    font-size: 125%;
     font-weight: normal;
     margin-top: 0.7em;
 }
 
 .content-5 h1, .content-4 h2, .content-3 h3, content-2 h4 {
-    font-size: 100%;
+    font-size: 110%;
     border: none;
     margin-top: 0.7em;
 }
diff --git a/organize/browser/event.py b/organize/browser/event.py
index 192af9b..94eb360 100644
--- a/organize/browser/event.py
+++ b/organize/browser/event.py
@@ -22,6 +22,7 @@ Definition of view classes and other browser related stuff for tasks.
 $Id$
 """
 
+from datetime import datetime
 from zope import interface, component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
@@ -59,7 +60,11 @@ class Events(ConceptView):
         cm = self.loopsRoot.getConceptManager()
         tEvent = cm['event']
         hasType = cm.getTypePredicate()
-        sort = lambda x: adapted(x.second).start
-        for r in tEvent.getChildRelations([hasType], sort=sort):
-            yield self.childViewFactory(r, self.request, contextIsSecond=True)
+        sort = lambda x: x.adapted.start
+        now = datetime.today()
+        relViews = (self.childViewFactory(r, self.request, contextIsSecond=True)
+                        for r in tEvent.getChildRelations([hasType], sort=None))
+        return sorted((rv for rv in relViews
+                          if not rv.adapted.end or rv.adapted.end >= now),
+                      key=sort)