Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py	(revision 10708)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py	(revision 10709)
@@ -206,4 +206,9 @@
             elif widget.__class__.__name__ == 'IntWidget':
                 widget.cssClass = 'span2'
+            if 'address' in widget.name or \
+                'comment' in widget.name or \
+                'notice' in widget.name:
+                widget.cssClass = 'span8'
+                widget.height = 6
         if self.widgets.get('title'):
             self.widgets['title'].cssClass = 'span12'
@@ -212,22 +217,7 @@
         if self.widgets.get('phone'):
             self.widgets['phone'].cssClass = 'span4'
-        if self.widgets.get('suspended_comment'):
-            self.widgets['suspended_comment'].cssClass = 'span8'
-            self.widgets['suspended_comment'].height = 6
-        if self.widgets.get('officer_comment'):
-            self.widgets['officer_comment'].cssClass = 'span8'
-            self.widgets['officer_comment'].height = 6
-        if self.widgets.get('perm_address'):
-            self.widgets['perm_address'].cssClass = 'span8'
-            self.widgets['perm_address'].height = 6
-        if self.widgets.get('next_kin_address'):
-            self.widgets['next_kin_address'].cssClass = 'span8'
-            self.widgets['next_kin_address'].height = 6
         if self.widgets.get('transcript_comment'):
             self.widgets['transcript_comment'].cssClass = 'span12'
             self.widgets['transcript_comment'].height = 12
-        if self.widgets.get('notice'):
-            self.widgets['notice'].cssClass = 'span8'
-            self.widgets['notice'].height = 6
         if self.widgets.get('jamb_subjects'):
             self.widgets['jamb_subjects'].cssClass = 'span8'
