--- loncom/homework/grades.pm	2023/03/10 23:36:22	1.596.2.12.2.60.2.3
+++ loncom/homework/grades.pm	2010/04/13 10:21:21	1.614
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.60.2.3 2023/03/10 23:36:22 raeburn Exp $
+# $Id: grades.pm,v 1.614 2010/04/13 10:21:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,14 +40,9 @@ use Apache::lonhomework;
 use Apache::lonpickcode;
 use Apache::loncoursedata;
 use Apache::lonmsg();
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common);
 use Apache::lonlocal;
 use Apache::lonenc;
-use Apache::lonstathelpers;
-use Apache::bridgetask();
-use Apache::lontexconvert();
-use HTML::Parser();
-use File::MMagic;
 use String::Similarity;
 use LONCAPA;
 
@@ -56,7 +51,6 @@ use POSIX qw(floor);
 
 
 my %perm=();
-my %old_essays=();
 
 #  These variables are used to recover from ssi errors
 
@@ -143,8 +137,6 @@ sub nameUserString {
 
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
-#--- Count responseIDs, essayresponse items, and dropbox items ---
-#--- Sets response_error pointer to "1" if navmaps object broken ---
 sub response_type {
     my ($symb,$response_error) = @_;
 
@@ -161,7 +153,6 @@ sub response_type {
         return;
     }
     my $partlist = $res->parts();
-    my ($numresp,$numessay,$numdropbox) = (0,0,0);
     my %vPart = 
 	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
     my (%response_types,%handgrade);
@@ -171,20 +162,13 @@ sub response_type {
 	my @types = $res->responseType($part);
 	my @ids = $res->responseIds($part);
 	for (my $i=0; $i < scalar(@ids); $i++) {
-            $numresp ++;
 	    $response_types{$part}{$ids[$i]} = $types[$i];
-            if ($types[$i] eq 'essay') {
-                $numessay ++;
-                if (&Apache::lonnet::EXT("resource.$part".'_'.$ids[$i].".uploadedfiletypes",$symb)) {
-                    $numdropbox ++;
-                }
-            }
 	    $handgrade{$part.'_'.$ids[$i]} = 
 		&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
 				     '.handgrade',$symb);
 	}
     }
-    return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox);
+    return ($partlist,\%handgrade,\%response_types);
 }
 
 sub flatten_responseType {
@@ -211,133 +195,9 @@ sub get_display_part {
     return $display;
 }
 
-#--- Show parts and response type
-sub showResourceInfo {
-    my ($symb,$partlist,$responseType,$formname,$checkboxes,$uploads) = @_;
-    unless ((ref($partlist) eq 'ARRAY') && (ref($responseType) eq 'HASH')) {
-        return '<br clear="all">';
-    }
-    my $coltitle = &mt('Problem Part Shown');
-    if ($checkboxes) {
-        $coltitle = &mt('Problem Part');
-    } else {
-        my $checkedparts = 0;
-        foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
-            if (grep(/^\Q$partid\E$/,@{$partlist})) {
-                $checkedparts ++;
-            }
-        }
-        if ($checkedparts == scalar(@{$partlist})) {
-            return '<br clear="all">';
-        }
-        if ($uploads) {
-            $coltitle = &mt('Problem Part Selected');
-        }
-    }
-    my $result = '<div class="LC_left_float" style="display:inline-block;">';
-    if ($checkboxes) {
-        my $legend = &mt('Parts to display');
-        if ($uploads) {
-            $legend = &mt('Part(s) with dropbox');
-        }
-        $result .= '<fieldset style="display:inline-block;"><legend>'.$legend.'</legend>'.
-                   '<span class="LC_nobreak">'.
-                   '<label><input type="radio" name="chooseparts" value="0" onclick="toggleParts('."'$formname'".');" checked="checked" />'.
-                   &mt('All parts').'</label>'.('&nbsp;'x2).
-                   '<label><input type="radio" name="chooseparts" value="1" onclick="toggleParts('."'$formname'".');" />'.
-                   &mt('Selected parts').'</label></span>'.
-                   '<div id="LC_partselector" style="display:none">';
-    }
-    $result .= &Apache::loncommon::start_data_table()
-              .&Apache::loncommon::start_data_table_header_row();
-    if ($checkboxes) {
-        $result .= '<th>'.&mt('Display?').'</th>';
-    }
-    $result .= '<th>'.$coltitle.'</th>'
-              .'<th>'.&mt('Res. ID').'</th>'
-              .'<th>'.&mt('Type').'</th>'
-              .&Apache::loncommon::end_data_table_header_row();
-    my %partsseen;
-    foreach my $partID (sort(keys(%$responseType))) {
-        foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
-            my $responsetype = $responseType->{$partID}->{$resID};
-            if ($uploads) {
-                next unless ($responsetype eq 'essay');
-                next unless (&Apache::lonnet::EXT("resource.$partID".'_'."$resID.uploadedfiletypes",$symb));
-            }
-            my $display_part=&get_display_part($partID,$symb);
-            if (exists($partsseen{$partID})) {
-                $result.=&Apache::loncommon::continue_data_table_row();
-            } else {
-                $partsseen{$partID}=scalar(keys(%{$responseType->{$partID}}));
-                $result.=&Apache::loncommon::start_data_table_row().
-                         '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">';
-                if ($checkboxes) {
-                    $result.='<input type="checkbox" name="vPart" checked="checked" value="'.$partID.'" /></td>'.
-                             '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'.$display_part.'</td>';
-                } else {
-                    $result.=$display_part.'</td>';
-                }
-            }
-            $result.='<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
-                    .'<td>'.&mt($responsetype).'</td>'
-                    .&Apache::loncommon::end_data_table_row();
-        }
-    }
-    $result.=&Apache::loncommon::end_data_table();
-    if ($checkboxes) {
-        $result .= '</div></fieldset>';
-    }
-    $result .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
-    if (!keys(%partsseen)) {
-        $result = '';
-        if ($uploads) {
-            return '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-                   '<p class="LC_info">'.
-                    &mt('No dropbox items or essayresponse items with uploadedfiletypes set.').
-                   '</p>';
-        } else {
-            return '<br clear="all" />';
-        }
-    }  
-    return $result;
-}
-
-sub part_selector_js {
-    my $js = <<"END";
-function toggleParts(formname) {
-    if (document.getElementById('LC_partselector')) {
-        var index = '';
-        if (document.forms.length) {
-            for (var i=0; i<document.forms.length; i++) {
-                if (document.forms[i].name == formname) {
-                    index = i;
-                    break;
-                }
-            }
-        }
-        if ((index != '') && (document.forms[index].elements['chooseparts'].length > 1)) {
-            for (var i=0; i<document.forms[index].elements['chooseparts'].length; i++) {
-                if (document.forms[index].elements['chooseparts'][i].checked) {
-                   var val = document.forms[index].elements['chooseparts'][i].value;
-                    if (document.forms[index].elements['chooseparts'][i].value == 1) {
-                        document.getElementById('LC_partselector').style.display = 'block';
-                    } else {
-                        document.getElementById('LC_partselector').style.display = 'none';
-                    }
-                }
-            }
-        }
-    }
-}
-END
-    return &Apache::lonhtmlcommon::scripttag($js);
-}
-
 sub reset_caches {
     &reset_analyze_cache();
     &reset_perm();
-    &reset_old_essays();
 }
 
 {
@@ -350,13 +210,8 @@ sub reset_caches {
     }
 
     sub get_analyze {
-	my ($symb,$uname,$udom,$no_increment,$add_to_hash,$type,$trial,$rndseed,$bubbles_per_row)=@_;
+	my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_;
 	my $key = "$symb\0$uname\0$udom";
-        if ($type eq 'randomizetry') {
-            if ($trial ne '') {
-                $key .= "\0".$trial;
-            }
-        }
 	if (exists($analyze_cache{$key})) {
             my $getupdate = 0;
             if (ref($add_to_hash) eq 'HASH') {
@@ -384,18 +239,9 @@ sub reset_caches {
                     'grade_courseid'    =>  $env{'request.course.id'},
                     'grade_username'    => $uname,
                     'grade_noincrement' => $no_increment);
-        if ($bubbles_per_row ne '') {
-            $form{'bubbles_per_row'} = $bubbles_per_row;
-        }
-        if ($type eq 'randomizetry') {
-            $form{'grade_questiontype'} = $type;
-            if ($rndseed ne '') {
-                $form{'grade_rndseed'} = $rndseed;
-            }
-        }
         if (ref($add_to_hash)) {
             %form = (%form,%{$add_to_hash});
-        }
+        } 
 	my $subresult=&ssi_with_retries($url, $ssi_retries,%form);
 	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
@@ -408,15 +254,15 @@ sub reset_caches {
     }
 
     sub get_order {
-	my ($partid,$respid,$symb,$uname,$udom,$no_increment,$type,$trial,$rndseed)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment,undef,$type,$trial,$rndseed);
+	my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
+	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
 	return $analyze->{"$partid.$respid.shown"};
     }
 
     sub get_radiobutton_correct_foil {
-	my ($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom,undef,undef,$type,$trial,$rndseed);
-        my $foils = &get_order($partid,$respid,$symb,$uname,$udom,undef,$type,$trial,$rndseed);
+	my ($partid,$respid,$symb,$uname,$udom)=@_;
+	my $analyze = &get_analyze($symb,$uname,$udom);
+        my $foils = &get_order($partid,$respid,$symb,$uname,$udom);
         if (ref($foils) eq 'ARRAY') {
 	    foreach my $foil (@{$foils}) {
 	        if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
@@ -427,7 +273,7 @@ sub reset_caches {
     }
 
     sub scantron_partids_tograde {
-        my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row,$scancode) = @_;
+        my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_;
         my (%analysis,@parts);
         if (ref($resource)) {
             my $symb = $resource->symb();
@@ -435,16 +281,7 @@ sub reset_caches {
             if ($check_for_randomlist) {
                 $add_to_form = { 'check_parts_withrandomlist' => 1,};
             }
-            if ($scancode) {
-                if (ref($add_to_form) eq 'HASH') {
-                    $add_to_form->{'code_for_randomlist'} = $scancode;
-                } else {
-                    $add_to_form = { 'code_for_randomlist' => $scancode,};
-                }
-            }
-            my $analyze =
-                &get_analyze($symb,$uname,$udom,undef,$add_to_form,
-                             undef,undef,undef,$bubbles_per_row);
+            my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form);
             if (ref($analyze) eq 'HASH') {
                 %analysis = %{$analyze};
             }
@@ -467,12 +304,10 @@ sub reset_caches {
 #        response types only.
 sub cleanRecord {
     my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
-	$uname,$udom,$type,$trial,$rndseed) = @_;
+	$uname,$udom) = @_;
     my $grayFont = '<span class="LC_internal_info">';
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
-        my @answer = %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) {
@@ -486,11 +321,9 @@ sub cleanRecord {
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
 	    '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
-	    $bottomrow.'</tr></table></blockquote>';
+	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'match') {
 	my %answer=&Apache::lonnet::str2hash($answer);
-        my @answer = %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);
@@ -510,14 +343,12 @@ sub cleanRecord {
 	    '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
 	    $middlerow.'</tr>'.
 	    '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
-	    $bottomrow.'</tr></table></blockquote>';
+	    $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);
+	    &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom);
 	foreach my $foil (@$order) {
 	    if (exists($answer{$foil})) {
 		if ($foil eq $correct) {
@@ -533,7 +364,7 @@ sub cleanRecord {
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
 	    '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
-	    $bottomrow.'</tr></table></blockquote>';
+	    $bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'essay') {
 	if (! exists ($env{'form.'.$symb})) {
 	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
@@ -547,11 +378,10 @@ 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);
+	$answer =~ s-\n-<br />-g;
 	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>"');
+	my $result='Smile representation: "<tt>'.$answer.'</tt>"';
 	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
 	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
 	return $result;
@@ -585,14 +415,12 @@ sub cleanRecord {
 	    $result.='</ul>';
 	    return $result;
 	}
-    } elsif ( $response =~ m/(?:numerical|formula|custom)/) {
-        # Respect multiple input fields, see Bug #5409 
+    } elsif ( $response =~ m/(?:numerical|formula)/) {
 	$answer = 
 	    &Apache::loncommon::format_previous_attempt_value('submission',
 							      $answer);
-	return $answer;
     }
-    return &HTML::Entities::encode($answer, '"<>&');
+    return $answer;
 }
 
 #-- A couple of common js functions
@@ -632,7 +460,7 @@ COMMONJSFUNCTIONS
 #--- Dumps the class list with usernames,list of sections,
 #--- section, ids and fullnames for each user.
 sub getclasslist {
-    my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;
+    my ($getsec,$filterlist,$getgroup) = @_;
     my @getsec;
     my @getgroup;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -660,13 +488,6 @@ 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) = &response_type($symb,\$res_error);
-    }
     foreach my $student (keys(%$classlist)) {
         my $end      = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
@@ -683,7 +504,7 @@ sub getclasslist {
         my $group   = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
 	# filter students according to status selected
-	if ($filterbyaccstatus && (!($stu_status =~ /Any/))) {
+	if ($filterlist && (!($stu_status =~ /Any/))) {
 	    if (!($stu_status =~ $status)) {
 		delete($classlist->{$student});
 		next;
@@ -700,58 +521,13 @@ 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)) {
@@ -766,6 +542,7 @@ sub getclasslist {
 	    delete($classlist->{$student});
 	}
     }
+    my %seen = ();
     my @sections = sort(keys(%sections));
     return ($classlist,\@sections,\%fullnames);
 }
@@ -781,7 +558,7 @@ sub canmodify {
 		#can modify the requested section
 		return 1;
 	    } else {
-		# can't modify the requested section
+		# can't modify the request section
 		return 0;
 	    }
 	}
@@ -794,19 +571,19 @@ sub canview {
     my ($sec)=@_;
     if ($perm{'vgr'}) {
 	if (!defined($perm{'vgr_section'})) {
-	    # can view whole class
+	    # can modify whole class
 	    return 1;
 	} else {
 	    if ($sec eq $perm{'vgr_section'}) {
-		#can view the requested section
+		#can modify the requested section
 		return 1;
 	    } else {
-		# can't view the requested section
+		# can't modify the request section
 		return 0;
 	    }
 	}
     }
-    #can't view
+    #can't modify
     return 0;
 }
 
@@ -884,11 +661,7 @@ sub compute_points {
 #
 
 sub most_similar {
-    my ($uname,$udom,$symb,$uessay)=@_;
-
-    unless ($symb) { return ''; }
-
-    unless (ref($old_essays{$symb}) eq 'HASH') { return ''; }
+    my ($uname,$udom,$uessay,$old_essays)=@_;
 
 # ignore spaces and punctuation
 
@@ -905,11 +678,11 @@ sub most_similar {
     my $scrsid='';
     my $sessay='';
 # go through all essays ...
-    foreach my $tkey (keys(%{$old_essays{$symb}})) {
+    foreach my $tkey (keys(%$old_essays)) {
 	my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey));
 # ... except the same student
         next if (($tname eq $uname) && ($tdom eq $udom));
-	my $tessay=$old_essays{$symb}{$tkey};
+	my $tessay=$old_essays->{$tkey};
 	$tessay=~s/\W+/ /gs;
 # String similarity gives up if not even limit
 	my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
@@ -919,7 +692,7 @@ sub most_similar {
 	    $sname=$tname;
 	    $sdom=$tdom;
 	    $scrsid=$tcrsid;
-	    $sessay=$old_essays{$symb}{$tkey};
+	    $sessay=$old_essays->{$tkey};
 	}
     }
     if ($limit>0.6) {
@@ -937,7 +710,7 @@ sub most_similar {
 sub initialverifyreceipt {
    my ($request,$symb) = @_;
    &commonJSfunctions($request);
-   return '<form name="gradingMenu" action=""><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'.
+   return '<form name="gradingMenu"><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".
@@ -947,14 +720,14 @@ sub initialverifyreceipt {
 
 #--- Check whether a receipt number is valid.---
 sub verifyreceipt {
-    my ($request,$symb) = @_;
+    my ($request,$symb)  = @_;
 
     my $courseid = $env{'request.course.id'};
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
 	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
 
-    my $title =
+    my $title.=
 	'<h3><span class="LC_info">'.
 	&mt('Verifying Receipt Number [_1]',$receipt).
 	'</span></h3>'."\n";
@@ -1035,36 +808,27 @@ sub verifyreceipt {
 #--- Also called directly when one clicks on the subm button 
 #    on the problem page.
 sub listStudents {
-    my ($request,$symb,$submitonly,$divforres) = @_;
+    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'};
     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
-    unless ($submitonly) {
-        $submitonly = $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
-    }
+    my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+    my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
 
-    my $result='';
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
+    my $result='<h3><span class="LC_info">&nbsp;'
+	.&mt("$viewgrade Submissions for a Student or a Group of Students")
+	.'</span></h3>';
 
-    my $table;
-    if (ref($partlist) eq 'ARRAY') {
-        if (scalar(@$partlist) > 1 ) {
-            $table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1);
-        } elsif ($divforres) {
-            $table = '<div style="padding:0;clear:both;margin:0;border:0"></div>';
-        } else {
-            $table = '<br clear="all" />';
-        }
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb
+#,$res_error
+    );
 
-    my %js_lt = &Apache::lonlocal::texthash (
+    my %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(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
     function checkSelect(checkBox) {
 	var ctr=0;
@@ -1075,12 +839,12 @@ sub listStudents {
 		    ctr++;
 		}
 	    }
-	    sense = '$js_lt{'multiple'}';
+	    sense = '$lt{'multiple'}';
 	} else {
 	    if (checkBox.checked) {
 		ctr = 1;
 	    }
-	    sense = '$js_lt{'single'}';
+	    sense = '$lt{'single'}';
 	}
 	if (ctr == 0) {
 	    alert(sense);
@@ -1099,9 +863,11 @@ 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"
@@ -1114,102 +880,64 @@ LISTJAVASCRIPT
                   .'<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 = &Apache::lonlocal::texthash (
-                          lastonly => 'last submission',
-                          last     => 'last submission with details',
-                          datesub  => 'all submissions',
-                          all      => 'all submissions with details',
-                      );
-    my $submission_options =
+    $submission_options.=
         '<span class="LC_nobreak">'.
-        '<label><input type="radio" name="lastSub" value="lastonly" /> '.
-        $optiontext{'lastonly'}.' </label></span>'."\n".
+        '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
+        &mt('last submission only').' </label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="last" /> '.
-        $optiontext{'last'}.' </label></span>'."\n".
+        &mt('last submission &amp; parts info').' </label></span>'."\n".
         '<span class="LC_nobreak">'.
-        '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.
-        $optiontext{'datesub'}.'</label></span>'."\n".
+        '<label><input type="radio" name="lastSub" value="datesub" /> '.
+        &mt('by dates and submissions').'</label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="all" /> '.
-        $optiontext{'all'}.'</label></span>';
-    my ($compmsg,$nocompmsg);
-    $nocompmsg = ' checked="checked"';
-    if ($numessay) {
-        $compmsg = $nocompmsg;
-        $nocompmsg = '';
-    }
+        &mt('all details').'</label></span>';
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
-                  .$submission_options;
-# Check if any gradable
-    my $showmore;
-    if ($perm{'mgr'}) {
-        my @sections;
-        if ($env{'request.course.sec'} ne '') {
-            @sections = ($env{'request.course.sec'});
-        } elsif ($env{'form.section'} eq '') {
-            @sections = ('all');
-        } else {
-            @sections = &Apache::loncommon::get_env_multiple('form.section');
-        }
-        if (grep(/^all$/,@sections)) {
-            $showmore = 1;
-        } else {
-            foreach my $sec (@sections) {
-                if (&canmodify($sec)) {
-                    $showmore = 1;
-                    last;
-                }
-            }
-        }
-    }
-
-    if ($showmore) {
-        $gradeTable .=
-                   &Apache::lonhtmlcommon::row_closure()
-                  .&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))
-                  .'<span class="LC_nobreak">'
-                  .'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
-                  .&mt('No').('&nbsp;'x2).'</label>'
-                  .'<label><input type="radio" name="compmsg" value="1"'.$compmsg.' />'
-                  .&mt('Yes').('&nbsp;'x2).'</label>'
+                  .$submission_options
                   .&Apache::lonhtmlcommon::row_closure();
 
-        $gradeTable .= 
-                   &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
                   .'<select name="increment">'
                   .'<option value="1">'.&mt('Whole Points').'</option>'
                   .'<option value=".5">'.&mt('Half Points').'</option>'
                   .'<option value=".25">'.&mt('Quarter Points').'</option>'
                   .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
-                  .'</select>';
-    }
+                  .'</select>'
+                  .&Apache::lonhtmlcommon::row_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="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
-    if (exists($env{'form.Status'})) {
-	$gradeTable .= '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
+
+    if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
+	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {
-        $gradeTable .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(&mt('Student Status'))
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
                       .&Apache::lonhtmlcommon::StatusOptions(
-                           $saveStatus,undef,1,'javascript:reLoadList(this.form);');
+                           $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                      .&Apache::lonhtmlcommon::row_closure();
     }
-    if ($numessay) {
-        $gradeTable .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
-                      .'<input type="checkbox" name="checkPlag" checked="checked" />';
-    }
-    $gradeTable .= &Apache::lonhtmlcommon::row_closure(1)
+
+    $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();
 
     $gradeTable .= '<p>'
-                  .&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.")."\n"
+                  .&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"
                   .'<input type="hidden" name="command" value="processGroup" />'
                   .'</p>';
 
@@ -1226,7 +954,9 @@ LISTJAVASCRIPT
     while ($loop < 2) {
 	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
 	    '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';
-	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
+	if ($env{'form.showgrading'} eq 'yes' 
+	    && $submitonly ne 'queued'
+	    && $submitonly ne 'all') {
 	    foreach my $part (sort(@$partlist)) {
 		my $display_part=
 		    &get_display_part((split(/_/,$part))[0],$symb);
@@ -1262,7 +992,9 @@ LISTJAVASCRIPT
 	    $status{'gradingqueue'} = $queue_status{'gradingqueue'};
 	}
 
-	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
+	if ($env{'form.showgrading'} eq 'yes' 
+	    && $submitonly ne 'queued'
+	    && $submitonly ne 'all') {
 	    (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
 	    my $submitted = 0;
 	    my $graded = 0;
@@ -1303,7 +1035,7 @@ LISTJAVASCRIPT
 	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
 	       '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
 
-	    if ($submitonly ne 'all') {
+	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 		foreach (sort(keys(%status))) {
 		    next if ($_ =~ /^resource.*?submitted_by$/);
 		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
@@ -1317,7 +1049,9 @@ LISTJAVASCRIPT
     }
     if ($ctr%2 ==1) {
 	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
-	    if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
+	    if ($env{'form.showgrading'} eq 'yes' 
+		&& $submitonly ne 'queued'
+		&& $submitonly ne 'all') {
 		foreach (@$partlist) {
 		    $gradeTable.='<td>&nbsp;</td>';
 		}
@@ -1341,7 +1075,7 @@ LISTJAVASCRIPT
 	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
 	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
 	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
-		&mt('No '.$submissions.' found for this resource for any students. ([quant,_1,student] checked for '.$submissions.')',
+		&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
 		    $num_students).
 		'</span><br />';
 	}
@@ -1355,8 +1089,8 @@ LISTJAVASCRIPT
 #---- Called from the listStudents routine
 
 sub check_script {
-    my ($form,$type) = @_;
-    my $chkallscript = &Apache::lonhtmlcommon::scripttag('
+    my ($form, $type)=@_;
+    my $chkallscript= &Apache::lonhtmlcommon::scripttag('
     function checkall() {
         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
             ele = document.forms.'.$form.'.elements[i];
@@ -1401,7 +1135,7 @@ sub check_buttons {
 
 #     Displays the submissions for one student or a group of students
 sub processGroup {
-    my ($request,$symb) = @_;
+    my ($request)  = shift;
     my $ctr        = 0;
     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;
@@ -1411,7 +1145,7 @@ sub processGroup {
 	$env{'form.student'}        = $uname;
 	$env{'form.userdom'}        = $udom;
 	$env{'form.fullname'}       = $fullname;
-	&submission($request,$ctr,$total,$symb);
+	&submission($request,$ctr,$total);
 	$ctr++;
     }
     return '';
@@ -1425,8 +1159,7 @@ sub processGroup {
 #--- Javascript to handle the submission page functionality ---
 sub sub_page_js {
     my $request = shift;
-    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
-    &js_escape(\$alertmsg);
+	    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
     function updateRadio(formname,id,weight) {
 	var gradeBox = formname["GD_BOX"+id];
@@ -1544,8 +1277,17 @@ 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();
     }
@@ -1589,14 +1331,13 @@ sub sub_page_js {
 SUBJAVASCRIPT
 }
 
-#--- javascript for grading message center
-sub sub_grademessage_js {
+#--- javascript for essay type problem --
+sub sub_page_kw_js {
     my $request = shift;
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
 
-    my $inner_js_msg_central= (<<INNERJS);
-<script type="text/javascript">
+    my $inner_js_msg_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
     function checkInput() {
       opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
       var nmsg   = opener.document.SCORE.savemsgN.value;
@@ -1633,35 +1374,57 @@ sub sub_grademessage_js {
       self.close()
 
     }
-</script>
 INNERJS
 
-    my $start_page_msg_central =
+    my $inner_js_highlight_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
+    function updateChoice(flag) {
+      opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+      opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+      opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+      opener.document.SCORE.refresh.value = "on";
+      if (opener.document.SCORE.keywords.value!=""){
+         opener.document.SCORE.submit();
+      }
+      self.close()
+    }
+INNERJS
+
+    my $start_page_msg_central = 
         &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
 				       {'js_ready'  => 1,
 					'only_body' => 1,
 					'bgcolor'   =>'#FFFFFF',});
-    my $end_page_msg_central =
+    my $end_page_msg_central = 
 	&Apache::loncommon::end_page({'js_ready' => 1});
 
 
+    my $start_page_highlight_central = 
+        &Apache::loncommon::start_page('Highlight Central',
+				       $inner_js_highlight_central,
+				       {'js_ready'  => 1,
+					'only_body' => 1,
+					'bgcolor'   =>'#FFFFFF',});
+    my $end_page_highlight_central = 
+	&Apache::loncommon::end_page({'js_ready' => 1});
+
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;
-
-    my %html_js_lt = &Apache::lonlocal::texthash(
-                comp => 'Compose Message for: ',
-                incl => 'Include',
-                type => 'Type',
-                subj => 'Subject',
-                mesa => 'Message',
-                new  => 'New',
-                save => 'Save',
-                canc => 'Cancel',
-             );
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
+    my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
     $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
 
+//===================== Show list of keywords ====================
+  function keywords(formname) {
+    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
+    if (nret==null) return;
+    formname.keywords.value = nret;
+
+    if (formname.keywords.value != "") {
+	formname.refresh.value = "on";
+	formname.submit();
+    }
+    return;
+  }
+
 //===================== Script to view submitted by ==================
   function viewSubmitter(submitter) {
     document.SCORE.refresh.value = "on";
@@ -1671,6 +1434,26 @@ INNERJS
     return;
   }
 
+//===================== Script to add keyword(s) ==================
+  function getSel() {
+    if (document.getSelection) txt = document.getSelection();
+    else if (document.selection) txt = document.selection.createRange().text;
+    else return;
+    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+    if (cleantxt=="") {
+	alert("$alertmsg");
+	return;
+    }
+    var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
+    if (nret==null) return;
+    document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
+    if (document.SCORE.keywords.value != "") {
+	document.SCORE.refresh.value = "on";
+	document.SCORE.submit();
+    }
+    return;
+  }
+
 //====================== Script for composing message ==============
    // preload images
    img1 = new Image();
@@ -1725,15 +1508,17 @@ INNERJS
 
   function savedMsgHeader(Nmsg,usrctr,fullname) {
     var height = 70*Nmsg+250;
+    var scrollbar = "no";
     if (height > 600) {
 	height = 600;
+	scrollbar = "yes";
     }
     var xpos = (screen.width-600)/2;
     xpos = (xpos < 0) ? '0' : xpos;
     var ypos = (screen.height-height)/2-30;
     ypos = (ypos < 0) ? '0' : ypos;
 
-    pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height);
+    pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
     pWin.focus();
     pDoc = pWin.document;
     pDoc.$docopen;
@@ -1741,146 +1526,47 @@ INNERJS
 
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pDoc.write("<h1>&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/h1>");
+    pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
 
-    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>");
+    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>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
 }
     function displaySubject(msg,shwsel) {
     pDoc = pWin.document;
-    pDoc.write("<tr>");
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    pDoc.write("<td>Subject<\\/td>");
     pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
-    pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");
-    pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");
+    pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
 }
 
   function displaySavedMsg(ctr,msg,shwsel) {
     pDoc = pWin.document;
-    pDoc.write("<tr>");
-    pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
+    pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/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>");
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    pDoc.write("<td align=\\"center\\">New<\\/td>");
     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("<\\/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 />");
+    pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     pDoc.write("<\\/form>");
     pDoc.write('$end_page_msg_central');
     pDoc.close();
 }
 
-SUBJAVASCRIPT
-}
-
-#--- javascript for essay type problem --
-sub sub_page_kw_js {
-    my $request = shift;
-
-    unless ($env{'form.compmsg'}) {
-        &commonJSfunctions($request);
-    }
-
-    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);
-      opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
-      opener.document.SCORE.refresh.value = "on";
-      if (opener.document.SCORE.keywords.value!=""){
-         opener.document.SCORE.submit();
-      }
-      self.close()
-    }
-</script>
-INNERJS
-
-    my $start_page_highlight_central =
-        &Apache::loncommon::start_page('Highlight Central',
-                                       $inner_js_highlight_central,
-                                       {'js_ready'  => 1,
-                                        'only_body' => 1,
-                                        'bgcolor'   =>'#FFFFFF',});
-    my $end_page_highlight_central =
-        &Apache::loncommon::end_page({'js_ready' => 1});
-
-    my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
-    $docopen=~s/^document\.//;
-
-    my %js_lt = &Apache::lonlocal::texthash(
-                keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
-                plse => 'Please select a word or group of words from document and then click this link.',
-                adds => 'Add selection to keyword list? Edit if desired.',
-                col1 => 'red',
-                col2 => 'green',
-                col3 => 'blue',
-                siz1 => 'normal',
-                siz2 => '+1',
-                siz3 => '+2',
-                sty1 => 'normal',
-                sty2 => 'italic',
-                sty3 => 'bold',
-             );
-    my %html_js_lt = &Apache::lonlocal::texthash(
-                save => 'Save',
-                canc => 'Cancel',
-                kehi => 'Keyword Highlight Options',
-                txtc => 'Text Color',
-                font => 'Font Size',
-                fnst => 'Font Style',
-             );
-    &js_escape(\%js_lt);
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
-    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
-
-//===================== Show list of keywords ====================
-  function keywords(formname) {
-    var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);
-    if (nret==null) return;
-    formname.keywords.value = nret;
-
-    if (formname.keywords.value != "") {
-        formname.refresh.value = "on";
-        formname.submit();
-    }
-    return;
-  }
-
-//===================== Script to add keyword(s) ==================
-  function getSel() {
-    if (document.getSelection) txt = document.getSelection();
-    else if (document.selection) txt = document.selection.createRange().text;
-    else return;
-    if (typeof(txt) != 'string') {
-        txt = String(txt);
-    }
-    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
-    if (cleantxt=="") {
-        alert("$js_lt{'plse'}");
-        return;
-    }
-    var nret = prompt("$js_lt{'adds'}",cleantxt);
-    if (nret==null) return;
-    document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
-    if (document.SCORE.keywords.value != "") {
-        document.SCORE.refresh.value = "on";
-        document.SCORE.submit();
-    }
-    return;
-  }
-
 //====================== Script for keyword highlight options ==============
   function kwhighlight() {
     var kwclr    = document.SCORE.kwclr.value;
@@ -1889,34 +1575,25 @@ INNERJS
     var redsel = "";
     var grnsel = "";
     var blusel = "";
-    var txtcol1 = "$js_lt{'col1'}";
-    var txtcol2 = "$js_lt{'col2'}";
-    var txtcol3 = "$js_lt{'col3'}";
-    var txtsiz1 = "$js_lt{'siz1'}";
-    var txtsiz2 = "$js_lt{'siz2'}";
-    var txtsiz3 = "$js_lt{'siz3'}";
-    var txtsty1 = "$js_lt{'sty1'}";
-    var txtsty2 = "$js_lt{'sty2'}";
-    var txtsty3 = "$js_lt{'sty3'}";
-    if (kwclr=="red")   {var redsel="checked='checked'"};
-    if (kwclr=="green") {var grnsel="checked='checked'"};
-    if (kwclr=="blue")  {var blusel="checked='checked'"};
+    if (kwclr=="red")   {var redsel="checked"};
+    if (kwclr=="green") {var grnsel="checked"};
+    if (kwclr=="blue")  {var blusel="checked"};
     var sznsel = "";
     var sz1sel = "";
     var sz2sel = "";
-    if (kwsize=="0")  {var sznsel="checked='checked'"};
-    if (kwsize=="+1") {var sz1sel="checked='checked'"};
-    if (kwsize=="+2") {var sz2sel="checked='checked'"};
+    if (kwsize=="0")  {var sznsel="checked"};
+    if (kwsize=="+1") {var sz1sel="checked"};
+    if (kwsize=="+2") {var sz2sel="checked"};
     var synsel = "";
     var syisel = "";
     var sybsel = "";
-    if (kwstyle=="")    {var synsel="checked='checked'"};
-    if (kwstyle=="<i>") {var syisel="checked='checked'"};
-    if (kwstyle=="<b>") {var sybsel="checked='checked'"};
+    if (kwstyle=="")    {var synsel="checked"};
+    if (kwstyle=="<i>") {var syisel="checked"};
+    if (kwstyle=="<b>") {var sybsel="checked"};
     highlightCentral();
-    highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel);
-    highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel);
-    highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel);
+    highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
+    highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
+    highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
     highlightend();
     return;
   }
@@ -1934,29 +1611,31 @@ INNERJS
     hDoc.$docopen;
     hDoc.write('$start_page_highlight_central');
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-    hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>");
+    hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options<\\/span><\\/h3><br /><br />");
 
-    hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">');
-    hDoc.write("<th>$html_js_lt{'txtc'}<\\/th><th>$html_js_lt{'font'}<\\/th><th>$html_js_lt{'fnst'}<\\/th><\\/tr>");
+    hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
+    hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
+    hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
   }
 
   function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
     var hDoc = hwdWin.document;
-    hDoc.write("<tr>");
+    hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/>&nbsp;"+clrtxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/>&nbsp;"+sztxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/>&nbsp;"+sytxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"<\\/td>");
     hDoc.write("<\\/tr>");
   }
 
   function highlightend() { 
     var hDoc = hwdWin.document;
-    hDoc.write("<\\/table><br \\/>");
-    hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>&nbsp;&nbsp;");
-    hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");
+    hDoc.write("<\\/table>");
+    hDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     hDoc.write("<\\/form>");
     hDoc.write('$end_page_highlight_central');
     hDoc.close();
@@ -2004,7 +1683,7 @@ sub gradeBox {
     $wgt       = ($wgt > 0 ? $wgt : '1');
     my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
 		  '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt));
-    my $data_WGT='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
+    my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
     my $display_part= &get_display_part($partid,$symb);
     my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
 				       [$partid]);
@@ -2012,7 +1691,7 @@ sub gradeBox {
     if ($last_resets{$partid}) {
         $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
     }
-    my $result=&Apache::loncommon::start_data_table_row();
+    $result.=&Apache::loncommon::start_data_table_row();
     my $ctr = 0;
     my $thisweight = 0;
     my $increment = &get_increment();
@@ -2049,9 +1728,8 @@ sub gradeBox {
 
 
     $result .= 
-	    '<td>'.$data_WGT.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
+	    '<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
     $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="'.
@@ -2062,7 +1740,6 @@ sub gradeBox {
         $aggtries.'" />'."\n";
     my $res_error;
     $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
-    $result.='</td>'.&Apache::loncommon::end_data_table_row();
     if ($res_error) {
         return &navmap_errormsg();
     }
@@ -2070,11 +1747,10 @@ sub gradeBox {
 }
 
 sub handback_box {
-    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,$res_error_pointer);
-    return unless ($numessay);
+    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
     my (@respids);
-    my @part_response_id = &flatten_responseType($responseType);
+     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
     	my ($part,$resp) = @{ $part_response_id };
         if ($part eq $partid) {
@@ -2086,10 +1762,9 @@ sub handback_box {
 	my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
 	my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
 	next if (!@$files);
-	my $file_counter = 0;
+	my $file_counter = 1;
 	foreach my $file (@$files) {
 	    if ($file =~ /\/portfolio\//) {
-                $file_counter++;
     	        my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
     	        my ($name,$version,$ext) = &file_name_version_ext($file_disp);
     	        $file_disp = "$name.$ext";
@@ -2097,14 +1772,11 @@ sub handback_box {
     	        $result.=&mt('Return commented version of [_1] to student.',
     			 '<span class="LC_filename">'.$file_disp.'</span>');
     	        $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
-    	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />'."\n";
+    	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
+    	        $result.='('.&mt('File will be uploaded when you click on Save &amp; Next below.').')<br />';
+    	        $file_counter++;
 	    }
 	}
-        if ($file_counter) {
-            $result .= '<input type="hidden" name="'.$prefix.'countreturndoc" value="'.$file_counter.'" />'."\n".
-                       '<span class="LC_info">'.
-                       '('.&mt('File(s) will be uploaded when you click on Save &amp; Next below.',$file_counter).')</span><br /><br />';
-        }
     }
     return $result;    
 }
@@ -2137,27 +1809,14 @@ sub show_problem {
 	$companswer=~s|</form>||g;
 	$companswer=~s|name="submit"|name="would_have_been_submit"|g;
     }
-    my $renderheading = &mt('View of the problem');
-    my $answerheading = &mt('Correct answer');
-    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-        my $stu_fullname = $env{'form.fullname'};
-        if ($stu_fullname eq '') {
-            $stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
-        }
-        my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom);
-        if ($forwhom ne '') {
-            $renderheading = &mt('View of the problem for[_1]',$forwhom);
-            $answerheading = &mt('Correct answer for[_1]',$forwhom);
-        }
-    }
     $rendered=
         '<div class="LC_Box">'
-       .'<h3 class="LC_hcell">'.$renderheading.'</h3>'
+       .'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'
        .$rendered
        .'</div>';
     $companswer=
         '<div class="LC_Box">'
-       .'<h3 class="LC_hcell">'.$answerheading.'</h3>'
+       .'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'
        .$companswer
        .'</div>';
     my $result;
@@ -2174,11 +1833,12 @@ 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'},
 					      $udom,$uname);
-        my ($string)= &get_last_submission(\%record);
+        my ($string,$timestamp)= &get_last_submission(\%record);
         foreach my $submission (@$string) {
             my ($partid,$respid) =
 		($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
@@ -2192,10 +1852,6 @@ 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'));
 
@@ -2208,54 +1864,7 @@ sub download_all_link {
                              'cgi.'.$identifier.'.parts' => $parts,});
     $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
 	      &mt('Download All Submitted Documents').'</a>');
-    return;
-}
-
-sub submit_download_link {
-    my ($request,$symb) = @_;
-    if (!$symb) { return ''; }
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&mt('An error occurred retrieving response types'));
-        return;
-    }
-    unless ($numessay) {
-        $request->print(&mt('No essayresponse items found'));
-        return;
-    }
-    my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
-    if (@chosenparts) {
-        $request->print(&showResourceInfo($symb,$partlist,$responseType,
-                                          undef,undef,1));
-    }
-    if ($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 ($numdropbox) {
-                    &download_all_link($request,$symb);
-                } else {
-                    $request->print(&mt('No essayrespose items with dropbox found'));
-                }
-# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox
-# 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;
+    return
 }
 
 sub build_section_inputs {
@@ -2273,58 +1882,39 @@ sub build_section_inputs {
 
 # --------------------------- show submissions of a student, option to grade 
 sub submission {
-    my ($request,$counter,$total,$symb,$divforres,$calledby) = @_;
+    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 $probtitle=&Apache::lonnet::gettitle($symb); 
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
-    my $probtitle=&Apache::lonnet::gettitle($symb);
-    my ($essayurl,%coursedesc_by_cid);
 
     if (!&canview($usec)) {
-        $request->print(
-            '<span class="LC_warning">'.
-            &mt('Unable to view 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">Unable to view requested student.('.
+			$uname.':'.$udom.' in section '.$usec.' in course id '.
+			$env{'request.course.id'}.')</span>');
 	return;
     }
 
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        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'; }
-    if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {
-        $env{'form.compmsg'} = 1;
-    }
     my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
     my $checkIcon = '<img alt="'.&mt('Check Mark').
 	'" src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
 
+    my %old_essays;
     # header info
     if ($counter == 0) {
-        my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
-        if (@chosenparts) {
-            $request->print(&showResourceInfo($symb,$partlist,$responseType,'gradesub'));
-        } elsif ($divforres) {
-            $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
-        } else {
-            $request->print('<br clear="all" />');
-        }
 	&sub_page_js($request);
-        &sub_grademessage_js($request) if ($env{'form.compmsg'});
-	&sub_page_kw_js($request) if ($numessay);
+	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
+	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>');
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
@@ -2341,27 +1931,23 @@ sub submission {
 	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
 	}
 
+	# kwclr is the only variable that is guaranteed to be non blank 
+        # if this subroutine has been called once.
 	my %keyhash = ();
-	if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) {
+	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
 					     $env{'course.'.$env{'request.course.id'}.'.domain'},
 					     $env{'course.'.$env{'request.course.id'}.'.num'});
-	}
-	# kwclr is the only variable that is guaranteed not to be blank
-	# if this subroutine has been called once.
-	if ($env{'form.kwclr'} eq '' && $numessay) {
+
 	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
 	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
 	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
 	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
-	}
-	if ($env{'form.compmsg'}) {
-	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?
+	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
 		$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".
@@ -2372,26 +1958,28 @@ sub submission {
 			'<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".
-			'<input type="hidden" name="compmsg"    value="'.$env{'form.compmsg'}.'" />'."\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.compmsg'}) {
-	    $request->print('<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
-			    '<input type="hidden" name="shownSub" value="0" />'."\n".
-			    '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
-	}
-	if ($numessay) {
+	if ($env{'form.handgrade'} eq 'yes') {
 	    $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".
-			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n");
+			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n".
+			    '<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
+			    '<input type="hidden" name="shownSub" value="0" />'."\n".
+			    '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
+	    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+		$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+	    }
 	}
-
+	
 	my ($cts,$prnmsg) = (1,'');
 	while ($cts <= $env{'form.savemsgN'}) {
 	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
@@ -2404,51 +1992,25 @@ sub submission {
 	}
 	$request->print($prnmsg);
 
-	if ($numessay) {
-
-            my %lt = &Apache::lonlocal::texthash(
-                          keyh => 'Keyword Highlighting for Essays',
-                          keyw => 'Keyword Options',
-                          list => 'List',
-                          past => 'Paste Selection to List',
-                          high => 'Highlight Attribute',
-                     );
+	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
 #
 # Print out the keyword options line
 #
-	    $request->print(
-                '<div class="LC_columnSection">'
-               .'<fieldset><legend>'.$lt{'keyh'}.'</legend>'
-               .&Apache::lonhtmlcommon::funclist_from_array(
-                    ['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>',
-                     '<a href="#" onmousedown="javascript:getSel(); return false"
- class="page">'.$lt{'past'}.'</a>',
-                     '<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'],
-                    {legend => $lt{'keyw'}})
-               .'</fieldset></div>'
-            );
-
+	    $request->print(<<KEYWORDS);
+&nbsp;<b>Keyword Options:</b>&nbsp;
+<a href="javascript:keywords(document.SCORE);" target="_self">List</a>&nbsp; &nbsp;
+<a href="#" onmousedown="javascript:getSel(); return false"
+ CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
+<a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
+KEYWORDS
 #
 # Load the other essays for similarity check
 #
-            (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);
-            }
+            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;
+	    %old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
         }
     }
 
@@ -2465,7 +2027,7 @@ sub submission {
     if ($perm{'vgr'}) {
         $request->print(
             &Apache::loncommon::track_student_link(
-                'View recent activity',
+                &mt('View recent activity'),
                 $uname,$udom,'check')
            .' '
         );
@@ -2492,6 +2054,12 @@ sub submission {
     }
 
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        $request->print(&navmap_errormsg());
+        return;
+    }
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
@@ -2500,16 +2068,16 @@ sub submission {
               .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
     $result.='<input type="hidden" name="name'.$counter.
              '" value="'.$env{'form.fullname'}.'" />'."\n";
-    if ($numresp > $numessay) {
+    if ($env{'form.handgrade'} eq 'no') {
         $result.='<p class="LC_info">'
                 .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
                 ."</p>\n";
     }
 
-    # If any part of the problem is an essayresponse, then check for collaborators
+    # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my $fullname;
     my $col_fullnames = [];
-    if ($numessay) {
+    if ($env{'form.handgrade'} eq 'yes') {
 	(my $sub_result,$fullname,$col_fullnames)=
 	    &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
 				 $counter);
@@ -2518,227 +2086,174 @@ sub submission {
     $request->print($result."\n");
 
     # print student answer/submission
-    # Options are (1) Last submission only
-    #             (2) Last submission (with detailed information for that submission)
-    #             (3) All transactions (by date)
-    #             (4) The whole record (with detailed information for all transactions)
-
-    my ($string,$timestamp,$lastgradetime,$lastsubmittime) = &get_last_submission(\%record);
-
-    my $lastsubonly;
+    # 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
+    if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
+	my ($string,$timestamp)= &get_last_submission(\%record);
+	
+	my $lastsubonly;
 
-    if ($timestamp eq '') {
-        $lastsubonly.='<div class="LC_grade_submissions_body">'.$string->[0].'</div>'; 
-    } else {
-        my ($shownsubmdate,$showngradedate);
-        if ($lastsubmittime && $lastgradetime) {
-            $shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime);
-            if ($lastgradetime > $lastsubmittime) {
-                 $showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime);
-             }
+        if ($$timestamp eq '') {
+            $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
         } else {
-            $shownsubmdate = $timestamp;
-        }
-        $lastsubonly =
-            '<div class="LC_grade_submissions_body">'
-           .'<b>'.&mt('Date Submitted:').'</b> '.$shownsubmdate."\n";
-        if ($showngradedate) {
-            $lastsubonly .= '<br /><b>'.&mt('Date Graded:').'</b> '.$showngradedate."\n";
-        }
-
-	my %seenparts;
-	my @part_response_id = &flatten_responseType($responseType);
-	foreach my $part (@part_response_id) {
-	    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>';
-                            } elsif ($ocrsid ne '') {
-                                my %old_course_desc;
-                                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">'.
+            $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;
+		    my $submitby='<b>Part:</b> '.$display_part.
+			' <b>Collaborative submission by:</b> '.
+			'<a href="javascript:viewSubmitter(\''.
+			$env{"form.$uname:$udom:$partid:submitted_by"}.
+			'\');" target="_self">'.
+			$$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+		    $request->print($submitby);
+		    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('Part 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,$subval) = split(/:/,$submission,3);
+		    # Similarity check
+		    my $similar='';
+		    if($env{'form.checkPlag'}){
+			my ($oname,$odom,$ocrsid,$oessay,$osim)=
+			    &most_similar($uname,$udom,$subval,\%old_essays);
+			if ($osim) {
+			    $osim=int($osim*100.0);
+			    my %old_course_desc = 
+				&Apache::lonnet::coursedescription($ocrsid,
+								   {'one_time' => 1});
+
+                            if ($hide) {
+                                $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>';
-                            } else {
-                                $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>';
+				    '</span></h3><blockquote><i>'.
+				    &keywords_highlight($oessay).
+				    '</i></blockquote><hr />';
                             }
-                            $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)$/)) {
-		    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}));
-                        } 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 $order=&get_order($partid,$respid,$symb,$uname,$udom);
+		    if ($env{'form.lastSub'} eq 'lastonly' || 
+			($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('Part ID: [_1]',$respid).')'.
+                            '</span>&nbsp; &nbsp;';
+			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+			if (@$files) {
+                            if ($hide) {
+                                $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
                             } 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>';
+                                $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
+                                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" /> '.$file.'</a>';
+                                }
                             }
+			    $lastsubonly.='<br />';
+			}
+                        if ($hide) {
+                            $lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; 
+                        } else {
+			    $lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
+			        &cleanRecord($subval,$responsetype,$symb,$partid,
+					     $respid,\%record,$order,undef,$uname,$udom);
                         }
-			$lastsubonly.='<br />';
+			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+			$lastsubonly.='</div>';
 		    }
-                    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
 	}
-	$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($lastsubonly);
+   } elsif ($env{'form.lastSub'} eq 'datesub') {
+#	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
+    my ($parts,$handgrade,$responseType) = &response_type($symb);
+
 	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
-    }
-    if ($env{'form.lastSub'} =~ /^(last|all)$/) {
-        my $identifier = (&canmodify($usec)? $counter : '');
+    } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $env{'request.course.id'},
 								 $last,'.submission',
-								 'Apache::grades::keywords_highlight',
-                                                                 $usec,$identifier));
+								 'Apache::grades::keywords_highlight'));
     }
+
     $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
 	.$udom.'" />'."\n");
     # return if view submission with no grading option
-    if (!&canmodify($usec)) {
-        $request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
-        return;
+    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";
+	$request->print($toGrade);
+	return;
     } else {
 	$request->print('</div>'."\n");
     }
 
-    # grading message center
-
-    if ($env{'form.compmsg'}) {
-        my $result='<div class="LC_Box">'.
-                   '<h3 class="LC_hcell">'.&mt('Send Message').'</h3>'.
-                   '<div class="LC_grade_message_center_body">';
-        my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
-        my $msgfor = $givenn.' '.$lastname;
-        if (scalar(@$col_fullnames) > 0) {
-            my $lastone = pop(@$col_fullnames);
-            $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
-        }
-        $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
-        $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
-                 '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
-	         '&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
-                 ',\''.$msgfor.'\');" target="_self">'.
-                 &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" alt="" name="mailicon'.$counter.'" />'."\n".
-                 '<br />&nbsp;('.
-                 &mt('Message will be sent when you click on Save &amp; Next below.').")\n".
-	         '</div></div>';
-        $request->print($result);
+    # essay grading message center
+    if ($env{'form.handgrade'} eq 'yes') {
+	my $result='<div class="LC_grade_message_center">';
+    
+	$result.='<div class="LC_grade_message_center_header">'.
+	    &mt('Send Message').'</div><div class="LC_grade_message_center_body">';
+	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
+	my $msgfor = $givenn.' '.$lastname;
+	if (scalar(@$col_fullnames) > 0) {
+	    my $lastone = pop(@$col_fullnames);
+	    $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
+	}
+	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
+	$result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
+	    ',\''.$msgfor.'\');" target="_self">'.
+	    &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".
+	    '<br />&nbsp;('.
+	    &mt('Message will be sent when you click on Save &amp; Next below.').")\n";
+	$result.='</div></div>';
+	$request->print($result);
     }
 
     my %seen = ();
@@ -2755,6 +2270,8 @@ sub submission {
 	my $part_resp = join('_',@{ $part_response_id });
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
+	next if ($$handgrade{$part_resp} ne 'yes' 
+		 && $env{'form.lastSub'} eq 'hdgrade');
 	push(@partlist,$partid);
 	push(@gradePartRespid,$partid.'.'.$respid);
 	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
@@ -2823,10 +2340,10 @@ sub check_collaborators {
 	next if ($record->{'resource.'.$part.'.collaborators'} eq '');
 	my (@good_collaborators, @bad_collaborators);
 	foreach my $possible_collaborator
-	    (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { 
+	    (split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) { 
 	    $possible_collaborator =~ s/[\$\^\(\)]//g;
 	    next if ($possible_collaborator eq '');
-	    my ($co_name,$co_dom) = split(/:/,$possible_collaborator);
+	    my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);
 	    $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
 	    next if ($co_name eq $uname && $co_dom eq $udom);
 	    # Doing this grep allows 'fuzzy' specification
@@ -2839,13 +2356,13 @@ sub check_collaborators {
 	    }
 	}
 	if (scalar(@good_collaborators) != 0) {
-	    $result.='<br />'.&mt('Collaborators:').'<ol>';
+	    $result.='<br />'.&mt('Collaborators: ');
 	    foreach my $name (@good_collaborators) {
 		my ($lastname,$givenn) = split(/,/,$$fullname{$name});
 		push(@col_fullnames, $givenn.' '.$lastname);
-		$result.='<li>'.$fullname->{$name}.'</li>';
+		$result.=$fullname->{$name}.'&nbsp; &nbsp; &nbsp;';
 	    }
-	    $result.='</ol><br />'."\n";
+	    $result.='<br />'."\n";
 	    my ($part)=split(/\./,$part);
 	    $result.='<input type="hidden" name="collaborator'.$counter.
 		'" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
@@ -2869,103 +2386,58 @@ sub check_collaborators {
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
     my ($returnhash)=@_;
-    my (@string,$timestamp,$lastgradetime,$lastsubmittime);
+    my (@string,$timestamp,%lasthidden);
     if ($$returnhash{'version'}) {
 	my %lasthash=();
-        my %prevsolved=();
-        my %solved=();
-	my $version;
+	my ($version);
 	for ($version=1;$version<=$$returnhash{'version'};$version++) {
-            my %handgraded = ();
 	    foreach my $key (sort(split(/\:/,
 					$$returnhash{$version.':keys'}))) {
 		$lasthash{$key}=$$returnhash{$version.':'.$key};
-                if ($key =~ /\.([^.]+)\.regrader$/) {
-                    $handgraded{$1} = 1;
-                } elsif ($key =~ /\.portfiles$/) {
-                    if (($$returnhash{$version.':'.$key} ne '') &&
-                        ($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) {
-                        $lastsubmittime = $$returnhash{$version.':timestamp'};
-                    }
-                } elsif ($key =~ /\.submission$/) {
-                    if ($$returnhash{$version.':'.$key} ne '') {
-                        $lastsubmittime = $$returnhash{$version.':timestamp'};
-                    }
-                } elsif ($key =~ /\.([^.]+)\.solved$/) {
-                    $prevsolved{$1} = $solved{$1};
-                    $solved{$1} = $lasthash{$key};
-                }
-            }
-            foreach my $partid (keys(%handgraded)) {
-                if (($prevsolved{$partid} eq 'ungraded_attempted') &&
-                    (($solved{$partid} eq 'incorrect_by_override') ||
-                     ($solved{$partid} eq 'correct_by_override'))) {
-                    $lastgradetime = $$returnhash{$version.':timestamp'};
-                }
-                if ($solved{$partid} ne '') {
-                    $prevsolved{$partid} = $solved{$partid};
-                }
-            }
-	    $timestamp = 
-		&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
+		$timestamp = 
+		    &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
+	    }
 	}
-        my (%typeparts,%randombytry);
+        my %typeparts;
         my $showsurv = 
             &Apache::lonnet::allowed('vas',$env{'request.course.id'});
         foreach my $key (sort(keys(%lasthash))) {
             if ($key =~ /\.type$/) {
                 if (($lasthash{$key} eq 'anonsurvey') || 
-                    ($lasthash{$key} eq 'anonsurveycred') ||
-                    ($lasthash{$key} eq 'randomizetry')) {
+                    ($lasthash{$key} eq 'anonsurveycred')) {
                     my ($ign,@parts) = split(/\./,$key);
                     pop(@parts);
-                    my $id = join('.',@parts);
-                    if ($lasthash{$key} eq 'randomizetry') {
-                        $randombytry{$ign.'.'.$id} = $lasthash{$key};
-                    } else {
-                        unless ($showsurv) {
-                            $typeparts{$ign.'.'.$id} = $lasthash{$key};
-                        }
+                    unless ($showsurv) {
+                        my $id = join(',',@parts);
+                        $typeparts{$ign.'.'.$id} = $lasthash{$key};
                     }
                     delete($lasthash{$key});
                 }
             }
         }
         my @hidden = keys(%typeparts);
-        my @randomize = keys(%randombytry);
 	foreach my $key (keys(%lasthash)) {
 	    next if ($key !~ /\.submission$/);
             my $hide;
             if (@hidden) {
                 foreach my $id (@hidden) {
                     if ($key =~ /^\Q$id\E/) {
-                        $hide = 'anon';
+                        $hide = 1;
                         last;
                     }
                 }
             }
-            unless ($hide) {
-                if (@randomize) {
-                    foreach my $id (@randomize) {
-                        if ($key =~ /^\Q$id\E/) {
-                            $hide = 'rand';
-                            last;
-                        }
-                    }
-                }
-            }
 	    my ($partid,$foo) = split(/submission$/,$key);
-	    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}) ));
+	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+		'<span class="LC_warning">Draft Copy</span> ' : '';
+	    push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
 	}
     }
     if (!@string) {
 	$string[0] =
 	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
     }
-    return (\@string,$timestamp,$lastgradetime,$lastsubmittime);
+    return (\@string,\$timestamp);
 }
 
 #--- High light keywords, with style choosen by user.
@@ -2981,187 +2453,6 @@ sub keywords_highlight {
     return $string;
 }
 
-# For Tasks provide a mechanism to display previous version for one specific student
-
-sub show_previous_task_version {
-    my ($request,$symb) = @_;
-    if ($symb eq '') {
-        $request->print(
-            '<span class="LC_error">'.
-            &mt('Unable to handle ambiguous references.').
-            '</span>');
-        return '';
-    }
-    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>');
-        return;
-    }
-    my $mode = 'both';
-    my $isTask = ($symb =~/\.task$/);
-    if ($isTask) {
-        if ($env{'form.previousversion'} =~ /^\d+$/) {
-            if ($env{'form.fullname'} eq '') {
-                $env{'form.fullname'} =
-                    &Apache::loncommon::plainname($uname,$udom,'lastname');
-            }
-            my $probtitle=&Apache::lonnet::gettitle($symb);
-            $request->print("\n\n".
-                            '<div class="LC_grade_show_user">'.
-                            '<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
-                            '</h2>'."\n");
-            &Apache::lonxml::clear_problem_counter();
-            $request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,
-                            {'previousversion' => $env{'form.previousversion'} }));
-            $request->print("\n</div>");
-        }
-    }
-    return;
-}
-
-sub choose_task_version_form {
-    my ($symb,$uname,$udom,$nomenu) = @_;
-    my $isTask = ($symb =~/\.task$/);
-    my ($current,$version,$result,$js,$displayed,$rowtitle);
-    if ($isTask) {
-        my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
-                                              $udom,$uname);
-        if (($record{'resource.0.version'} eq '') ||
-            ($record{'resource.0.version'} < 2)) {
-            return ($record{'resource.0.version'},
-                    $record{'resource.0.version'},$result,$js);
-        } else {
-            $current = $record{'resource.0.version'};
-        }
-        if ($env{'form.previousversion'}) {
-            $displayed = $env{'form.previousversion'};
-            $rowtitle = &mt('Choose another version:')
-        } else {
-            $displayed = $current;
-            $rowtitle = &mt('Show earlier version:');
-        }
-        $result = '<div class="LC_left_float">';
-        my $list;
-        my $numversions = 0;
-        for (my $i=1; $i<=$record{'resource.0.version'}; $i++) {
-            if ($i == $current) {
-                if (!$env{'form.previousversion'} || $nomenu) {
-                    next;
-                } else {
-                    $list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n";
-                    $numversions ++;
-                }
-            } elsif (defined($record{'resource.'.$i.'.0.status'})) {
-                unless ($i == $env{'form.previousversion'}) {
-                    $numversions ++;
-                }
-                $list .= '<option value="'.$i.'">'.$i.'</option>'."\n";
-            }
-        }
-        if ($numversions) {
-            $symb = &HTML::Entities::encode($symb,'<>"&');
-            $result .=
-                '<form name="getprev" method="post" action=""'.
-                ' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'.
-                &Apache::loncommon::start_data_table().
-                &Apache::loncommon::start_data_table_row().
-                '<th align="left">'.$rowtitle.'</th>'.
-                '<td><select name="version">'.
-                '<option>'.&mt('Select').'</option>'.
-                $list.
-                '</select></td>'.
-                &Apache::loncommon::end_data_table_row();
-            unless ($nomenu) {
-                $result .= &Apache::loncommon::start_data_table_row().
-                '<th align="left">'.&mt('Open in new window').'</th>'.
-                '<td><span class="LC_nobreak">'.
-                '<label><input type="radio" name="prevwin" value="1" />'.
-                &mt('Yes').'</label>'.
-                '<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'.
-                '</span></td>'.
-                &Apache::loncommon::end_data_table_row();
-            }
-            $result .=
-                &Apache::loncommon::start_data_table_row().
-                '<th align="left">&nbsp;</th>'.
-                '<td>'.
-                '<input type="submit" name="prevsub" value="'.&mt('Display').'" />'.
-                '</td>'.
-                &Apache::loncommon::end_data_table_row().
-                &Apache::loncommon::end_data_table().
-                '</form>';
-            $js = &previous_display_javascript($nomenu,$current);
-        } elsif ($displayed && $nomenu) {
-            $result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>';
-        } else {
-            $result .= &mt('No previous versions to show for this student');
-        }
-        $result .= '</div>';
-    }
-    return ($current,$displayed,$result,$js);
-}
-
-sub previous_display_javascript {
-    my ($nomenu,$current) = @_;
-    my $js = <<"JSONE";
-<script type="text/javascript">
-// <![CDATA[
-function previousVersion(uname,udom,symb) {
-    var current = '$current';
-    var version = document.getprev.version.options[document.getprev.version.selectedIndex].value;
-    var prevstr = new RegExp("^\\\\d+\$");
-    if (!prevstr.test(version)) {
-        return false;
-    }
-    var url = '';
-    if (version == current) {
-        url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission';
-    } else {
-        url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version;
-    }
-JSONE
-    if ($nomenu) {
-        $js .= <<"JSTWO";
-    document.location.href = url;
-JSTWO
-    } else {
-        $js .= <<"JSTHREE";
-    var newwin = 0;
-    for (var i=0; i<document.getprev.prevwin.length; i++) {
-        if (document.getprev.prevwin[i].checked == true) {
-            newwin = document.getprev.prevwin[i].value;
-        }
-    }
-    if (newwin == 1) {
-        var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
-        url = url+'&inhibitmenu=yes';
-        if (typeof(previousWin) == 'undefined' || previousWin.closed) {
-            previousWin = window.open(url,'',options,1);
-        } else {
-            previousWin.location.href = url;
-        }
-        previousWin.focus();
-        return false;
-    } else {
-        document.location.href = url;
-        return false;
-    }
-JSTHREE
-    }
-    $js .= <<"ENDJS";
-    return false;
-}
-// ]]>
-</script>
-ENDJS
-
-}
-
 #--- Called from submission routine
 sub processHandGrade {
     my ($request,$symb) = @_;
@@ -3171,49 +2462,21 @@ sub processHandGrade {
     my $ntstu  = $env{'form.NTSTU'};
     my $cdom   = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum   = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my ($res_error,%queueable);
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    } else {
-        foreach my $part (@{$partlist}) {
-            if (ref($responseType->{$part}) eq 'HASH') {
-                foreach my $id (keys(%{$responseType->{$part}})) {
-                    if (($responseType->{$part}->{$id} eq 'essay') ||
-                        (lc($handgrade->{$part.'_'.$id}) eq 'yes')) {
-                        $queueable{$part} = 1;
-                        last;
-                    }
-                }
-            }
-        }
-    }
 
     if ($button eq 'Save & Next') {
 	my $ctr = 0;
 	while ($ctr < $ngrade) {
 	    my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
-	    my ($errorflag,$pts,$wgt,$numhidden) = 
-                &saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable);
+	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
 	    if ($errorflag eq 'no_score') {
 		$ctr++;
 		next;
 	    }
 	    if ($errorflag eq 'not_allowed') {
-                $request->print(
-                    '<span class="LC_error">'
-                   .&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
-                   .'</span>');
+		$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
 		$ctr++;
 		next;
 	    }
-            if ($numhidden) {
-                $request->print(
-                    '<span class="LC_info">'
-                   .&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden)
-                   .'</span><br />');
-            }
 	    my $includemsg = $env{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
 	    my $restitle = &Apache::lonnet::gettitle($symb);
@@ -3241,7 +2504,7 @@ sub processHandGrade {
                                                      undef,undef,$showsymb,
                                                      $restitle);
 		$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
-				$msgstatus.'<br />');
+				$msgstatus);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
 		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
@@ -3250,7 +2513,7 @@ sub processHandGrade {
 		    foreach my $collaborator (@collaborators) {
 			my ($errorflag,$pts,$wgt) = 
 			    &saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
-					   $env{'form.unamedom'.$ctr},$part,\%queueable);
+					   $env{'form.unamedom'.$ctr},$part);
 			if ($errorflag eq 'not_allowed') {
 			    $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
 			    next;
@@ -3272,12 +2535,12 @@ sub processHandGrade {
 	}
     }
 
-    my %keyhash = ();
-    if ($numessay) {
+    if ($env{'form.handgrade'} eq 'yes') {
 	# Keywords sorted in alphabatical order
 	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
+	my %keyhash = ();
 	$env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
-	$env{'form.keywords'}           =~ s/^\s+|\s+$//g;
+	$env{'form.keywords'}           =~ s/^\s+|\s+$//;
 	my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
 	$env{'form.keywords'} = join(' ',@keywords);
 	$keyhash{$symb.'_keywords'}     = $env{'form.keywords'};
@@ -3285,9 +2548,7 @@ sub processHandGrade {
 	$keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};
 	$keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};
 	$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
-    }
 
-    if ($env{'form.compmsg'}) {
 	# message center - Order of message gets changed. Blank line is eliminated.
 	# New messages are saved in env for the next student.
 	# All messages are saved in nohist_handgrade.db
@@ -3310,12 +2571,9 @@ sub processHandGrade {
 	}
 	$env{'form.savemsgN'} = --$idx;
 	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
-    }
-    if (($numessay) || ($env{'form.compmsg'})) {
 	my $putresult = &Apache::lonnet::put
 	    ('nohist_handgrade',\%keyhash,$cdom,$cnum);
     }
-
     # Called by Save & Refresh from Highlight Attribute Window
     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     if ($env{'form.refresh'} eq 'on') {
@@ -3330,12 +2588,22 @@ 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,$symb);
+	    &submission($request,$ctr,$total-1);
 	    $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)};
@@ -3355,6 +2623,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);
 	}
@@ -3365,7 +2634,14 @@ 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);
+    if ($res_error) {
+        $request->print(&navmap_errormsg());
+        return;
+    }
     foreach my $student (@parsedlist) {
 	my $submitonly=$env{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
@@ -3411,11 +2687,13 @@ sub processHandGrade {
 	$env{'form.student'}  = $uname;
 	$env{'form.userdom'}  = $udom;
 	$env{'form.fullname'} = $$fullname{$_};
-	&submission($request,$ctr,$total,$symb);
+	&submission($request,$ctr,$total);
 	$ctr++;
     }
     if ($total < 0) {
-        my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
+	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
+	$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
+	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
 	$request->print($the_end);
     }
     return '';
@@ -3423,7 +2701,7 @@ sub processHandGrade {
 
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
-    my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable) = @_;
+    my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
     my @version_parts;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $env{'request.course.id'});
@@ -3431,14 +2709,9 @@ sub saveHandGrade {
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
     my @parts_graded;
     my %newrecord  = ();
-    my ($pts,$wgt,$totchg) = ('','',0);
+    my ($pts,$wgt) = ('','');
     my %aggregate = ();
     my $aggregateflag = 0;
-    if ($env{'form.HIDE'.$newflg}) {
-        my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2);
-        my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1);
-        $totchg += $numchgs;
-    }
     my @parts = split(/:/,$env{'form.partlist'.$newflg});
     foreach my $new_part (@parts) {
 	#collaborator ($submi may vary for different parts
@@ -3535,47 +2808,17 @@ sub saveHandGrade {
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$env{'request.course.id'},$domain,$stuname);
 	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
-				     $cdom,$cnum,$domain,$stuname,$queueable);
+				     $cdom,$cnum,$domain,$stuname);
     }
     if ($aggregateflag) {
         &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
 			      $cdom,$cnum);
     }
-    return ('',$pts,$wgt,$totchg);
-}
-
-sub makehidden {
-    my ($version,$parts,$record,$symb,$domain,$stuname,$tolog) = @_;
-    return unless (ref($record) eq 'HASH');
-    my %modified;
-    my $numchanged = 0;
-    if (exists($record->{$version.':keys'})) {
-        my $partsregexp = $parts;
-        $partsregexp =~ s/,/|/g;
-        foreach my $key (split(/\:/,$record->{$version.':keys'})) {
-            if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) {
-                 my $item = $1;
-                 unless (($item eq 'solved') || ($item =~ /^award(|msg|ed)$/)) {
-                     $modified{$key} = $record->{$version.':'.$key};
-                 }
-            } elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) {
-                $modified{$1.'hidden'.$2} = $record->{$version.':'.$key};
-            } elsif ($key =~ /^(ip|timestamp|host)$/) {
-                $modified{$key} = $record->{$version.':'.$key};
-            }
-        }
-        if (keys(%modified)) {
-            if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified,
-                                          $domain,$stuname,$tolog) eq 'ok') {
-                $numchanged ++;
-            }
-        }
-    }
-    return $numchanged;
+    return ('',$pts,$wgt);
 }
 
 sub check_and_remove_from_queue {
-    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_;
+    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
     my @ungraded_parts;
     foreach my $part (@{$parts}) {
 	if (    $record->{   'resource.'.$part.'.awarded'} eq ''
@@ -3583,9 +2826,7 @@ sub check_and_remove_from_queue {
 	     && $newrecord->{'resource.'.$part.'.awarded'} eq ''
 	     && $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
 		) {
-            if ($queueable->{$part}) {
-	        push(@ungraded_parts, $part);
-            }
+	    push(@ungraded_parts, $part);
 	}
     }
     if ( !@ungraded_parts ) {
@@ -3603,80 +2844,64 @@ sub handback_files {
         $request->print('<br />'.&navmap_errormsg().'<br />');
         return;
     }
-    my @handedback;
-    my $file_msg;
     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
     	my ($part_id,$resp_id) = @{ $part_response_id };
 	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 (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
                 # 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 $file_counter = 1;
+		my $file_msg;
+                while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
+                    my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
                     my ($directory,$answer_file) = 
-                        ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/);
+                        ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
                     my ($answer_name,$answer_ver,$answer_ext) =
 		        &file_name_version_ext($answer_file);
 		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
                     my $getpropath = 1;
-                    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);
-                    # fix filename
+		    my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);
+		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+                    # fix file name
                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
                     my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
-            	                                $newflg.'_'.$part_resp.'_returndoc'.$counter,
+            	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
             	                                $save_file_name);
                     if ($result !~ m|^/uploaded/|) {
                         $request->print('<br /><span class="LC_error">'.
                             &mt('An error occurred ([_1]) while trying to upload [_2].',
-                                $result,$newflg.'_'.$part_resp.'_returndoc'.$counter).
+                                $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).
                                         '</span>');
                     } else {
                         # mark the file as read only
-                        push(@handedback,$save_file_name);
+                        my @files = ($save_file_name);
+                        my @what = ($symb,$env{'request.course.id'},'handback');
+                        &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
 			if (exists($$newrecord{"resource.$new_part.$resp_id.handback"})) {
 			    $$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.= "\n".'<br /><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>'));
-                }
+                    $request->print("<br />".$fname." will be the uploaded file name");
+                    $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+                    $file_counter++;
+                }
+		my $subject = "File Handed Back by Instructor ";
+		my $message = "A file has been returned that was originally submitted in reponse to: <br />";
+		$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
+		$message .= ' The returned file(s) are named: '. $file_msg;
+		$message .= " and can be found in your portfolio space.";
+		my ($feedurl,$showsymb) = 
+		    &get_feedurl_and_symb($symb,$domain,$stuname);
+                my $restitle = &Apache::lonnet::gettitle($symb);
+		my $msgstatus = 
+                   &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject.
+			 ' (File Returned) ['.$restitle.']',$message,undef,
+                         $feedurl,undef,undef,undef,$showsymb,$restitle);
             }
         }
