Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -r1.7.2.156 -r1.7.2.157
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	5 Aug 2021 14:30:35 -0000	1.7.2.156
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	26 Aug 2021 12:49:27 -0000	1.7.2.157
@@ -133,7 +133,7 @@
 
   TestItemField instproc twocol_layout {} {
     return [expr {[${:parent_field} get_named_sub_component_value -default 0 twocol]
-                  ? "col-sm-6" : ""}]
+                  ? "col-sm-6" : "col-xs-12"}]
   }
 
 
@@ -602,7 +602,7 @@
         "</form>\n"
     append fc \
         "@categories:off @cr_fields:hidden\n" \
-        "{answer:[:dict_to_fc -type textarea $fc_dict]}"        
+        "{answer:[:dict_to_fc -type textarea $fc_dict]}"
 
     #ns_log notice "text_interaction $form\n$fc"
     ${:object} set_property -new 1 form $form
@@ -1122,9 +1122,11 @@
     [${:parent_field} get_named_sub_component points] value $total_points
 
     append form \
-        "<form class='row'>\n" \
+        "<form>\n" \
+        "<div class='composite_interaction row'>$intro_text</div>\n" \
         "<div class='question_text first-column $twocol'>$intro_text</div>\n" \
         "<div class='second-column $twocol'>$aggregatedForm</div>\n" \
+        "</div>" \
         "</form>\n"
 
     ${:object} set_property -new 1 form $form
@@ -2512,17 +2514,21 @@
     :method get_non_empty_file_formfields {
       {-submission:object}
     } {
-      set objs [lmap {name obj} [$submission set __form_fields] {set obj}]
+      if {[$submission exists __form_fields]} {
+        set objs [lmap {name obj} [$submission set __form_fields] {set obj}]
 
-      #
-      # Filter out the form-fields, which have a nonempty
-      # revision_id.
-      #
-      return [::xowiki::formfield::child_components \
-                  -filter {[$_ hasclass "::xowiki::formfield::file"]
-                    && [dict exists [$_ value] revision_id]
-                    && [dict get [$_ value] revision_id] ne ""} \
-                  $objs]
+        #
+        # Filter out the form-fields, which have a nonempty
+        # revision_id.
+        #
+        return [::xowiki::formfield::child_components \
+                    -filter {[$_ hasclass "::xowiki::formfield::file"]
+                      && [dict exists [$_ value] revision_id]
+                      && [dict get [$_ value] revision_id] ne ""} \
+                    $objs]
+      } else {
+        return ""
+      }
     }
 
     #----------------------------------------------------------------------
@@ -4791,7 +4797,7 @@
         [expr {[llength $review_periods] > 0 ? "#xowf.inclass-exam-review#: [join $review_periods {, }]<br>" : ""}]
         </p>
       }]
-      return $text
+      return "<div class='exam-info-block'>$text</div>"
     }
 
     #----------------------------------------------------------------------
Index: openacs-4/packages/xowf/www/resources/test-item.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/resources/test-item.css,v
diff -u -r1.1.2.36 -r1.1.2.37
--- openacs-4/packages/xowf/www/resources/test-item.css	29 Jul 2021 13:12:20 -0000	1.1.2.36
+++ openacs-4/packages/xowf/www/resources/test-item.css	26 Aug 2021 12:49:27 -0000	1.1.2.37
@@ -18,7 +18,7 @@
 div.single_exam div.runtime-data {
     background: #efefef;
     color: black;
-    padding: 2px 10px 4px 12px;
+    padding: 2px 10px 4px 10px;
 }
 div.single_exam div.runtime-data .data {
     color: #888;
@@ -33,6 +33,9 @@
 div.single_exam div.runtime-data .revision-details {
     text-align: right;
 }
+div.single_exam > form {
+    padding: 15px;
+}
 
 div.panel a.link-disabled {
     pointer-events: none;
@@ -110,7 +113,7 @@
 div.short_text_interaction,
 div.text_interaction,
 div.reorder_interaction {
-    padding: 15px 0px 0px 15px;
+    padding: 15px 0px 15px 0px;
 }
 div.mc_interaction label,
 div.sc_interaction label {