diff --git a/include/html.php b/include/html.php
index 419f15a..066def4 100644
--- a/include/html.php
+++ b/include/html.php
@@ -62,6 +62,14 @@ function html_tr($arr, $class = "", $extra = "")
 	return do_html_tr("td", $arr, $class, $extra);
 }
 
+function html_tr_highlight_clickable($sClass, $sHighlightColor, $sInactiveColor, $sUrl)
+{
+    echo '<tr class='.$sClass.' '.
+        'onmouseover="ChangeTrColor(this, true, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\');"'.
+        'onmouseout="ChangeTrColor(this, false, \''.$sHighlightColor.'\', \''.$sInactiveColor.'\');"'.
+        'onclick="DoNav(\''.$sUrl.'\');">';
+}
+
 // HTML TABLE
 function html_table_begin($extra = "")
 {
diff --git a/include/testData.php b/include/testData.php
index d7362ea..4d4e87e 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -409,15 +409,16 @@ class testData{
             $oSubmitter = new User($oTest->iSubmitterId);
             $oDistribution = new distribution($oTest->iDistributionId);
             $bgcolor = $oTest->sTestedRating;
-            echo '<tr class='.$bgcolor.'>',"\n";
 
             /* if the test we are displaying is this test then */
             /* mark it as the current test */
             if ($oTest->iTestingId == $this->iTestingId)
             {
+                echo '<tr class='.$bgcolor.'>',"\n";
                 echo '    <td align="center" class="color2"><b>Current</b></td>',"\n";
-            } else
+            } else /* make all non-current rows clickable so clicking on them selects the test as current */
             {
+                html_tr_highlight_clickable($bgcolor, "", "color2", $link.$oTest->iTestingId); 
                 echo '    <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId;
 
                 if(is_string($showAll))
diff --git a/include/util.php b/include/util.php
index 2782f56..09b8098 100644
--- a/include/util.php
+++ b/include/util.php
@@ -280,9 +280,10 @@ function outputTopXRow($oRow)
     $oVersion = new Version($oRow->versionId);
     $oApp = new Application($oVersion->iAppId);
     $img = Screenshot::get_random_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting
+    html_tr_highlight_clickable("white", "white", "white", 'appview.php?iVersionId='.$oRow->versionId);
     echo '
-    <tr class="white">
-      <td class="app_name"><a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td>
+      <td class="app_name">
+            <a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td>
       <td>'.util_trim_description($oApp->sDescription).'</td>
       <td><center>'.$img.'</center></td>
     </tr>';
diff --git a/index.php b/index.php
index 499022e..d2032e1 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,6 @@ require(BASE."include/incl.php");
 
 apidb_header("Wine Application Database");
 ?>
-
     <img src="images/appdb_montage.jpg" width=391 height=266 align=right alt="Wine AppDB">
     
 <h1>Welcome</h1>
diff --git a/scripts.js b/scripts.js
index 3229e84..cbd9cbe 100644
--- a/scripts.js
+++ b/scripts.js
@@ -18,3 +18,22 @@ function deleteURL(text, url) {
 	   self.location = url;
 	}
 }
+
+function ChangeTrColor(tableRow, bHighLight, sHighlightColor, sInactiveColor)
+{
+    if (bHighLight)
+    {
+        tableRow.style.backgroundColor = sHighlightColor;
+        tableRow.style.cursor = "hand";
+    }
+    else
+    {
+        tableRow.style.backgroundColor = sInactiveColor;
+        tableRow.style.cursor = "pointer";
+    }
+}
+
+function DoNav(sUrl)
+{
+    document.location.href = sUrl;
+}