4 files changed, 10 insertions, 15 deletions
diff --git a/share/skin/base/layout/action.tt b/share/skin/base/layout/action.tt
index 6fda5a1..5ef48cd 100644
--- a/share/skin/base/layout/action.tt
+++ b/share/skin/base/layout/action.tt
@@ -3,7 +3,7 @@
 <div class="action_form">
   <form action="" method="[% method %]" enctype="multipart/form-data">
     [% header  %]
-    [% field_list  %]
+    [% container_list %]
     [% buttons %]
     [% footer  %]
   </form>
@@ -11,13 +11,11 @@
 
 =for layout header
 
-=for layout field_list
+=for layout container_list
 
-<div class="action_field_list">
-  [% call_next %]
-</div>
+[% call_next %]
 
-=for layout field
+=for layout container
 
 [% call_next %]
 
diff --git a/share/skin/base/layout/object.tt b/share/skin/base/layout/object.tt
index 00816d3..8a5074a 100644
--- a/share/skin/base/layout/object.tt
+++ b/share/skin/base/layout/object.tt
@@ -1,13 +1,10 @@
 =for layout widget
 
-<div class="object_field_list">
-  [% field_list %]
-</div>
+[% container_list %]
 
-=for layout field
+=for layout container
 
-<span class="object_field">
-  [% call_next %]
-</span>
+[% call_next %]
 
 =cut
+
diff --git a/share/skin/default/layout/action.tt b/share/skin/default/layout/action.tt
index 4c32a37..a18e51d 100644
--- a/share/skin/default/layout/action.tt
+++ b/share/skin/default/layout/action.tt
@@ -1,6 +1,6 @@
 =extends NEXT
 
-=for layout field
+=for layout container
 
 [% call_next %] <br />
 
diff --git a/share/skin/default/layout/object.tt b/share/skin/default/layout/object.tt
index 20dee31..0f32321 100644
--- a/share/skin/default/layout/object.tt
+++ b/share/skin/default/layout/object.tt
@@ -1,6 +1,6 @@
 =extends NEXT
 
-=for layout field
+=for layout container
 
   [% call_next %] <br>