-    }
-    if (@handedback > 0) {
-        $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 ($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: ');
-        }
-        $message .= "<p><strong>".&Apache::lonnet::gettitle($symb)." </strong></p>";
-        $message .= &mt_user($user_lh,'The returned file(s) are named: [_1]',"<br />$file_msg <br />").
-                    &mt_user($user_lh,'The file(s) can be found in your [_1]portfolio[_2].','<a href="/adm/portfolio">','</a>');
-        my ($feedurl,$showsymb) =
-            &get_feedurl_and_symb($symb,$domain,$stuname);
-        my $restitle = &Apache::lonnet::gettitle($symb);
-        $subject .= ' '.&mt_user($user_lh,'(File Returned)').' ['.$restitle.']';
-        my $msgstatus =
-             &Apache::lonmsg::user_normal_msg($stuname,$domain,$subject,
-                 $message,undef,$feedurl,undef,undef,undef,$showsymb,
-                 $restitle);
-        if ($msgstatus) {
-            $request->print(&mt('Notification message status: [_1]','<span class="LC_info">'.$msgstatus.'</span>').'<br />');
-        }
-    }
     return;
 }
 
@@ -3784,11 +3009,9 @@ sub version_portfiles {
                 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 $getpropath = 1;    
+                my @dir_list = &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);
@@ -3807,24 +3030,21 @@ sub version_portfiles {
 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
+    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;
-                    }
+                # a versioned file is found  so save it for later
+                if ($file_version > $version) {
+		    $version = $file_version;
 	        }
             }
         }
