diff --git a/admin/index.php b/admin/index.php
index 9d2536c5fbe..5a191110d07 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -347,31 +347,31 @@
 
     $stradministration = get_string("administration");
     print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
-    print_simple_box_start("center", "80%", "#FFFFFF", 20);
+    print_simple_box_start("center", "90%", "$THEME->cellcontent2", 20);
     print_heading($stradministration);
 
     $table->align = array ("right", "left");
-    $table->data[] = array("<a href=\"../course/index.php?edit=on\">".get_string("courses")."</a>",
-                           "<font size=-1>".get_string("adminhelpcourses"));
-    $table->data[] = array("<a href=\"users.php\">".get_string("users")."</a>",
-                           "<font size=-1>".get_string("adminhelpusers"));
-    $table->data[] = array("<a href=\"config.php\">".get_string("configvariables")."</a>",
-                           "<font size=-1>".get_string("adminhelpconfiguration"));
-    $table->data[] = array("<a href=\"site.php\">".get_string("sitesettings")."</a>",
-                           "<font size=-1>".get_string("adminhelpsitesettings"));
-    $table->data[] = array("<a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a>",
-                           "<font size=-1>".get_string("adminhelpsitefiles"));
-    $table->data[] = array("<a href=\"../theme/index.php\">".get_string("themes")."</a>",
-                           "<font size=-1>".get_string("adminhelpthemes"));
-    $table->data[] = array("<a href=\"lang.php\">".get_string("language")."</a>",
-                           "<font size=-1>".get_string("adminhelplanguage"));
-    $table->data[] = array("<a href=\"modules.php\">".get_string("managemodules")."</a>",
-                           "<font size=-1>".get_string("adminhelpmanagemodules"));
-    $table->data[] = array("<a href=\"../course/log.php?id=$site->id.php\">".get_string("logs")."</a>",
-                           "<font size=-1>".get_string("adminhelplogs"));
+    $table->data[] = array("<b><a href=\"config.php\">".get_string("configvariables")."</a></b>",
+                           get_string("adminhelpconfiguration"));
+    $table->data[] = array("<b><a href=\"site.php\">".get_string("sitesettings")."</a></b>",
+                           get_string("adminhelpsitesettings"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on\">".get_string("courses")."</a></b>",
+                           get_string("adminhelpcourses"));
+    $table->data[] = array("<b><a href=\"users.php\">".get_string("users")."</a></b>",
+                           get_string("adminhelpusers"));
+    $table->data[] = array("<b><a href=\"../theme/index.php\">".get_string("themes")."</a></b>",
+                           get_string("adminhelpthemes"));
+    $table->data[] = array("<b><a href=\"lang.php\">".get_string("language")."</a></b>",
+                           get_string("adminhelplanguage"));
+    $table->data[] = array("<b><a href=\"modules.php\">".get_string("managemodules")."</a></b>",
+                           get_string("adminhelpmanagemodules"));
+    $table->data[] = array("<b><a href=\"../course/log.php?id=$site->id.php\">".get_string("logs")."</a></b>",
+                           get_string("adminhelplogs"));
+    $table->data[] = array("<b><a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a></b>",
+                           get_string("adminhelpsitefiles"));
     if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
-        $table->data[] = array("<a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a>",
-                               "<font size=-1>".get_string("adminhelpmanagedatabase"));
+        $table->data[] = array("<b><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></b>",
+                               get_string("adminhelpmanagedatabase"));
     }
 
     $table->width = "90%";
diff --git a/admin/users.php b/admin/users.php
index 5ae320f6596..f27b1dc6751 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -18,28 +18,28 @@
     print_header("$site->shortname: $stradministration", "$site->fullname", 
                  "<a href=\"index.php\">$stradministration</a> -> $strusers");
 
-    print_simple_box_start("center", "80%", "#FFFFFF", 20);
     print_heading($strusers);
 
     $table->align = array ("right", "left");
 
+    $table->data[] = array("<b><a href=\"auth.php\">".get_string("authentication")."</a></b>",
+                           get_string("adminhelpauthentication"));
+
     if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
-        $table->data[] = array("<a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a>",
-                               "<font size=-1>".get_string("adminhelpaddnewuser"));
+        $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a></b>",
+                               get_string("adminhelpaddnewuser"));
     }
