diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php
index f0c3aee..63455ff 100644
--- a/grade/edit/outcome/import.php
+++ b/grade/edit/outcome/import.php
@@ -24,9 +24,10 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-require_once '../../../config.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->libdir.'/gradelib.php';
+/// THIS SCRIPT IS CALLED WITH "require_once()" FROM index.php
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');
+}
 
 $courseid = optional_param('id', 0, PARAM_INT);
 $action   = optional_param('action', '', PARAM_ALPHA);
diff --git a/grade/edit/outcome/import_outcomes_form.php b/grade/edit/outcome/import_outcomes_form.php
new file mode 100644
index 0000000..06bd8a8
--- /dev/null
+++ b/grade/edit/outcome/import_outcomes_form.php
@@ -0,0 +1,34 @@
+<?php /* $Id$ */
+
+require_once($CFG->dirroot.'/lib/formslib.php');
+
+class import_outcomes_form extends moodleform {
+
+    function definition() {
+        global $COURSE, $USER;
+
+        $mform =& $this->_form;
+        $this->set_upload_manager(new upload_manager('imagefile', false, false, null, false, 0, true, true, false));
+
+        $mform->addElement('hidden', 'action', 'upload');
+        $mform->addElement('hidden', 'id', $COURSE->id);
+
+        $scope = array();
+        if (($COURSE->id > 1) && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+            $scope[] =& $mform->createElement('radio', 'scope', null, get_string('importcustom', 'grades'), 'custom', 1);
+            $scope[] =& $mform->createElement('radio', 'scope', null, get_string('importstandard', 'grades'), 'global', 0);
+            $mform->addGroup($scope, 'scopegroup', null, '<br />', true);
+        }
+        
+        $mform->addElement('file', 'importfile', get_string('importoutcomes', 'grades'));
+
+        $mform->addElement('submit', 'save', get_string('uploadthisfile'));
+
+    }
+
+    function get_um() {
+        return $this->_upload_manager;
+    }
+}
+
+?>
diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 9c4bb98..29357a4 100644
--- a/grade/edit/outcome/index.php
+++ b/grade/edit/outcome/index.php
@@ -25,6 +25,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 require_once '../../../config.php';
+require_once($CFG->dirroot.'/lib/formslib.php');
 require_once $CFG->dirroot.'/grade/lib.php';
 require_once $CFG->libdir.'/gradelib.php';
 
@@ -52,6 +53,14 @@ if ($courseid) {
 /// return tracking object
 $gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'outcome', 'courseid'=>$courseid));
 
+require_once('import_outcomes_form.php');
+$upload_form = new import_outcomes_form();
+
+if ($upload_form_data = $upload_form->get_data()) {
+    require_once('import.php');
+    exit();
+}
+
 
 $strgrades = get_string('grades');
 $pagename  = get_string('outcomes', 'grades');
@@ -118,7 +127,10 @@ if ($courseid) {
 
 print('<form action="export.php" method="post">' ."\n");
 
+$outcomes_to_export = false;
+
 if ($courseid and $outcomes = grade_outcome::fetch_all_local($courseid)) {
+    $outcomes_to_export = true;
 
     print_heading($strcustomoutcomes);
     $data = array();
@@ -175,7 +187,8 @@ if ($courseid and $outcomes = grade_outcome::fetch_all_local($courseid)) {
 
 
 if ($outcomes = grade_outcome::fetch_all_global()) {
-    
+    $outcomes_to_export = true;
+
     print_heading($strstandardoutcome); 
     $data = array();
     foreach($outcomes as $outcome) {
@@ -235,7 +248,9 @@ if ($outcomes = grade_outcome::fetch_all_global()) {
 
 echo '<div class="buttons">';
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
-print('<input type="submit" value="'. get_string('exportselectedoutcomes', 'grades') .'" name="export_outcomes"></form>');
+if ( $outcomes_to_export ) {
+    print('<input type="submit" value="'. get_string('exportselectedoutcomes', 'grades') .'" name="export_outcomes"></form>');
+}
 print_single_button('edit.php', array('courseid'=>$courseid), $srtcreatenewoutcome);
 echo '</div>';
 
@@ -243,34 +258,13 @@ echo '<div>';
 $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes);
 $filesize = display_size($upload_max_filesize);
 
-$strimportoutcomes = get_string('importoutcomes', 'grades');
-$struploadthisfile = get_string('uploadthisfile');
-$strimportcustom = get_string('importcustom', 'grades');
-$strimportstandard = get_string('importstandard', 'grades');
-$strmaxsize = get_string("maxsize", "", $filesize);
-
-require_once($CFG->dirroot.'/lib/uploadlib.php');
-
-echo '<div>';
-echo '<form enctype="multipart/form-data" method="post" action="import.php">';
-echo '<input type="hidden" name="action" value="upload" />';
-echo '<input type="hidden" name="id" value="'. $courseid .'" />';
-echo '<input type="hidden" name="sesskey" value="'. $USER->sesskey .'" />';
-echo '<table class="generalbox boxaligncenter" width="50%" cellspacing="1" cellpadding="5">';
-if ($courseid && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
-    echo '<tr><td><ul style="list-style-type:none;">';
-    echo '<li><label><input type="radio" name="scope" value="local" checked="checked">'. $strimportcustom .'</label>';
-    echo '<li><label><input type="radio" name="scope" value="global">'. $strimportstandard .'</label>';
-    echo '</ul></td></tr>';
-}
-echo '<tr><td><p>'. $strimportoutcomes .'('. $strmaxsize .')</p></td></tr>';
-echo '<tr><td>'. 
-    upload_print_form_fragment(1,array('userfile'),null,false,null,$upload_max_filesize,0,true) .
-    '<input type="submit" name="save" value="'. $struploadthisfile .'" /></td></tr>';
-echo '</table>';
-echo '</div>';
-echo '</form>';
-echo '</div>';
+//$strimportoutcomes = get_string('importoutcomes', 'grades');
+//$struploadthisfile = get_string('uploadthisfile');
+//$strimportcustom = get_string('importcustom', 'grades');
+//$strimportstandard = get_string('importstandard', 'grades');
+//$strmaxsize = get_string("maxsize", "", $filesize);
+
+$upload_form->display();
 
 if ($courseid) {
     print_footer($course);
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
diff --git a/tag/lib.php b/tag/lib.php
diff --git a/tag/manage.php b/tag/manage.php