-    }
+    } 
     $version ++;
     return($version);
 }
@@ -3871,7 +3091,6 @@ sub viewgrades_js {
     my ($request) = shift;
 
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
-    &js_escape(\$alertmsg);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
    function writePoint(partid,weight,point) {
 	var radioButton = document.classgrade["RADVAL_"+partid];
@@ -4061,86 +3280,19 @@ sub viewgrades {
 	&build_section_inputs().
 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
 
-    #retrieve selected groups
-    my (@groups,$group_display);
-    @groups = &Apache::loncommon::get_env_multiple('form.group');
-    if (grep(/^all$/,@groups)) {
-        @groups = ('all');
-    } elsif (grep(/^none$/,@groups)) {
-        @groups = ('none');
-    } elsif (@groups > 0) {
-        $group_display = join(', ',@groups);
+    my ($common_header,$specific_header);
+    if ($env{'form.section'} eq 'all') {
+	$common_header = &mt('Assign Common Grade to Class');
+        $specific_header = &mt('Assign Grade to Specific Students in Class');
+    } elsif ($env{'form.section'} eq 'none') {
+        $common_header = &mt('Assign Common Grade to Students in no Section');
+	$specific_header = &mt('Assign Grade to Specific Students in no Section');
+    } else {
+        my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
+        $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);
     }
-
-    my ($common_header,$specific_header,@sections,$section_display);
-    if ($env{'request.course.sec'} ne '') {
-        @sections = ($env{'request.course.sec'});
-    } else {
-        @sections = &Apache::loncommon::get_env_multiple('form.section');
-    }
-
-# Check if Save button should be usable
-    my $disabled = ' disabled="disabled"';
-    if ($perm{'mgr'}) {
-        if (grep(/^all$/,@sections)) {
-            undef($disabled);
-        } else {
-            foreach my $sec (@sections) {
-                if (&canmodify($sec)) {
-                    undef($disabled);
-                    last;
-                }
-            }
-        }
-    }
-    if (grep(/^all$/,@sections)) {
-        @sections = ('all');
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in Group(s) [_1]',$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Group(s) [_1]',$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $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');
-            $specific_header = &mt('Assign Grade to Specific Students in Class');
-        }
-    } elsif (grep(/^none$/,@sections)) {
-        @sections = ('none');
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in no Section and in Group(s) [_1]',$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in no Section and in Group(s)',$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $common_header = &mt('Assign Common Grade to Students in no Section and in no Group');
-            $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');
-        }
-    } else {
-        $section_display = join (", ",@sections);
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in Section(s) [_1], and in Group(s) [_2]',
-                                 $section_display,$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1], and in Group(s) [_2]',
-                                   $section_display,$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $common_header = &mt('Assign Common Grade to Students in Section(s) [_1] and no Group',$section_display);
-            $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);
-        }
-    }
-    my %submit_types = &substatus_options();
-    my $submission_status = $submit_types{$env{'form.submitonly'}};
-
-    if ($env{'form.submitonly'} eq 'all') {
-        $result.= '<h3>'.$common_header.'</h3>';
-    } else {
-        $result.= '<h3>'.$common_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>'; 
-    }
-    $result .= &Apache::loncommon::start_data_table();
+    $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
     my $res_error;
@@ -4157,6 +3309,7 @@ sub viewgrades {
 	my $part_resp = join('_',@{ $part_response_id });
 	next if $seen{$partid};
 	$seen{$partid}++;
+	my $handgrade=$$handgrade{$part_resp};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -4175,9 +3328,8 @@ 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.'\','.
+	$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>'.
@@ -4202,12 +3354,8 @@ sub viewgrades {
 
     #table listing all the students in a section/class
     #header of table
-    if ($env{'form.submitonly'} eq 'all') { 
-        $result.= '<h3>'.$specific_header.'</h3>';
-    } else {
-        $result.= '<h3>'.$specific_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>';
-    }
-    $result.= &Apache::loncommon::start_data_table().
+    $result.= '<h3>'.$specific_header.'</h3>'.
+              &Apache::loncommon::start_data_table().
 	      &Apache::loncommon::start_data_table_header_row().
 	      '<th>'.&mt('No.').'</th>'.
 	      '<th>'.&nameUserString('header')."</th>\n";
@@ -4225,14 +3373,11 @@ sub viewgrades {
 	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
 	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]<br /> (weight = [_2])',
+		    $display_part,$weight{$partid}).'</th>'."\n";
 	    next;
 	    
 	} else {
@@ -4253,7 +3398,7 @@ sub viewgrades {
 
     #get info for each student
     #list all the students - with points and grade status
-    my (undef,undef,$fullname) = &getclasslist(\@sections,'1',\@groups);
+    my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     my $ctr = 0;
     foreach (sort 
 	     {
@@ -4262,142 +3407,35 @@ sub viewgrades {
 		 }
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
+	$ctr++;
 	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
-				   $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets);
+				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+    $result.='<input type="button" value="'.&mt('Save').'" '.
 	'onclick="javascript:submit();" target="_self" /></form>'."\n";
-    if ($ctr == 0) {
+    if (scalar(%$fullname) eq 0) {
+	my $colspan=3+scalar(@parts);
+	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
-        $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'.
-                '<span class="LC_warning">';
-        if ($env{'form.submitonly'} eq 'all') {
-            if (grep(/^all$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students with enrollment status [_1] to modify or grade.',
-                                   $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);
-                } else {
-                    $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $group_display,$stu_status);
-                }
-            } elsif (grep(/^none$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in no section with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in no section and no group with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } else {
-                    $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $group_display,$stu_status);
-                }
-            } else {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $section_display,$stu_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] to modify or grade.',
-                                   $section_display,$stu_status);
-                } else {
-                    $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] to modify or grade.',
-                                   $section_display,$group_display,$stu_status);
-                }
-            }
-        } else {
-            if (grep(/^all$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students with no group assigned with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } else {
-                    $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $group_display,$stu_status,$submission_status);
-                }
-            } elsif (grep(/^none$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in no section with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in no section and no group with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } else {
-                    $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $group_display,$stu_status,$submission_status);
-                }
-            } 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);
-                } 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);
-                } else {
-                    $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] and submission status "[_4]" to modify or grade.',
-                                   $section_display,$group_display,$stu_status,$submission_status);
-                }
-            }
-	}
-	$result .= '</span><br />';
+	$result='<span class="LC_warning">'.
+	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
+	        $section_display, $stu_status).
+	    '</span>';
     }
     return $result;
 }
 
