--- loncom/interface/lonhelper.pm	2003/05/14 20:16:56	1.29
+++ loncom/interface/lonhelper.pm	2003/05/15 16:14:52	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.29 2003/05/14 20:16:56 bowersj2 Exp $
+# $Id: lonhelper.pm,v 1.30 2003/05/15 16:14:52 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -553,11 +553,17 @@ HEADER
         <h2><i>$stateTitle</i></h2>
 HEADER
 
+    $result .= "<table><tr><td rowspan='2' valign='top'>";
+
     if (!$state->overrideForm()) {
         $result .= $self->_saveVars();
     }
-    $result .= $state->render() . "<p>&nbsp;</p>";
+    $result .= $state->render();
+
+    $result .= "</td><td valign='top'>";
 
+    # Warning: Copy and pasted from below, because it's too much trouble to 
+    # turn this into a subroutine
     if (!$state->overrideForm()) {
         $result .= '<center>';
         if ($self->{STATE} ne $self->{START_STATE}) {
@@ -568,9 +574,30 @@ HEADER
             $result .= "<a href=\"$returnPage\">End Helper</a>";
         }
         else {
-            $result .= '<input name="back" type="button" ';
+            $result .= '<nobr><input name="back" type="button" ';
             $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
-            $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" />';
+            $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>&nbsp;';
+        }
+        $result .= "</center>\n";
+    }
+
+    $result .= "</td></tr><tr><td valign='bottom'>";
+
+    # Warning: Copy and pasted from above, because it's too much trouble to 
+    # turn this into a subroutine
+    if (!$state->overrideForm()) {
+        $result .= '<center>';
+        if ($self->{STATE} ne $self->{START_STATE}) {
+            #$result .= '<input name="SUBMIT" type="submit" value="&lt;- Previous" />&nbsp;&nbsp;';
+        }
+        if ($self->{DONE}) {
+            my $returnPage = $self->{RETURN_PAGE};
+            $result .= "<a href=\"$returnPage\">End Helper</a>";
+        }
+        else {
+            $result .= '<nobr><input name="back" type="button" ';
+            $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
+            $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>';
         }
         $result .= "</center>\n";
     }
@@ -579,6 +606,8 @@ HEADER
     #    $result .= "|$key| -> " . $self->{VARS}->{$key} . "<br />";
     #}
 
+    $result .= "</td></tr></table>";
+
     $result .= <<FOOTER;
               </td>
             </tr>
@@ -684,7 +713,6 @@ sub addElement {
     push @{$self->{ELEMENTS}}, $element;
 }
 
-use Data::Dumper;
 sub render {
     my $self = shift;
     my @results = ();