Index: openacs-4/packages/acs-templating/resources/forms/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/wizard.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-templating/resources/forms/wizard.adp	6 Dec 2002 09:36:50 -0000	1.2.2.1
+++ openacs-4/packages/acs-templating/resources/forms/wizard.adp	5 Mar 2003 14:57:23 -0000	1.2.2.2
@@ -53,7 +53,7 @@
 
 		  <if \@formgroup.rownum@ le \@formgroup:rowcount@>
 		    <td align=right>&nbsp;\@formgroup.widget@</td>      
-		    <td align=left>\@formgroup.label@</td> 
+		    <td align=left><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td> 
 		  </if><else><td>&nbsp;</td><td>&nbsp;</td></else>
 
 		<if \@formgroup.col@ eq 4></tr></if>
@@ -98,9 +98,13 @@
 
 </td></tr>
 
-<noparse><if \@form_properties.has_submit\@ nil></noparse>
+<noparse><if \@buttons:rowcount\@ gt 0></noparse>
   <tr>
-    <td align=right><br><input type=submit value=Submit></td>
+    <td align=right>
+      <multiple name="buttons">
+        <input type="submit" name="@buttons.name@" value="@buttons.label@">
+      </multiple>
+    </td>
   </tr>
 <noparse></if></noparse>
 <noparse><else></noparse>