-#--- call by previous routine to display each student who satisfies submission filter.
+#--- call by previous routine to display each student
 sub viewstudentgrade {
     my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
     my ($uname,$udom) = split(/:/,$student);
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-    my $submitonly = $env{'form.submitonly'};
-    unless (($submitonly eq 'all') || ($submitonly eq 'queued')) {
-        my %partstatus = ();
-        if (ref($parts) eq 'ARRAY') {
-            foreach my $apart (@{$parts}) {
-                my ($part,$type) = &split_part_type($apart);
-                my ($status,undef) = split(/_/,$record{"resource.$part.solved"},2);
-                $status = 'nothing' if ($status eq '');
-                $partstatus{$part}      = $status;
-                my $subkey = "resource.$part.submitted_by";
-                $partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');
-            }
-            my $submitted = 0;
-            my $graded = 0;
-            my $incorrect = 0;
-            foreach my $key (keys(%partstatus)) {
-                $submitted = 1 if ($partstatus{$key} ne 'nothing');
-                $graded = 1 if ($partstatus{$key} =~ /^ungraded/);
-                $incorrect = 1 if ($partstatus{$key} =~ /^incorrect/);
-
-                my $partid = (split(/\./,$key))[1];
-                if ($partstatus{'resource.'.$partid.'.'.$key.'.submitted_by'} ne '') {
-                    $submitted = 0;
-                }
-            }
-            return if (!$submitted && ($submitonly eq 'yes' ||
-                                       $submitonly eq 'incorrect' ||
-                                       $submitonly eq 'graded'));
-            return if (!$graded && ($submitonly eq 'graded'));
-            return if (!$incorrect && $submitonly eq 'incorrect');
-        }
-    }
-    if ($submitonly eq 'queued') {
-        my ($cdom,$cnum) = split(/_/,$courseid);
-        my %queue_status =
-            &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
-                                                    $udom,$uname);
-        return if (!defined($queue_status{'gradingqueue'}));
-    }
-    $$ctr++;
-    my %aggregates = ();
+    my %aggregates = (); 
     my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
-	'<input type="hidden" name="ctr'.($$ctr-1).'" value="'.$student.'" />'.
-	"\n".$$ctr.'&nbsp;</td><td>&nbsp;'.
+	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
+	"\n".$ctr.'&nbsp;</td><td>&nbsp;'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 	'\');" target="_self">'.$fullname.'</a> '.
 	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
