diff --git a/downloadsites/webtools/archive/index.php b/downloadsites/webtools/archive/index.php
index fbd2067bb0879ac81c73559448263c6ed479ca4d..1d642cc42b88bf5730a12ea1e6ca7dd2ab603612 100644
--- a/downloadsites/webtools/archive/index.php
+++ b/downloadsites/webtools/archive/index.php
@@ -155,12 +155,6 @@ include 'drops/report.php';
 $latestTimeStamp=array();
 $latestFile = array();
 
-echo "<table border=0 cellpadding=2 width=\"100%\"><tr>";
-echo "<td colspan=\"2\" bgcolor=\"#0080C0\"><b><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">Latest Downloads</td></font></b>";
-echo "</td></tr></table>";
-
-
-
 foreach ($buildBranches as $buildBranch ) {
 
     $dirfilename = "drops/".$buildBranch;
@@ -250,54 +244,16 @@ foreach ($buildBranches as $buildBranch ) {
     }
 }
 
-?>
-<TABLE
-    width="100%"
-    cellpadding=2>
-    <tr>
-        <td width=\"30%\"><b>Build Type</b></td>
-        <td><b>Build Stream</b></td>
-        <td><b>Build Name</b></td>
-        <td><b>Build Date</b></td>
-    </tr>
-    <?php
-    foreach($dropType as $value) {
-        $prefix=$typeToPrefix[$value];
-
-        foreach($buildBranches as $bValue) {
-
-            if (array_key_exists($bValue,$latestFile) && array_key_exists($prefix, $latestFile[$bValue])) {
-                $fileName = $latestFile[$bValue][$prefix];
-                echo "<tr>
-                <td width=\"30%\">$value</td> <td>$bValue</td>";
 
-                $parts = explode("-", $fileName);
+foreach($dropType as $value) {
+    $prefix=$typeToPrefix[$value];
 
-                if (sizeof($parts) > 1) {
-                    // Uncomment the line below if we need click through licenses.
-                    // echo "<td><a href=license.php?license=drops/$bValue/$fileName>$parts[1]</a></td>";
 
-                    // Comment the line below if we need click through licenses.
-                    echo "<td><a href=\"drops/$bValue/$fileName/\">$parts[1]</a></td>";
-
-                    echo "<td>$timeStamps[$fileName]</td>";
-                    echo "</tr>";
-                }
-            }
-        }
-    }
-    ?>
-</TABLE>
-    <?php
-    foreach($dropType as $value) {
-        $prefix=$typeToPrefix[$value];
-
-
-        echo "
-        <table width=\"100%\" cellpadding=2>
-        <tr bgcolor=\"#999999\">
-        <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
-        echo "</font></a></b></td>
+    echo "
+    <table width=\"100%\" cellpadding=2>
+    <tr bgcolor=\"#999999\">
+    <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
+    echo "</font></a></b></td>
                          </TR>
                          <TR>
                          <td align=left>
@@ -307,48 +263,48 @@ foreach ($buildBranches as $buildBranch ) {
                          <td><b>Build Date</b></td>
                          </tr>";
 
-        foreach($buildBranches as $bValue) {
-            if (array_key_exists($bValue,$buckets) && array_key_exists($prefix, $buckets[$bValue])) {
-                echo "<tr><td colspan=\"7\"/><hr/></tr>";
-                $aBucket = $buckets[$bValue][$prefix];
-                if (isset($aBucket)) {
-                    rsort($aBucket);
-
-                    $i = 0;
-                    $ts = array();
-                    $ts2iv = array();
-                    foreach($aBucket as $iv) {
-                        $parts = explode("-", $iv);
-                        $ts[$i] = $parts[2];
-                        $ts2iv[$ts[$i]] = $iv;
-                        $i++;
-                    }
+    foreach($buildBranches as $bValue) {
+        if (array_key_exists($bValue,$buckets) && array_key_exists($prefix, $buckets[$bValue])) {
+            echo "<tr><td colspan=\"7\"/><hr/></tr>";
+            $aBucket = $buckets[$bValue][$prefix];
+            if (isset($aBucket)) {
+                rsort($aBucket);
+
+                $i = 0;
+                $ts = array();
+                $ts2iv = array();
+                foreach($aBucket as $iv) {
+                    $parts = explode("-", $iv);
+                    $ts[$i] = $parts[2];
+                    $ts2iv[$ts[$i]] = $iv;
+                    $i++;
+                }
 
-                    rsort($ts);
-                    $i = 0;
-                    $aBucket = array();
-                    foreach($ts as $tsvalue) {
-                        $aBucket[$i] = $ts2iv[$tsvalue];
-                        $i++;
-                    }
+                rsort($ts);
+                $i = 0;
+                $aBucket = array();
+                foreach($ts as $tsvalue) {
+                    $aBucket[$i] = $ts2iv[$tsvalue];
+                    $i++;
+                }
 
-                    foreach($aBucket as $innerValue) {
-                        $parts = explode("-", $innerValue);
-                        echo "<tr>";
+                foreach($aBucket as $innerValue) {
+                    $parts = explode("-", $innerValue);
+                    echo "<tr>";
 
-                        // Uncomment the line below if we need click through licenses.
-                        // echo "<td><a href=\"license.php?license=drops/$bValue/$innerValue\">$parts[1]</a></td>";
+                    // Uncomment the line below if we need click through licenses.
+                    // echo "<td><a href=\"license.php?license=drops/$bValue/$innerValue\">$parts[1]</a></td>";
 
-                        // Comment the line below if we need click through licenses.
-                        echo "<td><a href=\"drops/$bValue/$innerValue/\">$parts[1]</a></td>";
-                        echo "<td>$bValue</td>";
-                        echo "<td>$timeStamps[$innerValue]</td>";
+                    // Comment the line below if we need click through licenses.
+                    echo "<td><a href=\"drops/$bValue/$innerValue/\">$parts[1]</a></td>";
+                    echo "<td>$bValue</td>";
+                    echo "<td>$timeStamps[$innerValue]</td>";
 
-                    }
-                }}}
-                echo "</table></table>";
-    }
-    ?>
+                }
+            }}}
+            echo "</table></table>";
+}
+?>
 <table
     border="0"
     width="100%"