--- loncom/xml/londefdef.pm	2007/09/10 19:50:20	1.376
+++ loncom/xml/londefdef.pm	2007/10/15 19:40:53	1.379
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.376 2007/09/10 19:50:20 albertel Exp $
+# $Id: londefdef.pm,v 1.379 2007/10/15 19:40:53 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -578,10 +578,10 @@ sub start_body {
 					    'force_register' => 1});
 
 	if ($env{'request.state'} ne 'published') {
-
+	    $currentstring.=&Apache::lonmenu::constspaceform();
+	    $currentstring.=&Apache::londefdef::edit_controls();
 	}
 	$currentstring.=&Apache::lonxml::message_location();
-	$currentstring.=&Apache::londefdef::edit_controls();
     } elsif ($target eq 'tex') {
 	$currentstring = '\begin{document}';  
     } 
@@ -589,8 +589,7 @@ sub start_body {
 }
 
 sub edit_controls {
-    my $result = &Apache::lonmenu::constspaceform();
-    $result .= (<<EDITBUTTON);
+    my $result .= (<<EDITBUTTON);
 <form method="post">
 <input type="submit" name="editmode" accesskey="e" value="Edit" />
 </form>
@@ -4544,6 +4543,12 @@ sub align_latex_image {
     my ($align, $latex_rendering, $image, $width, $height) = @_;
     my $currentstring;        # The 1/2 wrapped image.
     my $closure;              # The closure of the wrappage.
+
+    # if it's none just return it back
+    if ($latex_rendering eq 'none') {
+	return ($image,'');
+    }
+
     #    If there's an alignment specification we need to honor it here.
     #    For the horizontal alignments, we will also honor the
     #    value of the latex specfication.  The default is parbox,