@@ -4461,7 +3499,7 @@ sub editgrades {
 
     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     my $title='<h2>'.&mt('Current Grade Status').'</h2>';
-    $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().
@@ -4495,7 +3533,6 @@ sub editgrades {
 	$ctr++;
     }
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
-    my $totcolspan = 0;
     foreach my $partid (@partid) {
 	$header .= '<th align="center">'.&mt('Old Score').'</th>'.
 	    '<th align="center">'.&mt('New Score').'</th>';
@@ -4512,7 +3549,6 @@ sub editgrades {
 		'<th align="center">'.&mt('New').' '.$display.'</th>';
 	    $columns{$partid}+=2;
 	}
-        $totcolspan += $columns{$partid};
     }
     foreach my $partid (@partid) {
 	my $display_part=&get_display_part($partid,$symb);
@@ -4527,22 +3563,21 @@ sub editgrades {
 	&Apache::loncommon::end_data_table_header_row();
     my @noupdate;
     my ($updateCtr,$noupdateCtr) = (1,1);
-    my ($got_types,%queueable);
     for ($i=0; $i<$env{'form.total'}; $i++) {
+	my $line;
 	my $user = $env{'form.ctr'.$i};
 	my ($uname,$udom)=split(/:/,$user);
 	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;
-        }
+	$line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
+	my $usec=$classlist->{"$uname:$udom"}[5];
+	if (!&canmodify($usec)) {
+	    my $numcols=scalar(@partid)*4+2;
+	    push(@noupdate,
+		 $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
+		 &mt('Not allowed to modify student')."</span></td></tr>");
+	    next;
+	}
         my %aggregate = ();
         my $aggregateflag = 0;
 	$user=~s/:/_/; # colon doen't work in javascript for names
@@ -4627,32 +3662,12 @@ sub editgrades {
 					     $udom,$uname);
 		my $all_graded = 1;
 		my $none_graded = 1;
-                unless ($got_types) {
-                    my $error;
-                    my ($plist,$handgrd,$resptype) = &response_type($symb,\$error);
-                    unless ($error) {
-                        foreach my $part (@parts) {
-                            if (ref($resptype->{$part}) eq 'HASH') {
-                                foreach my $id (keys(%{$resptype->{$part}})) {
-                                    if (($resptype->{$part}->{$id} eq 'essay') ||
-                                        (lc($handgrd->{$part.'_'.$id}) eq 'yes')) {
-                                        $queueable{$part} = 1;
-                                        last;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    $got_types = 1;
-                }
 		foreach my $part (@parts) {
-                    if ($queueable{$part}) {
-		        if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
-			    $all_graded = 0;
-		        } else {
-			    $none_graded = 0;
-		        }
-                    }
+		    if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
+			$all_graded = 0;
+		    } else {
+			$none_graded = 0;
+		    }
 		}
 
 		if ($all_graded || $none_graded) {
@@ -4677,7 +3692,8 @@ sub editgrades {
         }
     }
     if (@noupdate) {
-        my $numcols=$totcolspan+2;
+#	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+	my $numcols=scalar(@partid)*4+2;
 	$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
 	    '<td align="center" colspan="'.$numcols.'">'.
 	    &mt('No Changes Occurred For the Students Below').
@@ -4720,8 +3736,6 @@ sub split_part_type {
 sub csvupload_javascript_reverse_associate {
     my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
-  &js_escape(\$error1);
-  &js_escape(\$error2);
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
@@ -4762,8 +3776,6 @@ ENDPICK
 sub csvupload_javascript_forward_associate {
     my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
-  &js_escape(\$error1);
-  &js_escape(\$error2);
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
@@ -4807,16 +3819,20 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
+    my $result='';
     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);
-<br />
-<input type="button" value="$reverse" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<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>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />
@@ -4863,19 +3879,17 @@ sub csvupload_fields {
 
 sub csvuploadmap_footer {
     my ($request,$i,$keyfields) =@_;
-    my $buttontext = &mt('Assign Grades');
     $request->print(<<ENDPICK);
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
 </form>
 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 = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
@@ -4892,11 +3906,11 @@ sub upcsvScores_form {
     my ($request,$symb) = @_;
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
-    $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>';
+    $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";
     my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     my $ignore=&mt('Ignore First Line');
@@ -4911,26 +3925,23 @@ $upfile_select
 </form>
 ENDUPFORM
     $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
-                           &mt("How do I create a CSV file from a spreadsheet")).
-            '</td>'.
-            &Apache::loncommon::end_data_table_row().
-            &Apache::loncommon::end_data_table();
+                           &mt("How do I create a CSV file from a spreadsheet"))
+    .'</td></tr></table>'."\n";
+    $result.='</td></tr></table><br /><br />'."\n";
     return $result;
 }
 
 
 sub csvuploadmap {
-    my ($request,$symb) = @_;
+    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'});
-        if ($datatoken ne '') { 
-	    &Apache::loncommon::load_tmp_file($request,$datatoken);
-        }
+	$datatoken=$env{'form.datatoken'};
+	&Apache::loncommon::load_tmp_file($request);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@records); }
@@ -4969,23 +3980,31 @@ sub csvuploadmap {
 
 sub csvuploadoptions {
     my ($request,$symb)= @_;
-    my $overwrite=&mt('Overwrite any existing score');
     my $checked=(($env{'form.noFirstLine'})?'1':'0');
     my $ignore=&mt('Ignore First Line');
     $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
+   Overwrite any existing score
 </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>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
+	$request->print("\n<p> Users are in domain: ".$domform."</p>\n");
     }
     foreach my $key (sort(keys(%env))) {
 	if ($key !~ /^form\.(.*)$/) { next; }
@@ -4996,7 +4015,7 @@ ENDPICK
     }
     # FIXME do a check for any duplicated user ids...
     # FIXME do a check for any invalid user ids?...
-    $request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br />
+    $request->print('<input type="submit" value="Assign Grades" /><br />
 <hr /></form>'."\n");
     return '';
 }
@@ -5019,21 +4038,18 @@ sub get_fields {
 }
 
 sub csvuploadassign {
-    my ($request,$symb) = @_;
+    my ($request,$symb)= @_;
     if (!$symb) {return '';}
     my $error_msg = '';
-    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-    if ($datatoken ne '') {
-        &Apache::loncommon::load_tmp_file($request,$datatoken);
-    }
+    &Apache::loncommon::load_tmp_file($request);
     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;
     my @skipped;
-    my @warnings;
     my $countdone=0;
     foreach my $grade (@gradedata) {
 	my %entries=&Apache::loncommon::record_sep($grade);
@@ -5082,9 +4098,6 @@ sub csvuploadassign {
                     my $pcr=$entries{$fields{$dest}} / $wgt;
                     my $award=($pcr == 0) ? 'incorrect_by_override'
                                           : 'correct_by_override';
-                    if ($pcr>1) {
-                        push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
-                    }
                     $grades{"resource.$part.awarded"}=$pcr;
                     $grades{"resource.$part.solved"}=$award;
                     $points{$part}=1;
@@ -5104,7 +4117,7 @@ sub csvuploadassign {
 		$grades{$store_key}=$entries{$fields{$dest}};
 	    }
 	}
-	if (! %grades) {
+	if (! %grades) { 
            push(@skipped,&mt("[_1]: no data to save","$username:$domain")); 
         } else {
 	   $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
@@ -5112,13 +4125,7 @@ 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 {
 	      $request->print("<p><span class=\"LC_error\">".
                               &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
@@ -5129,10 +4136,6 @@ sub csvuploadassign {
         }
     }
     $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
-    if (@warnings) {
-        $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />');
-        $request->print(join(', ',@warnings));
-    }
     if (@skipped) {
 	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
         $request->print(join(', ',@skipped));
@@ -5155,7 +4158,6 @@ sub pickStudentPage {
     my ($request,$symb) = @_;
 
     my $alertmsg = &mt('Please select the student you wish to grade.');
-    &js_escape(\$alertmsg);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
 
 function checkPickOne(formname) {
@@ -5175,7 +4177,6 @@ LISTJAVASCRIPT
     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>';
@@ -5190,11 +4191,21 @@ LISTJAVASCRIPT
     my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);
-
-    # Collection of hidden fields
+    my $select = '<select name="selectpage">'."\n";
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+	$select.='<option value="'.$ctr.'" '.
+	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
+	    '>'.$showtitle.'</option>'."\n";
+	$ctr++;
+    }
+    $select.= '</select>';
+    $result.='&nbsp;<b>'.&mt('Problems from').':</b> '.$select."<br />\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";
 	$ctr++;
@@ -5202,56 +4213,26 @@ LISTJAVASCRIPT
     $result.='<input type="hidden" name="page" />'."\n".
 	'<input type="hidden" name="title" />'."\n";
 
+    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.=&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="command" value="displayPage" />'."\n".
+	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."<br />\n";
 
-    # Show grading options
-    $result.=&Apache::lonhtmlcommon::start_pick_box();
-    my $select = '<select name="selectpage">'."\n";
-    $ctr=0;
-    foreach (@$titles) {
-        my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-        $select.='<option value="'.$ctr.'"'.
-            ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
-            '>'.$showtitle.'</option>'."\n";
-        $ctr++;
-    }
-    $select.= '</select>';
+    $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
 
-    $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.=
-        &Apache::lonhtmlcommon::row_title(&mt('Use CODE'))
-       .'<input type="text" name="CODE" value="" />'
-       .&Apache::lonhtmlcommon::row_closure(1)
-       .&Apache::lonhtmlcommon::end_pick_box();
-
-    # Show list of students to select for grading
-    $result.='<br /><input type="button" '.
+    $result.='&nbsp;<input type="button" '.
              'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
 
     $request->print($result);
@@ -5265,7 +4246,7 @@ LISTJAVASCRIPT
 	'<th>'.&nameUserString('header').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
  
-    my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup);
+    my (undef,undef,$fullname) = &getclasslist($getsec,'1');
     my $ptr = 1;
     foreach my $student (sort 
 			 {
@@ -5346,12 +4327,8 @@ 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>');
-        return;
+	$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>';
     $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
@@ -5400,7 +4377,7 @@ sub displayPage {
         '</span>'."\n".
 	&Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
-	'<th>'.&mt('Prob.').'</th>'.
+	'<th align="center">&nbsp;Prob.&nbsp;</th>'.
 	'<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
 
@@ -5420,8 +4397,8 @@ sub displayPage {
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' 
-		                        : '<br />('.&mt('[_1]parts',
-							scalar(@{$parts}).'&nbsp;').')'
+		                        : '<br />('.&mt('[_1]&nbsp;parts)',
+							scalar(@{$parts}))
 		 ).
 		 '</td>';
 	    $studentTable.='<td valign="top">';
@@ -5462,11 +4439,9 @@ sub displayPage {
 		}
 	    } elsif ($env{'form.lastSub'} eq 'all') {
 		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-                my $identifier = (&canmodify($usec)? $prob : '');
 		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
 									$env{'request.course.id'},
-									'','.submission',undef,
-                                                                        $usec,$identifier);
+									'','.submission');
  
 	    }
 	    if (&canmodify($usec)) {
@@ -5484,14 +4459,10 @@ sub displayPage {
 	}
         $curRes = $iterator->next();
     }
-    my $disabled;
-    unless (&canmodify($usec)) {
-        $disabled = ' disabled="disabled"';
-    }
 
     $studentTable.=
         '</table>'."\n".
-        '<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+        '<input type="button" value="'.&mt('Save').'" '.
         'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
         '</form>'."\n";
     $request->print($studentTable);
@@ -5508,7 +4479,6 @@ sub displaySubByDates {
 	&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>'.&mt('Status').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
@@ -5522,16 +4492,13 @@ sub displaySubByDates {
 
     my $interaction;
     my $no_increment = 1;
-    my (%lastrndseed,%lasttype);
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = 
 	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
 	if (exists($$record{$version.':resource.0.version'})) {
 	    $interaction = $$record{$version.':resource.0.version'};
 	}
-        if ($isTask && $env{'form.previousversion'}) {
-            next unless ($interaction == $env{'form.previousversion'});
-        }
+
 	my $where = ($isTask ? "$version:resource.$interaction"
 		             : "$version:resource");
 	$studentTable.=&Apache::loncommon::start_data_table_row().
@@ -5539,23 +4506,17 @@ sub displaySubByDates {
 	if ($isCODE) {
 	    $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
 	}
-        if ($isTask) {
-            $studentTable.='<td>'.$interaction.'</td>';
-        }
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
-            my ($hidden,$type);
-            $type = $$record{$version.':resource.'.$partid.'.type'};
-            if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
+            my $hidden;
+            if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') ||
+                ($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) {
                 $hidden = 1;
             }
-	    my @matchKey;
-            if ($isTask) {
-                @matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));
-            } else {
-		@matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
-            }
+	    my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
+			            : 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) {
@@ -5564,45 +4525,32 @@ sub displaySubByDates {
                     
 		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
 				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
-                    $displaySub[0].='<span class="LC_nobreak">';
+                    $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).')'
+                                   .'('.&mt('Part 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"};
-                        }
 		        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)) {
+		        if (!exists($orders{$partid}->{$responseId})) {
 			    $orders{$partid}->{$responseId}=
 			        &get_order($partid,$responseId,$symb,$uname,$udom,
-                                           $no_increment,$type,$trial,$rndseed);
+                                           $no_increment);
 		        }
-		        $displaySub[0].='</b>'.$newvariation.'</span>'; # /nobreak
+		        $displaySub[0].='</b></span>'; # /nobreak
 		        $displaySub[0].='&nbsp; '.
-			    &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom,$type,$trial,$rndseed).'<br />';
+			    &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
                     }
 		}
 	    }
@@ -5688,7 +4636,7 @@ sub updateGradeByPage {
 
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
-    my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0);
+    my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
     while ($depth > 0) {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
@@ -5701,7 +4649,7 @@ sub updateGradeByPage {
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' 
-                                        : '<br />('.&mt('[quant,_1,part]',scalar(@{$parts}))
+                                        : '<br />('.&mt('[quant,_1,&nbsp;part]',scalar(@{$parts}))
 		.')').'</td>';
 	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
 
@@ -5709,30 +4657,10 @@ sub updateGradeByPage {
 	    my @displayPts=();
             my %aggregate = ();
             my $aggregateflag = 0;
-            my %queueable;
-            if ($env{'form.HIDE'.$prob}) {
-                my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
-                my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);
-                my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1);
-                $hideflag += $numchgs;
-            }
 	    foreach my $partid (@{$parts}) {
 		my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
 		my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
-                my @types = $curRes->responseType($partid);
-                if (grep(/^essay$/,@types)) {
-                    $queueable{$partid} = 1;
-                } else {
-                    my @ids = $curRes->responseIds($partid);
-                    for (my $i=0; $i < scalar(@ids); $i++) {
-                        my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i].
-                                                          '.handgrade',$symb);
-                        if (lc($hndgrd) eq 'yes') {
-                            $queueable{$partid} = 1;
-                            last;
-                        }
-                    }
-                }
+
 		my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? 
 		    $env{'form.WGT'.$question.'_'.$partid} : 1;
 		my $partial = $newpts/$wgt;
@@ -5798,7 +4726,7 @@ sub updateGradeByPage {
 						   $env{'request.course.id'},
 						   $udom,$uname);
 		&check_and_remove_from_queue($parts,\%record,undef,$symbx,
-					     $cdom,$cnum,$udom,$uname,\%queueable);
+					     $cdom,$cnum,$udom,$uname);
 	    }
 	    
             if ($aggregateflag) {
@@ -5819,11 +4747,8 @@ sub updateGradeByPage {
     $studentTable.=&Apache::loncommon::end_data_table();
     my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
 		  &mt('The scores were changed for [quant,_1,problem].',
-		  $changeflag).'<br />');
-    my $hidemsg=($hideflag == 0 ? '' :
-                 &mt('Submissions were marked "hidden" for [quant,_1,transaction].',
-                     $hideflag).'<br />');
-    $request->print($hidemsg.$grademsg.$studentTable);
+		  $changeflag));
+    $request->print($grademsg.$studentTable);
 
     return '';
 }
@@ -5846,19 +4771,19 @@ sub updateGradeByPage {
    from the file that we are parsing that represents one entire sheet
 
    'bubble line' refers to the data
-   representing the line of bubbles that are on the physical bubblesheet
+   representing the line of bubbles that are on the physical bubble sheet
 
 
-The overall process is that a scanned in bubblesheet data is uploaded
+The overall process is that a scanned in bubble sheet data is uploaded
 into a course. When a user wants to grade, they select a
-sequence/folder of resources, a file of bubblesheet info, and pick
+sequence/folder of resources, a file of bubble sheet info, and pick
 one of the predefined configurations for what each scanline looks
 like.
 
 Next each scanline is checked for any errors of either 'missing
 bubbles' (it's an error because it may have been mis-scanned
 because too light bubbling), 'double bubble' (each bubble line should
-have no more than one letter picked), invalid or duplicated CODE,
+have no more that one letter picked), invalid or duplicated CODE,
 invalid student/employee ID
 
 If the CODE option is used that determines the randomization of the
@@ -5867,14 +4792,14 @@ username:domain.
 
 During the validation phase the instructor can choose to skip scanlines. 
 
-After the validation phase, there are now 3 bubblesheet files
+After the validation phase, there are now 3 bubble sheet files
 
   scantron_original_filename (unmodified original file)
   scantron_corrected_filename (file where the corrected information has replaced the original information)
   scantron_skipped_filename (contains the exact text of scanlines that where skipped)
 
 Also there is a separate hash nohist_scantrondata that contains extra
-correction information that isn't representable in the bubblesheet
+correction information that isn't representable in the bubble sheet
 file (see &scantron_getfile() for more information)
 
 After all scanlines are either valid, marked as valid or skipped, then
@@ -5897,7 +4822,7 @@ the homework problem.
 
 sub defaultFormData {
     my ($symb)=@_;
-    return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />';
+    return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />';
 }
 
 
@@ -5946,11 +4871,6 @@ my %subdivided_bubble_lines;       # no.
 
 my %responsetype_per_response;     # responsetype for each response
 
-my %masterseq_id_responsenum;      # src_id (e.g., 12.3_0.11 etc.) for each
-                                   # numbered response. Needed when randomorder
-                                   # or randompick are in use. Key is ID, value 
-                                   # is response number.
-
 # Save and restore the bubble lines array to the form env.
 
 
@@ -5964,17 +4884,12 @@ sub save_bubble_lines {
         $env{"form.scantron.responsetype.$line"} =
             $responsetype_per_response{$line};
     }
-    foreach my $resid (keys(%masterseq_id_responsenum)) {
-        my $line = $masterseq_id_responsenum{$resid};
-        $env{"form.scantron.residpart.$line"} = $resid;
-    }
 }
 
 
 sub restore_bubble_lines {
     my $line = 0;
     %bubble_lines_per_response = ();
-    %masterseq_id_responsenum = ();
     while ($env{"form.scantron.bubblelines.$line"}) {
 	my $value = $env{"form.scantron.bubblelines.$line"};
 	$bubble_lines_per_response{$line} = $value;
@@ -5984,12 +4899,28 @@ sub restore_bubble_lines {
             $env{"form.scantron.sub_bubblelines.$line"};
         $responsetype_per_response{$line} =
             $env{"form.scantron.responsetype.$line"};
-        my $id = $env{"form.scantron.residpart.$line"};
-        $masterseq_id_responsenum{$id} = $line;
 	$line++;
     }
 }
 
+#  Given the parsed scanline, get the response for 
+#  'answer' number n:
+
+sub get_response_bubbles {
+    my ($parsed_line, $response)  = @_;
+
+    my $bubble_line = $first_bubble_line{$response-1} +1;
+    my $bubble_lines= $bubble_lines_per_response{$response-1};
+    
+    my $selected = "";
+
+    for (my $bline = 0; $bline < $bubble_lines; $bline++) {
+	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
+	$bubble_line++;
+    }
+    return $selected;
+}
+
 =pod 
 
 =item scantron_filenames
@@ -6002,16 +4933,14 @@ sub scantron_filenames {
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $getpropath = 1;
-    my ($dirlist,$listerror) = &Apache::lonnet::dirlist('userfiles',$cdom,
-                                                        $cname,$getpropath);
+    my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
+                                       $getpropath);
     my @possiblenames;
-    if (ref($dirlist) eq 'ARRAY') {
-        foreach my $filename (sort(@{$dirlist})) {
-	    ($filename)=split(/&/,$filename);
-	    if ($filename!~/^scantron_orig_/) { next ; }
-	    $filename=~s/^scantron_orig_//;
-	    push(@possiblenames,$filename);
-        }
+    foreach my $filename (sort(@files)) {
+	($filename)=split(/&/,$filename);
+	if ($filename!~/^scantron_orig_/) { next ; }
+	$filename=~s/^scantron_orig_//;
+	push(@possiblenames,$filename);
     }
     return @possiblenames;
 }
@@ -6050,7 +4979,7 @@ sub scantron_uploads {
 sub scantron_scantab {
     my $result='<select name="scantron_format">'."\n";
     $result.='<option></option>'."\n";
-    my @lines = &Apache::lonnet::get_scantronformat_file();
+    my @lines = &get_scantronformat_file();
     if (@lines > 0) {
         foreach my $line (@lines) {
             next if (($line =~ /^\#/) || ($line eq ''));
@@ -6062,6 +4991,62 @@ sub scantron_scantab {
     return $result;
 }
 
+=pod
+
+=item get_scantronformat_file
+
+  Returns an array containing lines from the scantron format file for
+  the domain of the course.
+
+  If a url for a custom.tab file is listed in domain's configuration.db, 
+  lines are from this file.
+
+  Otherwise, if a default.tab has been published in RES space by the 
+  domainconfig user, lines are from this file.
+
+  Otherwise, fall back to getting lines from the legacy file on the
+  local server:  /home/httpd/lonTabs/default_scantronformat.tab    
+
+=cut
+
+sub get_scantronformat_file {
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
+    my $gottab = 0;
+    my @lines;
+    if (ref($domconfig{'scantron'}) eq 'HASH') {
+        if ($domconfig{'scantron'}{'scantronformat'} ne '') {
+            my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
+            if ($formatfile ne '-1') {
+                @lines = split("\n",$formatfile,-1);
+                $gottab = 1;
+            }
+        }
+    }
+    if (!$gottab) {
+        my $confname = $cdom.'-domainconfig';
+        my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
+        my $formatfile =  &Apache::lonnet::getfile($default);
+        if ($formatfile ne '-1') {
+            @lines = split("\n",$formatfile,-1);
+            $gottab = 1;
+        }
+    }
+    if (!$gottab) {
+        my @domains = &Apache::lonnet::current_machine_domains();
+        if (grep(/^\Q$cdom\E$/,@domains)) {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        } else {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        }
+    }
+    return @lines;
+}
+
 =pod 
 
 =item scantron_CODElist
@@ -6109,7 +5094,7 @@ sub scantron_CODEunique {
 
 =item scantron_selectphase
 
-  Generates the initial screen to start the bubblesheet process.
+  Generates the initial screen to start the bubble sheet process.
   Allows for - starting a grading run.
              - downloading existing scan data (original, corrected
                                                 or skipped info)
@@ -6143,58 +5128,47 @@ 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 $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.');
-        &js_escape(\$alertmsg);
-        my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
-        $r->print(&Apache::lonhtmlcommon::scripttag('
+    <br />
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th>
+              &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td>
+');
+    my $default_form_data=&defaultFormData($symb);
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
+    $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
-        if (formname.upfile.value == "") {
-            alert("'.$alertmsg.'");
-            return false;
-        }
-        formname.submit();
-    }'."\n".$formatjs));
-        $r->print('
+	if (formname.upfile.value == "") {
+	    alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
+	    return false;
+	}
+	formname.submit();
+    }'));
+    $r->print('
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
                 '.$default_form_data.'
                 <input name="courseid" type="hidden" value="'.$cnum.'" />
                 <input name="domainid" type="hidden" value="'.$cdom.'" />
                 <input name="command" value="scantronupload_save" type="hidden" />
-              '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-              '.&Apache::loncommon::start_data_table_header_row().'
-                <th>
-                &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
-                </th>
-              '.&Apache::loncommon::end_data_table_header_row().'
-              '.&Apache::loncommon::start_data_table_row().'
-            <td>
-                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");
-        if ($formatoptions) {
-            $r->print('</td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'.$formattitle.('&nbsp;'x2).$formatoptions.'
-                 </td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'
-            );
-        } else {
-            $r->print(' <br />');
-        }
-        $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
-              </td>
-             '.&Apache::loncommon::end_data_table_row().'
-             '.&Apache::loncommon::end_data_table().'
-             </form>'
-        );
+                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
+                <br />
+                <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
+              </form>
+');
 
+        $r->print('
+            </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table().'
+');
     }
 
     # Chunk of form to prompt for a file to grade and how:
@@ -6244,6 +5218,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.
 
@@ -6270,7 +5246,7 @@ sub scantron_selectphase {
 
     &Apache::lonpickcode::code_list($r,2);
 
-    $r->print('<br /><form method="post" name="checkscantron" action="">'.
+    $r->print('<br /><form method="post" name="checkscantron">'.
              $default_form_data."\n".
              &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
              &Apache::loncommon::start_data_table_header_row()."\n".
@@ -6305,6 +5281,95 @@ sub scantron_selectphase {
     return;
 }
 
+=pod
+
+=item get_scantron_config
+
+   Parse and return the scantron configuration line selected as a
+   hash of configuration file fields.
+
+ Arguments:
+    which - the name of the configuration to parse from the file.
+
+
+ Returns:
+            If the named configuration is not in the file, an empty
+            hash is returned.
+    a hash with the fields
+      name         - internal name for the this configuration setup
+      description  - text to display to operator that describes this config
+      CODElocation - if 0 or the string 'none'
+                          - no CODE exists for this config
+                     if -1 || the string 'letter'
+                          - a CODE exists for this config and is
+                            a string of letters
+                     Unsupported value (but planned for future support)
+                          if a positive integer
+                               - The CODE exists as the first n items from
+                                 the question section of the form
+                          if the string 'number'
+                               - The CODE exists for this config and is
+                                 a string of numbers
+      CODEstart   - (only matter if a CODE exists) column in the line where
+                     the CODE starts
+      CODElength  - length of the CODE
+      IDstart     - column where the student/employee ID starts
+      IDlength    - length of the student/employee ID info
+      Qstart      - column where the information from the bubbled
+                    'questions' start
+      Qlength     - number of columns comprising a single bubble line from
+                    the sheet. (usually either 1 or 10)
+      Qon         - either a single character representing the character used
+                    to signal a bubble was chosen in the positional setup, or
+                    the string 'letter' if the letter of the chosen bubble is
+                    in the final, or 'number' if a number representing the
+                    chosen bubble is in the file (1->A 0->J)
+      Qoff        - the character used to represent that a bubble was
+                    left blank
+      PaperID     - if the scanning process generates a unique number for each
+                    sheet scanned the column that this ID number starts in
+      PaperIDlength - number of columns that comprise the unique ID number
+                      for the sheet of paper
+      FirstName   - column that the first name starts in
+      FirstNameLength - number of columns that the first name spans
+ 
+      LastName    - column that the last name starts in
+      LastNameLength - number of columns that the last name spans
+
+=cut
+
+sub get_scantron_config {
+    my ($which) = @_;
+    my @lines = &get_scantronformat_file();
+    my %config;
+    #FIXME probably should move to XML it has already gotten a bit much now
+    foreach my $line (@lines) {
+	my ($name,$descrip)=split(/:/,$line);
+	if ($name ne $which ) { next; }
+	chomp($line);
+	my @config=split(/:/,$line);
+	$config{'name'}=$config[0];
+	$config{'description'}=$config[1];
+	$config{'CODElocation'}=$config[2];
+	$config{'CODEstart'}=$config[3];
+	$config{'CODElength'}=$config[4];
+	$config{'IDstart'}=$config[5];
+	$config{'IDlength'}=$config[6];
+	$config{'Qstart'}=$config[7];
+ 	$config{'Qlength'}=$config[8];
+	$config{'Qoff'}=$config[9];
+	$config{'Qon'}=$config[10];
+	$config{'PaperID'}=$config[11];
+	$config{'PaperIDlength'}=$config[12];
+	$config{'FirstName'}=$config[13];
+	$config{'FirstNamelength'}=$config[14];
+	$config{'LastName'}=$config[15];
+	$config{'LastNamelength'}=$config[16];
+	last;
+    }
+    return %config;
+}
+
 =pod 
 
 =item username_to_idmap
@@ -6328,17 +5393,8 @@ sub username_to_idmap {
     my ($classlist)= @_;
     my %idmap;
     foreach my $student (keys(%$classlist)) {
-        my $id = $classlist->{$student}->[&Apache::loncoursedata::CL_ID];
-        unless ($id eq '') {
-            if (!exists($idmap{$id})) {
-                $idmap{$id} = $student;
-            } else {
-                my $status = $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS];
-                if ($status eq 'Active') {
-                    $idmap{$id} = $student;
-                }
-            }
-        }
+	$idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}=
+	    $student;
     }
     return %idmap;
 }
@@ -6350,7 +5406,7 @@ sub username_to_idmap {
    Process a requested correction to a scanline.
 
   Arguments:
-    $scantron_config   - hash from &Apache::lonnet::get_scantron_config()
+    $scantron_config   - hash from &get_scantron_config()
     $scan_data         - hash of correction information 
                           (see &scantron_getfile())
     $line              - existing scanline
@@ -6520,27 +5576,6 @@ sub digits_to_letters {
                        (see scantron_getfile for more information)
     just_header      - True if should not process question answers but only
                        the stuff to the left of the answers.
-    randomorder      - True if randomorder in use
-    randompick       - True if randompick in use
-    sequence         - Exam folder URL
-    master_seq       - Ref to array containing symbs in exam folder
-    symb_to_resource - Ref to hash of symbs for resources in exam folder
-                       (corresponding values are resource objects)
-    partids_by_symb  - Ref to hash of symb -> array ref of partIDs
-    orderedforcode   - Ref to hash of arrays. keys are CODEs and values
-                       are refs to an array of resource objects, ordered
-                       according to order used for CODE, when randomorder
-                       and or randompick are in use.
-    respnumlookup    - Ref to hash mapping question numbers in bubble lines
-                       for current line to question number used for same question
-                        in "Master Sequence" (as seen by Course Coordinator).
-    startline        - Ref to hash where key is question number (0 is first)
-                       and value is number of first bubble line for current 
-                       student or code-based randompick and/or randomorder.
-    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
 
@@ -6585,12 +5620,12 @@ sub digits_to_letters {
 =cut
 
 sub scantron_parse_scanline {
-    my ($line,$whichline,$scantron_config,$scan_data,$just_header,$idmap,
-        $randomorder,$randompick,$sequence,$master_seq,$symb_to_resource,
-        $partids_by_symb,$orderedforcode,$respnumlookup,$startline,$totalref)=@_;
+    my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
 
     my %record;
-    my $data=substr($line,0,$$scantron_config{'Qstart'}-1); # stuff before answers
+    my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
+    my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers
+    my $data=substr($line,0,$$scantron_config{'Qstart'}-1);     # earlier stuff
     if (!($$scantron_config{'CODElocation'} eq 0 ||
 	  $$scantron_config{'CODElocation'} eq 'none')) {
 	if ($$scantron_config{'CODElocation'} < 0 ||
@@ -6626,29 +5661,10 @@ sub scantron_parse_scanline {
     my $questnum=0;
     my $ansnum  =1;		# Multiple 'answer lines'/question.
 
-    my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
-    if ($randompick || $randomorder) {
-        my $total = &get_respnum_lookups($sequence,$scan_data,$idmap,$line,\%record,
-                                         $master_seq,$symb_to_resource,
-                                         $partids_by_symb,$orderedforcode,
-                                         $respnumlookup,$startline);
-        if ($total) {
-            $lastpos = $total*$$scantron_config{'Qlength'};
-        }
-        if (ref($totalref)) {
-            $$totalref = $total;
-        }
-    }
-    my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers
     chomp($questions);		# Get rid of any trailing \n.
     $questions =~ s/\r$//;      # Get rid of trailing \r too (MAC or Win uploads).
     while (length($questions)) {
-        my $answers_needed;
-        if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-            $answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}};
-        } else {
-            $answers_needed = $bubble_lines_per_response{$questnum};
-        }
+	my $answers_needed = $bubble_lines_per_response{$questnum};
         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
                              || 1;
         $questnum++;
@@ -6657,16 +5673,11 @@ sub scantron_parse_scanline {
         $questions       = substr($questions,$answer_length);
         if (length($currentquest) < $answer_length) { next; }
 
-        my $subdivided;
-        if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-            $subdivided = $subdivided_bubble_lines{$respnumlookup->{$questnum-1}};
-        } else {
-            $subdivided = $subdivided_bubble_lines{$questnum-1};
-        }
-        if ($subdivided =~ /,/) {
+        if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
             my $subquestnum = 1;
             my $subquestions = $currentquest;
-            my @subanswers_needed = split(/,/,$subdivided);
+            my @subanswers_needed = 
+                split(/,/,$subdivided_bubble_lines{$questnum-1});  
             foreach my $subans (@subanswers_needed) {
                 my $subans_length =
                     ($$scantron_config{'Qlength'} * $subans)  || 1;
@@ -6677,13 +5688,10 @@ sub scantron_parse_scanline {
                     ($$scantron_config{'Qon'} eq 'number')) {
                     $ansnum = &scantron_validator_lettnum($ansnum, 
                         $questnum,$quest_id,$subans,$currsubquest,$whichline,
-                        \@alphabet,\%record,$scantron_config,$scan_data,
-                        $randomorder,$randompick,$respnumlookup);
+                        \@alphabet,\%record,$scantron_config,$scan_data);
                 } else {
                     $ansnum = &scantron_validator_positional($ansnum,
-                        $questnum,$quest_id,$subans,$currsubquest,$whichline,
-                        \@alphabet,\%record,$scantron_config,$scan_data,
-                        $randomorder,$randompick,$respnumlookup);
+                        $questnum,$quest_id,$subans,$currsubquest,$whichline,                        \@alphabet,\%record,$scantron_config,$scan_data);
                 }
                 $subquestnum ++;
             }
@@ -6692,13 +5700,11 @@ sub scantron_parse_scanline {
                 ($$scantron_config{'Qon'} eq 'number')) {
                 $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
                     $quest_id,$answers_needed,$currentquest,$whichline,
-                    \@alphabet,\%record,$scantron_config,$scan_data,
-                    $randomorder,$randompick,$respnumlookup);
+                    \@alphabet,\%record,$scantron_config,$scan_data);
             } else {
                 $ansnum = &scantron_validator_positional($ansnum,$questnum,
                     $quest_id,$answers_needed,$currentquest,$whichline,
-                    \@alphabet,\%record,$scantron_config,$scan_data,
-                    $randomorder,$randompick,$respnumlookup);
+                    \@alphabet,\%record,$scantron_config,$scan_data);
             }
         }
     }
@@ -6706,77 +5712,9 @@ sub scantron_parse_scanline {
     return \%record;
 }
 
-sub get_master_seq {
-    my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_;
-    return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
-                   (ref($symb_to_resource) eq 'HASH'));
-    if ($need_symb_in_map) {
-        return unless (ref($symb_for_examcode) eq 'HASH');
-    }
-    my $resource_error;
-    foreach my $resource (@{$resources}) {
-        my $ressymb;
-        if (ref($resource)) {
-            $ressymb = $resource->symb();
-            push(@{$master_seq},$ressymb);
-            $symb_to_resource->{$ressymb} = $resource;
-            if ($need_symb_in_map) {
-                unless ($resource->is_map()) {
-                    my $map=(&Apache::lonnet::decode_symb($ressymb))[0];
-                    unless (exists($symb_for_examcode->{$map})) {
-                        $symb_for_examcode->{$map} = $ressymb;
-                    }
-                }
-            }
-        } else {
-            $resource_error = 1;
-            last;
-        }
-    }
-    return $resource_error;
-}
-
-sub get_respnum_lookups {
-    my ($sequence,$scan_data,$idmap,$line,$record,$master_seq,$symb_to_resource,
-        $partids_by_symb,$orderedforcode,$respnumlookup,$startline) = @_;
-    return unless ((ref($record) eq 'HASH') && (ref($master_seq) eq 'ARRAY') &&
-                   (ref($symb_to_resource) eq 'HASH') && (ref($partids_by_symb) eq 'HASH') &&
-                   (ref($orderedforcode) eq 'HASH') && (ref($respnumlookup) eq 'HASH') &&
-                   (ref($startline) eq 'HASH'));
-    my ($user,$scancode);
-    if ((exists($record->{'scantron.CODE'})) &&
-        (&Apache::lonnet::validCODE($record->{'scantron.CODE'}))) {
-        $scancode = $record->{'scantron.CODE'};
-    } else {
-        $user = &scantron_find_student($record,$scan_data,$idmap,$line);
-    }
-    my @mapresources =
-        &users_order($user,$scancode,$sequence,$master_seq,$symb_to_resource,
-                     $orderedforcode);
-    my $total = 0;
-    my $count = 0;
-    foreach my $resource (@mapresources) {
-        my $id = $resource->id();
-        my $symb = $resource->symb();
-        if (ref($partids_by_symb->{$symb}) eq 'ARRAY') {
-            foreach my $partid (@{$partids_by_symb->{$symb}}) {
-                my $respnum = $masterseq_id_responsenum{$id.'_'.$partid};
-                if ($respnum ne '') {
-                    $respnumlookup->{$count} = $respnum;
-                    $startline->{$count} = $total;
-                    $total += $bubble_lines_per_response{$respnum};
-                    $count ++;
-                }
-            }
-        }
-    }
-    return $total;
-}
-
 sub scantron_validator_lettnum {
     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
-        $alphabet,$record,$scantron_config,$scan_data,$randomorder,
-        $randompick,$respnumlookup) = @_;
+        $alphabet,$record,$scantron_config,$scan_data) = @_;
 
     # Qon 'letter' implies for each slot in currquest we have:
     #    ? or * for doubles, a letter in A-Z for a bubble, and
@@ -6795,23 +5733,19 @@ sub scantron_validator_lettnum {
         $matchon = '\d';
     }
     my $occurrences = 0;
-    my $responsenum = $questnum-1;
-    if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-       $responsenum = $respnumlookup->{$questnum-1}
-    }
-    if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
-        ($responsetype_per_response{$responsenum} eq 'formularesponse') ||
-        ($responsetype_per_response{$responsenum} eq 'stringresponse') ||
-        ($responsetype_per_response{$responsenum} eq 'imageresponse') ||
-        ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||
-        ($responsetype_per_response{$responsenum} eq 'organicresponse')) {
+    if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
         my @singlelines = split('',$currquest);
         foreach my $entry (@singlelines) {
             $occurrences = &occurence_count($entry,$matchon);
             if ($occurrences > 1) {
                 last;
             }
-        }
+        } 
     } else {
         $occurrences = &occurence_count($currquest,$matchon); 
     }
@@ -6859,8 +5793,7 @@ sub scantron_validator_lettnum {
 
 sub scantron_validator_positional {
     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
-        $whichline,$alphabet,$record,$scantron_config,$scan_data,
-        $randomorder,$randompick,$respnumlookup) = @_;
+        $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
 
     # Otherwise there's a positional notation;
     # each bubble line requires Qlength items, and there are filled in
@@ -6902,16 +5835,12 @@ sub scantron_validator_positional {
         #  record all the bubbles filled in as well as the
         #  fact this response consists of multiple bubbles.
         #
-        my $responsenum = $questnum-1;
-        if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-            $responsenum = $respnumlookup->{$questnum-1}
-        }
-        if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
-            ($responsetype_per_response{$responsenum} eq 'formularesponse') ||
-            ($responsetype_per_response{$responsenum} eq 'stringresponse') ||
-            ($responsetype_per_response{$responsenum} eq 'imageresponse') ||
-            ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||
-            ($responsetype_per_response{$responsenum} eq 'organicresponse')) {
+        if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
             my $doubleerror = 0;
             while (($currquest >= $$scantron_config{'Qlength'}) && 
                    (!$doubleerror)) {
@@ -7044,7 +5973,7 @@ sub scantron_filter {
 
 sub scantron_process_corrections {
     my ($r) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my $which=$env{'form.scantron_line'};
@@ -7093,11 +6022,7 @@ sub scantron_process_corrections {
 	}
     }
     if ($err) {
-	$r->print(
-            '<p class="LC_error">'
-           .&mt('Unable to accept last correction, an error occurred: [_1]',
-                $errmsg)
-           .'</p>');
+	$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
     } else {
 	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
 	&scantron_putfile($scanlines,$scan_data);
@@ -7189,7 +6114,7 @@ sub remember_current_skipped {
 =item check_for_error
 
     Checks if there was an error when attempting to remove a specific
-    scantron_.. bubblesheet data file. Prints out an error if
+    scantron_.. bubble sheet data file. Prints out an error if
     something went wrong.
 
 =cut
@@ -7211,37 +6136,32 @@ sub check_for_error {
 =cut
 
 sub scantron_warning_screen {
-    my ($button_text,$symb)=@_;
+    my ($button_text)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $CODElist;
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
 	$CODElist=$env{'form.scantron_CODElist'};
-	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; }
+	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
 	$CODElist=
 	    '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
 	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
     }
-    my $lastbubblepoints;
-    if ($env{'form.scantron_lastbubblepoints'} ne '') {
-        $lastbubblepoints =
-            '<tr><td><b>'.&mt('Hand-graded items: points from last bubble in row').'</b></td><td><tt>'.
-            $env{'form.scantron_lastbubblepoints'}.'</tt></td></tr>';
-    }
     return ('
 <p>
 <span class="LC_warning">
-'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span>
+'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
 </p>
 <table>
 <tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
 <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
-'.$CODElist.$lastbubblepoints.'
+'.$CODElist.'
 </table>
-<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 />
+<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>
 
 <br />
 ');
@@ -7264,21 +6184,20 @@ sub scantron_do_warning {
     if ( $env{'form.selectpage'} eq '' ||
 	 $env{'form.scantron_selectfile'} eq '' ||
 	 $env{'form.scantron_format'} eq '' ) {
-	$r->print("<p>".&mt('You have forgotten to specify some information. Please go Back and try again.')."</p>");
+	$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
 	if ( $env{'form.selectpage'} eq '') {
 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
 	} 
 	if ( $env{'form.scantron_selectfile'} eq '') {
-	    $r->print('<p><span class="LC_error">'.&mt("You have not selected a file that contains the student's response data.").'</span></p>');
+	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
 	} 
 	if ( $env{'form.scantron_format'} eq '') {
-	    $r->print('<p><span class="LC_error">'.&mt("You have not selected the format of the student's response data.").'</span></p>');
+	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
 	} 
     } else {
-	my $warning=&scantron_warning_screen('Grading: Validate Records',$symb);
-        my $bubbledbyhand=&hand_bubble_option();
+	my $warning=&scantron_warning_screen('Grading: Validate Records');
 	$r->print('
-'.$warning.$bubbledbyhand.'
+'.$warning.'
 <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
 <input type="hidden" name="command" value="scantron_validate" />
 ');
@@ -7320,11 +6239,9 @@ SCANTRONFORM
            '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n";
        $chunk .=
            '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n";
-       $chunk .=
-           '<input type="hidden" name="scantron.residpart.'.$line.'" value="'.$env{"form.scantron.residpart.$line"}.'" />'."\n";
        $result .= $chunk;
        $line++;
-    }
+   }
     return $result;
 }
 
@@ -7332,7 +6249,7 @@ SCANTRONFORM
 
 =item scantron_validate_file
 
-    Dispatch routine for doing validation of a bubblesheet data file.
+    Dispatch routine for doing validation of a bubble sheet data file.
 
     Also processes any necessary information resets that need to
     occur before validation begins (ignore previous corrections,
@@ -7345,7 +6262,7 @@ sub scantron_validate_file {
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);
     
-    # do the detection of only doing skipped records first before we delete
+    # do the detection of only doing skipped records first befroe we delete
     # them when doing the corrections reset
     if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
 	&reset_skipping_status();
@@ -7369,16 +6286,12 @@ sub scantron_validate_file {
     #get the student pick code ready
     $r->print(&Apache::loncommon::studentbrowser_javascript());
     my $nav_error;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
-    my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
+    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return '';
     }
     my $result=&scantron_form_start($max_bubble).$default_form_data;
-    if ($env{'form.scantron_lastbubblepoints'} ne '') {
-        $result .= '<input type="hidden" name="scantron_lastbubblepoints" value="'.$env{'form.scantron_lastbubblepoints'}.'" />';
-    }
     $r->print($result);
     
     my @validate_phases=( 'sequence',
@@ -7396,7 +6309,6 @@ 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';
@@ -7404,7 +6316,7 @@ sub scantron_validate_file {
 	}
     }
     if (!$stop) {
-	my $warning=&scantron_warning_screen('Start Grading',$symb);
+	my $warning=&scantron_warning_screen('Start Grading');
 	$r->print(&mt('Validation process complete.').'<br />'.
                   $warning.
                   &mt('Perform verification for each student after storage of submissions?').
@@ -7414,7 +6326,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('Otherwise, Grade/Manage/Review Bubblesheets [_1] Review bubblesheet data can be used once grading is complete.','&raquo;').'<br /><br />'.
+                  &mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
                   '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
                   '<input type="hidden" name="command" value="scantron_process" />'."\n");
     } else {
@@ -7426,7 +6338,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 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>');
+	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</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)" />');
@@ -7447,7 +6359,7 @@ sub scantron_validate_file {
 
 =item scantron_remove_file
 
-   Removes the requested bubblesheet data file, makes sure that
+   Removes the requested bubble sheet data file, makes sure that
    scantron_original_<filename> is never removed
 
 
@@ -7472,7 +6384,7 @@ sub scantron_remove_file {
 
 =item scantron_remove_scan_data
 
-   Removes all scan_data correction for the requested bubblesheet
+   Removes all scan_data correction for the requested bubble sheet
    data file.  (In the case that both the are doing skipped records we need
    to remember the old skipped lines for the time being so that element
    persists for a while.)
@@ -7509,7 +6421,7 @@ sub scantron_remove_scan_data {
 
 =item scantron_getfile
 
-    Fetches the requested bubblesheet data file (all 3 versions), and
+    Fetches the requested bubble sheet data file (all 3 versions), and
     the scan_data hash
   
   Arguments:
@@ -7609,7 +6521,7 @@ sub lonnet_putfile {
 
 =item scantron_putfile
 
-    Stores the current version of the bubblesheet data files, and the
+    Stores the current version of the bubble sheet data files, and the
     scan_data hash. (Does not modify the original version only the
     corrected and skipped versions.
 
@@ -7703,7 +6615,7 @@ sub get_todo_count {
 
 =item scantron_put_line
 
-    Updates the 'corrected' or 'skipped' versions of the bubblesheet
+    Updates the 'corrected' or 'skipped' versions of the bubble sheet
     data file.
 
  Arguments:
@@ -7805,12 +6717,7 @@ sub scantron_validate_sequence {
 	my @resources=
 	    $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
 	if (@resources) {
-	    $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'
-                   .' work correctly.')
-               .'</p>'
-            );
+	    $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
 	    return (1,$currentphase);
 	}
     }
@@ -7828,11 +6735,11 @@ sub scantron_validate_ID {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $nav_error;
-    &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble_lines.. array.
+    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return(1,$currentphase);
@@ -7891,35 +6798,25 @@ sub scantron_validate_ID {
 
 
 sub scantron_get_correction {
-    my ($r,$i,$scan_record,$scan_config,$line,$error,$arg,
-        $randomorder,$randompick,$respnumlookup,$startline)=@_;
+    my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
 #FIXME in the case of a duplicated ID the previous line, probably need
 #to show both the current line and the previous one and allow skipping
 #the previous one or the current one
 
     if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
-        $r->print(
-            '<p class="LC_warning">'
-           .&mt('An error was detected ([_1]) for PaperID [_2]',
-                "<b>$error</b>",
-                '<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>')
-           ."</p> \n");
-    } else {
-        $r->print(
-            '<p class="LC_warning">'
-           .&mt('An error was detected ([_1]) in scanline [_2] [_3]',
-                "<b>$error</b>", $i, "<pre>$line</pre>")
-           ."</p> \n");
-    }
-    my $message =
-        '<p>'
-       .&mt('The ID on the form is [_1]',
-            "<tt>$$scan_record{'scantron.ID'}</tt>")
-       .'<br />'
-       .&mt('The name on the paper is [_1], [_2]',
-            $$scan_record{'scantron.LastName'},
-            $$scan_record{'scantron.FirstName'})
-       .'</p>';
+	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
+			    " for PaperID <tt>[_1]</tt>",
+			    $$scan_record{'scantron.PaperID'})."</p> \n");
+    } else {
+	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
+			    " in scanline [_1] <pre>[_2]</pre>",
+			    $i,$line)."</p> \n");
+    }
+    my $message="<p>".&mt("The ID on the form is  <tt>[_1]</tt><br />".
+			  "The name on the paper is [_2],[_3]",
+			  $$scan_record{'scantron.ID'},
+			  $$scan_record{'scantron.LastName'},
+			  $$scan_record{'scantron.FirstName'})."</p>";
 
     $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
     $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
@@ -7929,10 +6826,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>".&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>".&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");
@@ -7942,21 +6839,20 @@ sub scantron_get_correction {
 	$r->print(&Apache::loncommon::selectstudent_link('scantronupload',
 				       'scantron_username','scantron_domain'));
 	$r->print(": <input type='text' name='scantron_username' value='' />");
-	$r->print("\n:\n".
+	$r->print("\n@".
 		 &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));
 
 	$r->print('</li>');
     } elsif ($error =~ /CODE$/) {
 	if ($error eq 'incorrectCODE') {
-	    $r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
+	    $r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
 	} 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 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>")
-                 ."</p>\n");
+	$r->print("<p>".&mt("The CODE on the form is  <tt>'[_1]'</tt>",
+			    $$scan_record{'scantron.CODE'})."<br />\n");
 	$r->print($message);
-	$r->print("<p>".&mt("How should I handle this?")."</p>\n");
+	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
 	$r->print("\n<br /> ");
 	my $i=0;
 	if ($error eq 'incorrectCODE' 
@@ -7983,7 +6879,7 @@ sub scantron_get_correction {
 	    $r->print("
     <label>
         <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
-       ".&mt("Use the CODE [_1] that was on the paper, ignoring the error.",
+       ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
 	     "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
     </label>");
 	    $r->print("\n<br />");
@@ -8021,13 +6917,12 @@ ENDSCRIPT
 	     "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
 	$r->print("\n<br /><br />");
     } elsif ($error eq 'doublebubble') {
-	$r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");
+	$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");
 
 	# The form field scantron_questions is acutally a list of line numbers.
 	# represented by this form so:
 
-	my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,
-                                                $respnumlookup,$startline);
+	my $line_list = &questions_to_line_list($arg);
 
 	$r->print('<input type="hidden" name="scantron_questions" value="'.
 		  $line_list.'" />');
@@ -8035,14 +6930,12 @@ ENDSCRIPT
 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
 	foreach my $question (@{$arg}) {
 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
-                                                   $scan_record, $error,
-                                                   $randomorder,$randompick,
-                                                   $respnumlookup,$startline);
+                                                   $scan_record, $error);
             push(@lines_to_correct,@linenums);
 	}
         $r->print(&verify_bubbles_checked(@lines_to_correct));
     } elsif ($error eq 'missingbubble') {
-	$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");
+	$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
 	$r->print($message);
 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
 	$r->print(&mt("Some questions have no scanned bubbles.")."\n");
@@ -8051,16 +6944,13 @@ ENDSCRIPT
 	# a list of question numbers. Therefore:
 	#
 	
-	my $line_list = &questions_to_line_list($arg,$randomorder,$randompick,
-                                                $respnumlookup,$startline);
+	my $line_list = &questions_to_line_list($arg);
 
 	$r->print('<input type="hidden" name="scantron_questions" value="'.
 		  $line_list.'" />');
 	foreach my $question (@{$arg}) {
 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
-                                                   $scan_record, $error,
-                                                   $randomorder,$randompick,
-                                                   $respnumlookup,$startline);
+                                                   $scan_record, $error);
             push(@lines_to_correct,@linenums);
 	}
         $r->print(&verify_bubbles_checked(@lines_to_correct));
@@ -8074,8 +6964,7 @@ sub verify_bubbles_checked {
     my (@ansnums) = @_;
     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 = &Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT);
+    my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
 function verify_bubble_radio(form) {
     var ansnumArray = new Array ("$ansnumstr");
     var need_bubble_count = 0;
@@ -8112,20 +7001,12 @@ used to fill in the scantron_questions f
 
   Arguments:
      questions    - Reference to an array of questions.
-     randomorder  - True if randomorder in use.
-     randompick   - True if randompick in use.
-     respnumlookup - Reference to HASH mapping question numbers in bubble lines
-                     for current line to question number used for same question
-                     in "Master Seqence" (as seen by Course Coordinator).
-     startline    - Reference to hash where key is question number (0 is first)
-                    and key is number of first bubble line for current student
-                    or code-based randompick and/or randomorder.
 
 =cut
 
 
 sub questions_to_line_list {
-    my ($questions,$randomorder,$randompick,$respnumlookup,$startline) = @_;
+    my ($questions) = @_;
     my @lines;
 
     foreach my $item (@{$questions}) {
@@ -8134,16 +7015,8 @@ sub questions_to_line_list {
         if ($item =~ /^(\d+)\.(\d+)$/) {
             $question = $1;
             my $subquestion = $2;
-            my $responsenum = $question-1;
-            if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
-                $responsenum = $respnumlookup->{$question-1};
-                if (ref($startline) eq 'HASH') {
-                    $first = $startline->{$question-1} + 1;
-                }
-            } else {
-                $first = $first_bubble_line{$responsenum} + 1;
-            }
-            my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
+            $first = $first_bubble_line{$question-1} + 1;
+            my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
             my $subcount = 1;
             while ($subcount<$subquestion) {
                 $first += $subans[$subcount-1];
@@ -8151,16 +7024,8 @@ sub questions_to_line_list {
             }
             $count = $subans[$subquestion-1];
         } else {
-            my $responsenum = $question-1;
-            if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
-                $responsenum = $respnumlookup->{$question-1};
-                if (ref($startline) eq 'HASH') {
-                    $first = $startline->{$question-1} + 1;
-                }
-            } else {
-                $first = $first_bubble_line{$responsenum} + 1;
-            }
-            $count   = $bubble_lines_per_response{$responsenum};
+	    $first   = $first_bubble_line{$question-1} + 1;
+	    $count   = $bubble_lines_per_response{$question-1};
         }
         $last = $first+$count-1;
         push(@lines, ($first..$last));
@@ -8182,14 +7047,6 @@ for multi and missing bubble cases).
    $scan_config - The scantron file configuration hash.
    $scan_record - Reference to the hash that has the the parsed scanlines.
    $error       - Type of error
-   $randomorder - True if randomorder in use.
-   $randompick  - True if randompick in use.
-   $respnumlookup - Reference to HASH mapping question numbers in bubble lines
-                    for current line to question number used for same question
-                    in "Master Seqence" (as seen by Course Coordinator).
-   $startline   - Reference to hash where key is question number (0 is first)
-                  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.
@@ -8214,26 +7071,15 @@ for multi and missing bubble cases).
 =cut
 
 sub prompt_for_corrections {
-    my ($r, $question, $scan_config, $scan_record, $error, $randomorder,
-        $randompick, $respnumlookup, $startline) = @_;
+    my ($r, $question, $scan_config, $scan_record, $error) = @_;
     my ($current_line,$lines);
     my @linenums;
     my $questionnum = $question;
-    my ($first,$responsenum);
     if ($question =~ /^(\d+)\.(\d+)$/) {
         $question = $1;
+        $current_line = $first_bubble_line{$question-1} + 1 ;
         my $subquestion = $2;
-        if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
-            $responsenum = $respnumlookup->{$question-1};
-            if (ref($startline) eq 'HASH') {
-                $first = $startline->{$question-1};
-            }
-        } else {
-            $responsenum = $question-1;
-            $first = $first_bubble_line{$responsenum};
-        }
-        $current_line = $first + 1 ;
-        my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
+        my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
         my $subcount = 1;
         while ($subcount<$subquestion) {
             $current_line += $subans[$subcount-1];
@@ -8241,34 +7087,25 @@ sub prompt_for_corrections {
         }
         $lines = $subans[$subquestion-1];
     } else {
-        if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
-            $responsenum = $respnumlookup->{$question-1};
-            if (ref($startline) eq 'HASH') {
-                $first = $startline->{$question-1};
-            }
-        } else {
-            $responsenum = $question-1;
-            $first = $first_bubble_line{$responsenum};
-        }
-        $current_line = $first + 1;
-        $lines        = $bubble_lines_per_response{$responsenum};
+        $current_line = $first_bubble_line{$question-1} + 1 ;
+        $lines        = $bubble_lines_per_response{$question-1};
     }
     if ($lines > 1) {
         $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />');
-        if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
-            ($responsetype_per_response{$responsenum} eq 'formularesponse') ||
-            ($responsetype_per_response{$responsenum} eq 'stringresponse') ||
-            ($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 />');
+        if (($responsetype_per_response{$question-1} eq 'essayresponse') ||
+            ($responsetype_per_response{$question-1} eq 'formularesponse') ||
+            ($responsetype_per_response{$question-1} eq 'stringresponse') ||
+            ($responsetype_per_response{$question-1} eq 'imageresponse') ||
+            ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
+            ($responsetype_per_response{$question-1} eq 'organicresponse')) {
+            $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the 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 />");
         }
     }
     for (my $i =0; $i < $lines; $i++) {
         my $selected = $$scan_record{"scantron.$current_line.answer"};
-	&scantron_bubble_selector($r,$scan_config,$current_line,
+	&scantron_bubble_selector($r,$scan_config,$current_line, 
 	        		  $questionnum,$error,split('', $selected));
         push(@linenums,$current_line);
 	$current_line++;
@@ -8288,7 +7125,7 @@ sub prompt_for_corrections {
 
  Arguments:
     $r           - Apache request object
-    $scan_config - hash from &Apache::lonnet::get_scantron_config()
+    $scan_config - hash from &get_scantron_config()
     $line        - Number of the line being displayed.
     $questionnum - Question number (may include subquestion)
     $error       - Type of error.
@@ -8301,19 +7138,7 @@ sub scantron_bubble_selector {
     my $max=$$scan_config{'Qlength'};
 
     my $scmode=$$scan_config{'Qon'};
-    if ($scmode eq 'number' || $scmode eq 'letter') {
-        if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&
-            ($$scan_config{'BubblesPerRow'} > 0)) {
-            $max=$$scan_config{'BubblesPerRow'};
-            if (($scmode eq 'number') && ($max > 10)) {
-                $max = 10;
-            } elsif (($scmode eq 'letter') && $max > 26) {
-                $max = 26;
-            }
-        } else {
-            $max = 10;
-        }
-    }
+    if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }	     
 
     my @alphabet=('A'..'Z');
     $r->print(&Apache::loncommon::start_data_table().
@@ -8452,7 +7277,7 @@ sub get_codes {
 
 sub scantron_validate_CODE {
     my ($r,$currentphase) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
@@ -8468,7 +7293,7 @@ sub scantron_validate_CODE {
     my %allcodes=&get_codes();
 
     my $nav_error;
-    &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the lines per response array.
+    &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return(1,$currentphase);
@@ -8522,54 +7347,12 @@ sub scantron_validate_doublebubble {
     #get student info
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
-    my (undef,undef,$sequence)=
-        &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
-    my $map=$navmap->getResourceByUrl($sequence);
-    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
-        %grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline);
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
-
     my $nav_error;
-    if (ref($map)) {
-        $randomorder = $map->randomorder();
-        $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
-        if ($randomorder || $randompick) {
-            $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
-            if ($nav_error) {
-                $r->print(&navmap_errormsg());
-                return(1,$currentphase);
-            }
-            &graders_resources_pass(\@resources,\%grader_partids_by_symb,
-                                    \%grader_randomlists_by_symb,$bubbles_per_row);
-        }
-    } else {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
-
-    &scantron_get_maxbubble(\$nav_error,\%scantron_config); # parse needs the bubble line array.
+    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return(1,$currentphase);
@@ -8579,15 +7362,11 @@ sub scantron_validate_doublebubble {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
-						 $scan_data,undef,\%idmap,$randomorder,
-                                                 $randompick,$sequence,\@master_seq,
-                                                 \%symb_to_resource,\%grader_partids_by_symb,
-                                                 \%orderedforcode,\%respnumlookup,\%startline);
+						 $scan_data);
 	if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
 	&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
 				 'doublebubble',
-				 $$scan_record{'scantron.doubleerror'},
-                                 $randomorder,$randompick,\%respnumlookup,\%startline);
+				 $$scan_record{'scantron.doubleerror'});
     	return (1,$currentphase);
     }
     return (0,$currentphase+1);
@@ -8595,7 +7374,7 @@ sub scantron_validate_doublebubble {
 
 
 sub scantron_get_maxbubble {
-    my ($nav_error,$scantron_config) = @_;
+    my ($nav_error) = @_;
     if (defined($env{'form.scantron_maxbubble'}) &&
 	$env{'form.scantron_maxbubble'}) {
 	&restore_bubble_lines();
@@ -8614,7 +7393,6 @@ sub scantron_get_maxbubble {
     }
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row($scantron_config);
 
     &Apache::lonxml::clear_problem_counter();
 
@@ -8626,14 +7404,11 @@ sub scantron_get_maxbubble {
     %first_bubble_line         = ();
     %subdivided_bubble_lines   = ();
     %responsetype_per_response = ();
-    %masterseq_id_responsenum  = ();
 
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-        my $resid = $resource->id();
-        my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,
-                                                          $udom,undef,$bubbles_per_row);
+        my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
 	    foreach my $part_id (@{$parts}) {
                 my $lines;
@@ -8662,10 +7437,9 @@ sub scantron_get_maxbubble {
                     if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
                         $numshown = scalar(@{$analysis->{$part_id.'.shown'}});
                     }
-                    my $bubbles_per_row =
-                        &bubblesheet_bubbles_per_row($scantron_config);
-                    my $inner_bubble_lines = int($numbub/$bubbles_per_row);
-                    if (($numbub % $bubbles_per_row) != 0) {
+                    my $bubbles_per_line = 10;
+                    my $inner_bubble_lines = int($numbub/$bubbles_per_line);
+                    if (($numbub % $bubbles_per_line) != 0) {
                         $inner_bubble_lines++;
                     }
                     for (my $i=0; $i<$numshown; $i++) {
@@ -8676,13 +7450,12 @@ sub scantron_get_maxbubble {
                     $lines = $numshown * $inner_bubble_lines;
                 } else {
                     $lines = $analysis->{"$part_id.bubble_lines"};
-                }
+                } 
 
                 $first_bubble_line{$response_number} = $bubble_line;
 	        $bubble_lines_per_response{$response_number} = $lines;
                 $responsetype_per_response{$response_number} = 
                     $analysis->{$part_id.'.type'};
-                $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;
 	        $response_number++;
 
 	        $bubble_line +=  $lines;
@@ -8698,87 +7471,26 @@ sub scantron_get_maxbubble {
     return $env{'form.scantron_maxbubble'};
 }
 
-sub bubblesheet_bubbles_per_row {
-    my ($scantron_config) = @_;
-    my $bubbles_per_row;
-    if (ref($scantron_config) eq 'HASH') {
-        $bubbles_per_row = $scantron_config->{'BubblesPerRow'};
-    }
-    if ((!$bubbles_per_row) || ($bubbles_per_row < 1)) {
-        $bubbles_per_row = 10;
-    }
-    return $bubbles_per_row;
-}
-
 sub scantron_validate_missingbubbles {
     my ($r,$currentphase) = @_;
     #get student info
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
-    my (undef,undef,$sequence)=
-        &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
-
-    my $map=$navmap->getResourceByUrl($sequence);
-    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
-        %grader_randomlists_by_symb,%orderedforcode,%respnumlookup,%startline);
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
-
     my $nav_error;
-    if (ref($map)) {
-        $randomorder = $map->randomorder();
-        $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
-        if ($randomorder || $randompick) {
-            $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
-            if ($nav_error) {
-                $r->print(&navmap_errormsg());
-                return(1,$currentphase);
-            }
-            &graders_resources_pass(\@resources,\%grader_partids_by_symb,
-                                    \%grader_randomlists_by_symb,$bubbles_per_row);
-        }
-    } else {
-        $r->print(&navmap_errormsg());
-        return(1,$currentphase);
-    }
-
-
-    my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
+    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
     if ($nav_error) {
-        $r->print(&navmap_errormsg());
         return(1,$currentphase);
     }
-
     if (!$max_bubble) { $max_bubble=2**31; }
     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 =
-            &scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap,
-                                     $randomorder,$randompick,$sequence,\@master_seq,
-                                     \%symb_to_resource,\%grader_partids_by_symb,
-                                     \%orderedforcode,\%respnumlookup,\%startline);
+	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+						 $scan_data);
 	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
 	my @to_correct;
 	
@@ -8787,45 +7499,28 @@ 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;
+               if (!defined($first_bubble_line{$question -1})) { next; }
+               my $first = $first_bubble_line{$question-1};
+               my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+               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};
+                if (!defined($first_bubble_line{$missing - 1})) { next; }
+                $lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1};
             }
             if ($lastbubble > $max_bubble) { next; }
 	    push(@to_correct,$missing);
 	}
 	if (@to_correct) {
 	    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
-				     $line,'missingbubble',\@to_correct,
-                                     $randomorder,$randompick,\%respnumlookup,
-                                     \%startline);
+				     $line,'missingbubble',\@to_correct);
 	    return (1,$currentphase);
 	}
 
@@ -8833,41 +7528,6 @@ sub scantron_validate_missingbubbles {
     return (0,$currentphase+1);
 }
 
-sub hand_bubble_option {
-    my (undef, undef, $sequence) =
-        &Apache::lonnet::decode_symb($env{'form.selectpage'});
-    return if ($sequence eq '');
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    unless (ref($navmap)) {
-        return;
-    }
-    my $needs_hand_bubbles;
-    my $map=$navmap->getResourceByUrl($sequence);
-    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    foreach my $res (@resources) {
-        if (ref($res)) {
-            if ($res->is_problem()) {
-                my $partlist = $res->parts();
-                foreach my $part (@{ $partlist }) {
-                    my @types = $res->responseType($part);
-                    if (grep(/^(chem|essay|image|formula|math|string|functionplot)$/,@types)) {
-                        $needs_hand_bubbles = 1;
-                        last;
-                    }
-                }
-            }
-        }
-    }
-    if ($needs_hand_bubbles) {
-        my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
-        my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
-        return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.
-               &mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').
-               '<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label>&nbsp;'.&mt('or').'&nbsp;'.
-               '<label><input type="radio" name="scantron_lastbubblepoints" value="0" />'.&mt('0 points').'</label></p>';
-    }
-    return;
-}
 
 sub scantron_process_students {
     my ($r,$symb) = @_;
@@ -8878,8 +7538,7 @@ sub scantron_process_students {
     }
     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 %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
@@ -8887,39 +7546,36 @@ sub scantron_process_students {
     unless (ref($navmap)) {
         $r->print(&navmap_errormsg());
         return '';
-    }
+    }  
     my $map=$navmap->getResourceByUrl($sequence);
-    my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
-        %grader_randomlists_by_symb,%symb_for_examcode);
-    if (ref($map)) {
-        $randomorder = $map->randomorder();
-        $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
+    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,
+                            \%grader_randomlists_by_symb);
+    my $resource_error;
+    foreach my $resource (@resources) {
+        my $ressymb;
+        if (ref($resource)) {
+            $ressymb = $resource->symb();
+        } else {
+            $resource_error = 1;
+            last;
+        }
+        my ($analysis,$parts) =
+            &scantron_partids_tograde($resource,$env{'request.course.id'},
+                                      $env{'user.name'},$env{'user.domain'},1);
+        $grader_partids_by_symb{$ressymb} = $parts;
+        if (ref($analysis) eq 'HASH') {
+            if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
+                $grader_randomlists_by_symb{$ressymb} = 
+                    $analysis->{'parts_withrandomlist'};
             }
         }
-    } else {
+    }
+    if ($resource_error) {
         $r->print(&navmap_errormsg());
         return '';
     }
-    my $nav_error;
-    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    if ($randomorder || $randompick) {
-        $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode);
-        if ($nav_error) {
-            $r->print(&navmap_errormsg());
-            return '';
-        }
-    }
-    &graders_resources_pass(\@resources,\%grader_partids_by_symb,
-                            \%grader_randomlists_by_symb,$bubbles_per_row);
 
     my ($uname,$udom);
     my $result= <<SCANTRONFORM;
@@ -8934,14 +7590,18 @@ 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');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
+ 				    'Bubblesheet Progress',$count,
+				    'inline',undef,'scantronupload');
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+					  'Processing first student');
     $r->print('<br />');
     my $start=&Time::HiRes::time();
     my $i=-1;
     my $started;
 
-    &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return '';
@@ -8957,9 +7617,8 @@ SCANTRONFORM
 	return '';		# Dunno why the other returns return '' rather than just returning.
     }
 
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
-    my %orderedforcode;
 
     while ($i<$scanlines->{'count'}) {
  	($uname,$udom)=('','');
@@ -8967,18 +7626,12 @@ 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,
-                                                 $randompick,$sequence,\@master_seq,
-                                                 \%symb_to_resource,\%grader_partids_by_symb,
-                                                 \%orderedforcode,\%respnumlookup,\%startline,
-                                                 \$total);
+ 						 $scan_data);
  	unless ($uname=&scantron_find_student($scan_record,$scan_data,
  					      \%idmap,$i)) {
   	    &scantron_add_delay(\@delayqueue,$line,
@@ -8990,26 +7643,10 @@ SCANTRONFORM
  				'Student '.$uname.' has multiple sheets',2);
  	    next;
  	}
-        my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];
-        my $user = $uname.':'.$usec;
   	($uname,$udom)=split(/:/,$uname);
 
-        my $scancode;
-        if ((exists($scan_record->{'scantron.CODE'})) &&
-            (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
-            $scancode = $scan_record->{'scantron.CODE'};
-        } else {
-            $scancode = '';
-        }
-
-        my @mapresources = @resources;
-        if ($randomorder || $randompick) {
-            @mapresources =
-                &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
-                             \%orderedforcode);
-        }
         my (%partids_by_symb,$res_error);
-        foreach my $resource (@mapresources) {
+        foreach my $resource (@resources) {
             my $ressymb;
             if (ref($resource)) {
                 $ressymb = $resource->symb();
@@ -9019,14 +7656,8 @@ SCANTRONFORM
             }
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
-                my $currcode;
-                if (exists($grader_randomlists_by_symb{$ressymb})) {
-                    $currcode = $scancode;
-                }
                 my ($analysis,$parts) =
-                    &scantron_partids_tograde($resource,$env{'request.course.id'},
-                                              $uname,$udom,undef,$bubbles_per_row,
-                                              $currcode);
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
                 $partids_by_symb{$ressymb} = $parts;
             } else {
                 $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
@@ -9046,11 +7677,16 @@ SCANTRONFORM
 	    &scantron_putfile($scanlines,$scan_data);
 	}
 	
+        my $scancode;
+        if ((exists($scan_record->{'scantron.CODE'})) &&
+            (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
+            $scancode = $scan_record->{'scantron.CODE'};
+        } else {
+            $scancode = '';
+        }
+
         if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
-                                   \@mapresources,\%partids_by_symb,
-                                   $bubbles_per_row,$randomorder,$randompick,
-                                   \%respnumlookup,\%startline) 
-            eq 'ssi_error') {
+                                   \@resources,\%partids_by_symb) eq 'ssi_error') {
             $ssi_error = 0; # So end of handler error message does not trigger.
             $r->print("</form>");
             &ssi_print_error($r);
@@ -9058,48 +7694,26 @@ SCANTRONFORM
             return '';      # Why return ''?  Beats me.
         }
 
-        if (($scancode) && ($randomorder || $randompick)) {
-            foreach my $key (keys(%symb_for_examcode)) {
-                my $symb_in_map = $symb_for_examcode{$key};
-                if ($symb_in_map ne '') {
-                    my $parmresult =
-                        &Apache::lonparmset::storeparm_by_symb($symb_in_map,
-                                                               '0_examcode',2,$scancode,
-                                                               'string_examcode',$uname,
-                                                               $udom);
-                }
-            }
-        }
 	$completedstudents{$uname}={'line'=>$line};
         if ($env{'form.verifyrecord'}) {
             my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
-            if ($randompick) {
-                if ($total) {
-                    $lastpos = $total*$scantron_config{'Qlength'};
-                }
-            }
-
             my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
             chomp($studentdata);
             $studentdata =~ s/\r$//;
             my $studentrecord = '';
             my $counter = -1;
-            foreach my $resource (@mapresources) {
+            foreach my $resource (@resources) {
                 my $ressymb = $resource->symb();
                 ($counter,my $recording) =
                     &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
                                              $counter,$studentdata,$partids_by_symb{$ressymb},
-                                             \%scantron_config,\%lettdig,$numletts,$randomorder,
-                                             $randompick,\%respnumlookup,\%startline);
+                                             \%scantron_config,\%lettdig,$numletts);
                 $studentrecord .= $recording;
             }
             if ($studentrecord ne $studentdata) {
                 &Apache::lonxml::clear_problem_counter();
                 if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
-                                           \@mapresources,\%partids_by_symb,
-                                           $bubbles_per_row,$randomorder,$randompick,
-                                           \%respnumlookup,\%startline)
-                    eq 'ssi_error') {
+                                           \@resources,\%partids_by_symb) eq 'ssi_error') {
                     $ssi_error = 0; # So end of handler error message does not trigger.
                     $r->print("</form>");
                     &ssi_print_error($r);
@@ -9109,23 +7723,21 @@ SCANTRONFORM
                 }
                 $counter = -1;
                 $studentrecord = '';
-                foreach my $resource (@mapresources) {
+                foreach my $resource (@resources) {
                     my $ressymb = $resource->symb();
                     ($counter,my $recording) =
                         &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
                                                  $counter,$studentdata,$partids_by_symb{$ressymb},
-                                                 \%scantron_config,\%lettdig,$numletts,
-                                                 $randomorder,$randompick,\%respnumlookup,
-                                                 \%startline);
+                                                 \%scantron_config,\%lettdig,$numletts);
                     $studentrecord .= $recording;
                 }
                 if ($studentrecord ne $studentdata) {
-                    $r->print('<p><span class="LC_warning">');
+                    $r->print('<p><span class="LC_error">');
                     if ($scancode eq '') {
-                        $r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].',
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',
                                   $uname.':'.$udom,$scan_record->{'scantron.ID'}));
                     } else {
-                        $r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].',
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',
                                   $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
                     }
                     $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
