Index: trunk/PHP/tools.php
===================================================================
--- trunk/PHP/tools.php	(revision 19441)
+++ trunk/PHP/tools.php	(working copy)
@@ -26,10 +26,18 @@
     global $nummodels;
     global $modelnames,$imagenames,$models;
 
+    $count = 0;
+
     print "<p><table class=\"rockbox\" cellpadding=\"0\">\n";
-    for ($i=0;$i<$nummodels;$i++)
+    for ($row = 0; $row < $nummodels / 7; $row++)
     {
-       print "<div class=\"playerbox\"><a href=\"".SITEURL."/models/$models[$i]/\"><img border=\"0\" src=\"http://www.rockbox.org/playerpics/$imagenames[$i]\" alt=\"$modelnames[$i]\" /><p>$modelnames[$i]</a></div>\n";
+      print "<tr valign=\"top\">\n";
+      for ($col = 0; $col < 7; $col++)
+      {
+        print "<td align=\"center\"><a href=\"".SITEURL."/models/$models[$count]/\"><img border=\"0\" src=\"http://www.rockbox.org/playerpics/$imagenames[$count]\" alt=\"$modelnames[$count]\" /><p>$modelnames[$count]</a></td>\n";
+        $count++;
+      }
+      print "</tr>\n";
     }
     print "</table></p>\n";
 }
@@ -39,7 +47,7 @@
 {
     $count = 0;
 
-    $fh = fopen(DATADIR."/themes.txt", "r");
+    $fh = @fopen(DATADIR."/themes.txt", "r");
     if ($fh)
     {
         while ((list($id,$name,$shortname,$img1,$img2,$author,$email,$mainlcd,$remotelcd,$description,$date) = fgetcsv($fh, 1000, "|")) !== FALSE)
Index: trunk/PHP/.htaccess
===================================================================
--- trunk/PHP/.htaccess	(revision 19441)
+++ trunk/PHP/.htaccess	(working copy)
@@ -1,4 +1,8 @@
 RewriteEngine On
-RewriteRule ^models/(.*)/ index.php?model=$1
+RewriteRule ^models/(.+)/ index.php?model=$1
+RewriteRule ^models/(.+) index.php?model=$1
+RewriteRule ^models/?$ index.php
+
 Options -Indexes
-php_value max_upload_size 10MB
\ No newline at end of file
+
+php_value max_upload_size 10MB
Index: trunk/PHP/index.php
===================================================================
--- trunk/PHP/index.php	(revision 19441)
+++ trunk/PHP/index.php	(working copy)
@@ -5,10 +5,8 @@
 require_once('tools.php');
 require_once('ini.php');
 
-if(isset($_GET['model']))
-    $modelid = get_modelid($_GET['model']);
-else
-    $modelid = -1;
+$modelid = (isset($_GET['model'])) ? get_modelid($_GET['model']) : -1;
+$modelid = ($modelid !== FALSE) ? $modelid : -1;
 
 if ($modelid == -1)
 {
@@ -19,6 +17,7 @@
     print "<ul>\n";
     print "<li><a href=\"http://www.rockbox.org/wiki/ThemeInstallation\">ThemeInstallation</a> - Installation instructions;</li>\n";
     print "<li><a href=\"http://www.rockbox.org/wiki/ThemeSubmission\">ThemeSubmission</a> - How to submit your theme to the Rockbox Themes site.</li>\n";
+    print "<li><a href=\"".SITEURL."/upload.php\">Submit your theme</a> - Share your theme with other Rockbox users.</li>";
     print "</ul>\n";
 
     show_main_table();
@@ -120,4 +119,4 @@
 }
 
 include('bottom.php');
-?>
\ No newline at end of file
+?>