-    $table->data[] = array("<a href=\"user.php\">".get_string("edituser")."</a>",
-                           "<font size=-1>".get_string("adminhelpedituser"));
-    $table->data[] = array("<a href=\"admin.php\">".get_string("assignadmins")."</a>",
-                           "<font size=-1>".get_string("adminhelpassignadmins"));
-    $table->data[] = array("<a href=\"creators.php\">".get_string("assigncreators")."</a>",
-                           "<font size=-1>".get_string("adminhelpassigncreators"));
-    $table->data[] = array("<a href=\"auth.php\">".get_string("authentication")."</a>",
-                           "<font size=-1>".get_string("adminhelpauthentication"));
+    $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
+                           get_string("adminhelpedituser"));
+    $table->data[] = array("<b><a href=\"admin.php\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+    $table->data[] = array("<b><a href=\"creators.php\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=11 width=11>");
 
     print_table($table);
     
-    print_simple_box_end();
-
     print_footer($site);
 
 ?>
diff --git a/course/lib.php b/course/lib.php
index 11783de5594..d4134f1a2f3 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -692,6 +692,12 @@ function print_admin_links ($siteid, $width=180) {
         $icon = "<img src=\"$CFG->wwwroot/theme/$CFG->theme/pix/i/admin.gif\" height=16 width=16 alt=\"\">";
     }
 
+    if (isadmin()) {
+	    $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/config.php\">".get_string("configvariables")."</a>";
+		$modicon[]=$icon;
+		$moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/site.php\">".get_string("sitesettings")."</a>";
+		$modicon[]=$icon;
+    }
     if (iscreator()) {
 	    $moddata[]="<a href=\"$CFG->wwwroot/course/index.php?edit=on\">".get_string("courses")."</a>";
 		$modicon[]=$icon;
@@ -700,12 +706,6 @@ function print_admin_links ($siteid, $width=180) {
     if (isadmin()) {
 	    $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/users.php\">".get_string("users")."</a>";
 		$modicon[]=$icon;
-	    $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/config.php\">".get_string("configvariables")."</a>";
-		$modicon[]=$icon;
-		$moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/site.php\">".get_string("sitesettings")."</a>";
-		$modicon[]=$icon;
-		$moddata[]="<a href=\"$CFG->wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles")."</a>";
-		$modicon[]=$icon;
 		$moddata[]="<a href=\"$CFG->wwwroot/theme/index.php\">".get_string("themes")."</a>";
 		$modicon[]=$icon;
 		$moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/lang.php\">".get_string("language")."</a>";
@@ -714,6 +714,8 @@ function print_admin_links ($siteid, $width=180) {
 		$modicon[]=$icon;
 		$moddata[]="<a href=\"$CFG->wwwroot/course/log.php?id=$siteid\">".get_string("logs")."</a>";
 		$modicon[]=$icon;
+		$moddata[]="<a href=\"$CFG->wwwroot/files/index.php?id=$siteid\">".get_string("sitefiles")."</a>";
+		$modicon[]=$icon;
 		if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
             $moddata[]="<a href=\"$CFG->wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a>";
 			$modicon[]=$icon;
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 4da25ea7aff..61df8c96b2f 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -28,14 +28,15 @@ $string['admin'] = "Admin";
 $string['adminhelpaddnewuser'] = "To manually create a new user account";
 $string['adminhelpassignadmins'] = "Admins can do anything and go anywhere in the site";
 $string['adminhelpassigncreators'] = "Creators can create new courses and teach in them";
-$string['adminhelpauthentication'] = "Internal user accounts or external databases";
+$string['adminhelpassignteachers'] = "Select a course then use the icon to add teachers";
+$string['adminhelpauthentication'] = "You can use internal user accounts or external databases";
 $string['adminhelpconfiguration'] = "Configure variables that affect general operation of the site";
 $string['adminhelpcourses'] = "Define courses and categories and assign people to them";
 $string['adminhelpedituser'] = "Browse the list of user accounts and edit any of them";
 $string['adminhelplanguage'] = "For checking and editing the current language pack";
 $string['adminhelplogs'] = "Browse logs of all activity on this site";
 $string['adminhelpmanagemodules'] = "Manage installed modules and their settings";
-$string['adminhelpmanagedatabase'] = "Access your database directly";
+$string['adminhelpmanagedatabase'] = "Access the database directly (be careful!)";
 $string['adminhelpsitesettings'] = "Define the how the front page of the site looks";
 $string['adminhelpsitefiles'] = "For publishing general files or uploading external backups";
 $string['adminhelpthemes'] = "Choose how the site looks";
@@ -58,7 +59,8 @@ $string['answer'] = "Answer";
 $string['areyousuretorestorethis'] = "Are you sure to restore it ?";
 $string['assessment'] = "Assessment";
 $string['assignadmins'] = "Assign admins";
-$string['assigncreators'] = "Assign course creators";
+$string['assigncreators'] = "Assign creators";
+$string['assignstudents'] = "Assign students";
 $string['assignteachers'] = "Assign teachers";
 $string['authentication'] = "Authentication";
 $string['autosubscribe'] = "Forum auto-subscribe";