@@ -9133,12 +7745,12 @@ SCANTRONFORM
                               '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
                               &Apache::loncommon::end_data_table_header_row()."\n".
                               &Apache::loncommon::start_data_table_row().
-                              '<td>'.&mt('Bubblesheet').'</td>'.
-                              '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentdata.'</tt></span></td>'.
+                              '<td>'.&mt('Bubble Sheet').'</td>'.
+                              '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.
                               &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::start_data_table_row().
-                              '<td>'.&mt('Stored submissions').'</td>'.
-                              '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentrecord.'</tt></span></td>'."\n".
+                              '<td>Stored submissions</td>'.
+                              '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".
                               &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::end_data_table().'</p>');
                 } else {
@@ -9164,16 +7776,14 @@ SCANTRONFORM
 }
 
 sub graders_resources_pass {
-    my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb,
-        $bubbles_per_row) = @_;
+    my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;
     if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && 
         (ref($grader_randomlists_by_symb) eq 'HASH')) {
         foreach my $resource (@{$resources}) {
             my $ressymb = $resource->symb();
             my ($analysis,$parts) =
                 &scantron_partids_tograde($resource,$env{'request.course.id'},
-                                          $env{'user.name'},$env{'user.domain'},
-                                          1,$bubbles_per_row);
+                                          $env{'user.name'},$env{'user.domain'},1);
             $grader_partids_by_symb->{$ressymb} = $parts;
             if (ref($analysis) eq 'HASH') {
                 if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
@@ -9186,67 +7796,8 @@ sub graders_resources_pass {
     return;
 }
 
-=pod
-
-=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
-  "NAMEd" exam.
-
-  Should be used when randomorder and/or randompick applied when the 
-  corresponding exam was printed, prior to students completing bubblesheets 
-  for the version of the exam the student received.
-
-=cut
-
-sub users_order  {
-    my ($user,$scancode,$mapurl,$master_seq,$symb_to_resource,$orderedforcode) = @_;
-    my @mapresources;
-    unless ((ref($master_seq) eq 'ARRAY') && (ref($symb_to_resource) eq 'HASH')) {
-        return @mapresources;
-    }
-    if ($scancode) {
-        if ((ref($orderedforcode) eq 'HASH') && (ref($orderedforcode->{$scancode}) eq 'ARRAY')) {
-            @mapresources = @{$orderedforcode->{$scancode}};
-        } else {
-            $env{'form.CODE'} = $scancode;
-            my $actual_seq =
-                &Apache::lonprintout::master_seq_to_person_seq($mapurl,
-                                                               $master_seq,
-                                                               $user,$scancode,1);
-            if (ref($actual_seq) eq 'ARRAY') {
-                @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq};
-                if (ref($orderedforcode) eq 'HASH') {
-                    if (@mapresources > 0) {
-                        $orderedforcode->{$scancode} = \@mapresources;
-                    }
-                }
-            }
-            delete($env{'form.CODE'});
-        }
-    } else {
-        my $actual_seq =
-            &Apache::lonprintout::master_seq_to_person_seq($mapurl,
-                                                           $master_seq,
-                                                           $user,undef,1);
-        if (ref($actual_seq) eq 'ARRAY') {
-            @mapresources =
-                map { $symb_to_resource->{$_}; } @{$actual_seq};
-        }
-    }
-    return @mapresources;
-}
-
 sub grade_student_bubbles {
-    my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts,$bubbles_per_row,
-        $randomorder,$randompick,$respnumlookup,$startline) = @_;
-    my $uselookup = 0;
-    if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH') &&
-        (ref($startline) eq 'HASH')) {
-        $uselookup = 1;
-    }
-
+    my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_;
     if (ref($resources) eq 'ARRAY') {
         my $count = 0;
         foreach my $resource (@{$resources}) {
@@ -9259,21 +7810,11 @@ sub grade_student_bubbles {
                         'grade_symb'     => $ressymb,
                         'CODE'           => $scancode
                        );
-            if ($bubbles_per_row ne '') {
-                $form{'bubbles_per_row'} = $bubbles_per_row;
-            }
-            if ($env{'form.scantron_lastbubblepoints'} ne '') {
-                $form{'scantron_lastbubblepoints'} = $env{'form.scantron_lastbubblepoints'};
-            }
             if (ref($parts) eq 'HASH') {
                 if (ref($parts->{$ressymb}) eq 'ARRAY') {
                     foreach my $part (@{$parts->{$ressymb}}) {
-                        if ($uselookup) {
-                            $form{'scantron_questnum_start.'.$part} = $startline->{$count} + 1;
-                        } else {
-                            $form{'scantron_questnum_start.'.$part} =
-                                1+$env{'form.scantron.first_bubble_line.'.$count};
-                        }
+                        $form{'scantron_questnum_start.'.$part} =
+                            1+$env{'form.scantron.first_bubble_line.'.$count};
                         $count++;
                     }
                 }
@@ -9287,21 +7828,18 @@ sub grade_student_bubbles {
 }
 
 sub scantron_upload_scantron_data {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     my $dom = $env{'request.role.domain'};
-    my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);
     my $domdesc = &Apache::lonnet::domain($dom,'description');
     $r->print(&Apache::loncommon::coursebrowser_javascript($dom));
     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
 							  'domainid',
 							  'coursename',$dom);
     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
-                       ('&nbsp'x2).&mt('(shows course personnel)');
+                       ('&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);
     my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
-    &js_escape(\$nocourseid_alert);
     $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
@@ -9329,10 +7867,9 @@ sub scantron_upload_scantron_data {
         return;
     }
 
-    '.$formatjs.'
 '));
     $r->print('
-<h3>'.&mt('Send bubblesheet data to a course').'</h3>
+<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>
 
 <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
 '.$default_form_data.
@@ -9345,12 +7882,7 @@ sub scantron_upload_scantron_data {
   &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('Domain')).
   '<input name="domainid" type="hidden" />'.$domdesc.
-  &Apache::lonhtmlcommon::row_closure());
-    if ($formatoptions) {
-        $r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions.
-                  &Apache::lonhtmlcommon::row_closure());
-    }
-    $r->print(
+  &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
   '<input type="file" name="upfile" size="50" />'.
   &Apache::lonhtmlcommon::row_closure(1).
@@ -9363,87 +7895,9 @@ sub scantron_upload_scantron_data {
     return '';
 }
 
-sub scantron_upload_dataformat {
-    my ($dom) = @_;
-    my ($formatoptions,$formattitle,$formatjs);
-    $formatjs = <<'END';
-function toggleScantab(form) {
-   return;
-}
-END
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom);
-    if (ref($domconfig{'scantron'}) eq 'HASH') {
-        if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-            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 (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                            my ($onclick,$formatextra,$singleline);
-                            my @lines = &Apache::lonnet::get_scantronformat_file();
-                            my $count = 0;
-                            foreach my $line (@lines) {
-                                next if (($line =~ /^\#/) || ($line eq ''));
-                                $singleline = $line;
-                                $count ++;
-                            }
-                            if ($count > 1) {
-                                $formatextra = '<div style="display:none" id="bubbletype">'.
-                                               '<span class="LC_nobreak">'.
-                                               &mt('Bubblesheet type').':&nbsp;'.
-                                               &scantron_scantab().'</span></div>';
-                                $onclick = ' onclick="toggleScantab(this.form);"';
-                                $formatjs = <<"END";
-function toggleScantab(form) {
-    var divid = 'bubbletype';
-    if (document.getElementById(divid)) {
-        var radioname = 'fileformat';
-        var num = form.elements[radioname].length;
-        if (num) {
-            for (var i=0; i<num; i++) {
-                if (form.elements[radioname][i].checked) {
-                    var chosen = form.elements[radioname][i].value;
-                    if (chosen == 'dat') {
-                        document.getElementById(divid).style.display = 'none';
-                    } else if (chosen == 'csv') {
-                        document.getElementById(divid).style.display = 'block';
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-
-END
-                            } elsif ($count == 1) {
-                                my $formatname = (split(/:/,$singleline,2))[0];
-                                $formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />';
-                            }
-                            $formattitle = &mt('File format');
-                            $formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'.
-                                             &mt('Plain Text (no delimiters)').
-                                             '</label>'.('&nbsp;'x2).
-                                             '<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'.
-                                             &mt('Comma separated values').'</label>'.$formatextra;
-                        }
-                    }
-                }
-            } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {
-                if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                    if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                        $formattitle = &mt('Bubblesheet type');
-                        $formatoptions = &scantron_scantab();
-                    }
-                }
-            }
-        }
-    }
-    return ($formatoptions,$formattitle,$formatjs);
-}
 
 sub scantron_upload_scantron_data_save {
-    my ($r,$symb) = @_;
+    my($r,$symb)=@_;
     my $doanotherupload=
 	'<br /><form action="/adm/grades" method="post">'."\n".
 	'<input type="hidden" name="command" value="scantronupload" />'."\n".
@@ -9453,67 +7907,30 @@ 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 />");
-        unless ($symb) {
+	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('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
     if (length($env{'form.upfile'}) < 2) {
-        $r->print(
-            &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));
+        $r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
     } else {
-        my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'});
-        my $parser;
-        if (ref($domconfig{'scantron'}) eq 'HASH') {
-            if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-                my $is_csv;
-                my @possibles = keys(%{$domconfig{'scantron'}{'config'}});
-                if (@possibles > 1) {
-                    if ($env{'form.fileformat'} eq 'csv') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                            if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                                if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                    $is_csv = 1;
-                                }
-                            }
-                        }
-                    }
-                } elsif (@possibles == 1) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                            if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                $is_csv = 1;
-                            }
-                        }
-                    }
-                }
-                if ($is_csv) {
-                   $parser = $domconfig{'scantron'}{'config'}{'csv'};
-                }
-            }
-        }
-        my $result =
-            &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
+        my $result = 
+            &Apache::lonnet::userfileupload('upfile','','scantron','','','',
                                             $env{'form.courseid'},$env{'form.domainid'});
 	if ($result =~ m{^/uploaded/}) {
-            $r->print(
-                &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.
-                &mt('Uploaded [_1] bytes of data into location: [_2]',
-                        (length($env{'form.upfile'})-1),
-                        '<span class="LC_filename">'.$result.'</span>'));
+	    $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
+                          '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
+			  '<span class="LC_filename">'.$result.'</span>'));
             ($uploadedfile) = ($result =~ m{/([^/]+)$});
             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
                                                        $env{'form.courseid'},$uploadedfile));
 	} else {
-            $r->print(
-                &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.
-                    &mt('An error ([_1]) occurred when attempting to upload the file: [_2]',
-                          $result,
+	    $r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]',
+                          '<span class="LC_error">','</span>',$result,
 			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
 	}
     }
