diff --git a/html/user/download.php b/html/user/download.php
index ff524b8df1..d98cfade7e 100644
--- a/html/user/download.php
+++ b/html/user/download.php
@@ -16,9 +16,9 @@ function platform_downloads($platform, $core_app) {
         $filename = parse_element($app_version->xml_doc, "<name>");
         if (!$filename) { echo "CAN'T FIND FILENAMEn $app_version->xml_doc\n";}
 	$version = sprintf(
-            "<a href=$download_url/$filename>BOINC core client, <b>version %s.</b></a>", 
+            "<a href=$download_url/$filename>BOINC core client, <b>version %s %.2f</b></a>", 
             $platform->name,
-            $app_version->version_num
+            $app_version->version_num/100
         );
 	echo "<tr><td>$version</td></tr>\n";
     	//$app_version->md5_cksum";
diff --git a/html/user/team_edit_form.php b/html/user/team_edit_form.php
index c901fc7cf5..92c5d28e3b 100644
--- a/html/user/team_edit_form.php
+++ b/html/user/team_edit_form.php
@@ -6,6 +6,7 @@ require_once("team.inc");
 $authenticator = init_session();
 db_init();
 
+    $id = $HTTP_GET_VARS["id"];
     $query = "select * from team where id = $id";
     $result = mysql_query($query);
     if ($result) {
@@ -19,31 +20,31 @@ db_init();
     $team_description = $team->description;
     $team_type = $team->type;
     page_head("Edit $team_name");
-    echo "<table width=780>";
-    echo "<tr><td>";
-    echo "<form method=post action=team_edit_action.php>";
-    echo "<input type=hidden name=id value=$team_id>";
-    echo "</td></tr></table>";
-    echo "<table><tr>";
-    echo "<td>Team name (plain-text version):<br><br>&nbsp;</td>";
-    echo "<td><input name=name size=50 value=$team_name>";
-    echo "<br><font size=2>This name will be print as-is";
-    echo "<br>and is the name you should use when searching for your team.";
-    echo "</td></tr></tr>";
-    echo "<td>Team name (HTML version):<br><br>&nbsp;</td>";
-    echo "<td><input name=name_html size=50 value='$team_name_html'>";
-    echo "<br><font size=2>This name will be printed as HTML source, so you may include any HTML";
-    echo "<br>code that you want. This will only be displayed in your team's page.";
-    echo "<br>If you don't know HTML, just leave this box blank.";
-    echo "</td></tr><tr>";
-    echo "<td>URL of team web page, if any:<br><font size=2>(without &quot;http://&quot;)</td>";
-    echo "<td><input name=url size=60 value=$team_url>";
-    echo "<br><font size=2>This page will be linked to from the project's team page.";
-    echo "</td></tr><tr>";
-    echo "<td valign=top>Description of team:</td>";
-    echo "<td><textarea name=description value=$team_description cols=60 rows=10>$team_description</textarea>";
-    echo "</td></tr><tr>";
-    echo "<td valign=top>Type of team:</td><td>";
+    echo "<table width=780>
+    <tr><td>
+    <form method=post action=team_edit_action.php>
+    <input type=hidden name=id value=$team_id>
+    </td></tr></table>
+    <table><tr>
+    <td>Team name (plain-text version):<br><br>&nbsp;</td>
+    <td><input name=name size=50 value=$team_name>
+    <br><font size=2>This name will be print as-is
+    <br>and is the name you should use when searching for your team.
+    </td></tr></tr>
+    <td>Team name (HTML version):<br><br>&nbsp;</td>
+    <td><input name=name_html size=50 value='$team_name_html'>
+    <br><font size=2>This name will be printed as HTML source, so you may include any HTML
+    <br>code that you want. This will only be displayed in your team's page.
+    <br>If you don't know HTML, just leave this box blank.
+    </td></tr><tr>
+    <td>URL of team web page, if any:<br><font size=2>(without &quot;http://&quot;)</td>
+    <td><input name=url size=60 value=$team_url>
+    <br><font size=2>This page will be linked to from the project's team page.
+    </td></tr><tr>
+    <td valign=top>Description of team:</td>
+    <td><textarea name=description value=$team_description cols=60 rows=10>$team_description</textarea>
+    </td></tr><tr>
+    <td valign=top>Type of team:</td><td>";
     printf("<input type=radio name=type value=4%s>Club<br>", ($team->type==4)?" checked":"");
     printf("<input type=radio name=type value=1%s>Small Company (< 50 employees)<br>", ($team->type==1)?" checked":"");
     printf("<input type=radio name=type value=2%s>Medium Company (50-1000 employees)<br>", ($team->type==2)?" checked":"");
@@ -53,8 +54,9 @@ db_init();
     printf("<input type=radio name=type value=8%s>Junior College<br>", ($team->type==8)?" checked":"");
     printf("<input type=radio name=type value=7%s>University or Department<br>", ($team->type==7)?" checked":"");
     printf("<input type=radio name=type value=9%s>Government Agency</td>", ($team->type==9)?" checked":"");
-    echo "</tr></table>";
-    echo "<input type=submit value=\"Edit Team\">";
-    echo "</form>";
+    echo "</tr></table>
+    <input type=submit value=\"Edit Team\">
+    </form>
+    <p>";
     page_tail();
 ?>
diff --git a/html/user/top_teams.php b/html/user/top_teams.php
index de5aaedb40..65b9834f27 100644
--- a/html/user/top_teams.php
+++ b/html/user/top_teams.php
@@ -4,13 +4,14 @@
 
 function team_table_start() {
     echo VISTABLE."
-        <tr><th>Name</th><th>Average credit</th><th>Total credit</th>
+        <tr><th>Name</th><th>Members</th><th>Average credit</th><th>Total credit</th>
         <th>Founded</th></tr>";
 }
 
 function show_team_row($team) {
     echo "<tr>
         <td><a href=team_display.php?id=$team->id>$team->name</a></td>
+        <td>$team->nusers</td>
         <td>$team->expavg_credit</td>
         <td>$team->total_credit</td>
         <td>".time_str($team->create_time)."</td>
@@ -38,13 +39,13 @@ function show_team_row($team) {
 
         $total_credit = $total_credit_sum/$nmembers;
         $expavg_credit = $expavg_credit_sum/$nmembers;
-        $query = "update team set total_credit=$total_credit, expavg_credit=$expavg_credit where id=$team->id";
+        $query = "update team set nusers=$nmembers, total_credit=$total_credit, expavg_credit=$expavg_credit where id=$team->id";
         $result2 = mysql_query($query);
     }
     mysql_free_result($result);
 
     page_head("Top teams");
-    $result = mysql_query("select * from team");
+    $result = mysql_query("select * from team order by expavg_credit desc, total_credit desc");
     team_table_start();
     while ($team = mysql_fetch_object($result)) {
         show_team_row($team);
diff --git a/html/user/top_users.php b/html/user/top_users.php
index bc4828e10e..33853f3c0d 100644
--- a/html/user/top_users.php
+++ b/html/user/top_users.php
@@ -5,7 +5,7 @@
     $authenticator = init_session();
     db_init();
     page_head("Top users");
-    $result = mysql_query("select * from user order by expavg_credit desc");
+    $result = mysql_query("select * from user order by expavg_credit desc,total_credit desc");
     user_table_start();
     while ($user = mysql_fetch_object($result)) {
         show_user_row($user);