--- loncom/homework/grades.pm	2019/02/05 16:13:05	1.596.2.12.2.41.2.4
+++ loncom/homework/grades.pm	2020/02/12 16:25:56	1.762
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.41.2.4 2019/02/05 16:13:05 raeburn Exp $
+# $Id: grades.pm,v 1.762 2020/02/12 16:25:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,8 +43,13 @@ use Apache::lonmsg();
 use Apache::Constants qw(:common :http);
 use Apache::lonlocal;
 use Apache::lonenc;
+use Apache::lonstathelpers;
+use Apache::lonquickgrades;
 use Apache::bridgetask();
+use Apache::lontexconvert();
 use String::Similarity;
+use HTML::Parser();
+use File::MMagic;
 use LONCAPA;
 
 use POSIX qw(floor);
@@ -98,6 +103,9 @@ sub ssi_print_error {
 
 #
 # --- Retrieve the parts from the metadata file.---
+# Returns an array of everything that the resources stores away
+#
+
 sub getpartlist {
     my ($symb,$errorref) = @_;
 
@@ -111,7 +119,11 @@ sub getpartlist {
     my $res      = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
     my $url      = $res->src();
-    my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+    my $toolsymb;
+    if ($url =~ /ext\.tool$/) {
+        $toolsymb = $symb;
+    }
+    my @metakeys = split(/,/,&Apache::lonnet::metadata($url,'keys',$toolsymb));
 
     my @stores;
     foreach my $part (@{ $partlist }) {
@@ -122,24 +134,6 @@ sub getpartlist {
     return @stores;
 }
 
-# --- Get the symbolic name of a problem and the url
-sub get_symb {
-    my ($request,$silent) = @_;
-    my $symb=$env{'form.symb'};
-    unless ($symb) {
-        (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-        $symb = &Apache::lonnet::symbread($url);
-        if ($symb eq '') { 
-	    if (!$silent) {
-                $request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
-	        return ();
-	    }
-        }
-    }
-    &Apache::lonenc::check_decrypt(\$symb);
-    return ($symb);
-}
-
 #--- Format fullname, username:domain if different for display
 #--- Use anywhere where the student names are listed
 sub nameUserString {
@@ -154,6 +148,7 @@ sub nameUserString {
 
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
+#--- Sets response_error pointer to "1" if navmaps object broken ---
 sub response_type {
     my ($symb,$response_error) = @_;
 
@@ -212,55 +207,6 @@ sub get_display_part {
     return $display;
 }
 
-#--- Show resource title
-#--- and parts and response type
-sub showResourceInfo {
-    my ($symb,$probTitle,$checkboxes,$res_error) = @_;
-    my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
-    if (ref($res_error)) {
-        if ($$res_error) {
-            return;
-        }
-    }
-    $result.=&Apache::loncommon::start_data_table()
-            .&Apache::loncommon::start_data_table_header_row();
-    if ($checkboxes) {
-        $result.='<th>&nbsp;</th>';
-    }
-    $result.='<th>'.&mt('Problem Part').'</th>'
-            .'<th>'.&mt('Res. ID').'</th>'
-            .'<th>'.&mt('Type').'</th>'
-            .&Apache::loncommon::end_data_table_header_row();
-    my %resptype = ();
-    my $hdgrade='no';
-    my %partsseen;
-    foreach my $partID (sort(keys(%$responseType))) {
-        foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
-            my $handgrade=$$handgrade{$partID.'_'.$resID};
-            my $responsetype = $responseType->{$partID}->{$resID};
-            $hdgrade = $handgrade if ($handgrade eq 'yes');
-            $result.=&Apache::loncommon::start_data_table_row();
-            if ($checkboxes) {
-                if (exists($partsseen{$partID})) {
-                    $result.="<td>&nbsp;</td>";
-                } else {
-                    $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
-                }
-                $partsseen{$partID}=1;
-            }
-            my $display_part=&get_display_part($partID,$symb);
-            $result.='<td>'.$display_part.'</td>'
-                    .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
-                    .'<td>'.&mt($responsetype).'</td>'
-#                   .'<td><b>'.&mt('Handgrade: [_1]',$handgrade).'</b></td>'
-                    .&Apache::loncommon::end_data_table_row();
-        }
-    }
-    $result.=&Apache::loncommon::end_data_table();
-    return $result,$responseType,$hdgrade,$partlist,$handgrade;
-}
-
 sub reset_caches {
     &reset_analyze_cache();
     &reset_perm();
@@ -369,7 +315,7 @@ sub reset_caches {
                     $add_to_form = { 'code_for_randomlist' => $scancode,};
                 }
             }
-            my $analyze =
+            my $analyze = 
                 &get_analyze($symb,$uname,$udom,undef,$add_to_form,
                              undef,undef,undef,$bubbles_per_row);
             if (ref($analyze) eq 'HASH') {
@@ -399,7 +345,7 @@ sub cleanRecord {
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
+        %answer = map {&HTML::Entities::encode($_, '"<>&')}  @answer;
 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
 	my ($toprow,$bottomrow);
 	foreach my $foil (@$order) {
@@ -417,7 +363,7 @@ sub cleanRecord {
     } elsif ($response eq 'match') {
 	my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
+        %answer = map {&HTML::Entities::encode($_, '"<>&')}  @answer;
 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
 	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
 	my ($toprow,$middlerow,$bottomrow);
@@ -440,6 +386,8 @@ sub cleanRecord {
 	    $bottomrow.'</tr></table></blockquote>';
     } elsif ($response eq 'radiobutton') {
 	my %answer=&Apache::lonnet::str2hash($answer);
+        my @answer = %answer;
+        %answer = map {&HTML::Entities::encode($_, '"<>&')}  @answer;
 	my ($toprow,$bottomrow);
 	my $correct = 
 	    &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);
@@ -472,7 +420,9 @@ sub cleanRecord {
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
+        $answer = &Apache::lontexconvert::msgtexconverted($answer);
 	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
+
     } elsif ( $response eq 'organic') {
         my $result=&mt('Smile representation: [_1]',
                            '"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"');
@@ -510,11 +460,11 @@ sub cleanRecord {
 	    return $result;
 	}
     } elsif ( $response =~ m/(?:numerical|formula|custom)/) {
-        # Respect multiple input fields, see Bug #5409 
+        # Respect multiple input fields, see Bug #5409
 	$answer = 
 	    &Apache::loncommon::format_previous_attempt_value('submission',
 							      $answer);
-        return $answer;
+	return $answer;
     }
     return &HTML::Entities::encode($answer, '"<>&');
 }
@@ -522,8 +472,7 @@ sub cleanRecord {
 #-- A couple of common js functions
 sub commonJSfunctions {
     my $request = shift;
-    $request->print(<<COMMONJSFUNCTIONS);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<COMMONJSFUNCTIONS));
     function radioSelection(radioButton) {
 	var selection=null;
 	if (radioButton.length > 1) {
@@ -551,14 +500,13 @@ sub commonJSfunctions {
 	    return selectOne.value;
 	}
     }
-</script>
 COMMONJSFUNCTIONS
 }
 
 #--- Dumps the class list with usernames,list of sections,
 #--- section, ids and fullnames for each user.
 sub getclasslist {
-    my ($getsec,$filterlist,$getgroup) = @_;
+    my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;
     my @getsec;
     my @getgroup;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -586,6 +534,13 @@ sub getclasslist {
     #
     my %sections;
     my %fullnames;
+    my ($cdom,$cnum,$partlist);
+    if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
+        $cdom = $env{"course.$env{'request.course.id'}.domain"};
+        $cnum = $env{"course.$env{'request.course.id'}.num"};
+        my $res_error;
+        ($partlist,my $handgrade,my $responseType) = &response_type($symb,\$res_error);
+    }
     foreach my $student (keys(%$classlist)) {
         my $end      = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
@@ -602,7 +557,7 @@ sub getclasslist {
         my $group   = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
 	# filter students according to status selected
-	if ($filterlist && (!($stu_status =~ /Any/))) {
+	if ($filterbyaccstatus && (!($stu_status =~ /Any/))) {
 	    if (!($stu_status =~ $status)) {
 		delete($classlist->{$student});
 		next;
@@ -619,13 +574,58 @@ sub getclasslist {
     	            } 
 	        }
     	        if (($grp eq 'none') && !$group) {
-        	        $exclude = 0;
+        	    $exclude = 0;
         	}
 	    }
 	    if ($exclude) {
 	        delete($classlist->{$student});
+		next;
 	    }
 	}
+        if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
+            my $udom =
+                $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];
+            my $uname =
+                $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];
+            if (($symb ne '') && ($udom ne '') && ($uname ne '')) {
+                if ($submitonly eq 'queued') {
+                    my %queue_status =
+                        &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
+                                                                $udom,$uname);
+                    if (!defined($queue_status{'gradingqueue'})) {
+                        delete($classlist->{$student});
+                        next;
+                    }
+                } else {
+                    my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
+                    my $submitted = 0;
+                    my $graded = 0;
+                    my $incorrect = 0;
+                    foreach (keys(%status)) {
+                        $submitted = 1 if ($status{$_} ne 'nothing');
+                        $graded = 1 if ($status{$_} =~ /^ungraded/);
+                        $incorrect = 1 if ($status{$_} =~ /^incorrect/);
+
+                        my ($foo,$partid,$foo1) = split(/\./,$_);
+                        if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+                            $submitted = 0;
+                        }
+                    }
+                    if (!$submitted && ($submitonly eq 'yes' ||
+                                        $submitonly eq 'incorrect' ||
+                                        $submitonly eq 'graded')) {
+                        delete($classlist->{$student});
+                        next;
+                    } elsif (!$graded && ($submitonly eq 'graded')) {
+                        delete($classlist->{$student});
+                        next;
+                    } elsif (!$incorrect && $submitonly eq 'incorrect') {
+                        delete($classlist->{$student});
+                        next;
+                    }
+                }
+            }
+        }
 	$section = ($section ne '' ? $section : 'none');
 	if (&canview($section)) {
 	    if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
@@ -640,7 +640,6 @@ sub getclasslist {
 	    delete($classlist->{$student});
 	}
     }
-    my %seen = ();
     my @sections = sort(keys(%sections));
     return ($classlist,\@sections,\%fullnames);
 }
@@ -706,17 +705,15 @@ sub student_gradeStatus {
 sub jscriptNform {
     my ($symb) = @_;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
-    my $jscript='<script type="text/javascript" language="javascript">'."\n".
+    my $jscript= &Apache::lonhtmlcommon::scripttag(
 	'    function viewOneStudent(user,domain) {'."\n".
 	'	document.onestudent.student.value = user;'."\n".
 	'	document.onestudent.userdom.value = domain;'."\n".
 	'	document.onestudent.submit();'."\n".
 	'    }'."\n".
-	'</script>'."\n";
+	"\n");
     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
 	'<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
 	'<input type="hidden" name="command" value="submission" />'."\n".
 	'<input type="hidden" name="student" value="" />'."\n".
@@ -810,22 +807,31 @@ sub most_similar {
 
 #------------------------------------ Receipt Verification Routines
 #
+
+sub initialverifyreceipt {
+   my ($request,$symb) = @_;
+   &commonJSfunctions($request);
+   return '<form name="gradingMenu" action=""><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'.
+        &Apache::lonnet::recprefix($env{'request.course.id'}).
+        '-<input type="text" name="receipt" size="4" />'.
+        '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+        '<input type="hidden" name="command" value="verify" />'.
+        "</form>\n";
+}
+
 #--- Check whether a receipt number is valid.---
 sub verifyreceipt {
-    my $request  = shift;
+    my ($request,$symb)  = @_;
 
     my $courseid = $env{'request.course.id'};
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
 	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
-    my ($symb)   = &get_symb($request);
 
     my $title.=
 	'<h3><span class="LC_info">'.
-	&mt('Verifying Receipt No. [_1]',$receipt).
-	'</span></h3>'."\n".
-	'<h4>'.&mt('[_1]Resource: [_2]','<b>','</b>'.$env{'form.probTitle'}).
-	'</h4>'."\n";
+	&mt('Verifying Receipt Number [_1]',$receipt).
+	'</span></h3>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -895,7 +901,7 @@ sub verifyreceipt {
 	    $contents.
 	    &Apache::loncommon::end_data_table()."\n";
     }
-    return $string.&show_grading_menu_form($symb);
+    return $string;
 }
 
 #--- This is called by a number of programs.
@@ -903,31 +909,27 @@ sub verifyreceipt {
 #--- Also called directly when one clicks on the subm button 
 #    on the problem page.
 sub listStudents {
-    my ($request) = shift;
+    my ($request,$symb,$submitonly) = @_;
 
-    my ($symb) = &get_symb($request);
+    my $is_tool   = ($symb =~ /ext\.tool$/);
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
-    my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
-    my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
-    $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
-	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-
-    my $result='<h3><span class="LC_info">&nbsp;'
-	.&mt("$viewgrade Submissions for a Student or a Group of Students")
-	.'</span></h3>';
+    unless ($submitonly) {
+       $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+    }
 
-    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+    my $result='';
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
 
     my %js_lt = &Apache::lonlocal::texthash (
 		'multiple' => 'Please select a student or group of students before clicking on the Next button.',
 		'single'   => 'Please select the student before clicking on the Next button.',
 	     );
     &js_escape(\%js_lt);
-    $request->print(<<LISTJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
     function checkSelect(checkBox) {
 	var ctr=0;
 	var sense="";
@@ -956,54 +958,75 @@ sub listStudents {
 	formname.command.value = 'submission';
 	formname.submit();
     }
-</script>
 LISTJAVASCRIPT
 
     &commonJSfunctions($request);
     $request->print($result);
 
-    my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
-    my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
-	"\n".$table;
+	"\n";
 	
     $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
-                  .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
-                  .'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"
-                  .'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"
-                  .&Apache::lonhtmlcommon::row_closure();
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
-                  .'<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n"
-                  .'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
-                  .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
-                  .&Apache::lonhtmlcommon::row_closure();
+    unless ($is_tool) {
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
+                      .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
+                      .'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"
+                      .'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"
+                      .&Apache::lonhtmlcommon::row_closure();
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
+                      .'<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n"
+                      .'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
+                      .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
+                      .&Apache::lonhtmlcommon::row_closure();
+    }
 
     my $submission_options;
-    if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
-	$submission_options.=
-	    '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
-    }
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
     $env{'form.Status'} = $saveStatus;
+    my %optiontext;
+    if ($is_tool) {
+        %optiontext = &Apache::lonlocal::texthash (
+                          lastonly => 'last transaction',
+                          last     => 'last transaction with details',
+                          datesub  => 'all transactions',
+                          all      => 'all transactions with details',
+                      );
+    } else {
+        %optiontext = &Apache::lonlocal::texthash (
+                          lastonly => 'last submission',
+                          last     => 'last submission with details',
+                          datesub  => 'all submissions',
+                          all      => 'all submissions with details',
+                      );
+    }
     $submission_options.=
         '<span class="LC_nobreak">'.
-        '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
-        &mt('last submission only').' </label></span>'."\n".
+        '<label><input type="radio" name="lastSub" value="lastonly" /> '.
+        $optiontext{'lastonly'}.' </label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="last" /> '.
-        &mt('last submission &amp; parts info').' </label></span>'."\n".
+        $optiontext{'last'}.' </label></span>'."\n".
         '<span class="LC_nobreak">'.
-        '<label><input type="radio" name="lastSub" value="datesub" /> '.
-        &mt('by dates and submissions').'</label></span>'."\n".
+        '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.
+        $optiontext{'datesub'}.'</label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="all" /> '.
-        &mt('all details').'</label></span>';
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
+        $optiontext{'all'}.'</label></span>';
+    my $viewtitle;
+    if ($is_tool) {
+        $viewtitle = &mt('View Transactions');
+    } else {
+        $viewtitle = &mt('View Submissions');
+    }
+    $gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle)
                   .$submission_options
                   .&Apache::lonhtmlcommon::row_closure();
 
+    my $closure;
+    if (($is_tool) && (exists($env{'form.Status'}))) {
+        $closure = 1;
+    }
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
                   .'<select name="increment">'
                   .'<option value="1">'.&mt('Whole Points').'</option>'
@@ -1011,34 +1034,41 @@ LISTJAVASCRIPT
                   .'<option value=".25">'.&mt('Quarter Points').'</option>'
                   .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
                   .'</select>'
-                  .&Apache::lonhtmlcommon::row_closure();
+                  .&Apache::lonhtmlcommon::row_closure($closure);
 
     $gradeTable .= 
         &build_section_inputs().
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
-	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
-	'<input type="hidden" name="saveState"   value="'.$env{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="probTitle"   value="'.$env{'form.probTitle'}.'" />'."\n".
 	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
 
-    if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
+    if (exists($env{'form.Status'})) {
 	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {
+        if ($is_tool) {
+            $closure = 1;
+        }
         $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
                       .&Apache::lonhtmlcommon::StatusOptions(
                            $saveStatus,undef,1,'javascript:reLoadList(this.form);')
-                      .&Apache::lonhtmlcommon::row_closure();
+                      .&Apache::lonhtmlcommon::row_closure($closure);
     }
 
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
-                  .'<input type="checkbox" name="checkPlag" checked="checked" />'
-                  .&Apache::lonhtmlcommon::row_closure(1)
-                  .&Apache::lonhtmlcommon::end_pick_box();
-
+    unless ($is_tool) {
+        $closure = 1;
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
+                      .'<input type="checkbox" name="checkPlag" checked="checked" />'
+                      .&Apache::lonhtmlcommon::row_closure($closure);
+    }
+    $gradeTable .= &Apache::lonhtmlcommon::end_pick_box();
+    my $regrademsg;
+    if ($is_tool) {
+        $regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button.");
+    } else {
+        $regrademsg = &mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.");
+    }
     $gradeTable .= '<p>'
-                  .&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"
+                  .$regrademsg."\n"
                   .'<input type="hidden" name="command" value="processGroup" />'
                   .'</p>';
 
@@ -1055,9 +1085,7 @@ LISTJAVASCRIPT
     while ($loop < 2) {
 	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
 	    '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';
-	if ($env{'form.showgrading'} eq 'yes' 
-	    && $submitonly ne 'queued'
-	    && $submitonly ne 'all') {
+	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
 	    foreach my $part (sort(@$partlist)) {
 		my $display_part=
 		    &get_display_part((split(/_/,$part))[0],$symb);
@@ -1093,9 +1121,7 @@ LISTJAVASCRIPT
 	    $status{'gradingqueue'} = $queue_status{'gradingqueue'};
 	}
 
-	if ($env{'form.showgrading'} eq 'yes' 
-	    && $submitonly ne 'queued'
-	    && $submitonly ne 'all') {
+	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
 	    (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
 	    my $submitted = 0;
 	    my $graded = 0;
@@ -1136,7 +1162,7 @@ LISTJAVASCRIPT
 	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
 	       '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
 
-	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    if ($submitonly ne 'all') {
 		foreach (sort(keys(%status))) {
 		    next if ($_ =~ /^resource.*?submitted_by$/);
 		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
@@ -1150,9 +1176,7 @@ LISTJAVASCRIPT
     }
     if ($ctr%2 ==1) {
 	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
-	    if ($env{'form.showgrading'} eq 'yes' 
-		&& $submitonly ne 'queued'
-		&& $submitonly ne 'all') {
+	    if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
 		foreach (@$partlist) {
 		    $gradeTable.='<td>&nbsp;</td>';
 		}
@@ -1183,7 +1207,6 @@ LISTJAVASCRIPT
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
     }
-    $gradeTable.=&show_grading_menu_form($symb);
     $request->print($gradeTable);
     return '';
 }
@@ -1192,7 +1215,7 @@ LISTJAVASCRIPT
 
 sub check_script {
     my ($form, $type)=@_;
-    my $chkallscript='<script type="text/javascript">
+    my $chkallscript= &Apache::lonhtmlcommon::scripttag('
     function checkall() {
         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
             ele = document.forms.'.$form.'.elements[i];
@@ -1223,7 +1246,7 @@ sub check_script {
         }
     }
 
-</script>'."\n";
+'."\n");
     return $chkallscript;
 }
 
@@ -1237,7 +1260,7 @@ sub check_buttons {
 
 #     Displays the submissions for one student or a group of students
 sub processGroup {
-    my ($request)  = shift;
+    my ($request,$symb)  = @_;
     my $ctr        = 0;
     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;
@@ -1247,7 +1270,7 @@ sub processGroup {
 	$env{'form.student'}        = $uname;
 	$env{'form.userdom'}        = $udom;
 	$env{'form.fullname'}       = $fullname;
-	&submission($request,$ctr,$total);
+	&submission($request,$ctr,$total,$symb);
 	$ctr++;
     }
     return '';
@@ -1263,8 +1286,7 @@ sub sub_page_js {
     my $request = shift;
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     &js_escape(\$alertmsg);
-    $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
     function updateRadio(formname,id,weight) {
 	var gradeBox = formname["GD_BOX"+id];
 	var radioButton = formname["RADVAL"+id];
@@ -1384,13 +1406,6 @@ sub sub_page_js {
 		}
 	    }
 	}
-	if (val == "Grade Student") {
-	    formname.showgrading.value = "yes";
-	    if (formname.Status.value == "") {
-		formname.Status.value = "Active";
-	    }
-	    formname.studentNo.value = total;
-	}
 	formname.submit();
     }
 
@@ -1430,7 +1445,6 @@ sub sub_page_js {
 
 	formname.submit();
     }
-</script>
 SUBJAVASCRIPT
 }
 
@@ -1440,8 +1454,8 @@ sub sub_page_kw_js {
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
 
-    my $inner_js_msg_central=<<INNERJS;
-    <script text="text/javascript">
+    my $inner_js_msg_central= (<<INNERJS);
+<script type="text/javascript">
     function checkInput() {
       opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
       var nmsg   = opener.document.SCORE.savemsgN.value;
@@ -1478,11 +1492,11 @@ sub sub_page_kw_js {
       self.close()
 
     }
-    </script>
+</script>
 INNERJS
 
-    my $inner_js_highlight_central=<<INNERJS;
- <script type="text/javascript">
+    my $inner_js_highlight_central= (<<INNERJS);
+<script type="text/javascript">
     function updateChoice(flag) {
       opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
       opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
@@ -1547,8 +1561,7 @@ INNERJS
     &js_escape(\%js_lt);
     &html_escape(\%html_js_lt);
     &js_escape(\%html_js_lt);
-    $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
 
 //===================== Show list of keywords ====================
   function keywords(formname) {
@@ -1662,39 +1675,38 @@ INNERJS
 
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/span><\\/h3><br /><br />");
+    pDoc.write("<h1>&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/h1>");
 
-    pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
-    pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
-    pDoc.write("<td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");
+    pDoc.write('<table style="border:1px solid black;"><tr>');
+    pDoc.write("<td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");
 }
     function displaySubject(msg,shwsel) {
     pDoc = pWin.document;
-    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
-    pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");
+    pDoc.write("<tr>");
     pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
-    pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
+    pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");
+    pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");
 }
 
   function displaySavedMsg(ctr,msg,shwsel) {
     pDoc = pWin.document;
-    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
-    pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
+    pDoc.write("<tr>");
     pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+    pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
     pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");
 }
 
   function newMsg(newmsg,shwsel) {
     pDoc = pWin.document;
-    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
-    pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");
+    pDoc.write("<tr>");
     pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+    pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");
     pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
 }
 
   function msgTail() {
     pDoc = pWin.document;
-    pDoc.write("<\\/table>");
+    //pDoc.write("<\\/table>");
     pDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
     pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
     pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
@@ -1784,7 +1796,6 @@ INNERJS
     hDoc.close();
   }
 
-</script>
 SUBJAVASCRIPT
 }
 
@@ -1873,7 +1884,8 @@ sub gradeBox {
 
     $result .= 
 	    '<td>'.$data_WGT.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
-    $result.=&Apache::loncommon::end_data_table_row().'<td colspan="6">';
+    $result.=&Apache::loncommon::end_data_table_row();
+    $result.=&Apache::loncommon::start_data_table_row().'<td colspan="6">';
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
 	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
@@ -1892,8 +1904,8 @@ sub gradeBox {
 }
 
 sub handback_box {
-    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);
     my (@respids);
     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
@@ -1912,7 +1924,7 @@ sub handback_box {
 	    if ($file =~ /\/portfolio\//) {
                 $file_counter++;
     	        my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
-    	        my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+    	        my ($name,$version,$ext) = &Apache::lonnet::file_name_version_ext($file_disp);
     	        $file_disp = "$name.$ext";
     	        $file = $file_path.$file_disp;
     	        $result.=&mt('Return commented version of [_1] to student.',
@@ -1995,7 +2007,6 @@ sub show_problem {
 sub files_exist {
     my ($r, $symb) = @_;
     my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');
-
     foreach my $student (@students) {
         my ($uname,$udom,$fullname) = split(/:/,$student);
         my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
@@ -2014,6 +2025,10 @@ sub files_exist {
 
 sub download_all_link {
     my ($r,$symb) = @_;
+    unless (&files_exist($r, $symb)) {
+       $r->print(&mt('There are currently no submitted documents.'));
+       return;
+    }
     my $all_students = 
 	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
 
@@ -2026,7 +2041,62 @@ sub download_all_link {
                              'cgi.'.$identifier.'.parts' => $parts,});
     $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
 	      &mt('Download All Submitted Documents').'</a>');
-    return
+    return;
+}
+
+sub submit_download_link {
+    my ($request,$symb) = @_;
+    if (!$symb) { return ''; }
+#FIXME: Figure out which type of problem this is and provide appropriate download
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+    if (ref($res_error)) {
+        if ($$res_error) {
+            $request->print(&mt('An error occurred retrieving response types'));
+            return;
+        }
+    }
+    my ($numupload,$numessay) = (0,0);
+    if (ref($responseType) eq 'HASH') {
+        foreach my $part (sort(keys(%$responseType))) {
+            foreach my $id (sort(keys(%{ $responseType->{$part} }))) {
+                my $responsetype = $responseType->{$part}->{$id};
+                if ($responsetype eq 'essay') {
+                    my $uploadedfiletypes =
+                        &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes",$symb);
+                    if ($uploadedfiletypes) {
+                        $numupload++;
+                    } else {
+                        $numessay++;
+                    }
+                }
+            }
+        }
+    }
+    if (($numupload) || ($numessay)) {
+        my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+        my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+        my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
+        (undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1);
+        if (ref($fullname) eq 'HASH') {
+            my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
+            if (@students) {
+                @{$env{'form.stuinfo'}} = @students;
+                if ($numupload) {
+                    &download_all_link($request,$symb);
+                }
+# FIXME Need to provide a mechanism to download essays, i.e., if $numessay > 0
+# Needs to omit user's identity if resource instance is for an anonymous survey.
+            } else {
+                $request->print(&mt('No students match the criteria you selected'));
+            }
+        } else {
+            $request->print(&mt('Could not retrieve student information'));
+        }
+    } else {
+        $request->print(&mt('No essayresponse items found'));
+    }
+    return;
 }
 
 sub build_section_inputs {
@@ -2044,13 +2114,16 @@ sub build_section_inputs {
 
 # --------------------------- show submissions of a student, option to grade 
 sub submission {
-    my ($request,$counter,$total) = @_;
+    my ($request,$counter,$total,$symb) = @_;
     my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
     $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
     $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
-    my ($symb) = &get_symb($request); 
+
+    my $probtitle=&Apache::lonnet::gettitle($symb); 
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
+    my $is_tool = ($symb =~ /ext\.tool$/);
+    my ($essayurl,%coursedesc_by_cid);
 
     if (!&canview($usec)) {
         $request->print(
@@ -2059,13 +2132,14 @@ sub submission {
             ' '.&mt('([_1] in section [_2] in course id [_3])',
                         $uname.':'.$udom,$usec,$env{'request.course.id'}).
             '</span>');
-	$request->print(&show_grading_menu_form($symb));
 	return;
     }
 
     if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
-    if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
-    if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
+    unless ($is_tool) { 
+        if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
+        if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
+    }
     my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
     my $checkIcon = '<img alt="'.&mt('Check Mark').
 	'" src="'.$request->dir_config('lonIconsURL').
@@ -2074,14 +2148,7 @@ sub submission {
     # header info
     if ($counter == 0) {
 	&sub_page_js($request);
-	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
-	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
-	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
-	    &download_all_link($request, $symb);
-	}
-	$request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
-			'<h4>&nbsp;'.&mt('[_1]Resource: [_2]','<b>','</b>'.$env{'form.probTitle'}).'</h4>'."\n");
+	&sub_page_kw_js($request);
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
@@ -2101,7 +2168,8 @@ sub submission {
 	# kwclr is the only variable that is guaranteed not to be blank 
         # if this subroutine has been called once.
 	my %keyhash = ();
-	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
+#	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
+        if (1) {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
 					     $env{'course.'.$env{'request.course.id'}.'.domain'},
 					     $env{'course.'.$env{'request.course.id'}.'.num'});
@@ -2112,31 +2180,28 @@ sub submission {
 	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
-		$keyhash{$symb.'_subject'} : $env{'form.probTitle'};
+		$keyhash{$symb.'_subject'} : $probtitle;
 	    $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
 	}
 	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
 	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
 	$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
 			'<input type="hidden" name="command"    value="handgrade" />'."\n".
-			'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
 			'<input type="hidden" name="Status"     value="'.$stu_status.'" />'."\n".
 			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
-			'<input type="hidden" name="probTitle"  value="'.$env{'form.probTitle'}.'" />'."\n".
 			'<input type="hidden" name="refresh"    value="off" />'."\n".
 			'<input type="hidden" name="studentNo"  value="" />'."\n".
 			'<input type="hidden" name="gradeOpt"   value="" />'."\n".
 			'<input type="hidden" name="symb"       value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-			'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
 			'<input type="hidden" name="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".
 			'<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".
 			'<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".
 			&build_section_inputs().
 			'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
-			'<input type="hidden" name="handgrade"  value="'.$env{'form.handgrade'}.'" />'."\n".
 			'<input type="hidden" name="NCT"'.
 			' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
-	if ($env{'form.handgrade'} eq 'yes') {
+#	if ($env{'form.handgrade'} eq 'yes') {
+        if (1) {
 	    $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
 			    '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".
 			    '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".
@@ -2161,7 +2226,8 @@ sub submission {
 	}
 	$request->print($prnmsg);
 
-	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
+#	if ($env{'form.handgrade'} eq 'yes') {
+        unless ($is_tool) {
 
             my %lt = &Apache::lonlocal::texthash(
                           keyh => 'Keyword Highlighting for Essays',
@@ -2169,11 +2235,11 @@ sub submission {
                           list => 'List',
                           past => 'Paste Selection to List',
                           high => 'Highlight Attribute',
-                     );
+                     );    
 #
 # Print out the keyword options line
 #
-            $request->print(
+	    $request->print(
                 '<div class="LC_columnSection">'
                .'<fieldset><legend>'.$lt{'keyh'}.'</legend>'
                .&Apache::lonhtmlcommon::funclist_from_array(
@@ -2188,11 +2254,24 @@ sub submission {
 #
 # Load the other essays for similarity check
 #
-            my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
-	    $apath=&escape($apath);
-	    $apath=~s/\W/\_/gs;
-            &init_old_essays($symb,$apath,$adom,$aname);
+            (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
+            if ($essayurl eq 'lib/templates/simpleproblem.problem') {
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($cdom ne '' && $cnum ne '') {
+                    my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);
+                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) {
+                        my $apath = $1.'_'.$id;
+                        $apath=~s/\W/\_/gs;
+                        &init_old_essays($symb,$apath,$cdom,$cnum);
+                    }
+                }
+            } else {
+	        my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+	        $apath=&escape($apath);
+	        $apath=~s/\W/\_/gs;
+                &init_old_essays($symb,$apath,$adom,$aname);
+            }
         }
     }
 
@@ -2246,11 +2325,16 @@ sub submission {
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
 
+    my $boxtitle = &mt('Submissions');
+    if ($is_tool) {
+        $boxtitle = &mt('Transactions')
+    }
     my $result='<div class="LC_Box">'
-              .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
+              .'<h3 class="LC_hcell">'.$boxtitle.'</h3>';
     $result.='<input type="hidden" name="name'.$counter.
              '" value="'.$env{'form.fullname'}.'" />'."\n";
-    if ($env{'form.handgrade'} eq 'no') {
+#    if ($env{'form.handgrade'} eq 'no') {
+    unless ($is_tool) {
         $result.='<p class="LC_info">'
                 .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
                 ."</p>\n";
@@ -2259,188 +2343,214 @@ sub submission {
     # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my $fullname;
     my $col_fullnames = [];
-    if ($env{'form.handgrade'} eq 'yes') {
+#    if ($env{'form.handgrade'} eq 'yes') {
+    unless ($is_tool) {
 	(my $sub_result,$fullname,$col_fullnames)=
 	    &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
 				 $counter);
 	$result.=$sub_result;
     }
     $request->print($result."\n");
-
+    
     # print student answer/submission
     # Options are (1) Handgraded submission only
     #             (2) Last submission, includes submission that is not handgraded 
     #                  (for multi-response type part)
     #             (3) Last submission plus the parts info
     #             (4) The whole record for this student
-
-	my ($string,$timestamp)= &get_last_submission(\%record);
+    
+    my ($string,$timestamp)= &get_last_submission(\%record,$is_tool);
 	
-	my $lastsubonly;
+    my $lastsubonly;
 
-        if ($$timestamp eq '') {
-            $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
-        } else {
-            $lastsubonly =
-                '<div class="LC_grade_submissions_body">'
-               .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";
-
-	    my %seenparts;
-	    my @part_response_id = &flatten_responseType($responseType);
-	    foreach my $part (@part_response_id) {
-		next if ($env{'form.lastSub'} eq 'hdgrade' 
+    if ($$timestamp eq '') {
+        $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
+    } elsif ($is_tool) {
+        $lastsubonly =
+            '<div class="LC_grade_submissions_body">'
+           .'<b>'.&mt('Date Grade Passed Back:').'</b> '.$$timestamp."</div>\n";
+    } else {
+        $lastsubonly =
+            '<div class="LC_grade_submissions_body">'
+           .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";
+
+	my %seenparts;
+	my @part_response_id = &flatten_responseType($responseType);
+	foreach my $part (@part_response_id) {
+	    next if ($env{'form.lastSub'} eq 'hdgrade' 
 			 && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
 
-		my ($partid,$respid) = @{ $part };
-		my $display_part=&get_display_part($partid,$symb);
-		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
-		    if (exists($seenparts{$partid})) { next; }
-		    $seenparts{$partid}=1;
-                    $request->print(
-                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                        ' <b>'.&mt('Collaborative submission by: [_1]',
-                                   '<a href="javascript:viewSubmitter(\''.
-                                   $env{"form.$uname:$udom:$partid:submitted_by"}.
-                                   '\');" target="_self">'.
-                                   $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').
-                        '<br />');
-		    next;
-		}
-		my $responsetype = $responseType->{$partid}->{$respid};
-		if (!exists($record{"resource.$partid.$respid.submission"})) {
-                    $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
-                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                        ' <span class="LC_internal_info">'.
-                        '('.&mt('Response ID: [_1]',$respid).')'.
-                        '</span>&nbsp; &nbsp;'.
-			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
-		    next;
-		}
-		foreach my $submission (@$string) {
-		    my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
-		    if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
-		    my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);
-		    # Similarity check
-		    my $similar='';
-                    my ($type,$trial,$rndseed);
-                    if ($hide eq 'rand') {
-                        $type = 'randomizetry';
-                        $trial = $record{"resource.$partid.tries"};
-                        $rndseed = $record{"resource.$partid.rndseed"};
-                    }
-		    if ($env{'form.checkPlag'}) {
-			my ($oname,$odom,$ocrsid,$oessay,$osim)=
-			    &most_similar($uname,$udom,$symb,$subval);
-			if ($osim) {
-			    $osim=int($osim*100.0);
-			    my %old_course_desc = 
-				&Apache::lonnet::coursedescription($ocrsid,
-								   {'one_time' => 1});
-
-                            if ($hide eq 'anon') {
-                                $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
-                                         &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
-                            } else {
-			        $similar="<hr /><h3><span class=\"LC_warning\">".
-				    &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
-				        $osim,
-				        &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
-				        $old_course_desc{'description'},
-				        $old_course_desc{'num'},
-				        $old_course_desc{'domain'}).
-				    '</span></h3><blockquote><i>'.
-				    &keywords_highlight($oessay).
-				    '</i></blockquote><hr />';
-                            }
-			}
-		    }
-		    my $order=&get_order($partid,$respid,$symb,$uname,$udom,
-                                         undef,$type,$trial,$rndseed);
-                    if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' &&
-                         $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
-			my $display_part=&get_display_part($partid,$symb);
-                        $lastsubonly.='<div class="LC_grade_submission_part">'.
-                            '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                            ' <span class="LC_internal_info">'.
-                            '('.&mt('Response ID: [_1]',$respid).')'.
-                            '</span>&nbsp; &nbsp;';
-			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
-			if (@$files) {
-                            if ($hide eq 'anon') {
-                                $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
+	    my ($partid,$respid) = @{ $part };
+	    my $display_part=&get_display_part($partid,$symb);
+	    if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
+		if (exists($seenparts{$partid})) { next; }
+		$seenparts{$partid}=1;
+                $request->print(
+                    '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                    ' <b>'.&mt('Collaborative submission by: [_1]',
+                               '<a href="javascript:viewSubmitter(\''.
+                               $env{"form.$uname:$udom:$partid:submitted_by"}.
+                               '\');" target="_self">'.
+                               $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').
+                    '<br />');
+		next;
+		}
+	    my $responsetype = $responseType->{$partid}->{$respid};
+	    if (!exists($record{"resource.$partid.$respid.submission"})) {
+                $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
+                    '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                    ' <span class="LC_internal_info">'.
+                    '('.&mt('Response ID: [_1]',$respid).')'.
+                    '</span>&nbsp; &nbsp;'.
+	       	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
+		next;
+	    }
+	    foreach my $submission (@$string) {
+		my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
+		if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
+		my ($ressub,$hide,$draft,$subval) = split(/:/,$submission,4);
+		# Similarity check
+                my $similar='';
+                my ($type,$trial,$rndseed);
+                if ($hide eq 'rand') {
+                    $type = 'randomizetry';
+                    $trial = $record{"resource.$partid.tries"};
+                    $rndseed = $record{"resource.$partid.rndseed"};
+                }
+	        if ($env{'form.checkPlag'}) {
+    		    my ($oname,$odom,$ocrsid,$oessay,$osim)=
+		        &most_similar($uname,$udom,$symb,$subval);
+		    if ($osim) {
+			$osim=int($osim*100.0);
+                        if ($hide eq 'anon') {
+                            $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
+                                     &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
+                        } else {
+			    $similar='<hr />';
+                            if ($essayurl eq 'lib/templates/simpleproblem.problem') {
+                                $similar .= '<h3><span class="LC_warning">'.
+                                            &mt('Essay is [_1]% similar to an essay by [_2]',
+                                                $osim,
+                                                &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
+                                            '</span></h3>';
                             } else {
-                                $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'
-                                            .'<br /><span class="LC_warning">';
-                                if(@$files == 1) {
-                                    $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');
+                                my %old_course_desc;
+                                if ($ocrsid ne '') {
+                                    if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') {
+                                        %old_course_desc = %{$coursedesc_by_cid{$ocrsid}};
+                                    } else {
+                                        my $args;
+                                        if ($ocrsid ne $env{'request.course.id'}) {
+                                            $args = {'one_time' => 1};
+                                        }
+                                        %old_course_desc =
+                                            &Apache::lonnet::coursedescription($ocrsid,$args);
+                                        $coursedesc_by_cid{$ocrsid} = \%old_course_desc;
+                                    }
+                                    $similar .=
+                                        '<h3><span class="LC_warning">'.
+                                        &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
+                                            $osim,
+                                            &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
+                                            $old_course_desc{'description'},
+                                            $old_course_desc{'num'},
+                                            $old_course_desc{'domain'}).
+                                        '</span></h3>';
                                 } else {
-                                    $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
-                                }
-                                $lastsubonly .= '</span>';
-
-                                foreach my $file (@$files) {
-                                    &Apache::lonnet::allowuploaded('/adm/grades',$file);
-                                    $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>';
+                                    $similar .=
+                                        '<h3><span class="LC_warning">'.
+                                        &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course',
+                                            $osim,
+                                            &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
+                                        '</span></h3>';
                                 }
                             }
-			    $lastsubonly.='<br />';
-			}
+                            $similar .= '<blockquote><i>'.
+                                        &keywords_highlight($oessay).
+                                        '</i></blockquote><hr />';
+                        }
+	            }
+		}
+		my $order=&get_order($partid,$respid,$symb,$uname,$udom,
+                                     undef,$type,$trial,$rndseed);
+                if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($env{'form.lastSub'} eq 'hdgrade' && 
+			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
+		    my $display_part=&get_display_part($partid,$symb);
+                    $lastsubonly.='<div class="LC_grade_submission_part">'.
+                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                        ' <span class="LC_internal_info">'.
+                        '('.&mt('Response ID: [_1]',$respid).')'.
+                        '</span>&nbsp; &nbsp;';
+		    my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+                        
+		    if (@$files) {
                         if ($hide eq 'anon') {
-                            $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; 
+                            $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
                         } else {
-			    $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
-                            if ($draft) {
-                                $lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';
+                            $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'
+                                        .'<br /><span class="LC_warning">';
+                            if(@$files == 1) {
+                                $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');
+                            } else {
+                                $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
                             }
-                            $subval =
-			        &cleanRecord($subval,$responsetype,$symb,$partid,
-					     $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
-                            if ($responsetype eq 'essay') {
-                                $subval =~ s{\n}{<br />}g;
+                            $lastsubonly .= '</span>';                         
+                            foreach my $file (@$files) {
+                                &Apache::lonnet::allowuploaded('/adm/grades',$file);
+                                $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" alt="" /> '.$file.'</a>';
                             }
-                            $lastsubonly.=$subval."\n";
                         }
-			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
-			$lastsubonly.='</div>';
-		    }
+			$lastsubonly.='<br />';
+                    }
+                    if ($hide eq 'anon') {
+                        $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; 
+                    } else {
+             	        $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
+                        if ($draft) {
+                            $lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';
+                        }
+                        $subval =
+			    &cleanRecord($subval,$responsetype,$symb,$partid,
+					 $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
+                        if ($responsetype eq 'essay') {
+                            $subval =~ s{\n}{<br />}g;
+                        }
+                        $lastsubonly.=$subval."\n";
+                    }
+	            if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+		    $lastsubonly.='</div>';
 		}
-	    }
-	    $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
+            }
 	}
-	$request->print($lastsubonly);
-   if ($env{'form.lastSub'} eq 'datesub') {
-	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
-	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
+	$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
     }
+    $request->print($lastsubonly);
+    if ($env{'form.lastSub'} eq 'datesub') {
+        my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
+	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
+  
+    } 
     if ($env{'form.lastSub'} =~ /^(last|all)$/) {
         my $identifier = (&canmodify($usec)? $counter : '');
-	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+        $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $env{'request.course.id'},
 								 $last,'.submission',
 								 'Apache::grades::keywords_highlight',
                                                                  $usec,$identifier));
     }
-
     $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
 	.$udom.'" />'."\n");
     # return if view submission with no grading option
-    if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
-	my $toGrade.='<input type="button" value="Grade Student" '.
-	    'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
-	    .$counter.'\');" target="_self" /> &nbsp;'."\n" if (&canmodify($usec));
-	$toGrade.='</div>'."\n";
-	if (($env{'form.command'} eq 'submission') || 
-	    ($env{'form.command'} eq 'processGroup' && $counter == $total)) {
-	    $toGrade.='</form>'.&show_grading_menu_form($symb); 
-	}
-	$request->print($toGrade);
+    if (!&canmodify($usec)) {
+	$request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
 	return;
     } else {
 	$request->print('</div>'."\n");
     }
 
     # essay grading message center
-    if ($env{'form.handgrade'} eq 'yes') {
+#    if ($env{'form.handgrade'} eq 'yes') {
+    if (1) {
 	my $result='<div class="LC_grade_message_center">';
     
 	$result.='<div class="LC_grade_message_center_header">'.
@@ -2459,7 +2569,7 @@ sub submission {
 	    &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.
 	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
 	    ' <img src="'.$request->dir_config('lonIconsURL').
-	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
+	    '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".
 	    '<br />&nbsp;('.
 	    &mt('Message will be sent when you click on Save &amp; Next below.').")\n";
 	$result.='</div></div>';
@@ -2469,7 +2579,12 @@ sub submission {
     my %seen = ();
     my @partlist;
     my @gradePartRespid;
-    my @part_response_id = &flatten_responseType($responseType);
+    my @part_response_id;
+    if ($is_tool) {
+        @part_response_id = ([0,'']);
+    } else {
+        @part_response_id = &flatten_responseType($responseType);
+    }
     $request->print(
         '<div class="LC_Box">'
        .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
@@ -2532,7 +2647,6 @@ sub submission {
         $endform.="<input type='hidden' value='".&get_increment().
             "' name='increment' />";
 	$endform.='</td></tr></table></form>';
-	$endform.=&show_grading_menu_form($symb);
 	$request->print($endform);
     }
     return '';
@@ -2596,7 +2710,7 @@ sub check_collaborators {
 
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
-    my ($returnhash)=@_;
+    my ($returnhash,$is_tool)=@_;
     my (@string,$timestamp,%lasthidden);
     if ($$returnhash{'version'}) {
 	my %lasthash=();
@@ -2655,15 +2769,21 @@ sub get_last_submission {
                 }
             }
 	    my ($partid,$foo) = split(/submission$/,$key);
-	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1: 0;
+	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1 : 0;
             push(@string, join(':', $key, $hide, $draft, (
                 ref($lasthash{$key}) eq 'ARRAY' ?
                     join(',', @{$lasthash{$key}}) : $lasthash{$key}) ));
 	}
     }
     if (!@string) {
+        my $msg;
+        if ($is_tool) {
+            $msg = &mt('No grade passed back.');
+        } else {
+            $msg = &mt('Nothing submitted - no attempts.');
+        }
 	$string[0] =
-	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
+	    '<span class="LC_warning">'.$msg.'</span>';
     }
     return (\@string,\$timestamp);
 }
@@ -2695,11 +2815,12 @@ sub show_previous_task_version {
     my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
     if (!&canview($usec)) {
-        $request->print('<span class="LC_warning">'.
-                        &mt('Unable to view previous version for requested student.').
-                        ' '.&mt('([_1] in section [_2] in course id [_3])',
-                                $uname.':'.$udom,$usec,$env{'request.course.id'}).
-                        '</span>');
+        $request->print(
+            '<span class="LC_warning">'.
+            &mt('Unable to view previous version for requested student.').
+            ' '.&mt('([_1] in section [_2] in course id [_3])',
+                    $uname.':'.$udom,$usec,$env{'request.course.id'}).
+            '</span>');
         return;
     }
     my $mode = 'both';
@@ -2864,8 +2985,7 @@ ENDJS
 
 #--- Called from submission routine
 sub processHandGrade {
-    my ($request) = shift;
-    my ($symb)   = &get_symb($request);
+    my ($request,$symb) = @_;
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
     my $button = $env{'form.gradeOpt'};
     my $ngrade = $env{'form.NCT'};
@@ -2884,7 +3004,7 @@ sub processHandGrade {
 		next;
 	    }
 	    if ($errorflag eq 'not_allowed') {
-                $request->print(
+		$request->print(
                     '<span class="LC_error">'
                    .&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
                    .'</span>');
@@ -2915,7 +3035,7 @@ sub processHandGrade {
 		if ($env{'form.withgrades'.$ctr}) {
 		    $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
 		    $messagetail = " for <a href=\"".
-		                   $feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+		                   $feedurl."?symb=$showsymb\">$restitle</a>";
 		}
 		$msgstatus = 
                     &Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
@@ -2943,7 +3063,7 @@ sub processHandGrade {
 						      $udom);
 			    if ($env{'form.withgrades'.$ctr}) {
 				$messagetail = " for <a href=\"".
-                                    $baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";
+                                    $baseurl."?symb=$showsymb\">$restitle</a>";
 			    }
 			    $msgstatus = 
 				&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
@@ -2955,7 +3075,8 @@ sub processHandGrade {
 	}
     }
 
-    if ($env{'form.handgrade'} eq 'yes') {
+#    if ($env{'form.handgrade'} eq 'yes') {
+    if (1) {
 	# Keywords sorted in alphabatical order
 	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
 	my %keyhash = ();
@@ -3008,22 +3129,12 @@ sub processHandGrade {
 	    my $processUser = $env{'form.unamedom'.$ctr};
 	    ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
 	    $env{'form.fullname'} = $$fullname{$processUser};
-	    &submission($request,$ctr,$total-1);
+	    &submission($request,$ctr,$total-1,$symb);
 	    $ctr++;
 	}
 	return '';
     }
 
-# Go directly to grade student - from submission or link from chart page
-    if ($button eq 'Grade Student') {
-	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
-	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
-	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
-	$env{'form.fullname'} = $$fullname{$processUser};
-	&submission($request,0,0);
-	return '';
-    }
-
     # Get the next/previous one or group of students
     my $firststu = $env{'form.unamedom0'};
     my $laststu = $env{'form.unamedom'.($ngrade-1)};
@@ -3043,6 +3154,7 @@ sub processHandGrade {
 		 }
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
+# FIXME: this is fishy, looks like the button label
 	if ($nextflg == 1 && $button =~ /Next$/) {
 	    push(@parsedlist,$item);
 	}
@@ -3053,6 +3165,7 @@ sub processHandGrade {
 	}
     }
     $ctr = 0;
+# FIXME: this is fishy, looks like the button label
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
     my $res_error;
     my ($partlist) = &response_type($symb,\$res_error);
@@ -3105,14 +3218,11 @@ sub processHandGrade {
 	$env{'form.student'}  = $uname;
 	$env{'form.userdom'}  = $udom;
 	$env{'form.fullname'} = $$fullname{$_};
-	&submission($request,$ctr,$total);
+	&submission($request,$ctr,$total,$symb);
 	$ctr++;
     }
     if ($total < 0) {
-	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
-	$the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
-	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
-	$the_end.=&show_grading_menu_form($symb);
+	my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
 	$request->print($the_end);
     }
     return '';
@@ -3306,19 +3416,19 @@ sub handback_files {
 	my $part_resp = join('_',@{ $part_response_id });
         if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) {
             for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) {
-                # if multiple files are uploaded names will be 'returndoc2','returndoc3'
-		if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
+                # if multiple files are uploaded names will be 'returndoc2','returndoc3' 
+                if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
                     my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};
                     my ($directory,$answer_file) = 
                         ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/);
                     my ($answer_name,$answer_ver,$answer_ext) =
-		        &file_name_version_ext($answer_file);
+		        &Apache::lonnet::file_name_version_ext($answer_file);
 		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
                     my $getpropath = 1;
-                    my ($dir_list,$listerror) =
+                    my ($dir_list,$listerror) = 
                         &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,
                                                  $domain,$stuname,$getpropath);
-		    my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
+		    my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list);
                     # fix filename
                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
                     my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
@@ -3336,8 +3446,7 @@ sub handback_files {
 			    $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
 			}
                         $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
-			$file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
-
+			$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
                     }
                     $request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));
                 }
@@ -3348,10 +3457,11 @@ sub handback_files {
         $request->print('<br />');
         my @what = ($symb,$env{'request.course.id'},'handback');
         &Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what);
-        my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});
+        my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});    
         my ($subject,$message);
         if (scalar(@handedback) == 1) {
             $subject = &mt_user($user_lh,'File Handed Back by Instructor');
+            $message = &mt_user($user_lh,'A file has been returned that was originally submitted in response to: ');
         } else {
             $subject = &mt_user($user_lh,'Files Handed Back by Instructor');
             $message = &mt_user($user_lh,'Files have been returned that were originally submitted in response to: ');
@@ -3467,29 +3577,14 @@ sub version_portfiles {
     my $version_parts = join('|',@$v_flag);
     my @returned_keys;
     my $parts = join('|', @$parts_graded);
-    my $portfolio_root = '/userfiles/portfolio';
     foreach my $key (keys(%$record)) {
         my $new_portfiles;
         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
             my @versioned_portfiles;
             my @portfiles = split(/\s*,\s*/,$$record{$key});
-            foreach my $file (@portfiles) {
-                &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
-                my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
-		my ($answer_name,$answer_ver,$answer_ext) =
-		    &file_name_version_ext($answer_file);
-                my $getpropath = 1;
-                my ($dir_list,$listerror) =
-                    &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
-                                             $stu_name,$getpropath);
-                my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
-                my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
-                if ($new_answer ne 'problem getting file') {
-                    push(@versioned_portfiles, $directory.$new_answer);
-                    &Apache::lonnet::mark_as_readonly($domain,$stu_name,
-                        [$directory.$new_answer],
-                        [$symb,$env{'request.course.id'},'graded']);
-                }
+            if (@portfiles) {
+                &Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles,
+                                                      \@versioned_portfiles);
             }
             $$record{$key} = join(',',@versioned_portfiles);
             push(@returned_keys,$key);
@@ -3498,64 +3593,6 @@ sub version_portfiles {
     return (@returned_keys);   
 }
 
-sub get_next_version {
-    my ($answer_name, $answer_ext, $dir_list) = @_;
-    my $version;
-    if (ref($dir_list) eq 'ARRAY') {
-        foreach my $row (@{$dir_list}) {
-            my ($file) = split(/\&/,$row,2);
-            my ($file_name,$file_version,$file_ext) =
-	        &file_name_version_ext($file);
-            if (($file_name eq $answer_name) && 
-	        ($file_ext eq $answer_ext)) {
-                # gets here if filename and extension match, 
-                # regardless of version
-                if ($file_version ne '') {
-                    # a versioned file is found  so save it for later
-                    if ($file_version > $version) {
-		        $version = $file_version;
-                    }
-	        }
-            }
-        }
-    }
-    $version ++;
-    return($version);
-}
-
-sub version_selected_portfile {
-    my ($domain,$stu_name,$directory,$file_name,$version) = @_;
-    my ($answer_name,$answer_ver,$answer_ext) =
-        &file_name_version_ext($file_name);
-    my $new_answer;
-    $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
-    if($env{'form.copy'} eq '-1') {
-        $new_answer = 'problem getting file';
-    } else {
-        $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
-        my $copy_result = &Apache::lonnet::finishuserfileupload(
-                            $stu_name,$domain,'copy',
-		        '/portfolio'.$directory.$new_answer);
-    }    
-    return ($new_answer);
-}
-
-sub file_name_version_ext {
-    my ($file)=@_;
-    my @file_parts = split(/\./, $file);
-    my ($name,$version,$ext);
-    if (@file_parts > 1) {
-	$ext=pop(@file_parts);
-	if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
-	    $version=pop(@file_parts);
-	}
-	$name=join('.',@file_parts);
-    } else {
-	$name=join('.',@file_parts);
-    }
-    return($name,$version,$ext);
-}
-
 #--------------------------------------------------------------------------------------
 #
 #-------------------------- Next few routines handles grading by section or whole class
@@ -3566,8 +3603,7 @@ sub viewgrades_js {
 
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     &js_escape(\$alertmsg);
-    $request->print(<<VIEWJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
    function writePoint(partid,weight,point) {
 	var radioButton = document.classgrade["RADVAL_"+partid];
 	var textbox = document.classgrade["TEXTVAL_"+partid];
@@ -3728,16 +3764,19 @@ sub viewgrades_js {
 	}
     }
 
-</script>
 VIEWJAVASCRIPT
 }
 
 #--- show scores for a section or whole class w/ option to change/update a score
 sub viewgrades {
-    my ($request) = shift;
+    my ($request,$symb) = @_;
+    my ($is_tool,$toolsymb);
+    if ($symb =~ /ext\.tool$/) {
+        $is_tool = 1;
+        $toolsymb = $symb;
+    }
     &viewgrades_js($request);
 
-    my ($symb) = &get_symb($request);
     #need to make sure we have the correct data for later EXT calls, 
     #thus invalidate the cache
     &Apache::lonnet::devalidatecourseresdata(
@@ -3746,7 +3785,6 @@ sub viewgrades {
     &Apache::lonnet::clear_EXT_cache_status();
 
     my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
-    $result.='<h4><b>'.&mt('Current Resource').':</b> '.$env{'form.probTitle'}.'</h4>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($symb);
@@ -3757,9 +3795,7 @@ sub viewgrades {
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="command" value="editgrades" />'."\n".
 	&build_section_inputs().
-	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
-	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 
     #retrieve selected groups
     my (@groups,$group_display);
@@ -3783,7 +3819,7 @@ sub viewgrades {
             $common_header = &mt('Assign Common Grade to Students not assigned to any groups');
             $specific_header = &mt('Assign Grade to Specific Students not assigned to any groups');
         } else {
-            $common_header = &mt('Assign Common Grade to Class');
+	    $common_header = &mt('Assign Common Grade to Class');
             $specific_header = &mt('Assign Grade to Specific Students in Class');
         }
     } elsif (grep(/^none$/,@sections)) {
@@ -3796,7 +3832,7 @@ sub viewgrades {
             $specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group');
         } else {
             $common_header = &mt('Assign Common Grade to Students in no Section');
-            $specific_header = &mt('Assign Grade to Specific Students in no Section');
+	    $specific_header = &mt('Assign Grade to Specific Students in no Section');
         }
     } else {
         $section_display = join (", ",@sections);
@@ -3810,7 +3846,7 @@ sub viewgrades {
             $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display);
         } else {
             $common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
+	    $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
         }
     }
     my %submit_types = &substatus_options();
@@ -3819,7 +3855,13 @@ sub viewgrades {
     if ($env{'form.submitonly'} eq 'all') {
         $result.= '<h3>'.$common_header.'</h3>';
     } else {
-        $result.= '<h3>'.$common_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>'; 
+        my $text;
+        if ($is_tool) {
+            $text = &mt('(transaction status: "[_1]")',$submission_status);
+        } else {
+            $text = &mt('(submission status: "[_1]")',$submission_status);
+        }
+        $result.= '<h3>'.$common_header.'&nbsp;'.$text.'</h3>';
     }
     $result .= &Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
@@ -3832,13 +3874,18 @@ sub viewgrades {
     my %weight = ();
     my $ctsparts = 0;
     my %seen = ();
-    my @part_response_id = &flatten_responseType($responseType);
+    my @part_response_id;
+    if ($is_tool) {
+        @part_response_id = ([0,'']);
+    } else {
+        @part_response_id = &flatten_responseType($responseType);
+    }
     foreach my $part_response_id (@part_response_id) {
     	my ($partid,$respid) = @{ $part_response_id };
 	my $part_resp = join('_',@{ $part_response_id });
 	next if $seen{$partid};
 	$seen{$partid}++;
-	my $handgrade=$$handgrade{$part_resp};
+#	my $handgrade=$$handgrade{$part_resp};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -3857,10 +3904,10 @@ sub viewgrades {
 	    $partid.'" size="4" '.'onchange="javascript:writePoint(\''.
 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
 	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
-	$line.= '<td><b>'.&mt('Grade Status').':</b>'.
-                '<select name="SELVAL_'.$partid.'" '.
-	        'onchange="javascript:writeRadText(\''.$partid.'\','.
-		$weight{$partid}.')"> '.
+        $line.= '<td><b>'.&mt('Grade Status').':</b>'.
+            '<select name="SELVAL_'.$partid.'" '.
+            'onchange="javascript:writeRadText(\''.$partid.'\','.
+                $weight{$partid}.')"> '.
 	    '<option selected="selected"> </option>'.
 	    '<option value="excused">'.&mt('excused').'</option>'.
 	    '<option value="reset status">'.&mt('reset status').'</option>'.
@@ -3884,10 +3931,16 @@ sub viewgrades {
 
     #table listing all the students in a section/class
     #header of table
-    if ($env{'form.submitonly'} eq 'all') { 
+    if ($env{'form.submitonly'} eq 'all') {
         $result.= '<h3>'.$specific_header.'</h3>';
     } else {
-        $result.= '<h3>'.$specific_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>';
+        my $text;
+        if ($is_tool) {
+            $text = &mt('(transaction status: "[_1]")',$submission_status);
+        } else {
+            $text = &mt('(submission status: "[_1]")',$submission_status);
+        }
+        $result.= '<h3>'.$specific_header.'&nbsp;'.$text.'</h3>';
     }
     $result.= &Apache::loncommon::start_data_table().
 	      &Apache::loncommon::start_data_table_header_row().
@@ -3901,17 +3954,20 @@ sub viewgrades {
     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
     my @partids = ();
     foreach my $part (@parts) {
-	my $display=&Apache::lonnet::metadata($url,$part.'.display');
+	my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
         my $narrowtext = &mt('Tries');
 	$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower
-	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name',$toolsymb); }
 	my ($partid) = &split_part_type($part);
         push(@partids,$partid);
+#
+# FIXME: Looks like $display looks at English text
+#
 	my $display_part=&get_display_part($partid,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
 	    $result.='<th>'.
-                &mt('Score Part: [_1][_2](weight = [_3])',
-                    $display_part,'<br />',$weight{$partid}).'</th>'."\n";
+		&mt('Score Part: [_1][_2](weight = [_3])',
+		    $display_part,'<br />',$weight{$partid}).'</th>'."\n";
 	    next;
 	    
 	} else {
@@ -3942,7 +3998,7 @@ sub viewgrades {
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
 	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
-				   $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets);
+				   $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets,$is_tool);
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
@@ -3959,7 +4015,7 @@ sub viewgrades {
                                    $stu_status);
                 } elsif (grep(/^none$/,@groups)) {
                     $result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
+                                   $stu_status); 
                 } else {
                     $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',
                                    $group_display,$stu_status);
@@ -4012,8 +4068,8 @@ sub viewgrades {
                 }
             } else {
                 if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $section_display,$stu_status,$submission_status);
+	            $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
+	                           $section_display,$stu_status,$submission_status);
                 } elsif (grep(/^none$/,@groups)) {
                     $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.',
                                    $section_display,$stu_status,$submission_status);
@@ -4022,16 +4078,15 @@ sub viewgrades {
                                    $section_display,$group_display,$stu_status,$submission_status);
                 }
             }
-	}
+        }
 	$result .= '</span><br />';
     }
-    $result.=&show_grading_menu_form($symb);
     return $result;
 }
 
-#--- call by previous routine to display each student who satisfies submission filter.
+#--- call by previous routine to display each student who satisfies submission filter. 
 sub viewstudentgrade {
-    my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
+    my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_;
     my ($uname,$udom) = split(/:/,$student);
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
     my $submitonly = $env{'form.submitonly'};
@@ -4089,7 +4144,6 @@ sub viewstudentgrade {
         my ($aggtries,$totaltries);
         unless (exists($aggregates{$part})) {
 	    $totaltries = $record{'resource.'.$part.'.tries'};
-
 	    $aggtries = $totaltries;
             if ($$last_resets{$part}) {  
                 $aggtries = &get_num_tries(\%record,$$last_resets{$part},
@@ -4137,13 +4191,15 @@ sub viewstudentgrade {
 #--- change scores for all the students in a section/class
 #    record does not get update if unchanged
 sub editgrades {
-    my ($request) = @_;
+    my ($request,$symb) = @_;
+    my $toolsymb;
+    if ($symb =~ /ext\.tool$/) {
+        $toolsymb = $symb;
+    }
 
-    my ($symb)=&get_symb($request);
     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     my $title='<h2>'.&mt('Current Grade Status').'</h2>';
-    $title.='<h4><b>'.&mt('Current Resource').':</b> '.$env{'form.probTitle'}.'</h4>'."\n";
-    $title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</h4>'."\n";
+    $title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
 
     my $result= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
@@ -4186,7 +4242,7 @@ sub editgrades {
 	    my ($part,$type) = &split_part_type($stores);
 	    if ($part !~ m/^\Q$partid\E/) { next;}
 	    if ($type eq 'awarded' || $type eq 'solved') { next; }
-	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
+	    my $display=&Apache::lonnet::metadata($url,$stores.'.display',$toolsymb);
 	    $display =~ s/\[Part: \Q$part\E\]//;
             my $narrowtext = &mt('Tries');
 	    $display =~ s/Number of Attempts/$narrowtext/;
@@ -4215,15 +4271,15 @@ sub editgrades {
 	my %newrecord;
 	my $updateflag = 0;
 	my $usec=$classlist->{"$uname:$udom"}[5];
-        my $canmodify = &canmodify($usec);
-        my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
-                   &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
-        if (!$canmodify) {
-            push(@noupdate,
-                 $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
-                 &mt('Not allowed to modify student')."</span></td>");
-            next;
-        }
+	my $canmodify = &canmodify($usec);
+	my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
+		   &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
+	if (!$canmodify) {
+	    push(@noupdate,
+		 $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
+		 &mt('Not allowed to modify student')."</span></td>");
+	    next;
+	}
         my %aggregate = ();
         my $aggregateflag = 0;
 	$user=~s/:/_/; # colon doen't work in javascript for names
@@ -4351,8 +4407,7 @@ sub editgrades {
 		&Apache::loncommon::end_data_table_row();
 	}
     }
-    $result .= &Apache::loncommon::end_data_table().
-	&show_grading_menu_form($symb);
+    $result .= &Apache::loncommon::end_data_table();
     my $msg = '<p><b>'.
 	&mt('Number of records updated = [_1] for [quant,_2,student].',
 	    $rec_update,$count).'</b><br />'.
@@ -4380,7 +4435,7 @@ sub split_part_type {
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
-    my $error1=&mt('You need to specify the username or the student/employee ID');
+    my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
     my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);
   &js_escape(\$error2);
@@ -4389,13 +4444,15 @@ sub csvupload_javascript_reverse_associa
     var foundsomething=0;
     var founduname=0;
     var foundID=0;
+    var foundclicker=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
       if (i==0 && tw!=0) { foundID=1; }
       if (i==1 && tw!=0) { founduname=1; }
-      if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
+      if (i==2 && tw!=0) { foundclicker=1; }
+      if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; }
     }
-    if (founduname==0 && foundID==0) {
+    if (founduname==0 && foundID==0 && foundclicker==0) {
 	alert('$error1');
 	return;
     }
@@ -4422,7 +4479,7 @@ ENDPICK
 }
 
 sub csvupload_javascript_forward_associate {
-    my $error1=&mt('You need to specify the username or the student/employee ID');
+    my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
     my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);
   &js_escape(\$error2);
@@ -4431,13 +4488,15 @@ sub csvupload_javascript_forward_associa
     var foundsomething=0;
     var founduname=0;
     var foundID=0;
+    var foundclicker=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
       if (tw==1) { foundID=1; }
       if (tw==2) { founduname=1; }
-      if (tw>3) { foundsomething=1; }
+      if (tw==3) { foundclicker=1; }
+      if (tw>4) { foundsomething=1; }
     }
-    if (founduname==0 && foundID==0) {
+    if (founduname==0 && foundID==0 && ƒoundclicker==0) {
 	alert('$error1');
 	return;
     }
@@ -4469,21 +4528,14 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
-    my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
-    my $ignore=&mt('Ignore First Line');
     $symb = &Apache::lonenc::check_encrypt($symb);
+    $request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'.
+                    &mt('Total number of records found in file: [_1]',$distotal).'<hr />'.
+                    &mt('Associate entries from the uploaded file with as many fields as you can.'));
+    my $reverse=&mt("Reverse Association");
     $request->print(<<ENDPICK);
-<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<h3><span class="LC_info">Uploading Class Grades</span></h3>
-$result
-<hr />
-<h3>Identify fields</h3>
-Total number of records found in file: $distotal <hr />
-Enter as many fields as you can. The system will inform you and bring you back
-to this page if the data selected is insufficient to run your class.<hr />
-<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
+<br />
+<input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
@@ -4492,20 +4544,20 @@ to this page if the data selected is ins
 <input type="hidden" name="upfile_associate" 
                                        value="$env{'form.upfile_associate'}" />
 <input type="hidden" name="symb"       value="$symb" />
-<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
-<input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
 <input type="hidden" name="command"    value="csvuploadoptions" />
 <hr />
-<script type="text/javascript" language="Javascript">
-$javascript
-</script>
 ENDPICK
+    $request->print(&Apache::lonhtmlcommon::scripttag($javascript));
     return '';
 
 }
 
 sub csvupload_fields {
     my ($symb,$errorref) = @_;
+    my $toolsymb;
+    if ($symb =~ /ext\.tool$/) {
+        $toolsymb = $symb;
+    }
     my (@parts) = &getpartlist($symb,$errorref);
     if (ref($errorref)) {
         if ($$errorref) {
@@ -4515,13 +4567,14 @@ sub csvupload_fields {
 
     my @fields=(['ID','Student/Employee ID'],
 		['username','Student Username'],
+		['clicker','Clicker ID'],
 		['domain','Student Domain']);
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
     foreach my $part (sort(@parts)) {
 	my @datum;
-	my $display=&Apache::lonnet::metadata($url,$part.'.display');
+	my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
 	my $name=$part;
-	if  (!$display) { $display = $name; }
+	if (!$display) { $display = $name; }
 	@datum=($name,$display);
 	if ($name=~/^stores_(.*)_awarded/) {
 	    push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
@@ -4546,8 +4599,7 @@ ENDPICK
 sub checkforfile_js {
     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
     &js_escape(\$alertmsg);
-    my $result =<<CSVFORMJS;
-<script type="text/javascript" language="javascript">
+    my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
 	    alert("$alertmsg");
@@ -4555,24 +4607,19 @@ sub checkforfile_js {
 	}
 	formname.submit();
     }
-    </script>
 CSVFORMJS
     return $result;
 }
 
 sub upcsvScores_form {
-    my ($request) = shift;
-    my ($symb)=&get_symb($request);
+    my ($request,$symb) = @_;
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
-    $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
-    $result.=$table;
-    $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
-    $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource.').
-	'</b></td></tr>'."\n";
-    $result.='<tr bgcolor="#ffffe6"><td>'."\n";
+    $result.=&Apache::loncommon::start_data_table().
+             &Apache::loncommon::start_data_table_header_row().
+             '<th>'.&mt('Specify a file containing the class scores for current resource.').'</th>'.
+             &Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row().'<td>';
     my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');
@@ -4581,38 +4628,33 @@ sub upcsvScores_form {
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="csvuploadmap" />
-<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
-<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select
 <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>
 ENDUPFORM
     $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
-                           &mt("How do I create a CSV file from a spreadsheet"))
-    .'</td></tr></table>'."\n";
-    $result.='</td></tr></table><br /><br />'."\n";
-    $result.=&show_grading_menu_form($symb);
+                           &mt("How do I create a CSV file from a spreadsheet")).
+             '</td>'.
+            &Apache::loncommon::end_data_table_row().
+            &Apache::loncommon::end_data_table();
     return $result;
 }
 
 
 sub csvuploadmap {
-    my ($request)= @_;
-    my ($symb)=&get_symb($request);
+    my ($request,$symb)= @_;
     if (!$symb) {return '';}
 
     my $datatoken;
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
-        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+	$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
         if ($datatoken ne '') {
-            &Apache::loncommon::load_tmp_file($request,$datatoken);
+	    &Apache::loncommon::load_tmp_file($request,$datatoken);
         }
     }
     my @records=&Apache::loncommon::upfile_record_sep();
-    if ($env{'form.noFirstLine'}) { shift(@records); }
     &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
@@ -4642,39 +4684,27 @@ sub csvuploadmap {
 	}
     }
     &csvuploadmap_footer($request,$i,$keyfields);
-    $request->print(&show_grading_menu_form($symb));
 
     return '';
 }
 
 sub csvuploadoptions {
-    my ($request)= @_;
-    my ($symb)=&get_symb($request);
-    my $checked=(($env{'form.noFirstLine'})?'1':'0');
-    my $ignore=&mt('Ignore First Line');
+    my ($request,$symb)= @_;
+    my $overwrite=&mt('Overwrite any existing score');
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<h3><span class="LC_info">Uploading Class Grade Options</span></h3>
 <input type="hidden" name="command"    value="csvuploadassign" />
-<!--
-<p>
-<label>
-   <input type="checkbox" name="show_full_results" />
-   Show a table of all changes
-</label>
-</p>
--->
 <p>
 <label>
    <input type="checkbox" name="overwite_scores" checked="checked" />
-   Overwrite any existing score
+   $overwrite
 </label>
 </p>
 ENDPICK
     my %fields=&get_fields();
     if (!defined($fields{'domain'})) {
 	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
-	$request->print("\n<p> Users are in domain: ".$domform."</p>\n");
+	$request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
     }
     foreach my $key (sort(keys(%env))) {
 	if ($key !~ /^form\.(.*)$/) { next; }
@@ -4687,7 +4717,6 @@ ENDPICK
     # FIXME do a check for any invalid user ids?...
     $request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br />
 <hr /></form>'."\n");
-    $request->print(&show_grading_menu_form($symb));
     return '';
 }
 
@@ -4709,18 +4738,15 @@ sub get_fields {
 }
 
 sub csvuploadassign {
-    my ($request)= @_;
-    my ($symb)=&get_symb($request);
+    my ($request,$symb)= @_;
     if (!$symb) {return '';}
     my $error_msg = '';
     my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-    if ($datatoken ne '') {
+    if ($datatoken ne '') { 
         &Apache::loncommon::load_tmp_file($request,$datatoken);
     }
     my @gradedata = &Apache::loncommon::upfile_record_sep();
-    if ($env{'form.noFirstLine'}) { shift(@gradedata); }
     my %fields=&get_fields();
-    $request->print('<h3>Assigning Grades</h3>');
     my $courseid=$env{'request.course.id'};
     my ($classlist) = &getclasslist('all',0);
     my @notallowed;
@@ -4741,13 +4767,45 @@ sub csvuploadassign {
 	if (!$username) {
 	    my $id=$entries{$fields{'ID'}};
 	    $id=~s/\s//g;
-	    my %ids=&Apache::lonnet::idget($domain,$id);
-	    $username=$ids{$id};
+            if ($id ne '') {
+	        my %ids=&Apache::lonnet::idget($domain,[$id]);
+	        $username=$ids{$id};
+            } else {
+                if ($entries{$fields{'clicker'}}) {
+                    my $clicker = $entries{$fields{'clicker'}};
+                    $clicker=~s/\s//g;
+                    if ($clicker ne '') {
+                        my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers');
+                        if ($clickers{$clicker} ne '') {  
+                            my $match = 0;
+                            my @inclass;
+                            foreach my $poss (split(/,/,$clickers{$clicker})) {
+                                if (exists($$classlist{"$poss:$domain"})) {
+                                    $username = $poss;
+                                    push(@inclass,$poss);
+                                    $match ++;
+                                    
+                                }
+                            }
+                            if ($match > 1) {
+                                undef($username); 
+                                $request->print('<p class="LC_warning">'.
+                                                &mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])',
+                                                $clicker,join(', ',@inclass)).'</p>');
+                            }
+                        }
+                    }
+                }
+            }
 	}
 	if (!exists($$classlist{"$username:$domain"})) {
 	    my $id=$entries{$fields{'ID'}};
 	    $id=~s/\s//g;
-	    if ($id) {
+            my $clicker = $entries{$fields{'clicker'}};
+            $clicker=~s/\s//g;
+            if ($clicker) {
+                push(@skipped,"$clicker:$domain");
+	    } elsif ($id) {
 		push(@skipped,"$id:$domain");
 	    } else {
 		push(@skipped,"$username:$domain");
@@ -4775,7 +4833,7 @@ sub csvuploadassign {
                     my $award=($pcr == 0) ? 'incorrect_by_override'
                                           : 'correct_by_override';
                     if ($pcr>1) {
-                        push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
+                       push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
                     }
                     $grades{"resource.$part.awarded"}=$pcr;
                     $grades{"resource.$part.solved"}=$award;
@@ -4804,19 +4862,20 @@ sub csvuploadassign {
 					   $env{'request.course.id'},
 					   $domain,$username);
 	   if ($result eq 'ok') {
+# Successfully stored
 	      $request->print('.');
 # Remove from grading queue
               &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,
                                              $env{'course.'.$env{'request.course.id'}.'.domain'},
                                              $env{'course.'.$env{'request.course.id'}.'.num'},
                                              $domain,$username);
-	   } else {
+              $countdone++;
+           } else {
 	      $request->print("<p><span class=\"LC_error\">".
                               &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
                                   "$username:$domain",$result)."</span></p>");
 	   }
 	   $request->rflush();
-	   $countdone++;
         }
     }
     $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
@@ -4833,7 +4892,6 @@ sub csvuploadassign {
 	$request->print(join(', ',@notallowed));
     }
     $request->print("<br />\n");
-    $request->print(&show_grading_menu_form($symb));
     return $error_msg;
 }
 #------------- end of section for handling csv file upload ---------
@@ -4844,12 +4902,11 @@ sub csvuploadassign {
 #
 #--- Select a page/sequence and a student to grade
 sub pickStudentPage {
-    my ($request) = shift;
+    my ($request,$symb) = @_;
 
     my $alertmsg = &mt('Please select the student you wish to grade.');
     &js_escape(\$alertmsg);
-    $request->print(<<LISTJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
 
 function checkPickOne(formname) {
     if (radioSelection(formname.student) == null) {
@@ -4862,13 +4919,13 @@ function checkPickOne(formname) {
     formname.submit();
 }
 
-</script>
 LISTJAVASCRIPT
     &commonJSfunctions($request);
-    my ($symb) = &get_symb($request);
+
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+    my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
 
     my $result='<h3><span class="LC_info">&nbsp;'.
 	&mt('Manual Grading by Page or Sequence').'</span></h3>';
@@ -4883,49 +4940,68 @@ LISTJAVASCRIPT
     my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);
-    my $select = '<select name="selectpage">'."\n";
+
+    # Collection of hidden fields
     my $ctr=0;
     foreach (@$titles) {
-	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	$select.='<option value="'.$ctr.'" '.
-	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
-	    '>'.$showtitle.'</option>'."\n";
-	$ctr++;
+        my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+        $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
+        $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
+        $ctr++;
     }
-    $select.= '</select>';
-    $result.='&nbsp;<b>'.&mt('Problems from').':</b> '.$select."<br />\n";
+    $result.='<input type="hidden" name="page" />'."\n".
+        '<input type="hidden" name="title" />'."\n";
+
+    $result.=&build_section_inputs();
+    my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
+    $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
+	'<input type="hidden" name="command" value="displayPage" />'."\n".
+	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
 
+    # Show grading options
+    $result.=&Apache::lonhtmlcommon::start_pick_box();
+    my $select = '<select name="selectpage">'."\n";
     $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	$result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
-	$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
+	$select.='<option value="'.$ctr.'"'.
+	    ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
+	    '>'.$showtitle.'</option>'."\n";
 	$ctr++;
     }
-    $result.='<input type="hidden" name="page" />'."\n".
-	'<input type="hidden" name="title" />'."\n";
+    $select.= '</select>';
 
-    my $options =
-	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
-	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
-    $result.='&nbsp;<b>'.&mt('View Problem Text').': </b>'.$options;
-
-    $options =
-	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
-    $result.='&nbsp;<b>'.&mt('Submissions').': </b>'.$options;
+    $result.=
+        &Apache::lonhtmlcommon::row_title(&mt('Problems from'))
+       .$select
+       .&Apache::lonhtmlcommon::row_closure();
+
+    $result.=
+        &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
+       .'<label><input type="radio" name="vProb" value="no"'
+           .' checked="checked" /> '.&mt('no').' </label>'."\n"
+       .'<label><input type="radio" name="vProb" value="yes" />'
+           .&mt('yes').'</label>'."\n"
+       .&Apache::lonhtmlcommon::row_closure();
+
+    $result.=
+        &Apache::lonhtmlcommon::row_title(&mt('View Submissions'))
+       .'<label><input type="radio" name="lastSub" value="none" /> '
+           .&mt('none').' </label>'."\n"
+       .'<label><input type="radio" name="lastSub" value="datesub"'
+           .' checked="checked" /> '.&mt('all submissions').'</label>'."\n"
+       .'<label><input type="radio" name="lastSub" value="all" /> '
+           .&mt('all submissions with details').' </label>'
+       .&Apache::lonhtmlcommon::row_closure();
     
-    $result.=&build_section_inputs();
-    my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
-    $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
-	'<input type="hidden" name="command" value="displayPage" />'."\n".
-	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
-
-    $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
+    $result.=
+        &Apache::lonhtmlcommon::row_title(&mt('Use CODE'))
+       .'<input type="text" name="CODE" value="" />'
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box();
 
-    $result.='&nbsp;<input type="button" '.
+    # Show list of students to select for grading
+    $result.='<br /><input type="button" '.
              'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
 
     $request->print($result);
@@ -4939,7 +5015,7 @@ LISTJAVASCRIPT
 	'<th>'.&nameUserString('header').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
  
-    my (undef,undef,$fullname) = &getclasslist($getsec,'1');
+    my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup);
     my $ptr = 1;
     foreach my $student (sort 
 			 {
@@ -4967,7 +5043,6 @@ LISTJAVASCRIPT
     $studentTable.='<input type="button" '.
                    'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";
 
-    $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
 
     return '';
@@ -4990,7 +5065,7 @@ sub getSymbMap {
     my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
 					       1,0,1);
     for my $sequence ($navmap->getById('0.0'), @sequences) {
-	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
+	if ($navmap->hasResource($sequence, sub { shift->is_gradable(); }, 0) ) {
 	    my $title = $minder.'.'.
 		&HTML::Entities::encode($sequence->compTitle(),'"\'&');
 	    push(@titles, $title); # minder in case two titles are identical
@@ -5004,9 +5079,7 @@ sub getSymbMap {
 #
 #--- Displays a page/sequence w/wo problems, w/wo submissions
 sub displayPage {
-    my ($request) = shift;
-
-    my ($symb) = &get_symb($request);
+    my ($request,$symb) = @_;
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
@@ -5023,11 +5096,11 @@ sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print('<span class="LC_warning">'.
-                        &mt('Unable to view requested student. ([_1])',
-                            $env{'form.student'}).
-                        '</span>');
-        $request->print(&show_grading_menu_form($symb));
+        $request->print(
+            '<span class="LC_warning">'.
+            &mt('Unable to view requested student. ([_1])',
+                    $env{'form.student'}).
+            '</span>');
         return;
     }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
@@ -5045,14 +5118,12 @@ sub displayPage {
     my $navmap = Apache::lonnavmaps::navmap->new();
     unless (ref($navmap)) {
         $request->print(&navmap_errormsg());
-        $request->print(&show_grading_menu_form($symb));
         return;
     }
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
 	$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
-	$request->print(&show_grading_menu_form($symb));
 	return; 
     }
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -5065,8 +5136,7 @@ sub displayPage {
 	'<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
 	'<input type="hidden" name="title"   value="'.$env{'form.title'}.'" />'."\n".
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="overRideScore" value="no" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
+	'<input type="hidden" name="overRideScore" value="no" />'."\n";
 
     if (defined($env{'form.CODE'})) {
 	$studentTable.=
@@ -5080,7 +5150,7 @@ sub displayPage {
         '</span>'."\n".
 	&Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
-	'<th align="center">&nbsp;Prob.&nbsp;</th>'.
+	'<th>'.&mt('Prob.').'</th>'.
 	'<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
 
@@ -5092,10 +5162,11 @@ sub displayPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem()) {
+        if (ref($curRes) && $curRes->is_gradable()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
+            my $is_tool = ($symbx =~ /ext\.tool$/);
 	    $studentTable.=
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
@@ -5106,26 +5177,34 @@ sub displayPage {
 		 '</td>';
 	    $studentTable.='<td valign="top">';
 	    my %form = ('CODE' => $env{'form.CODE'},);
-	    if ($env{'form.vProb'} eq 'yes' ) {
-		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
-					     undef,'both',\%form);
-	    } else {
-		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
-		$companswer =~ s|<form(.*?)>||g;
-		$companswer =~ s|</form>||g;
-#		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
-#		    $companswer =~ s/$1/ /ms;
-#		    $request->print('match='.$1."<br />\n");
-#		}
-#		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
-		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
+            if ($is_tool) {
+                $studentTable.='&nbsp;<b>'.$title.'</b><br />';
+            } else {
+	        if ($env{'form.vProb'} eq 'yes' ) {
+		    $studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
+					         undef,'both',\%form);
+	        } else {
+		    my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
+		    $companswer =~ s|<form(.*?)>||g;
+		    $companswer =~ s|</form>||g;
+#		    while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
+#		        $companswer =~ s/$1/ /ms;
+#		        $request->print('match='.$1."<br />\n");
+#		    }
+#		    $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
+		    $studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
+		}
 	    }
 
 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
 
 	    if ($env{'form.lastSub'} eq 'datesub') {
 		if ($record{'version'} eq '') {
-		    $studentTable.='<br />&nbsp;<span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />';
+                    my $msg = &mt('No recorded submission for this problem.');
+                    if ($is_tool) {
+                        $msg = &mt('No recorded transactions for this external tool');
+                    }
+		    $studentTable.='<br />&nbsp;<span class="LC_warning">'.$msg.'</span><br />';
 		} else {
 		    my %responseType = ();
 		    foreach my $partid (@{$parts}) {
@@ -5138,11 +5217,10 @@ sub displayPage {
 			$responseType{$partid} = \%responseIds;
 		    }
 		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
-
 		}
 	    } elsif ($env{'form.lastSub'} eq 'all') {
 		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-                my $identifier = (&canmodify($usec)? $prob : '');
+                my $identifier = (&canmodify($usec)? $prob : ''); 
 		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
 									$env{'request.course.id'},
 									'','.submission',undef,
@@ -5170,7 +5248,6 @@ sub displayPage {
         '<input type="button" value="'.&mt('Save').'" '.
         'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
         '</form>'."\n";
-    $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
 
     return '';
@@ -5180,13 +5257,14 @@ sub displaySubByDates {
     my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
     my $isCODE=0;
     my $isTask = ($symb =~/\.task$/);
+    my $is_tool = ($symb =~/\.tool$/);
     if (exists($record->{'resource.CODE'})) { $isCODE=1; }
     my $studentTable=&Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
 	'<th>'.&mt('Date/Time').'</th>'.
 	($isCODE?'<th>'.&mt('CODE').'</th>':'').
         ($isTask?'<th>'.&mt('Version').'</th>':'').
-	'<th>'.&mt('Submission').'</th>'.
+	'<th>'.($is_tool?&mt('Grade'):&mt('Submission')).'</th>'.
 	'<th>'.&mt('Status').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
     my ($version);
@@ -5194,7 +5272,11 @@ sub displaySubByDates {
     my %orders;
     $mark{'correct_by_student'} = $checkIcon;
     if (!exists($$record{'1:timestamp'})) {
-	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
+        if ($is_tool) {
+            return '<br />&nbsp;<span class="LC_warning">'.&mt('No grade passed back.').'</span><br />';
+        } else {
+            return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
+        }
     }
 
     my $interaction;
@@ -5227,56 +5309,64 @@ sub displaySubByDates {
             if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
                 $hidden = 1;
             }
-	    my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
-			            : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
-	    
+            my @matchKey;
+            if ($isTask) {
+                @matchKey = sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys);
+            } elsif ($is_tool) {
+                @matchKey = sort(grep /^resource\.\Q$partid\E\.awarded$/,@versionKeys);
+            } else {
+                @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+            }
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
 	    my $display_part=&get_display_part($partid,$symb);
 	    foreach my $matchKey (@matchKey) {
 		if (exists($$record{$version.':'.$matchKey}) &&
 		    $$record{$version.':'.$matchKey} ne '') {
-                    
-		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
-				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
-                    $displaySub[0].='<span class="LC_nobreak">';
-                    $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
-                                   .' <span class="LC_internal_info">'
-                                   .'('.&mt('Response ID: [_1]',$responseId).')'
-                                   .'</span>'
-                                   .' <b>';
-                    if ($hidden) {
-                        $displaySub[0].= &mt('Anonymous Survey').'</b>';
+                    if ($is_tool) {
+                        $displaySub[0].=$$record{"$version:resource.$partid.awarded"};
                     } else {
-                        my ($trial,$rndseed,$newvariation);
-                        if ($type eq 'randomizetry') {
-                            $trial = $$record{"$where.$partid.tries"};
-                            $rndseed = $$record{"$where.$partid.rndseed"};
-                        }
-		        if ($$record{"$where.$partid.tries"} eq '') {
-			    $displaySub[0].=&mt('Trial not counted');
-		        } else {
-			    $displaySub[0].=&mt('Trial: [_1]',
-					    $$record{"$where.$partid.tries"});
-                            if (($rndseed ne '')  && ($lastrndseed{$partid} ne '')) {
-                                if (($rndseed ne $lastrndseed{$partid}) &&
-                                    (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
-                                    $newvariation = '&nbsp;('.&mt('New variation this try').')';
-                                }
+		        my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
+				                   : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
+                        $displaySub[0].='<span class="LC_nobreak">';
+                        $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
+                                       .' <span class="LC_internal_info">'
+                                       .'('.&mt('Response ID: [_1]',$responseId).')'
+                                       .'</span>'
+                                       .' <b>';
+                        if ($hidden) {
+                            $displaySub[0].= &mt('Anonymous Survey').'</b>';
+                        } else {
+                            my ($trial,$rndseed,$newvariation);
+                            if ($type eq 'randomizetry') {
+                                $trial = $$record{"$where.$partid.tries"};
+                                $rndseed = $$record{"$where.$partid.rndseed"};
                             }
-                            $lastrndseed{$partid} = $rndseed;
-                            $lasttype{$partid} = $type;
-		        }
-		        my $responseType=($isTask ? 'Task'
+		            if ($$record{"$where.$partid.tries"} eq '') {
+			        $displaySub[0].=&mt('Trial not counted');
+		            } else {
+			        $displaySub[0].=&mt('Trial: [_1]',
+					        $$record{"$where.$partid.tries"});
+                                if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
+                                    if (($rndseed ne $lastrndseed{$partid}) &&
+                                        (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
+                                        $newvariation = '&nbsp;('.&mt('New variation this try').')';
+                                    }
+                                }
+                                $lastrndseed{$partid} = $rndseed;
+                                $lasttype{$partid} = $type;
+		            }
+		            my $responseType=($isTask ? 'Task'
                                               : $responseType->{$partid}->{$responseId});
-		        if (!exists($orders{$partid})) { $orders{$partid}={}; }
-		        if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
-			    $orders{$partid}->{$responseId}=
-			        &get_order($partid,$responseId,$symb,$uname,$udom,
-                                           $no_increment,$type,$trial,$rndseed);
-		        }
-		        $displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
-		        $displaySub[0].='&nbsp; '.
-			    &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
+		            if (!exists($orders{$partid})) { $orders{$partid}={}; }
+		            if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
+			        $orders{$partid}->{$responseId}=
+			            &get_order($partid,$responseId,$symb,$uname,$udom,
+                                               $no_increment,$type,$trial,$rndseed);
+		            }
+		            $displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
+		            $displaySub[0].='&nbsp; '.
+			        &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
+                        }
                     }
 		}
 	    }
@@ -5291,14 +5381,22 @@ sub displaySubByDates {
 		    lc($$record{"$where.$partid.award"}).' '.
 		    $mark{$$record{"$where.$partid.solved"}}.
 		    '<br />';
+	    } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
+		if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) {
+		    $displaySub[1].=&mt('Grade passed back by external tool');
+		}
 	    }
 	    if (exists $$record{"$where.$partid.regrader"}) {
-		$displaySub[2].=$$record{"$where.$partid.regrader"}.
-		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+		$displaySub[2].=$$record{"$where.$partid.regrader"};
+		unless ($is_tool) {
+		    $displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
+		}
 	    } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
 		$displaySub[2].=
-		    $$record{"$version:resource.$partid.regrader"}.
-		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+		    $$record{"$version:resource.$partid.regrader"};
+                unless ($is_tool) {
+		    $displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
+                }
 	    }
 	}
 	# needed because old essay regrader has not parts info
@@ -5317,7 +5415,7 @@ sub displaySubByDates {
 }
 
 sub updateGradeByPage {
-    my ($request) = shift;
+    my ($request,$symb) = @_;
 
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
@@ -5328,7 +5426,6 @@ sub updateGradeByPage {
     my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {
 	$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
-	$request->print(&show_grading_menu_form($env{'form.symb'}));
 	return;
     }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
@@ -5347,8 +5444,6 @@ sub updateGradeByPage {
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
 	$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
-	my ($symb)=&get_symb($request);
-	$request->print(&show_grading_menu_form($symb));
 	return; 
     }
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -5480,7 +5575,6 @@ sub updateGradeByPage {
     }
 
     $studentTable.=&Apache::loncommon::end_data_table();
-    $studentTable.=&show_grading_menu_form($env{'form.symb'});
     my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
 		  &mt('The scores were changed for [quant,_1,problem].',
 		  $changeflag).'<br />');
@@ -5561,9 +5655,7 @@ the homework problem.
 
 sub defaultFormData {
     my ($symb)=@_;
-    return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-     '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
-     '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
+    return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />';
 }
 
 
@@ -5789,8 +5881,7 @@ sub scantron_CODEunique {
 =cut
 
 sub scantron_selectphase {
-    my ($r,$file2grade) = @_;
-    my ($symb)=&get_symb($r);
+    my ($r,$file2grade,$symb) = @_;
     if (!$symb) {return '';}
     my $map_error;
     my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
@@ -5799,7 +5890,6 @@ sub scantron_selectphase {
         return;
     }
     my $default_form_data=&defaultFormData($symb);
-    my $grading_menu_button=&show_grading_menu_form($symb);
     my $file_selector=&scantron_uploads($file2grade);
     my $format_selector=&scantron_scantab();
     my $CODE_selector=&scantron_CODElist();
@@ -5811,11 +5901,10 @@ sub scantron_selectphase {
     if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
         &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
 
-        # Chunk of form to prompt for a scantron file upload.
+	# Chunk of form to prompt for a scantron file upload.
 
         $r->print('
     <br />');
-    my $default_form_data=&defaultFormData($symb);
     my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
@@ -5823,11 +5912,11 @@ sub scantron_selectphase {
     my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
     $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
-        if (formname.upfile.value == "") {
-            alert("'.$alertmsg.'");
-            return false;
-        }
-        formname.submit();
+	if (formname.upfile.value == "") {
+	    alert("'.$alertmsg.'");
+	    return false;
+	}
+	formname.submit();
     }'."\n".$formatjs));
     $r->print('
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
@@ -5913,6 +6002,8 @@ sub scantron_selectphase {
    
     $r->print($result);
 
+
+
     # Chunk of the form that prompts to view a scoring office file,
     # corrected file, skipped records in a file.
 
@@ -5971,7 +6062,6 @@ sub scantron_selectphase {
               &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::end_data_table()."\n".
               '</form><br />');
-    $r->print($grading_menu_button);
     return;
 }
 
@@ -5980,7 +6070,9 @@ sub scantron_selectphase {
 =item username_to_idmap
 
     creates a hash keyed by student/employee ID with values of the corresponding
-    student username:domain.
+    student username:domain. If a single ID occurs for more than one student,
+    the status of the student is checked, and if Active, the value in the hash
+    will be set to the Active student.
 
   Arguments:
 
@@ -6180,12 +6272,12 @@ sub digits_to_letters {
 
 =item scantron_parse_scanline
 
-  Decodes a scanline from the selected scantron file
+  Decodes a scanline from the selected bubblesheet file
 
  Arguments:
-    line             - The text of the scantron file line to process
+    line             - The text of the bubblesheet file line to process
     whichline        - Line number
-    scantron_config  - Hash describing the format of the scantron lines.
+    scantron_config  - Hash describing the format of the bubblesheet lines.
     scan_data        - Hash of extra information about the scanline
                        (see scantron_getfile for more information)
     just_header      - True if should not process question answers but only
@@ -6210,7 +6302,7 @@ sub digits_to_letters {
     totalref         - Ref of scalar used to score total number of bubble
                        lines needed for responses in a scan line (used when
                        randompick in use. 
-
+    
  Returns:
    Hash containing the result of parsing the scanline
 
@@ -6303,7 +6395,7 @@ sub scantron_parse_scanline {
                                          $partids_by_symb,$orderedforcode,
                                          $respnumlookup,$startline);
         if ($total) {
-            $lastpos = $total*$$scantron_config{'Qlength'};
+            $lastpos = $total*$$scantron_config{'Qlength'}; 
         }
         if (ref($totalref)) {
             $$totalref = $total;
@@ -6317,7 +6409,7 @@ sub scantron_parse_scanline {
         if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
             $answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}};
         } else {
-            $answers_needed = $bubble_lines_per_response{$questnum};
+	    $answers_needed = $bubble_lines_per_response{$questnum};
         }
         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
                              || 1;
@@ -6378,7 +6470,7 @@ sub scantron_parse_scanline {
 
 sub get_master_seq {
     my ($resources,$master_seq,$symb_to_resource) = @_;
-    return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
+    return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && 
                    (ref($symb_to_resource) eq 'HASH'));
     my $resource_error;
     foreach my $resource (@{$resources}) {
@@ -6456,7 +6548,7 @@ sub scantron_validator_lettnum {
     my $occurrences = 0;
     my $responsenum = $questnum-1;
     if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-       $responsenum = $respnumlookup->{$questnum-1}
+       $responsenum = $respnumlookup->{$questnum-1} 
     }
     if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
         ($responsetype_per_response{$responsenum} eq 'formularesponse') ||
@@ -6752,7 +6844,7 @@ sub scantron_process_corrections {
 	}
     }
     if ($err) {
-	$r->print(
+        $r->print(
             '<p class="LC_error">'
            .&mt('Unable to accept last correction, an error occurred: [_1]',
                 $errmsg)
@@ -6870,7 +6962,7 @@ sub check_for_error {
 =cut
 
 sub scantron_warning_screen {
-    my ($button_text)=@_;
+    my ($button_text,$symb)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
     my $CODElist;
@@ -6899,9 +6991,8 @@ sub scantron_warning_screen {
 <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
 '.$CODElist.$lastbubblepoints.'
 </table>
-<br />
-<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'</p>
-<p> '.&mt("If something is incorrect, please click the 'Grading Menu' button to start over.").'</p>
+<p> '.&mt("If this information is correct, please click on '[_1]'.",&mt($button_text)).'<br />
+'.&mt('If something is incorrect, please return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>
 
 <br />
 ');
@@ -6917,8 +7008,7 @@ sub scantron_warning_screen {
 =cut
 
 sub scantron_do_warning {
-    my ($r)=@_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);
     $r->print(&scantron_form_start().$default_form_data);
@@ -6936,7 +7026,7 @@ sub scantron_do_warning {
 	    $r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>');
 	} 
     } else {
-	my $warning=&scantron_warning_screen('Grading: Validate Records');
+	my $warning=&scantron_warning_screen('Grading: Validate Records',$symb);
         my $bubbledbyhand=&hand_bubble_option();
 	$r->print('
 '.$warning.$bubbledbyhand.'
@@ -6944,7 +7034,7 @@ sub scantron_do_warning {
 <input type="hidden" name="command" value="scantron_validate" />
 ');
     }
-    $r->print("</form><br />".&show_grading_menu_form($symb));
+    $r->print("</form><br />");
     return '';
 }
 
@@ -7002,8 +7092,7 @@ SCANTRONFORM
 =cut
 
 sub scantron_validate_file {
-    my ($r) = @_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb) = @_;
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);
     
@@ -7058,7 +7147,7 @@ sub scantron_validate_file {
     while (!$stop && $currentphase < scalar(@validate_phases)) {
 	$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
 	$r->rflush();
-
+     
 	my $which="scantron_validate_".$validate_phases[$currentphase];
 	{
 	    no strict 'refs';
@@ -7066,7 +7155,7 @@ sub scantron_validate_file {
 	}
     }
     if (!$stop) {
-	my $warning=&scantron_warning_screen('Start Grading');
+	my $warning=&scantron_warning_screen('Start Grading',$symb);
 	$r->print(&mt('Validation process complete.').'<br />'.
                   $warning.
                   &mt('Perform verification for each student after storage of submissions?').
@@ -7076,7 +7165,7 @@ sub scantron_validate_file {
                   '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
                   '</label></span><br />'.
                   &mt('Grading will take longer if you use verification.').'<br />'.
-                  &mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
+                  &mt('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once grading is complete.','&raquo;').'<br /><br />'.
                   '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
                   '<input type="hidden" name="command" value="scantron_process" />'."\n");
     } else {
@@ -7088,7 +7177,7 @@ sub scantron_validate_file {
 	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');
 	    $r->print(' '.&mt('this error').' <br />');
 
-	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
+	    $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
 	} else {
             if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
 	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');
@@ -7100,7 +7189,7 @@ sub scantron_validate_file {
 	    $r->print(" ".&mt("this scanline saving it for later."));
 	}
     }
-    $r->print(" </form><br />".&show_grading_menu_form($symb));
+    $r->print(" </form><br />");
     return '';
 }
 
@@ -7467,9 +7556,10 @@ sub scantron_validate_sequence {
 	my @resources=
 	    $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
 	if (@resources) {
-	    $r->print('<p class="LC_warning">'
+	    $r->print(
+                '<p class="LC_warning">'
                .&mt('Some resources in the sequence currently are not set to'
-                   .' exam mode. Grading these resources currently may not'
+                   .' bubblesheet exam mode. Grading these resources currently may not'
                    .' work correctly.')
                .'</p>'
             );
@@ -7591,10 +7681,10 @@ sub scantron_get_correction {
 
     if ($error =~ /ID$/) {
 	if ($error eq 'incorrectID') {
-	    $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
+            $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
 		      "</p>\n");
 	} elsif ($error eq 'duplicateID') {
-	    $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
+            $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
 	}
 	$r->print($message);
 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
@@ -7614,8 +7704,8 @@ sub scantron_get_correction {
 	} elsif ($error eq 'duplicateCODE') {
 	    $r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
 	}
-        $r->print("<p>".&mt('The CODE on the form is [_1]',
-                            "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
+	$r->print("<p>".&mt('The CODE on the form is [_1]',
+			    "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
                  ."</p>\n");
 	$r->print($message);
 	$r->print("<p>".&mt("How should I handle this?")."</p>\n");
@@ -7651,8 +7741,7 @@ sub scantron_get_correction {
 	    $r->print("\n<br />");
 	}
 
-	$r->print(<<ENDSCRIPT);
-<script type="text/javascript">
+	$r->print(&Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT));
 function change_radio(field) {
     var slct=document.scantronupload.scantron_CODE_resolution;
     var i;
@@ -7660,7 +7749,6 @@ function change_radio(field) {
         if (slct[i].value==field) { slct[i].checked=true; }
     }
 }
-</script>
 ENDSCRIPT
 	my $href="/adm/pickcode?".
 	   "form=".&escape("scantronupload").
@@ -7714,7 +7802,7 @@ ENDSCRIPT
 	# The form field scantron_questions is actually a list of line numbers not
 	# a list of question numbers. Therefore:
 	#
-	
+
 	my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,
                                                 $respnumlookup,$startline);
 
@@ -7739,8 +7827,7 @@ sub verify_bubbles_checked {
     my $ansnumstr = join('","',@ansnums);
     my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
     &js_escape(\$warning);
-    my $output = (<<ENDSCRIPT);
-<script type="text/javascript">
+    my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
 function verify_bubble_radio(form) {
     var ansnumArray = new Array ("$ansnumstr");
     var need_bubble_count = 0;
@@ -7763,7 +7850,6 @@ function verify_bubble_radio(form) {
     }
     form.submit(); 
 }
-</script>
 ENDSCRIPT
     return $output;
 }
@@ -7826,7 +7912,7 @@ sub questions_to_line_list {
             } else {
                 $first = $first_bubble_line{$responsenum} + 1;
             }
-            $count   = $bubble_lines_per_response{$responsenum};
+	    $count   = $bubble_lines_per_response{$responsenum};
         }
         $last = $first+$count-1;
         push(@lines, ($first..$last));
@@ -7857,6 +7943,7 @@ for multi and missing bubble cases).
                   and value is number of first bubble line for current student
                   or code-based randompick and/or randomorder.
 
+
  Implicit inputs:
    %bubble_lines_per_response   - Starting line numbers for each question.
                                   Numbered from 0 (but question numbers are from
@@ -7909,7 +7996,7 @@ sub prompt_for_corrections {
     } else {
         if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
             $responsenum = $respnumlookup->{$question-1};
-            if (ref($startline) eq 'HASH') {
+            if (ref($startline) eq 'HASH') { 
                 $first = $startline->{$question-1};
             }
         } else {
@@ -7927,7 +8014,16 @@ sub prompt_for_corrections {
             ($responsetype_per_response{$responsenum} eq 'imageresponse') ||
             ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||
             ($responsetype_per_response{$responsenum} eq 'organicresponse')) {
-            $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
+            $r->print(
+                &mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines)
+               .'<br /><br />'
+               .&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.')
+               .'<br />'
+               .&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.')
+               .'<br />'
+               .&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.")
+               .'<br /><br />'
+            );
         } else {
             $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
         }
@@ -7967,7 +8063,7 @@ sub scantron_bubble_selector {
     my $max=$$scan_config{'Qlength'};
 
     my $scmode=$$scan_config{'Qon'};
-    if ($scmode eq 'number' || $scmode eq 'letter') {
+    if ($scmode eq 'number' || $scmode eq 'letter') { 
         if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&
             ($$scan_config{'BubblesPerRow'} > 0)) {
             $max=$$scan_config{'BubblesPerRow'};
@@ -8286,7 +8382,7 @@ sub scantron_get_maxbubble {
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-        my $resid = $resource->id();
+        my $resid = $resource->id(); 
         my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,
                                                           $udom,undef,$bubbles_per_row);
         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
@@ -8337,7 +8433,7 @@ sub scantron_get_maxbubble {
 	        $bubble_lines_per_response{$response_number} = $lines;
                 $responsetype_per_response{$response_number} = 
                     $analysis->{$part_id.'.type'};
-                $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;
+                $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;  
 	        $response_number++;
 
 	        $bubble_line +=  $lines;
@@ -8418,9 +8514,9 @@ sub scantron_validate_missingbubbles {
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
-        my $scan_record =
+	my $scan_record =
             &scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap,
-                                     $randomorder,$randompick,$sequence,\@master_seq,
+				     $randomorder,$randompick,$sequence,\@master_seq,
                                      \%symb_to_resource,\%grader_partids_by_symb,
                                      \%orderedforcode,\%respnumlookup,\%startline);
 	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
@@ -8431,36 +8527,36 @@ sub scantron_validate_missingbubbles {
 	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
             my $lastbubble;
             if ($missing =~ /^(\d+)\.(\d+)$/) {
-                my $question = $1;
-                my $subquestion = $2;
-                my ($first,$responsenum);
-                if ($randomorder || $randompick) {
-                    $responsenum = $respnumlookup{$question-1};
-                    $first = $startline{$question-1};
-                } else {
-                    $responsenum = $question-1;
-                    $first = $first_bubble_line{$responsenum};
-                }
-                if (!defined($first)) { next; }
-                my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
-                my $subcount = 1;
-                while ($subcount<$subquestion) {
-                    $first += $subans[$subcount-1];
-                    $subcount ++;
-                }
-                my $count = $subans[$subquestion-1];
-                $lastbubble = $first + $count;
+               my $question = $1;
+               my $subquestion = $2;
+               my ($first,$responsenum);
+               if ($randomorder || $randompick) {
+                   $responsenum = $respnumlookup{$question-1};
+                   $first = $startline{$question-1};
+               } else {
+                   $responsenum = $question-1; 
+                   $first = $first_bubble_line{$responsenum};
+               }
+               if (!defined($first)) { next; }
+               my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
+               my $subcount = 1;
+               while ($subcount<$subquestion) {
+                   $first += $subans[$subcount-1];
+                   $subcount ++;
+               }
+               my $count = $subans[$subquestion-1];
+               $lastbubble = $first + $count;
             } else {
-                my ($first,$responsenum);
-                if ($randomorder || $randompick) {
-                    $responsenum = $respnumlookup{$missing-1};
-                    $first = $startline{$missing-1};
-                } else {
-                    $responsenum = $missing-1;
-                    $first = $first_bubble_line{$responsenum};
-                }
-                if (!defined($first)) { next; }
-                $lastbubble = $first + $bubble_lines_per_response{$responsenum};
+               my ($first,$responsenum);
+               if ($randomorder || $randompick) {
+                   $responsenum = $respnumlookup{$missing-1};
+                   $first = $startline{$missing-1};
+               } else {
+                   $responsenum = $missing-1;
+                   $first = $first_bubble_line{$responsenum};
+               }
+               if (!defined($first)) { next; }
+               $lastbubble = $first + $bubble_lines_per_response{$responsenum};
             }
             if ($lastbubble > $max_bubble) { next; }
 	    push(@to_correct,$missing);
@@ -8514,17 +8610,16 @@ sub hand_bubble_option {
 }
 
 sub scantron_process_students {
-    my ($r) = @_;
+    my ($r,$symb) = @_;
 
     my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
-    my ($symb)=&get_symb($r);
     if (!$symb) {
 	return '';
     }
     my $default_form_data=&defaultFormData($symb);
 
     my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
+    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); 
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
@@ -8569,8 +8664,7 @@ SCANTRONFORM
     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-					  'Processing first student');
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
     $r->print('<br />');
     my $start=&Time::HiRes::time();
     my $i=-1;
@@ -8588,7 +8682,6 @@ SCANTRONFORM
     if ($ssi_error) {
 	$r->print("</form>");
 	&ssi_print_error($r);
-	$r->print(&show_grading_menu_form($symb));
         &Apache::lonnet::remove_lock($lock);
 	return '';		# Dunno why the other returns return '' rather than just returning.
     }
@@ -8603,15 +8696,14 @@ SCANTRONFORM
  	my $line=&scantron_get_line($scanlines,$scan_data,$i);
  	if ($line=~/^[\s\cz]*$/) { next; }
 	if ($started) {
-	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-						     'last student');
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
 	}
 	$started=1;
         my %respnumlookup = ();
         my %startline = ();
         my $total;
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
- 						 $scan_data,undef,\%idmap,$randomorder,
+                                                 $scan_data,undef,\%idmap,$randomorder,
                                                  $randompick,$sequence,\@master_seq,
                                                  \%symb_to_resource,\%grader_partids_by_symb,
                                                  \%orderedforcode,\%respnumlookup,\%startline,
@@ -8641,7 +8733,7 @@ SCANTRONFORM
 
         my @mapresources = @resources;
         if ($randomorder || $randompick) {
-            @mapresources =
+            @mapresources = 
                 &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
                              \%orderedforcode);
         }
@@ -8691,7 +8783,6 @@ SCANTRONFORM
             $ssi_error = 0; # So end of handler error message does not trigger.
             $r->print("</form>");
             &ssi_print_error($r);
-            $r->print(&show_grading_menu_form($symb));
             &Apache::lonnet::remove_lock($lock);
             return '';      # Why return ''?  Beats me.
         }
@@ -8731,12 +8822,11 @@ SCANTRONFORM
                 if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
                                            \@mapresources,\%partids_by_symb,
                                            $bubbles_per_row,$randomorder,$randompick,
-                                           \%respnumlookup,\%startline)
+                                           \%respnumlookup,\%startline) 
                     eq 'ssi_error') {
                     $ssi_error = 0; # So end of handler error message does not trigger.
                     $r->print("</form>");
                     &ssi_print_error($r);
-                    $r->print(&show_grading_menu_form($symb));
                     &Apache::lonnet::remove_lock($lock);
                     delete($completedstudents{$uname});
                     return '';
@@ -8794,7 +8884,6 @@ SCANTRONFORM
 #    $r->print("<p>took $lasttime</p>");
 
     $r->print("</form>");
-    $r->print(&show_grading_menu_form($symb));
     return '';
 }
 
@@ -8826,7 +8915,7 @@ sub graders_resources_pass {
 =item users_order
 
   Returns array of resources in current map, ordered based on either CODE,
-  if this is a CODEd exam, or based on student's identity if this is a
+  if this is a CODEd exam, or based on student's identity if this is a 
   "NAMEd" exam.
 
   Should be used when randomorder and/or randompick applied when the 
@@ -8853,7 +8942,7 @@ sub users_order  {
             if (ref($actual_seq) eq 'ARRAY') {
                 @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq};
                 if (ref($orderedforcode) eq 'HASH') {
-                    if (@mapresources > 0) {
+                    if (@mapresources > 0) { 
                         $orderedforcode->{$scancode} = \@mapresources;
                     }
                 }
@@ -8866,7 +8955,7 @@ sub users_order  {
                                                            $master_seq,
                                                            $user,undef,1);
         if (ref($actual_seq) eq 'ARRAY') {
-            @mapresources =
+            @mapresources = 
                 map { $symb_to_resource->{$_}; } @{$actual_seq};
         }
     }
@@ -8922,7 +9011,7 @@ sub grade_student_bubbles {
 }
 
 sub scantron_upload_scantron_data {
-    my ($r)=@_;
+    my ($r,$symb)=@_;
     my $dom = $env{'request.role.domain'};
     my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);
     my $domdesc = &Apache::lonnet::domain($dom,'description');
@@ -8931,8 +9020,7 @@ sub scantron_upload_scantron_data {
 							  'domainid',
 							  'coursename',$dom);
     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
-                       ('&nbsp'x2).&mt('(shows course personnel)');
-    my ($symb) = &get_symb($r,1);
+                       ('&nbsp'x2).&mt('(shows course personnel)'); 
     my $default_form_data=&defaultFormData($symb);
     my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
     &js_escape(\$nofile_alert);
@@ -9013,7 +9101,7 @@ END
             if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) {
                 if (($domconfig{'scantron'}{'config'}{'dat'}) &&
                     (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
+                    if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {  
                         if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
                             my ($onclick,$formatextra,$singleline);
                             my @lines = &Apache::lonnet::get_scantronformat_file();
@@ -9079,8 +9167,7 @@ END
 }
 
 sub scantron_upload_scantron_data_save {
-    my($r)=@_;
-    my ($symb)=&get_symb($r,1);
+    my($r,$symb)=@_;
     my $doanotherupload=
 	'<br /><form action="/adm/grades" method="post">'."\n".
 	'<input type="hidden" name="command" value="scantronupload" />'."\n".
@@ -9090,16 +9177,14 @@ sub scantron_upload_scantron_data_save {
 	!&Apache::lonnet::allowed('usc',
 			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
 	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
-	if ($symb) {
-	    $r->print(&show_grading_menu_form($symb));
-	} else {
+	unless ($symb) {
 	    $r->print($doanotherupload);
 	}
 	return '';
     }
     my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
     my $uploadedfile;
-    $r->print('<p>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</p>');
+    $r->print('<p>'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'</p>');
     if (length($env{'form.upfile'}) < 2) {
         $r->print(
             &Apache::lonhtmlcommon::confirm_success(
@@ -9139,7 +9224,7 @@ sub scantron_upload_scantron_data_save {
         my $result =
             &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
                                             $env{'form.courseid'},$env{'form.domainid'});
-	if ($result =~ m{^/uploaded/}) {
+        if ($result =~ m{^/uploaded/}) {
             $r->print(
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.
                 &mt('Uploaded [_1] bytes of data into location: [_2]',
@@ -9148,7 +9233,7 @@ sub scantron_upload_scantron_data_save {
             ($uploadedfile) = ($result =~ m{/([^/]+)$});
             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
                                                        $env{'form.courseid'},$uploadedfile));
-	} else {
+        } else {
             $r->print(
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.
                     &mt('An error ([_1]) occurred when attempting to upload the file: [_2]',
@@ -9157,7 +9242,7 @@ sub scantron_upload_scantron_data_save {
 	}
     }
     if ($symb) {
-	$r->print(&scantron_selectphase($r,$uploadedfile));
+	$r->print(&scantron_selectphase($r,$uploadedfile,$symb));
     } else {
 	$r->print($doanotherupload);
     }
@@ -9283,8 +9368,7 @@ sub valid_file {
 }
 
 sub scantron_download_scantron_data {
-    my ($r)=@_;
-    my ($symb) = &get_symb($r,1);
+    my ($r,$symb)=@_;
     my $default_form_data=&defaultFormData($symb);
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -9295,7 +9379,6 @@ sub scantron_download_scantron_data {
 	    '.&mt('The requested filename was invalid.').'
         </p>
 ');
-	$r->print(&show_grading_menu_form($symb));
 	return;
     }
     my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
@@ -9306,7 +9389,7 @@ sub scantron_download_scantron_data {
     &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
     $r->print('
     <p>
-	'.&mt('[_1]Original[_2] file as uploaded by bubblesheet scanning office.',
+	'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.',
 	      '<a href="'.$orig.'">','</a>').'
     </p>
     <p>
@@ -9318,15 +9401,12 @@ sub scantron_download_scantron_data {
 	      '<a href="'.$skipped.'">','</a>').'
     </p>
 ');
-    $r->print(&show_grading_menu_form($symb));
     return '';
 }
 
 sub checkscantron_results {
-    my ($r) = @_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb) = @_;
     if (!$symb) {return '';}
-    my $grading_menu_button=&show_grading_menu_form($symb);
     my $cid = $env{'request.course.id'};
     my %lettdig = &Apache::lonnet::letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
@@ -9348,7 +9428,7 @@ sub checkscantron_results {
     my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
         %grader_randomlists_by_symb,%orderedforcode);
-    if (ref($map)) {
+    if (ref($map)) { 
         $randomorder=$map->randomorder();
         $randompick=$map->randompick();
     }
@@ -9377,8 +9457,7 @@ sub checkscantron_results {
         return '';
     }
 
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-                                          'Processing first student');
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
     my $start=&Time::HiRes::time();
     my $i=-1;
 
@@ -9388,8 +9467,7 @@ sub checkscantron_results {
         my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
         if ($line=~/^[\s\cz]*$/) { next; }
         if ($started) {
-            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                     'last student');
+            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
         }
         $started=1;
         my $scan_record=
@@ -9501,19 +9579,21 @@ sub checkscantron_results {
             }
         }
     }
-    $r->print('<p>'.
-              &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
-                  '<b>',
-                  $numstudents,
-                  '</b>',
-                  $env{'form.scantron_maxbubble'}).
-              '</p>'
+    $r->print(
+        '<p>'
+       .&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
+            '<b>',
+            $numstudents,
+            '</b>',
+            $env{'form.scantron_maxbubble'})
+       .'</p>'
     );
     $r->print('<p>'
              .&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>')
              .'<br />'
              .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>')
-             .'</p>');
+             .'</p>'
+    );
     if ($passed) {
         $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
         $r->print(&Apache::loncommon::start_data_table()."\n".
@@ -9533,7 +9613,7 @@ sub checkscantron_results {
                  &Apache::loncommon::end_data_table()).'<br />'.
                  &mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');  
     }
-    $r->print('</form><br />'.$grading_menu_button);
+    $r->print('</form><br />');
     return;
 }
 
@@ -9659,36 +9739,13 @@ sub verify_scantron_grading {
     return ($counter,$record);
 }
 
+
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
 
 #-------------------------- Menu interface -------------------------
 #
-#--- Show a Grading Menu button - Calls the next routine ---
-sub show_grading_menu_form {
-    my ($symb)=@_;
-    my $result.='<br /><form action="/adm/grades" method="post">'."\n".
-	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
-	'<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".
-	'</form>'."\n";
-    return $result;
-}
-
-# -- Retrieve choices for grading form
-sub savedState {
-    my %savedState = ();
-    if ($env{'form.saveState'}) {
-	foreach (split(/:/,$env{'form.saveState'})) {
-	    my ($key,$value) = split(/=/,$_,2);
-	    $savedState{$key} = $value;
-	}
-    }
-    return \%savedState;
-}
-
 #--- Href with symb and command ---
 
 sub href_symb_cmd {
@@ -9697,23 +9754,26 @@ sub href_symb_cmd {
 }
 
 sub grading_menu {
-    my ($request) = @_;
-    my ($symb)=&get_symb($request);
+    my ($request,$symb) = @_;
     if (!$symb) {return '';}
-    my $probTitle = &Apache::lonnet::gettitle($symb);
-    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
 
-    $request->print($table);
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
-                  'handgrade'=>$hdgrade,
-                  'probTitle'=>$probTitle,
-                  'command'=>'submit_options',
-                  'saveState'=>"",
-                  'gradingMenu'=>1,
-                  'showgrading'=>"yes");
-    
-    my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+                  'command'=>'individual');
     
+    my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='ungraded';
+    my $url1b=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='table';
+    my $url1c=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='all_for_one';
+    my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='downloadfilesselect';
+    my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
     $fields{'command'} = 'csvform';
     my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
     
@@ -9722,15 +9782,46 @@ sub grading_menu {
     
     $fields{'command'} = 'scantron_selectphase';
     my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'} = 'initialverifyreceipt';
+    my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
     
-    my @menu = ({	categorytitle=>'Course Grading',
+    my @menu = ({	categorytitle=>'Hand Grading',
             items =>[
-                        {	linktext => 'Manual Grading/View Submissions',
-                    		url => $url1,
+                        {	linktext => 'Select individual students to grade',
+                    		url => $url1a,
                     		permission => 'F',
-                    		icon => 'edit-find-replace.png',
-                    		linktitle => 'Start the process of hand grading submissions.'
+                    		icon => 'grade_students.png',
+                    		linktitle => 'Grade current resource for a selection of students.'
+                        }, 
+                        {       linktext => 'Grade ungraded submissions.',
+                                url => $url1b,
+                                permission => 'F',
+                                icon => 'ungrade_sub.png',
+                                linktitle => 'Grade all submissions that have not been graded yet.'
+                        },
+
+                        {       linktext => 'Grading table',
+                                url => $url1c,
+                                permission => 'F',
+                                icon => 'grading_table.png',
+                                linktitle => 'Grade current resource for all students.'
                         },
+                        {       linktext => 'Grade page/folder for one student',
+                                url => $url1d,
+                                permission => 'F',
+                                icon => 'grade_PageFolder.png',
+                                linktitle => 'Grade all resources in current page/sequence/folder for one student.'
+                        },
+                        {       linktext => 'Download submissions',
+                                url => $url1e,
+                                permission => 'F',
+                                icon => 'download_sub.png',
+                                linktitle => 'Download all students submissions.'
+                        }]},
+                         { categorytitle=>'Automated Grading',
+               items =>[
+
                 	    {	linktext => 'Upload Scores',
                     		url => $url2,
                     		permission => 'F',
@@ -9746,168 +9837,137 @@ sub grading_menu {
                 	    {	linktext => 'Grade/Manage/Review Bubblesheets',
                     		url => $url4,
                     		permission => 'F',
-                    		icon => 'stat.png',
+                    		icon => 'bubblesheet.png',
                     		linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
-                	    }
+                	    },
+                            {   linktext => 'Verify Receipt Number',
+                                url => $url5,
+                                permission => 'F',
+                                icon => 'receipt_number.png',
+                                linktitle => 'Verify a system-generated receipt number for correct problem solution.'
+                            }
+
                     ]
             });
 
-    #$fields{'command'} = 'verify';
-    #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    #
     # Create the menu
     my $Str;
-    # $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
     $Str .= '<form method="post" action="" name="gradingMenu">';
     $Str .= '<input type="hidden" name="command" value="" />'.
-    	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
-	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
-	'<input type="hidden" name="saveState"   value="" />'."\n".
-	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
-	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-
-    $Str .= Apache::lonhtmlcommon::generate_menu(@menu);
-    #$menudata->{'jscript'}
-    $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
-        ' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-        ' /> '.
-        &Apache::lonnet::recprefix($env{'request.course.id'}).
-        '-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+    	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
 
-    $Str .="</form>\n";
-    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
-    $request->print(<<GRADINGMENUJS);
-<script type="text/javascript" language="javascript">
-    function checkChoice(formname,val,cmdx) {
-	if (val <= 2) {
-	    var cmd = radioSelection(formname.radioChoice);
-	    var cmdsave = cmd;
-	} else {
-	    cmd = cmdx;
-	    cmdsave = 'submission';
-	}
-	formname.command.value = cmd;
-	if (val < 5) formname.submit();
-	if (val == 5) {
-	    if (!checkReceiptNo(formname,'notOK')) { 
-	        return false;
-	    } else {
-	        formname.submit();
-	    }
-	}
-    }
+    $Str .= &Apache::lonhtmlcommon::generate_menu(@menu);
+    return $Str;    
+}
 
-    function checkReceiptNo(formname,nospace) {
-	var receiptNo = formname.receipt.value;
-	var checkOpt = false;
-	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
-	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
-	if (checkOpt) {
-	    alert("$receiptalert");
-	    formname.receipt.value = "";
-	    formname.receipt.focus();
-	    return false;
-	}
-	return true;
-    }
-</script>
-GRADINGMENUJS
+
+sub ungraded {
+    my ($request)=@_;
+    &submit_options($request);
+}
+
+sub submit_options_sequence {
+    my ($request,$symb) = @_;
+    if (!$symb) {return '';}
     &commonJSfunctions($request);
-    return $Str;    
+    my $result;
+
+    $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+        '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+    $result.=&selectfield(0).
+            '<input type="hidden" name="command" value="pickStudentPage" />
+            <div>
+              <input type="submit" value="'.&mt('Next').' &rarr;" />
+            </div>
+        </div>
+  </form>';
+    return $result;
+}
+
+sub submit_options_table {
+    my ($request,$symb) = @_;
+    if (!$symb) {return '';}
+    &commonJSfunctions($request);
+    my $is_tool = ($symb =~ /ext\.tool$/);
+    my $result;
+
+    $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+        '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+
+    $result.=&selectfield(1,$is_tool).
+            '<input type="hidden" name="command" value="viewgrades" />
+            <div>
+              <input type="submit" value="'.&mt('Next').' &rarr;" />
+            </div>
+        </div>
+  </form>';
+    return $result;
 }
 
+sub submit_options_download {
+    my ($request,$symb) = @_;
+    if (!$symb) {return '';}
+
+    my $is_tool = ($symb =~ /ext\.tool$/);
+    &commonJSfunctions($request);
+
+    my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+        '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+    $result.='
+<h2>
+  '.&mt('Select Students for whom to Download Submissions').'
+</h2>'.&selectfield(1,$is_tool).'
+                <input type="hidden" name="command" value="downloadfileslink" /> 
+              <input type="submit" value="'.&mt('Next').' &rarr;" />
+            </div>
+          </div>
+
+
+  </form>';
+    return $result;
+}
 
 #--- Displays the submissions first page -------
 sub submit_options {
-    my ($request) = @_;
-    my ($symb)=&get_symb($request);
+    my ($request,$symb) = @_;
     if (!$symb) {return '';}
-    my $probTitle = &Apache::lonnet::gettitle($symb);
 
-    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); 
-    $request->print(<<GRADINGMENUJS);
-<script type="text/javascript" language="javascript">
-    function checkChoice(formname,val,cmdx) {
-	if (val <= 2) {
-	    var cmd = radioSelection(formname.radioChoice);
-	    var cmdsave = cmd;
-	} else {
-	    cmd = cmdx;
-	    cmdsave = 'submission';
-	}
-	formname.command.value = cmd;
-	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
-	    ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
-	if (val < 5) formname.submit();
-	if (val == 5) {
-	    if (!checkReceiptNo(formname,'notOK')) { return false;}
-	    formname.submit();
-	}
-	if (val < 7) formname.submit();
-    }
-
-    function checkReceiptNo(formname,nospace) {
-	var receiptNo = formname.receipt.value;
-	var checkOpt = false;
-	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
-	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
-	if (checkOpt) {
-	    alert("$receiptalert");
-	    formname.receipt.value = "";
-	    formname.receipt.focus();
-	    return false;
-	}
-	return true;
-    }
-</script>
-GRADINGMENUJS
+    my $is_tool = ($symb =~ /ext\.tool$/);
     &commonJSfunctions($request);
-    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
     my $result;
-    my (undef,$sections) = &getclasslist('all','0');
-    my $savedState = &savedState();
-    my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
-    my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
-    my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
-    my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
-
-    # Preselect sections
-    my $selsec="";
-    if (ref($sections)) {
-        foreach my $section (sort(@$sections)) {
-            $selsec.='<option value="'.$section.'" '.
-                ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
-        }
-    }
 
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
-	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
-	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
-	'<input type="hidden" name="command"     value="" />'."\n".
-	'<input type="hidden" name="saveState"   value="" />'."\n".
-	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
-	'<input type="hidden" name="showgrading" value="yes" />'."\n";
+	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+    $result.=&selectfield(1,$is_tool).'
+                <input type="hidden" name="command" value="submission" /> 
+	      <input type="submit" value="'.&mt('Next').' &rarr;" />
+            </div>
+          </div>
 
-    $result.='
-<h2>
-  '.&mt('Grade Current Resource').'
-</h2>
-<div>
-  '.$table.'
-</div>
 
-<div class="LC_columnSection">
+  </form>';
+    return $result;
+}
+
+sub selectfield {
+   my ($full,$is_tool)=@_;
+   my %options;
+   if ($is_tool) {
+       %options =
+           (&transtatus_options,
+            'select_form_order' => ['yes','incorrect','all']);
+   } else {
+       %options = 
+           (&substatus_options,
+            'select_form_order' => ['yes','queued','graded','incorrect','all']);
+   }
+   my $result='<div class="LC_columnSection">
   
     <fieldset>
       <legend>
        '.&mt('Sections').'
       </legend>
-      <select name="section" multiple="multiple" size="5">'."\n";
-    $result.= $selsec;
-    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
-    $result.='
+      '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
     </fieldset>
   
     <fieldset>
@@ -9921,63 +9981,22 @@ GRADINGMENUJS
       <legend>
         '.&mt('Access Status').'
       </legend>
-      '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-    </fieldset>
-  
+      '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
+    </fieldset>';
+    if ($full) {
+        my $heading = &mt('Submission Status');
+        if ($is_tool) {
+            $heading = &mt('Transaction Status');
+        }
+        $result.='
     <fieldset>
       <legend>
-        '.&mt('Submission Status').'
-      </legend>
-      <select name="submitonly" size="5">
-	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
-	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
-	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
-	         <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
-                 <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
-      </select>
-    </fieldset>
-  
-</div>
-
-<br />
-          <div>
-            <div>
-              <label>
-                <input type="radio" name="radioChoice" value="submission" '.
-                  ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
-             &mt('Select individual students to grade and view submissions.').'
-	      </label> 
-            </div>
-            <div>
-	      <label>
-                <input type="radio" name="radioChoice" value="viewgrades" '.
-                  ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
-                    &mt('Grade all selected students in a grading table.').'
-              </label>
-            </div>
-            <div>
-	      <input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
-            </div>
-          </div>
-
-
-        <h2>
-         '.&mt('Grade Complete Folder for One Student').'
-        </h2>
-        <div>
-            <div>
-              <label>
-                <input type="radio" name="radioChoice" value="pickStudentPage" '.
-	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
-  &mt('The <b>complete</b> page/sequence/folder: For one student').'
-              </label>
-            </div>
-            <div>
-	      <input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
-            </div>
-        </div>
-  </form>';
-    $result .= &show_grading_menu_form($symb);
+        '.$heading.'
+      </legend>'.
+       &Apache::loncommon::select_form('all','submitonly',\%options).
+   '</fieldset>';
+    }
+    $result.='</div><br />';
     return $result;
 }
 
@@ -9991,6 +10010,14 @@ sub substatus_options {
                                       );
 }
 
+sub transtatus_options {
+    return &Apache::lonlocal::texthash(
+                                       'yes'       => 'with score transactions',
+                                       'incorrect' => 'with less than full credit',
+                                       'all'       => 'with any status',
+                                      );
+}
+
 sub reset_perm {
     undef(%perm);
 }
@@ -10090,18 +10117,14 @@ sub clicker_grading_parameters {
 }
 
 sub process_clicker {
-    my ($r)=@_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
-    $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
-    $result.=$table;
-    $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
-    $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource.').
-        '</b></td></tr>'."\n";
-    $result.='<tr bgcolor="#ffffe6"><td>'."\n";
+    $result.=&Apache::loncommon::start_data_table().
+             &Apache::loncommon::start_data_table_header_row().
+             '<th>'.&mt('Specify a file containing clicker information and set grading options.').'</th>'.
+             &Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row()."<td>\n";
 # Attempt to restore parameters from last session, set defaults if not present
     my %Saveable_Parameters=&clicker_grading_parameters();
     &Apache::loncommon::restore_course_settings('grades_clicker',
@@ -10118,7 +10141,7 @@ sub process_clicker {
        }
     }
 
-    my $upload=&mt("Upload File");
+    my $upload=&mt("Evaluate File");
     my $type=&mt("Type");
     my $attendance=&mt("Award points just for participation");
     my $personnel=&mt("Correctness determined from response by course personnel");
@@ -10128,12 +10151,11 @@ sub process_clicker {
     my $pcorrect=&mt("Percentage points for correct solution");
     my $pincorrect=&mt("Percentage points for incorrect solution");
     my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
-                                                   {'iclicker' => 'i>clicker',
+						   {'iclicker' => 'i>clicker',
                                                     'interwrite' => 'interwrite PRS',
                                                     'turning' => 'Turning Technologies'});
     $symb = &Apache::lonenc::check_encrypt($symb);
-    $result.=<<ENDUPFORM;
-<script type="text/javascript">
+    $result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
 function sanitycheck() {
 // Accept only integer percentages
    document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
@@ -10171,15 +10193,17 @@ function sanitycheck() {
 // Remember the old state
    document.forms.gradesupload.waschecked.value=newgradingchoice;
 }
-</script>
+ENDUPFORM
+    $result.= <<ENDUPFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="processclickerfile" />
-<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
-<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 <input type="file" name="upfile" size="50" />
 <br /><label>$type: $selectform</label>
-<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
+ENDUPFORM
+    $result.='</td>'.&Apache::loncommon::end_data_table_row().
+                     &Apache::loncommon::start_data_table_row().'<td>'.(<<ENDGRADINGFORM);
+      <label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
 <br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>
 <br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label>
 <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
@@ -10187,34 +10211,35 @@ function sanitycheck() {
 <br />&nbsp;&nbsp;&nbsp;
 <input type="text" name="givenanswer" size="50" />
 <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
-<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
+ENDGRADINGFORM
+         $result.='</td>'.&Apache::loncommon::end_data_table_row().
+                     &Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM);
+      <label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
 <br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
 <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
-</form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n".
-             '</td></tr></table><br /><br />'."\n";
-    $result.=&show_grading_menu_form($symb);
+</form>'
+ENDPERCFORM
+    $result.='</td>'.
+             &Apache::loncommon::end_data_table_row().
+             &Apache::loncommon::end_data_table();
     return $result;
 }
 
 sub process_clicker_file {
-    my ($r)=@_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 
     my %Saveable_Parameters=&clicker_grading_parameters();
     &Apache::loncommon::store_course_settings('grades_clicker',
                                               \%Saveable_Parameters);
-
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+    my $result='';
     if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
 	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
-	return $result.&show_grading_menu_form($symb);
+	return $result;
     }
     if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {
         $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';
-        return $result.&show_grading_menu_form($symb);
+        return $result;
     }
     my $foundgiven=0;
     if ($env{'form.gradingmechanism'} eq 'given') {
@@ -10263,7 +10288,7 @@ sub process_clicker_file {
             $result .=
                  &Apache::lonhtmlcommon::confirm_success(
                      &mt('No IDs found to determine correct answer'),1);
-            return $result,.&show_grading_menu_form($symb);
+            return $result;
         }
     }
     if (length($env{'form.upfile'}) < 2) {
@@ -10271,23 +10296,38 @@ sub process_clicker_file {
             &Apache::lonhtmlcommon::confirm_success(
                 &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',
                         '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1);
-        return $result.&show_grading_menu_form($symb);
+        return $result;
+    }
+    my $mimetype;
+    if ($env{'form.upfiletype'} eq 'iclicker') {
+        my $mm = new File::MMagic;
+        $mimetype = $mm->checktype_contents($env{'form.upfile'});
+        unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) {
+            $result.= '<p>'.
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'</p>';
+            return $result;
+        }
+    } elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) {
+        $result .= '<p>'.
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'</p>';
+        return $result;
     }
 
 # Were able to get all the info needed, now analyze the file
 
     $result.=&Apache::loncommon::studentbrowser_javascript();
     $symb = &Apache::lonenc::check_encrypt($symb);
-    my $heading=&mt('Scanning clicker file');
-    $result.=(<<ENDHEADER);
-<br /><table width="100%" border="0"><tr><td bgcolor="#777777">
-<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>
-<b>$heading</b></td></tr><tr bgcolor="#ffffe6"><td>
+    $result.=&Apache::loncommon::start_data_table().
+             &Apache::loncommon::start_data_table_header_row().
+             '<th>'.&mt('Evaluate clicker file').'</th>'.
+             &Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row().(<<ENDHEADER);
+<td>
 <form method="post" action="/adm/grades" name="clickeranalysis">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="assignclickergrades" />
-<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
-<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 <input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />
 <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
 <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
@@ -10300,12 +10340,14 @@ ENDHEADER
     my $errormsg='';
     my $number=0;
     if ($env{'form.upfiletype'} eq 'iclicker') {
-	($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
-    }
-    if ($env{'form.upfiletype'} eq 'interwrite') {
+        if ($mimetype eq 'text/plain') {
+            ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
+        } elsif ($mimetype eq 'text/html') {
+            ($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses);
+        }
+    } elsif ($env{'form.upfiletype'} eq 'interwrite') {
         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
-    }
-    if ($env{'form.upfiletype'} eq 'turning') {
+    } elsif ($env{'form.upfiletype'} eq 'turning') {
         ($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
     }
     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
@@ -10315,7 +10357,7 @@ ENDHEADER
              '<br />';
     if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {
        $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';
-       return $result.&show_grading_menu_form($symb);
+       return $result;
     } 
 # Remember Question Titles
 # FIXME: Possibly need delimiter other than ":"
@@ -10335,7 +10377,9 @@ ENDHEADER
        } elsif ($clicker_ids{$id}) {
           if ($clicker_ids{$id}=~/\,/) {
 # More than one user with the same clicker!
-             $result.="\n<hr />".&mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
+             $result.="</td>".&Apache::loncommon::end_data_table_row().
+                           &Apache::loncommon::start_data_table_row()."<td>".
+                       &mt('Clicker registered more than once').": <tt>".$id."</tt><br />";
              $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
                            "<select name='multi".$id."'>";
              foreach my $reguser (sort(split(/\,/,$clicker_ids{$id}))) {
@@ -10349,12 +10393,14 @@ ENDHEADER
              $student_count++;
           }
        } else {
-          $result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
+          $result.="</td>".&Apache::loncommon::end_data_table_row().
+                           &Apache::loncommon::start_data_table_row()."<td>".
+                    &mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
           $result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'.
                    "\n".&mt("Username").": <input type='text' name='uname".$id."' />&nbsp;".
                    "\n".&mt("Domain").": ".
                    &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).'&nbsp;'.
-                   &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id);
+                   &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,'',$id);
           $unknown_count++;
        }
     }
@@ -10375,9 +10421,10 @@ ENDHEADER
     } else {
        $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';
     }
-    $result.='</form></td></tr></table>'."\n".
-             '</td></tr></table><br /><br />'."\n";
-    return $result.&show_grading_menu_form($symb);
+    $result.='</form></td>'.
+             &Apache::loncommon::end_data_table_row().
+             &Apache::loncommon::end_data_table();
+    return $result;
 }
 
 sub iclicker_eval {
@@ -10408,6 +10455,49 @@ sub iclicker_eval {
     return ($errormsg,$number);
 }
 
+sub iclickerxml_eval {
+    my ($questiontitles,$responses)=@_;
+    my $number=0;
+    my $errormsg='';
+    my @state;
+    my %respbyid;
+    my $p = HTML::Parser->new
+    (
+        xml_mode => 1,
+        start_h =>
+            [sub {
+                 my ($tagname,$attr) = @_;
+                 push(@state,$tagname);
+                 if ("@state" eq "ssn p") {
+                     my $title = $attr->{qn};
+                     $title =~ s/(^\s+|\s+$)//g;
+                     $questiontitles->[$number]=$title;
+                 } elsif ("@state" eq "ssn p v") {
+                     my $id = $attr->{id};
+                     my $entry = $attr->{ans};
+                     $id=~s/^[\#0]+//;
+                     $entry =~s/[^a-zA-Z0-9\.\*\-\+]+//g;
+                     $respbyid{$id}[$number] = $entry;
+                 }
+            }, "tagname, attr"],
+         end_h =>
+               [sub {
+                   my ($tagname) = @_;
+                   if ("@state" eq "ssn p") {
+                       $number++;
+                   }
+                   pop(@state);
+                }, "tagname"],
+    );
+
+    $p->parse($env{'form.upfile'});
+    $p->eof;
+    foreach my $id (keys(%respbyid)) {
+        $responses->{$id}=join(',',@{$respbyid{$id}});
+    }
+    return ($errormsg,$number);
+}
+
 sub interwrite_eval {
     my ($questiontitles,$responses)=@_;
     my $number=0;
@@ -10464,9 +10554,9 @@ sub turning_eval {
     return ($errormsg,$number);
 }
 
+
 sub assign_clicker_grades {
-    my ($r)=@_;
-    my ($symb)=&get_symb($r);
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 # See which part we are saving to
     my $res_error;
@@ -10477,15 +10567,11 @@ sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
-
-    $result .= '<br />'.
-               &Apache::loncommon::start_data_table().
-               &Apache::loncommon::start_data_table_header_row().
-               '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
-               &Apache::loncommon::end_data_table_header_row().
-               &Apache::loncommon::start_data_table_row().'<td>';
-
+    my $result=&Apache::loncommon::start_data_table().
+             &Apache::loncommon::start_data_table_header_row().
+             '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
+             &Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row().'<td>';
 # Get correct result
 # FIXME: Possibly need delimiter other than ":"
     my @correct=();
@@ -10540,14 +10626,14 @@ sub assign_clicker_grades {
                       &mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').
                       '</span><br />';
           }
-          $users{$user}=1;
+          $users{$user}=1; 
           my @answer=split(/\,/,$env{$key});
           my $sum=0;
           my $realnumber=$number;
           for (my $i=0;$i<$number;$i++) {
              if  ($correct[$i] eq '-') {
                 $realnumber--;
-             } elsif ($answer[$i]) {
+             } elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/))  {
                 if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;
                 } elsif ($correct[$i] eq '*') {
@@ -10594,8 +10680,8 @@ sub assign_clicker_grades {
     $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
              '</td>'.
              &Apache::loncommon::end_data_table_row().
-             &Apache::loncommon::end_data_table()."<br /><br />\n";
-    return $result.&show_grading_menu_form($symb);
+             &Apache::loncommon::end_data_table();
+    return $result;
 }
 
 sub navmap_errormsg {
@@ -10615,17 +10701,27 @@ sub startpage {
          $args{'add_entries'} = \%loaditems;
     }
     if ($nomenu) {
-        $args{'only_body'} = 1;
+        $args{'only_body'} = 1; 
         $r->print(&Apache::loncommon::start_page("Student's Version",$js,\%args));
     } else {
+        unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
         $args{'bread_crumbs'} = $crumbs;
         $r->print(&Apache::loncommon::start_page('Grading',$js,\%args));
+        &Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
     }
     unless ($nodisplayflag) {
-       $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
+        $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
     }
 }
 
+sub select_problem {
+    my ($r)=@_;
+    $r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');
+    $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,undef,undef,1));
+    $r->print('<input type="hidden" name="command" value="gradingmenu" />');
+    $r->print('<input type="submit" value="'.&mt('Next').' &rarr;" /></form>');
+}
+
 sub handler {
     my $request=$_[0];
     &reset_caches();
@@ -10636,82 +10732,47 @@ sub handler {
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
-    my $symb=&get_symb($request,1);
+# see what command we need to execute
+
     my @commands=&Apache::loncommon::get_env_multiple('form.command');
     my $command=$commands[0];
 
+    &init_perm();
+    if (!$env{'request.course.id'}) {
+        unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
+                ($command =~ /^scantronupload/)) {
+            # Not in a course.
+            $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
+            return HTTP_NOT_ACCEPTABLE;
+        }
+    } elsif (!%perm) {
+        $request->internal_redirect('/adm/quickgrades');
+        return OK;
+    }
+    &Apache::loncommon::content_type($request,'text/html');
+    $request->send_http_header;
+
     if ($#commands > 0) {
 	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
     }
 
+# see what the symb is
+
+    my $symb=$env{'form.symb'};
+    unless ($symb) {
+       (my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+       $symb=&Apache::lonnet::symbread($url);
+    }
+    &Apache::lonenc::check_decrypt(\$symb);
+
     $ssi_error = 0;
-    my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
-    my $start_page = &Apache::loncommon::start_page('Grading',undef,
-                                                    {'bread_crumbs' => $brcrum});
-    if ($symb eq '' && $command eq '') {
-	if ($env{'user.adv'}) {
-            &Apache::loncommon::content_type($request,'text/html');
-            $request->send_http_header;
-            $request->print($start_page);
-	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
-		($env{'form.codethree'})) {
-		my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'.
-		    $env{'form.codethree'};
-		my ($tsymb,$tuname,$tudom,$tcrsid)=
-		    &Apache::lonnet::checkin($token);
-		if ($tsymb) {
-		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
-		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
-			$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries,
-					  ('grade_username' => $tuname,
-					   'grade_domain' => $tudom,
-					   'grade_courseid' => $tcrsid,
-					   'grade_symb' => $tsymb)));
-		    } else {
-			$request->print('<h3>Not authorized: '.$token.'</h3>');
-		    }
-		} else {
-		    $request->print('<h3>Not a valid DocID: '.$token.'</h3>');
-		}
-	    } else {
-		$request->print(&Apache::lonxml::tokeninputfield());
-	    }
-        } elsif ($env{'request.course.id'}) {
-            &init_perm(); 
-            if (!%perm) {
-                $request->internal_redirect('/adm/quickgrades');
-                return OK;
-            } else {
-                &Apache::loncommon::content_type($request,'text/html');
-                $request->send_http_header;
-                $request->print($start_page);
-            }
-        }
+    if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {
+#
+# Not called from a resource, but inside a course
+#    
+        &startpage($request,undef,[],1,1);
+        &select_problem($request);
     } else {
-        &init_perm();
-        if (!$env{'request.course.id'}) {
-            unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
-                    ($command =~ /^scantronupload/)) {
-                # Not in a course.
-                $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
-                return HTTP_NOT_ACCEPTABLE;
-            }
-        } elsif (!%perm) {
-            $request->internal_redirect('/adm/quickgrades');
-        }
-        &Apache::loncommon::content_type($request,'text/html');
-        $request->send_http_header;
-        if (($command eq 'scantron_selectphase' && $perm{'mgr'}) || 
-            (($command eq 'scantronupload') &&
-             (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
-              &Apache::lonnet::allowed('usc',$env{'request.course.id'})))) {
-            &startpage($request,$symb,[{href=>'/adm/grades', text=>"Grading"}],1,1,
-                       undef,undef,undef,undef,'toggleScantab(document.rules);');
-        } else {
-            unless ((($command eq 'submission' || $command eq 'versionsub')) && ($perm{'vgr'})) {
-                $request->print($start_page); 
-            }
-        }
 	if ($command eq 'submission' && $perm{'vgr'}) {
             my ($stuvcurrent,$stuvdisp,$versionform,$js);
             if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
@@ -10724,7 +10785,7 @@ sub handler {
                 $request->print($versionform);
             }
             $request->print('<br clear="all" />');
-	    ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
+	    ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
         } elsif ($command eq 'versionsub' && $perm{'vgr'}) {
             my ($stuvcurrent,$stuvdisp,$versionform,$js) =
                 &choose_task_version_form($symb,$env{'form.student'},
@@ -10737,79 +10798,149 @@ sub handler {
             $request->print('<br clear="all" />');
             $request->print(&show_previous_task_version($request,$symb));
 	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
-	    &pickStudentPage($request);
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
+                                       {href=>'',text=>'Select student'}],1,1);
+	    &pickStudentPage($request,$symb);
 	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
-	    &displayPage($request);
+            &startpage($request,$symb,
+                                      [{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
+                                       {href=>'',text=>'Select student'},
+                                       {href=>'',text=>'Grade student'}],1,1);
+	    &displayPage($request,$symb);
 	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
-	    &updateGradeByPage($request);
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
+                                       {href=>'',text=>'Select student'},
+                                       {href=>'',text=>'Grade student'},
+                                       {href=>'',text=>'Store grades'}],1,1);
+	    &updateGradeByPage($request,$symb);
 	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
-	    &processGroup($request);
+            &startpage($request,$symb,[{href=>'',text=>'...'},
+                                       {href=>'',text=>'Modify grades'}]);
+	    &processGroup($request,$symb);
 	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
-	    $request->print(&grading_menu($request));
-	} elsif ($command eq 'submit_options' && $perm{'vgr'}) {
-	    $request->print(&submit_options($request));
+            &startpage($request,$symb);
+	    $request->print(&grading_menu($request,$symb));
+	} elsif ($command eq 'individual' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]);
+	    $request->print(&submit_options($request,$symb));
+        } elsif ($command eq 'ungraded' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}]);
+            $request->print(&listStudents($request,$symb,'graded'));
+        } elsif ($command eq 'table' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>"", text=>"Grading table"}]);
+            $request->print(&submit_options_table($request,$symb));
+        } elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1);
+            $request->print(&submit_options_sequence($request,$symb));
 	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
-	    $request->print(&viewgrades($request));
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]);
+	    $request->print(&viewgrades($request,$symb));
 	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
-	    $request->print(&processHandGrade($request));
+            &startpage($request,$symb,[{href=>'',text=>'...'},
+                                       {href=>'',text=>'Store grades'}]);
+	    $request->print(&processHandGrade($request,$symb));
 	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
-	    $request->print(&editgrades($request));
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},
+                                       {href=>&href_symb_cmd($symb,'viewgrades').'&group=all&section=all&Status=Active',
+                                                                             text=>"Modify grades"},
+                                       {href=>'', text=>"Store grades"}]);
+	    $request->print(&editgrades($request,$symb));
+        } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);
+            $request->print(&initialverifyreceipt($request,$symb));
 	} elsif ($command eq 'verify' && $perm{'vgr'}) {
-	    $request->print(&verifyreceipt($request));
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'},
+                                       {href=>'',text=>'Verification Result'}]);
+	    $request->print(&verifyreceipt($request,$symb));
         } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
-            $request->print(&process_clicker($request));
+            &startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);
+            $request->print(&process_clicker($request,$symb));
         } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
-            $request->print(&process_clicker_file($request));
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
+                                       {href=>'', text=>'Process clicker file'}]);
+            $request->print(&process_clicker_file($request,$symb));
         } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {
-            $request->print(&assign_clicker_grades($request));
+            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
+                                       {href=>'', text=>'Process clicker file'},
+                                       {href=>'', text=>'Store grades'}]);
+            $request->print(&assign_clicker_grades($request,$symb));
 	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
-	    $request->print(&upcsvScores_form($request));
+            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+	    $request->print(&upcsvScores_form($request,$symb));
 	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
-	    $request->print(&csvupload($request));
+            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+	    $request->print(&csvupload($request,$symb));
 	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
-	    $request->print(&csvuploadmap($request));
+            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+	    $request->print(&csvuploadmap($request,$symb));
 	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
 	    if ($env{'form.associate'} ne 'Reverse Association') {
-		$request->print(&csvuploadoptions($request));
+                &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+		$request->print(&csvuploadoptions($request,$symb));
 	    } else {
 		if ( $env{'form.upfile_associate'} ne 'reverse' ) {
 		    $env{'form.upfile_associate'} = 'reverse';
 		} else {
 		    $env{'form.upfile_associate'} = 'forward';
 		}
-		$request->print(&csvuploadmap($request));
+                &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+		$request->print(&csvuploadmap($request,$symb));
 	    }
 	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
-	    $request->print(&csvuploadassign($request));
+            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
+	    $request->print(&csvuploadassign($request,$symb));
 	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
-	    $request->print(&scantron_selectphase($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
+                       undef,undef,undef,undef,'toggleScantab(document.rules);');
+	    $request->print(&scantron_selectphase($request,undef,$symb));
  	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
- 	    $request->print(&scantron_do_warning($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+ 	    $request->print(&scantron_do_warning($request,$symb));
 	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
-	    $request->print(&scantron_validate_file($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+	    $request->print(&scantron_validate_file($request,$symb));
 	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
-	    $request->print(&scantron_process_students($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+	    $request->print(&scantron_process_students($request,$symb));
  	} elsif ($command eq 'scantronupload' && 
  		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
 		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
- 	    $request->print(&scantron_upload_scantron_data($request)); 
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
+                       undef,undef,undef,undef,'toggleScantab(document.rules);');
+ 	    $request->print(&scantron_upload_scantron_data($request,$symb)); 
  	} elsif ($command eq 'scantronupload_save' &&
  		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
 		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
- 	    $request->print(&scantron_upload_scantron_data_save($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+ 	    $request->print(&scantron_upload_scantron_data_save($request,$symb));
  	} elsif ($command eq 'scantron_download' &&
 		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
- 	    $request->print(&scantron_download_scantron_data($request));
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+ 	    $request->print(&scantron_download_scantron_data($request,$symb));
         } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
-            $request->print(&checkscantron_results($request));     
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+            $request->print(&checkscantron_results($request,$symb));
+        } elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}]);
+            $request->print(&submit_options_download($request,$symb));
+         } elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {
+            &startpage($request,$symb,
+   [{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},
+    {href=>'', text=>'Download submitted files'}]);
+            &submit_download_link($request,$symb);
 	} elsif ($command) {
+            &startpage($request,$symb,[{href=>'', text=>'Access denied'}]);
 	    $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
 	}
     }
     if ($ssi_error) {
 	&ssi_print_error($request);
     }
-    $request->print(&Apache::loncommon::end_page());
+    if ($env{'form.inhibitmenu'}) {
+        $request->print(&Apache::loncommon::end_page());
+    } else {
+        &Apache::lonquickgrades::endGradeScreen($request);
+    }
     &reset_caches();
     return OK;
 }
@@ -10833,7 +10964,7 @@ described at http://www.lon-capa.org.
 =head1 OVERVIEW
 
 Do an ssi with retries:
-While I'd love to factor out this with the vesrion in lonprintout,
+While I'd love to factor out this with the version in lonprintout,
 that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
 I'm not quite ready to invent (e.g. an ssi_with_retry object).
 
@@ -10880,6 +11011,75 @@ ssi_with_retries()
 
 =over
 
+=head1 Routines to display previous version of a Task for a specific student
+
+Tasks are graded pass/fail. Students who have yet to pass a particular Task
+can receive another opportunity. Access to tasks is slot-based. If a slot
+requires a proctor to check-in the student, a new version of the Task will
+be created when the student is checked in to the new opportunity.
+
+If a particular student has tried two or more versions of a particular task,
+the submission screen provides a user with vgr privileges (e.g., a Course
+Coordinator) the ability to display a previous version worked on by the
+student.  By default, the current version is displayed. If a previous version
+has been selected for display, submission data are only shown that pertain
+to that particular version, and the interface to submit grades is not shown.
+
+=over 4
+
+=item show_previous_task_version()
+
+Displays a specified version of a student's Task, as the student sees it.
+
+Inputs: 2
+        request - request object
+        symb    - unique symb for current instance of resource
+
+Output: None.
+
+Side Effects: calls &show_problem() to print version of Task, with
+              version contained in form item: $env{'form.previousversion'}
+
+=item choose_task_version_form()
+
+Displays a web form used to select which version of a student's view of a
+Task should be displayed.  Either launches a pop-up window, or replaces
+content in existing pop-up, or replaces page in main window.
+
+Inputs: 4
+        symb    - unique symb for current instance of resource
+        uname   - username of student
+        udom    - domain of student
+        nomenu  - 1 if display is in a pop-up window, and hence no menu
+                  breadcrumbs etc., are displayed
+
+Output: 4
+        current   - student's current version
+        displayed - student's version being displayed
+        result    - scalar containing HTML for web form used to switch to
+                    a different version (or a link to close window, if pop-up).
+        js        - javascript for processing selection in versions web form
+
+Side Effects: None.
+
+=item previous_display_javascript()
+
+Inputs: 2
+        nomenu  - 1 if display is in a pop-up window, and hence no menu
+                  breadcrumbs etc., are displayed.
+        current - student's current version number.
+
+Output: 1
+        js      - javascript for processing selection in versions web form.
+
+Side Effects: None.
+
+=back
+
+=head1 Routines to process bubblesheet data.
+
+=over 4
+
 =item scantron_get_correction() : 
 
    Builds the interface screen to interact with the operator to fix a
@@ -10916,6 +11116,7 @@ ssi_with_retries()
                   or code-based randompick and/or randomorder.
 
 
+
 =item  scantron_get_maxbubble() : 
 
    Arguments:
@@ -10995,7 +11196,9 @@ ssi_with_retries()
 =item navmap_errormsg() :
 
    Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
-   Should be called whenever the request to instantiate a navmap object fails.  
+   Should be called whenever the request to instantiate a navmap object fails.
+
+=back
 
 =back