@@ -9535,7 +7952,7 @@ sub validate_uploaded_scantron_file {
     my $output;
     if (@lines) {
         my (%counts,$max_match_format);
-        my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0);
+        my ($max_match_count,$max_match_pct) = (0,0);
         my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);
         my %idmap = &username_to_idmap($classlist);
         foreach my $key (keys(%idmap)) {
@@ -9543,9 +7960,9 @@ sub validate_uploaded_scantron_file {
             $idmap{$lckey} = $idmap{$key};
         }
         my %unique_formats;
-        my @formatlines = &Apache::lonnet::get_scantronformat_file();
+        my @formatlines = &get_scantronformat_file();
         foreach my $line (@formatlines) {
-            next if (($line =~ /^\#/) || ($line eq ''));
+            chomp($line);
             my @config = split(/:/,$line);
             my $idstart = $config[5];
             my $idlength = $config[6];
@@ -9578,7 +7995,6 @@ sub validate_uploaded_scantron_file {
                 if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {
                     $max_match_pct = $percent_match;
                     $max_match_format = $key;
-                    $found_match_count = $counts{$key}{'found'};
                     $max_match_count = $counts{$key}{'total'};
                 }
             }
@@ -9597,40 +8013,17 @@ sub validate_uploaded_scantron_file {
                 }
             }
             my $showpct = sprintf("%.0f",$max_match_pct).'%';
-            $output .= '<br />';
-            if ($found_match_count == $max_match_count) {
-                # 100% matching entries
-                $output .= &Apache::lonhtmlcommon::confirm_success(
-                     &mt('Comparison of student IDs: [_1] matching ([quant,_2,entry,entries])',
-                            '<b>'.$showpct.'</b>',$found_match_count)).'<br />'.
-                &mt('Comparison of student IDs in the uploaded file with'.
-                    ' the course roster found matches for [_1] of the [_2] entries'.
-                    ' in the file (for the format defined for [_3]).',
-                        '<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs);
-            } else {
-                # Not all entries matching? -> Show warning and additional info
-                $output .=
-                    &Apache::lonhtmlcommon::confirm_success(
-                        &mt('Comparison of student IDs: [_1] matching ([_2]/[quant,_3,entry,entries])',
-                                '<b>'.$showpct.'</b>',$found_match_count,$max_match_count).'<br />'.
-                        &mt('Not all entries could be matched!'),1).'<br />'.
-                    &mt('Comparison of student IDs in the uploaded file with'.
-                        ' the course roster found matches for [_1] of the [_2] entries'.
-                        ' in the file (for the format defined for [_3]).',
-                            '<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
-                    '<p class="LC_info">'.
-                    &mt('A low percentage of matches results from one of the following:').
-                    '</p><ul>'.
-                    '<li>'.&mt('The file was uploaded to the wrong course.').'</li>'.
-                    '<li>'.&mt('The data is not in the format expected for the domain: [_1]',
-                               '<i>'.$cdom.'</i>').'</li>'.
-                    '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
-                    '<li>'.&mt('The course roster is not up to date.').'</li>'.
-                    '</ul>';
-            }
+            $output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
+                       '<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'.
+                       '<li>'.&mt('The file was uploaded to the wrong course').'</li>'.
+                       '<li>'.&mt('The data are not in the format expected for the domain: [_1]',
+                                  '<i>'.$cdom.'</i>').'</li>'.
+                       '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
+                       '<li>'.&mt('The course roster is not up to date').'</li>'.
+                       '</ul>';
         }
     } else {
-        $output = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>';
+        $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
     }
     return $output;
 }
@@ -9644,7 +8037,7 @@ sub valid_file {
 }
 
 sub scantron_download_scantron_data {
-    my ($r,$symb) = @_;
+    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'};
@@ -9652,7 +8045,7 @@ sub scantron_download_scantron_data {
     if (! &valid_file($file)) {
 	$r->print('
 	<p>
-	    '.&mt('The requested filename was invalid.').'
+	    '.&mt('The requested file name was invalid.').'
         </p>
 ');
 	return;
@@ -9665,7 +8058,7 @@ sub scantron_download_scantron_data {
     &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
     $r->print('
     <p>
-	'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.',
+	'.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
 	      '<a href="'.$orig.'">','</a>').'
     </p>
     <p>
@@ -9684,15 +8077,14 @@ sub checkscantron_results {
     my ($r,$symb) = @_;
     if (!$symb) {return '';}
     my $cid = $env{'request.course.id'};
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
     my $cnum = $env{'course.'.$cid.'.num'};
     my $cdom = $env{'course.'.$cid.'.domain'};
     my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
     my %record;
     my %scantron_config =
-        &Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
+        &Apache::grades::get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&Apache::grades::username_to_idmap($classlist);
@@ -9702,31 +8094,10 @@ sub checkscantron_results {
         return '';
     }
     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)) {
-        $randomorder=$map->randomorder();
-        $randompick=$map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
-    }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
-    if ($nav_error) {
-        $r->print(&navmap_errormsg());
-        return '';
-    }
-    &graders_resources_pass(\@resources,\%grader_partids_by_symb,
-                            \%grader_randomlists_by_symb,$bubbles_per_row);
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,                             \%grader_randomlists_by_symb);
+
     my ($uname,$udom);
     my (%scandata,%lastname,%bylast);
     $r->print('
@@ -9735,10 +8106,13 @@ sub checkscantron_results {
     my @delayqueue;
     my %completedstudents;
 
-    my $count=&get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
+    my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
+                                    'Progress of Bubblesheet Data/Submission Records Comparison',$count,
+                                    'inline',undef,'checkscantron');
     my ($username,$domain,$started);
-    &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
     if ($nav_error) {
         $r->print(&navmap_errormsg());
         return '';
@@ -9762,8 +8136,8 @@ sub checkscantron_results {
         my $scan_record=
             &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,
                                                      $scan_data);
-        unless ($uname=&scantron_find_student($scan_record,$scan_data,
-                                              \%idmap,$i)) {
+        unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data,
+                                                              \%idmap,$i)) {
             &Apache::grades::scantron_add_delay(\@delayqueue,$line,
                                 'Unable to find a student that matches',1);
             next;
@@ -9776,61 +8150,26 @@ sub checkscantron_results {
         my $pid = $scan_record->{'scantron.ID'};
         $lastname{$pid} = $scan_record->{'scantron.LastName'};
         push(@{$bylast{$lastname{$pid}}},$pid);
-        my $usec = $classlist->{$uname}->[&Apache::loncoursedata::CL_SECTION];
-        my $user = $uname.':'.$usec;
-        ($username,$domain)=split(/:/,$uname);
-
-        my $scancode;
-        if ((exists($scan_record->{'scantron.CODE'})) &&
-            (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
-            $scancode = $scan_record->{'scantron.CODE'};
-        } else {
-            $scancode = '';
-        }
-
-        my @mapresources = @resources;
         my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
-        my %respnumlookup=();
-        my %startline=();
-        if ($randomorder || $randompick) {
-            @mapresources =
-                &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
-                             \%orderedforcode);
-            my $total = &get_respnum_lookups($sequence,$scan_data,\%idmap,$line,
-                                             $scan_record,\@master_seq,\%symb_to_resource,
-                                             \%grader_partids_by_symb,\%orderedforcode,
-                                             \%respnumlookup,\%startline);
-            if ($randompick && $total) {
-                $lastpos = $total*$scantron_config{'Qlength'};
-            }
-        }
         $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
         chomp($scandata{$pid});
         $scandata{$pid} =~ s/\r$//;
-
+        ($username,$domain)=split(/:/,$uname);
         my $counter = -1;
-        foreach my $resource (@mapresources) {
+        foreach my $resource (@resources) {
             my $parts;
             my $ressymb = $resource->symb();
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
-                my $currcode;
-                if (exists($grader_randomlists_by_symb{$ressymb})) {
-                    $currcode = $scancode;
-                }
                 (my $analysis,$parts) =
-                    &scantron_partids_tograde($resource,$env{'request.course.id'},
-                                              $username,$domain,undef,
-                                              $bubbles_per_row,$currcode);
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);
             } else {
                 $parts = $grader_partids_by_symb{$ressymb};
             }
             ($counter,my $recording) =
                 &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
                                          $scandata{$pid},$parts,
-                                         \%scantron_config,\%lettdig,$numletts,
-                                         $randomorder,$randompick,
-                                         \%respnumlookup,\%startline);
+                                         \%scantron_config,\%lettdig,$numletts);
             $record{$pid} .= $recording;
         }
     }
@@ -9853,14 +8192,14 @@ sub checkscantron_results {
 '<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".
-'<td>'.&mt('Submissions').'</td><td>'.$showrecord.'</td></tr>'."\n";
+'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
                     $passed ++;
                 } else {
                     my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
                     $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
 '</tr>'."\n".
 '<tr class="'.$css_class.'">'."\n".
-'<td>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
+'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
 '</tr>'."\n";
                     $failed ++;
                 }
@@ -9868,19 +8207,8 @@ 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('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>');
+    $r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
+    $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</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".
@@ -9906,8 +8234,7 @@ sub checkscantron_results {
 
 sub verify_scantron_grading {
     my ($resource,$domain,$username,$cid,$counter,$scandata,$partids,
-        $scantron_config,$lettdig,$numletts,$randomorder,$randompick,
-        $respnumlookup,$startline) = @_;
+        $scantron_config,$lettdig,$numletts) = @_;
     my ($record,%expected,%startpos);
     return ($counter,$record) if (!ref($resource));
     return ($counter,$record) if (!$resource->is_problem());
@@ -9916,21 +8243,15 @@ sub verify_scantron_grading {
     foreach my $part_id (@{$partids}) {
         $counter ++;
         $expected{$part_id} = 0;
-        my $respnum = $counter;
-        if ($randomorder || $randompick) {
-            $respnum = $respnumlookup->{$counter};
-            $startpos{$part_id} = $startline->{$counter} + 1;
-        } else {
-            $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
-        }
-        if ($env{"form.scantron.sub_bubblelines.$respnum"}) {
-            my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$respnum"});
+        if ($env{"form.scantron.sub_bubblelines.$counter"}) {
+            my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
             foreach my $item (@sub_lines) {
                 $expected{$part_id} += $item;
             }
         } else {
-            $expected{$part_id} = $env{"form.scantron.bubblelines.$respnum"};
+            $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
         }
+        $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
     }
     if ($symb) {
         my %recorded;
@@ -10026,6 +8347,23 @@ sub verify_scantron_grading {
     return ($counter,$record);
 }
 
+sub letter_to_digits { 
+    my %lettdig = (
+                    A => 1,
+                    B => 2,
+                    C => 3,
+                    D => 4,
+                    E => 5,
+                    F => 6,
+                    G => 7,
+                    H => 8,
+                    I => 9,
+                    J => 0,
+                  );
+    return %lettdig;
+}
+
+
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
@@ -10036,7 +8374,7 @@ sub verify_scantron_grading {
 
 sub href_symb_cmd {
     my ($symb,$cmd)=@_;
-    return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&amp;command='.$cmd;
+    return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
 }
 
 sub grading_menu {
@@ -10044,8 +8382,10 @@ sub grading_menu {
     if (!$symb) {return '';}
 
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
-                  'command'=>'individual');
-
+                  'command'=>'individual',
+                  'gradingMenu'=>1,
+                  'showgrading'=>"yes");
+    
     my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
 
     $fields{'command'}='ungraded';
@@ -10057,9 +8397,6 @@ sub grading_menu {
     $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);
     
@@ -10071,75 +8408,59 @@ sub grading_menu {
 
     $fields{'command'} = 'initialverifyreceipt';
     my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-
-    my %permissions;
-    if ($perm{'mgr'}) {
-        $permissions{'either'} = 'F';
-        $permissions{'mgr'} = 'F';
-    }
-    if ($perm{'vgr'}) {
-        $permissions{'either'} = 'F';
-        $permissions{'vgr'} = 'F';
-    }
-
+    
     my @menu = ({	categorytitle=>'Hand Grading',
             items =>[
-                        {       linktext => 'Select individual students to grade',
-                                url => $url1a,
-                                permission => $permissions{'either'},
-                                icon => 'grade_students.png',
-                                linktitle => 'Grade current resource for a selection of students.'
-                        },
-                        {       linktext => 'Grade ungraded submissions',
+                        {	linktext => 'Select individual students to grade',
+                    		url => $url1a,
+                    		permission => 'F',
+                    		icon => 'edit-find-replace.png',
+                    		linktitle => 'Grade current resource for a selection of students.'
+                        }, 
+                        {       linktext => 'Grade ungraded submissions.',
                                 url => $url1b,
-                                permission => $permissions{'either'},
-                                icon => 'ungrade_sub.png',
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
                                 linktitle => 'Grade all submissions that have not been graded yet.'
                         },
 
                         {       linktext => 'Grading table',
                                 url => $url1c,
-                                permission => $permissions{'either'},
-                                icon => 'grading_table.png',
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
                                 linktitle => 'Grade current resource for all students.'
                         },
-                        {       linktext => 'Grade page/folder for one student',
+                        {       linktext => 'Grade complete page/sequence/folder for one student',
                                 url => $url1d,
-                                permission => $permissions{'either'},
-                                icon => 'grade_PageFolder.png',
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
                                 linktitle => 'Grade all resources in current page/sequence/folder for one student.'
-                        },
-                        {       linktext => 'Download submitted files',
-                                url => $url1e,
-                                permission => $permissions{'either'},
-                                icon => 'download_sub.png',
-                                linktitle => 'Download all files submitted by students.'
                         }]},
                          { categorytitle=>'Automated Grading',
                items =>[
 
                 	    {	linktext => 'Upload Scores',
                     		url => $url2,
-                    		permission => $permissions{'mgr'},
+                    		permission => 'F',
                     		icon => 'uploadscores.png',
                     		linktitle => 'Specify a file containing the class scores for current resource.'
                 	    },
                 	    {	linktext => 'Process Clicker',
                     		url => $url3,
-                    		permission => $permissions{'mgr'},
+                    		permission => 'F',
                     		icon => 'addClickerInfoFile.png',
                     		linktitle => 'Specify a file containing the clicker information for this resource.'
                 	    },
                 	    {	linktext => 'Grade/Manage/Review Bubblesheets',
                     		url => $url4,
-                    		permission => $permissions{'mgr'},
-                    		icon => 'bubblesheet.png',
-                    		linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
+                    		permission => 'F',
+                    		icon => 'stat.png',
+                    		linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
                 	    },
-                            {   linktext => 'Verify Receipt Number',
+                            {   linktext => 'Verify Receipt No.',
                                 url => $url5,
-                                permission => $permissions{'either'},
-                                icon => 'receipt_number.png',
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
                                 linktitle => 'Verify a system-generated receipt number for correct problem solution.'
                             }
 
@@ -10150,12 +8471,15 @@ sub grading_menu {
     my $Str;
     $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="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
+	'<input type="hidden" name="showgrading" value="yes" />'."\n";
 
     $Str .= &Apache::lonhtmlcommon::generate_menu(@menu);
     return $Str;    
 }
 
+
 sub ungraded {
     my ($request)=@_;
     &submit_options($request);
@@ -10168,8 +8492,15 @@ sub submit_options_sequence {
     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="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+        '<input type="hidden" name="gradingMenu" value="1" />'."\n".
+        '<input type="hidden" name="showgrading" value="yes" />'."\n";
+
+    $result.='
+<h2>
+  '.&mt('Grade complete page/sequence/folder for one student').'
+</h2>'.
+            &selectfield(0).
             '<input type="hidden" name="command" value="pickStudentPage" />
             <div>
               <input type="submit" value="'.&mt('Next').' &rarr;" />
@@ -10186,9 +8517,15 @@ sub submit_options_table {
     my $result;
 
     $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="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+        '<input type="hidden" name="gradingMenu" value="1" />'."\n".
+        '<input type="hidden" name="showgrading" value="yes" />'."\n";
 
-    $result.=&selectfield(1).
+    $result.='
+<h2>
+  '.&mt('Grading table').'
+</h2>'.
+            &selectfield(0).
             '<input type="hidden" name="command" value="viewgrades" />
             <div>
               <input type="submit" value="'.&mt('Next').' &rarr;" />
@@ -10198,47 +8535,8 @@ sub submit_options_table {
     return $result;
 }
 
-sub submit_options_download {
-    my ($request,$symb) = @_;
-    if (!$symb) {return '';}
-
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&mt('An error occurred retrieving response types'));
-        return;
-    }
-    unless ($numessay) {
-        $request->print(&mt('No essayresponse items found'));
-        return;
-    }
-    my $table;
-    if (ref($partlist) eq 'ARRAY') {
-        if (scalar(@$partlist) > 1 ) {
-            $table = &showResourceInfo($symb,$partlist,$responseType,'gradingMenu',1,1);
-        }
-    }
-
-    &commonJSfunctions($request);
-
-    my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
-        $table."\n".
-        '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
-    $result.='
-<h2>
-  '.&mt('Select Students for whom to Download Submitted Files').'
-</h2>'.&selectfield(1).'
-                <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,$symb) = @_;
@@ -10248,45 +8546,42 @@ sub submit_options {
     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).'
-                <input type="hidden" name="command" value="submission" />
-              <input type="submit" value="'.&mt('Next').' &rarr;" />
+	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
+	'<input type="hidden" name="showgrading" value="yes" />'."\n";
+
+    $result.='
+<h2>
+  '.&mt('Select individual students to grade').'
+</h2>'.&selectfield(1).'
+                <input type="hidden" name="command" value="submission" /> 
+	      <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
+
+
   </form>';
     return $result;
 }
 
 sub selectfield {
    my ($full)=@_;
-   my %options =
-       (&substatus_options,
-        'select_form_order' => ['yes','queued','graded','incorrect','all']);
-
-  #
-  # PrepareClasslist() needs to be called to avoid getting a sections list
-  # for a different course from the @Sections global in lonstatistics.pm,
-  # populated by an earlier request.
-  #
-   &Apache::lonstatistics::PrepareClasslist();
-
    my $result='<div class="LC_columnSection">
-
+  
     <fieldset>
       <legend>
        '.&mt('Sections').'
       </legend>
       '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
     </fieldset>
-
+  
     <fieldset>
       <legend>
         '.&mt('Groups').'
       </legend>
       '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
     </fieldset>
- 
+  
     <fieldset>
       <legend>
         '.&mt('Access Status').'
@@ -10294,36 +8589,25 @@ sub selectfield {
       '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
     </fieldset>';
     if ($full) {
-        $result.='
+       $result.='
     <fieldset>
       <legend>
         '.&mt('Submission Status').'
       </legend>'.
-       &Apache::loncommon::select_form('all','submitonly',\%options).
+       &Apache::loncommon::select_form('all','submitonly',
+          (&Apache::lonlocal::texthash(
+             'yes'       => 'with submissions',
+             'queued'    => 'in grading queue',
+             'graded'    => 'with ungraded submissions',
+             'incorrect' => 'with incorrect submissions',
+             'all'       => 'with any status'),
+             'select_form_order' => ['yes','queued','graded','incorrect','all'])).
    '</fieldset>';
     }
     $result.='</div><br />';
     return $result;
 }
 
-sub substatus_options {
-    return &Apache::lonlocal::texthash(
-                                      'yes'       => 'with submissions',
-                                      'queued'    => 'in grading queue',
-                                      'graded'    => 'with ungraded submissions',
-                                      'incorrect' => 'with incorrect submissions',
-                                      'all'       => 'with any status',
-                                      );
-}
-
-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);
 }
@@ -10346,21 +8630,6 @@ sub init_perm {
     }
 }
 
-sub init_old_essays {
-    my ($symb,$apath,$adom,$aname) = @_;
-    if ($symb ne '') {
-        my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
-        if (keys(%essays) > 0) {
-            $old_essays{$symb} = \%essays;
-        }
-    }
-    return;
-}
-
-sub reset_old_essays {
-    undef(%old_essays);
-}
-
 sub gather_clicker_ids {
     my %clicker_ids;
 
@@ -10426,11 +8695,11 @@ sub process_clicker {
     my ($r,$symb)=@_;
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
-    $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";
+    $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";
 # 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',
@@ -10447,7 +8716,7 @@ sub process_clicker {
        }
     }
 
-    my $upload=&mt("Evaluate File");
+    my $upload=&mt("Upload File");
     my $type=&mt("Type");
     my $attendance=&mt("Award points just for participation");
     my $personnel=&mt("Correctness determined from response by course personnel");
@@ -10457,9 +8726,8 @@ 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',
-                                                    'interwrite' => 'interwrite PRS',
-                                                    'turning' => 'Turning Technologies'});
+						   ('iclicker' => 'i>clicker',
+                                                    'interwrite' => 'interwrite PRS'));
     $symb = &Apache::lonenc::check_encrypt($symb);
     $result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
 function sanitycheck() {
@@ -10506,10 +8774,7 @@ ENDUPFORM
 <input type="hidden" name="command" value="processclickerfile" />
 <input type="file" name="upfile" size="50" />
 <br /><label>$type: $selectform</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="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" />
@@ -10517,22 +8782,18 @@ ENDUPFORM
 <br />&nbsp;&nbsp;&nbsp;
 <input type="text" name="givenanswer" size="50" />
 <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
-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>$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>
-ENDPERCFORM
-    $result.='</td>'.
-             &Apache::loncommon::end_data_table_row().
-             &Apache::loncommon::end_data_table();
+</form>'
+ENDUPFORM
+    $result.='</td></tr></table>'."\n".
+             '</td></tr></table><br /><br />'."\n";
     return $result;
 }
 
 sub process_clicker_file {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 
     my %Saveable_Parameters=&clicker_grading_parameters();
@@ -10551,7 +8812,7 @@ sub process_clicker_file {
     if ($env{'form.gradingmechanism'} eq 'given') {
         $env{'form.givenanswer'}=~s/^\s*//gs;
         $env{'form.givenanswer'}=~s/\s*$//gs;
-        $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-\+]+/\,/g;
+        $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g;
         $env{'form.givenanswer'}=uc($env{'form.givenanswer'});
         my @answers=split(/\,/,$env{'form.givenanswer'});
         $foundgiven=$#answers+1;
@@ -10590,34 +8851,16 @@ sub process_clicker_file {
 	    $number++;
 	}
         $result.="</p>\n";
-        if ($number==0) {
-            $result .=
-                 &Apache::lonhtmlcommon::confirm_success(
-                     &mt('No IDs found to determine correct answer'),1);
-            return $result;
-        }
+	if ($number==0) {
+	    $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
+	    return $result;
+	}
     }
     if (length($env{'form.upfile'}) < 2) {
-        $result .=
-            &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;
-    }
-    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>';
+        $result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.',
+		     '<span class="LC_error">',
+		     '</span>',
+		     '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>');
         return $result;
     }
 
@@ -10625,12 +8868,11 @@ sub process_clicker_file {
 
     $result.=&Apache::loncommon::studentbrowser_javascript();
     $symb = &Apache::lonenc::check_encrypt($symb);
-    $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>
+    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>
 <form method="post" action="/adm/grades" name="clickeranalysis">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="assignclickergrades" />
@@ -10646,15 +8888,10 @@ ENDHEADER
     my $errormsg='';
     my $number=0;
     if ($env{'form.upfiletype'} eq 'iclicker') {
-        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)=&iclicker_eval(\@questiontitles,\%responses);
+    }
+    if ($env{'form.upfiletype'} eq 'interwrite') {
         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
-    } elsif ($env{'form.upfiletype'} eq 'turning') {
-        ($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
     }
     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
              '<input type="hidden" name="number" value="'.$number.'" />'.
@@ -10683,9 +8920,7 @@ ENDHEADER
        } elsif ($clicker_ids{$id}) {
           if ($clicker_ids{$id}=~/\,/) {
 # More than one user with the same clicker!
-             $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<hr />".&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}))) {
@@ -10699,14 +8934,12 @@ ENDHEADER
              $student_count++;
           }
        } else {
-          $result.="</td>".&Apache::loncommon::end_data_table_row().
-                           &Apache::loncommon::start_data_table_row()."<td>".
-                    &mt('Unregistered Clicker')." <tt>".$id."</tt><br />";
+          $result.="\n<hr />".&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,'',$id);
+                   &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id);
           $unknown_count++;
        }
     }
@@ -10714,7 +8947,7 @@ ENDHEADER
              &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);
     if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) {
        if ($correct_count==0) {
-          $errormsg.="Found no correct answers for grading!";
+          $errormsg.="Found no correct answers answers for grading!";
        } elsif ($correct_count>1) {
           $result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>';
        }
@@ -10727,9 +8960,8 @@ ENDHEADER
     } else {
        $result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />';
     }
-    $result.='</form></td>'.
-             &Apache::loncommon::end_data_table_row().
-             &Apache::loncommon::end_data_table();
+    $result.='</form></td></tr></table>'."\n".
+             '</td></tr></table><br /><br />'."\n";
     return $result;
 }
 
@@ -10752,7 +8984,6 @@ sub iclicker_eval {
 	    $id=~s/^[\#0]+//;
 	    for (my $i=0;$i<$number;$i++) {
 		my $idx=3+$i*6;
-                $entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+]+//g;
 		push(@idresponses,$entries[$idx]);
 	    }
 	    $$responses{$id}=join(',',@idresponses);
@@ -10761,49 +8992,6 @@ 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;
@@ -10835,33 +9023,8 @@ sub interwrite_eval {
     return ($errormsg,$number);
 }
 
-sub turning_eval {
-    my ($questiontitles,$responses)=@_;
-    my $number=0;
-    my $errormsg='';
-    foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
-        my %components=&Apache::loncommon::record_sep($line);
-        my @entries=map {$components{$_}} (sort(keys(%components)));
-        if ($#entries>$number) { $number=$#entries; }
-        my $id=$entries[0];
-        my @idresponses;
-        $id=~s/^[\#0]+//;
-        unless ($id) { next; }
-        for (my $idx=1;$idx<=$#entries;$idx++) {
-            $entries[$idx]=~s/\,/\;/g;
-            $entries[$idx]=~s/[^a-zA-Z0-9\.\*\-\+\;]+//g;
-            push(@idresponses,$entries[$idx]);
-        }
-        $$responses{$id}=join(',',@idresponses);
-    }
-    for (my $i=1; $i<=$number; $i++) {
-        $$questiontitles[$i]=&mt('Question [_1]',$i);
-    }
-    return ($errormsg,$number);
-}
-
 sub assign_clicker_grades {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 # See which part we are saving to
     my $res_error;
@@ -10872,11 +9035,14 @@ sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
-    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>';
+    my $result='';
+
+    my $heading=&mt('Assigning grades based on 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>
+ENDHEADER
 # Get correct result
 # FIXME: Possibly need delimiter other than ":"
     my @correct=();
@@ -10892,26 +9058,25 @@ sub assign_clicker_grades {
                     $result.='<br /><span class="LC_warning">'.
                              &mt('More than one correct result given for question "[_1]": [_2] versus [_3].',
                                  $env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>';
-                 } elsif (($input[$i]) || ($input[$i] eq '0')) {
+                 } elsif ($input[$i]) {
                     $correct[$i]=$input[$i];
                  }
              }
           }
        }
        for (my $i=0;$i<$number;$i++) {
-          if ((!$correct[$i]) && ($correct[$i] ne '0')) {
+          if (!$correct[$i]) {
              $result.='<br /><span class="LC_error">'.
                       &mt('No correct result given for question "[_1]"!',
                           $env{'form.question:'.$i}).'</span>';
           }
        }
-       $result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ((($_) || ($_ eq '0'))?$_:'-') } @correct));
+       $result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct));
     }
 # Start grading
     my $pcorrect=$env{'form.pcorrect'};
     my $pincorrect=$env{'form.pincorrect'};
     my $storecount=0;
-    my %users=();
     foreach my $key (keys(%env)) {
        my $user='';
        if ($key=~/^form\.student\:(.*)$/) {
@@ -10925,42 +9090,24 @@ sub assign_clicker_grades {
              $user=$env{'form.multi'.$id};
           }
        }
-       if ($user) {
-          if ($users{$user}) {
-             $result.='<br /><span class="LC_warning">'.
-                      &mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').
-                      '</span><br />';
-          }
-          $users{$user}=1;
+       if ($user) { 
           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]) || ($answer[$i]=~/^[0\.]+$/)) {
+             } elsif ($answer[$i]) {
                 if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;
                 } elsif ($correct[$i] eq '*') {
                    $sum+=$pcorrect;
                 } else {
-# We actually grade if correct or not
-                   my $increment=$pincorrect;
-# Special case: numerical answer "0"
-                   if ($correct[$i] eq '0') {
-                      if ($answer[$i]=~/^[0\.]+$/) {
-                         $increment=$pcorrect;
-                      }
-# General numerical answer, both evaluate to something non-zero
-                   } elsif ((1.0*$correct[$i]!=0) && (1.0*$answer[$i]!=0)) {
-                      if (1.0*$correct[$i]==1.0*$answer[$i]) {
-                         $increment=$pcorrect;
-                      }
-# Must be just alphanumeric
-                   } elsif ($answer[$i] eq $correct[$i]) {
-                      $increment=$pcorrect;
+                   if ($answer[$i] eq $correct[$i]) {
+                      $sum+=$pcorrect;
+                   } else {
+                      $sum+=$pincorrect;
                    }
-                   $sum+=$increment;
                 }
              }
           }
@@ -10983,9 +9130,8 @@ sub assign_clicker_grades {
     }
 # We are done
     $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
-             '</td>'.
-             &Apache::loncommon::end_data_table_row().
-             &Apache::loncommon::end_data_table();
+             '</td></tr></table>'."\n".
+             '</td></tr></table><br /><br />'."\n";
     return $result;
 }
 
@@ -10997,67 +9143,32 @@ sub navmap_errormsg {
 }
 
 sub startpage {
-    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$head_extra,$onload,$divforres) = @_;
-    my %args;
-    if ($onload) {
-         my %loaditems = (
-                        'onload' => $onload,
-                      );
-         $args{'add_entries'} = \%loaditems;
-    }
-    if ($nomenu) {
-        $args{'only_body'} = 1;
-        $r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args));
-    } else {
-        if ($env{'request.course.id'}) {
-            unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
-        }
-        $args{'bread_crumbs'} = $crumbs;
-        $r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args));
-    }
+    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag) = @_;
+    unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
+    $r->print(&Apache::loncommon::start_page('Grading',undef,
+                                          {'bread_crumbs' => $crumbs}));
     unless ($nodisplayflag) {
-       $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres));
+       $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));
     }
 }
 
-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,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();
-    if ($request->header_only) {
-        &Apache::loncommon::content_type($request,'text/html');
-        $request->send_http_header;
-        return OK;
+    if ($env{'browser.mathml'}) {
+	&Apache::loncommon::content_type($request,'text/xml');
+    } else {
+	&Apache::loncommon::content_type($request,'text/html');
     }
+    $request->send_http_header;
+    return '' if $request->header_only;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
 # 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));
     }
@@ -11069,223 +9180,138 @@ sub handler {
        (my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
        $symb=&Apache::lonnet::symbread($url);
     }
-    &Apache::lonenc::check_decrypt(\$symb);
+    &Apache::lonenc::check_decrypt(\$symb);                             
 
     $ssi_error = 0;
-    if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {
-#
-# Not called from a resource, but inside a course
+    if ($symb eq '' && $command eq '') {
 #
-        &startpage($request,undef,[],1,1);
-        &select_problem($request);
+# Not called from a resource
+#    
+
     } else {
-        if ($command eq 'submission' && $perm{'vgr'}) {
-            my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload);
-            if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
-                ($stuvcurrent,$stuvdisp,$versionform,$js) =
-                    &choose_task_version_form($symb,$env{'form.student'},
-                                              $env{'form.userdom'});
-            }
-            my $divforres;
-            if ($env{'form.student'} eq '') {
-                $js .= &part_selector_js();
-                $onload = "toggleParts('gradesub');";
-            } else {
-                $divforres = 1;
-            }
-            my $head_extra = $js;
-            unless ($env{'form.vProb'} eq 'no') {
-                my $csslinks = &Apache::loncommon::css_links($symb);
-                if ($csslinks) {
-                    $head_extra .= "\n$csslinks";
-                }
-            }
-            &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,
-                       $stuvcurrent,$stuvdisp,undef,$head_extra,$onload,$divforres);
-            if ($versionform) {
-                if ($divforres) {
-                    $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
-                }
-                $request->print($versionform);
-            }
-            ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command));
-        } elsif ($command eq 'versionsub' && $perm{'vgr'}) {
-            my ($stuvcurrent,$stuvdisp,$versionform,$js) =
-                &choose_task_version_form($symb,$env{'form.student'},
-                                          $env{'form.userdom'},
-                                          $env{'form.inhibitmenu'});
-            my $head_extra = $js;
-            unless ($env{'form.vProb'} eq 'no') {
-                my $csslinks = &Apache::loncommon::css_links($symb);
-                if ($csslinks) {
-                    $head_extra .= "\n$csslinks";
-                }
-            }
-            &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,
-                       $stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$head_extra);
-            if ($versionform) {
-                $request->print($versionform);
-            }
-            $request->print('<br clear="all" />');
-            $request->print(&show_previous_task_version($request,$symb));
-        } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
-            &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'}) {
-            my $csslinks;
-            unless ($env{'form.vProb'} eq 'no') {
-                $csslinks = &Apache::loncommon::css_links($symb,'map');
-            }
-            &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,undef,undef,undef,$csslinks);
-            &displayPage($request,$symb);
-        } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
-            &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'}) {
-            my $csslinks;
-            unless ($env{'form.vProb'} eq 'no') {
-                $csslinks = &Apache::loncommon::css_links($symb);
-            }
-            &startpage($request,$symb,[{href=>'',text=>'...'},
-                                       {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1);
-            &processGroup($request,$symb);
-        } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
+	&init_perm();
+	if ($command eq 'submission' && $perm{'vgr'}) {
+            &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);
+	    ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
+	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
             &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));
+	    &pickStudentPage($request,$symb);
+	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
+            &startpage($request,$symb);
+	    &displayPage($request,$symb);
+	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    &updateGradeByPage($request,$symb);
+	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
+            &startpage($request,$symb);
+	    &processGroup($request,$symb);
+	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&grading_menu($request,$symb));
+	} elsif ($command eq 'individual' && $perm{'vgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&submit_options($request,$symb));
         } elsif ($command eq 'ungraded' && $perm{'vgr'}) {
-            my $js = &part_selector_js();
-            my $onload = "toggleParts('gradesub');";
-            &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}],
-                       undef,undef,undef,undef,undef,$js,$onload);
-            $request->print(&listStudents($request,$symb,'graded'));
+            &startpage($request,$symb);
+            $request->print(&submit_options($request,$symb));
         } 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);
+            &startpage($request,$symb);
             $request->print(&submit_options_sequence($request,$symb));
-        } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
+	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
             &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'}) {
-            &startpage($request,$symb,[{href=>'',text=>'...'},
-                                       {href=>'',text=>'Store grades'}]);
-            $request->print(&processHandGrade($request,$symb));
-        } elsif ($command eq 'editgrades' && $perm{'mgr'}) {
+	    $request->print(&viewgrades($request,$symb));
+	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&processHandGrade($request,$symb));
+	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
             &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));
+	    $request->print(&editgrades($request,$symb));
         } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
-            &startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);
+            &startpage($request,$symb);
             $request->print(&initialverifyreceipt($request,$symb));
-        } elsif ($command eq 'verify' && $perm{'vgr'}) {
-            &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 'verify' && $perm{'vgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&verifyreceipt($request,$symb));
         } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);
+            &startpage($request,$symb);
             $request->print(&process_clicker($request,$symb));
         } elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
-                                       {href=>'', text=>'Process clicker file'}]);
+            &startpage($request,$symb);
             $request->print(&process_clicker_file($request,$symb));
         } elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
-                                       {href=>'', text=>'Process clicker file'},
-                                       {href=>'', text=>'Store grades'}]);
+            &startpage($request,$symb);
             $request->print(&assign_clicker_grades($request,$symb));
-        } elsif ($command eq 'csvform' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&upcsvScores_form($request,$symb));
-        } elsif ($command eq 'csvupload' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&csvupload($request,$symb));
-        } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
-            &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') {
-                &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';
-                }
-                &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-                $request->print(&csvuploadmap($request,$symb));
-            }
-        } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
-            &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&csvuploadassign($request,$symb));
-        } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
-            &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'}) {
-            &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'}) {
-            &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'}) {
-            &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'}))) {
-            &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'}))) {
-            &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'})) {
-            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_download_scantron_data($request,$symb));
+	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&upcsvScores_form($request,$symb));
+	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&csvupload($request,$symb));
+	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
+            &startpage($request,$symb);
+	    $request->print(&csvuploadmap($request,$symb));
+	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
+	    if ($env{'form.associate'} ne 'Reverse Association') {
+                &startpage($request,$symb);
+		$request->print(&csvuploadoptions($request,$symb));
+	    } else {
+		if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+		    $env{'form.upfile_associate'} = 'reverse';
+		} else {
+		    $env{'form.upfile_associate'} = 'forward';
+		}
+                &startpage($request,$symb);
+		$request->print(&csvuploadmap($request,$symb));
+	    }
+	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+            &startpage($request,$symb);
+	    $request->print(&csvuploadassign($request,$symb));
+	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&scantron_selectphase($request,undef,$symb));
+ 	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+ 	    $request->print(&scantron_do_warning($request,$symb));
+	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $request->print(&scantron_validate_file($request,$symb));
+	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
+            &startpage($request,$symb);
+	    $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'}))) {
+            &startpage($request,$symb);
+ 	    $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'}))) {
+            &startpage($request,$symb);
+ 	    $request->print(&scantron_upload_scantron_data_save($request,$symb));
+ 	} elsif ($command eq 'scantron_download' &&
+		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+            &startpage($request,$symb);
+ 	    $request->print(&scantron_download_scantron_data($request,$symb));
         } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
-            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&checkscantron_results($request,$symb));
-        } elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {
-            my $js = &part_selector_js();
-            my $onload = "toggleParts('gradingMenu');";
-            &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}],
-                       undef,undef,undef,undef,undef,$js,$onload);
-            $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'}],
-               undef,undef,undef,undef,undef,undef,undef,1);
-            $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
-            &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>');
-        }
+            &startpage($request,$symb);
+            $request->print(&checkscantron_results($request,$symb));     
+	} elsif ($command) {
+            &startpage($request,$symb);
+	    $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());
     &reset_caches();
-    return OK;
+    return '';
 }
 
 1;
@@ -11318,11 +9344,11 @@ At least the logic that drives this has
 ssi_with_retries - Does the server side include of a resource.
                      if the ssi call returns an error we'll retry it up to
                      the number of times requested by the caller.
-                     If we still have a problem, no text is appended to the
+                     If we still have a proble, no text is appended to the
                      output and we set some global variables.
                      to indicate to the caller an SSI error occurred.  
                      All of this is supposed to deal with the issues described
-                     in LON-CAPA BZ 5631 see:
+                     in LonCAPA BZ 5631 see:
                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
                      by informing the user that this happened.
 
@@ -11363,7 +9389,7 @@ ssi_with_retries()
     $r           - Apache request object
     $i           - number of the current scanline
     $scan_record - hash ref as returned from &scantron_parse_scanline()
-    $scan_config - hash ref as returned from &Apache::lonnet::get_scantron_config()
+    $scan_config - hash ref as returned from &get_scantron_config()
     $line        - full contents of the current scanline
     $error       - error condition, valid values are
                    'incorrectCODE', 'duplicateCODE',
@@ -11380,16 +9406,6 @@ ssi_with_retries()
          - missingbubble - array ref of the bubble lines that have missing
                            bubble errors
 
-   $randomorder - True if exam folder (or a sub-folder) has randomorder set
-   $randompick  - True if exam folder (or a sub-folder) has randompick set
-   $respnumlookup - Reference to HASH mapping question numbers in bubble lines
-                     for current line to question number used for same question
-                     in "Master Seqence" (as seen by Course Coordinator).
-   $startline   - Reference to hash where key is question number (0 is first)
-                  and value is number of first bubble line for current student
-                  or code-based randompick and/or randomorder.
-
-
 =item  scantron_get_maxbubble() : 
 
    Arguments:
@@ -11399,8 +9415,6 @@ ssi_with_retries()
        calling routine should trap the error condition and display the warning
        found in &navmap_errormsg().
 
-       $scantron_config - Reference to bubblesheet format configuration hash.
-
    Returns the maximum number of bubble lines that are expected to
    occur. Does this by walking the selected sequence rendering the
    resource and then checking &Apache::lonxml::get_problem_counter()
@@ -11410,7 +9424,7 @@ ssi_with_retries()
    $env{'form.scantron.bubble_lines.n'}, 
    $env{'form.scantron.first_bubble_line.n'} and
    $env{"form.scantron.sub_bubblelines.n"}
-   which are the total number of bubble lines, the number of bubble
+   which are the total number of bubble, lines, the number of bubble
    lines for response n and number of the first bubble line for response n,
    and a comma separated list of numbers of bubble lines for sub-questions
    (for optionresponse, matchresponse, and rankresponse items), for response n.  
@@ -11424,7 +9438,7 @@ ssi_with_retries()
 
 =item  scantron_process_students() : 
 
-   Routine that does the actual grading of the bubblesheet information.
+   Routine that does the actual grading of the bubble sheet information.
 
    The parsed scanline hash is added to %env 
 
@@ -11444,7 +9458,7 @@ ssi_with_retries()
 
 =item  scantron_upload_scantron_data() :
 
-    Creates the screen for adding a new bubblesheet data file to a course.
+    Creates the screen for adding a new bubble sheet data file to a course.
 
 =item  scantron_upload_scantron_data_save() : 
 
@@ -11458,7 +9472,7 @@ ssi_with_retries()
 =item  scantron_download_scantron_data() : 
 
    Shows a list of the three internal files (original, corrected,
-   skipped) for a specific bubblesheet data file that exists in the
+   skipped) for a specific bubble sheet data file that exists in the
    course.
 
 =item  scantron_validate_ID() :