diff --git a/admin/adminCommentView.php b/admin/adminCommentView.php
index 8fa1d67..ab480ee 100644
--- a/admin/adminCommentView.php
+++ b/admin/adminCommentView.php
@@ -65,13 +65,13 @@ if($commentsPerPage > 100) $commentsPerPage = 100;
 
 /* display page selection links */
 echo "<center>";
-echo "<b>Page $currentPage of $totalPages</b><br>";
+echo "<b>Page $currentPage of $totalPages</b><br />";
 display_range($currentPage, $pageRange, $totalPages, $commentsPerPage);
-echo "<br>";
-echo "<br>";
+echo "<br />";
+echo "<br />";
 
 /* display the option to choose how many comments per-page to disable */
-echo "<form method=get name=message>";
+echo "<form method=\"get\" name=\"message\" action=\"".$_SERVER['PHP_SELF']."\">";
 echo "<b>Number of comments per page:</b>";
 echo "<select name='commentsPerPage'>";
 
diff --git a/help/index.php b/help/index.php
index efd573b..34e8b5f 100644
--- a/help/index.php
+++ b/help/index.php
@@ -31,23 +31,23 @@ function display_index ()
     $d = opendir($help_path);
     while($entry = readdir($d))
     {
-    	array_push($files, $entry);
+        array_push($files, $entry);
     }
     closedir($d);
     
-    //sort dir
+    // sort dir
     sort($files);
     
     // display dir
     while (list($key,$file) = each($files))
     {
         if(!ereg("(.+)\\.help$", $file, $arr))
-	    continue;
-	
-	$id    = $arr[1];
-	$title = get_help_title("$help_path/$file");
-	
-	echo "  <li> <a href='".$apidb_root."help?topic=$id'> $title </a> </li><p>\n";
+            continue;
+
+        $id    = $arr[1];
+        $title = get_help_title("$help_path/$file");
+
+        echo "  <li> <a href='".$apidb_root."help?topic=$id'> $title </a><p /></li>\n";
     }
 
     echo "</ul><hr noshade>\n";
diff --git a/include/sidebar.php b/include/sidebar.php
index e63367b..667a28d 100644
--- a/include/sidebar.php
+++ b/include/sidebar.php
@@ -31,10 +31,10 @@ function global_sidebar_menu() {
 function app_search_box($q = '')
 {
    global $apidb_root;
-   $str = '<form method="get" action="'.$apidb_root.'search.php">'."\n";
+   $str =  "</span><form method=\"get\" action=\"".$apidb_root."search.php\">\n";
    $str .= "<input type=text name=q value='$q' size=8 class=searchfield>";
    $str .= "<input type=submit value='Search' class=searchbutton>\n";
-   $str .= "</form>\n";
+   $str .= "</form>\n<span>";
    return $str;
 }
 
diff --git a/index.php b/index.php
index 1351c67..fba1c5c 100644
--- a/index.php
+++ b/index.php
@@ -2,6 +2,7 @@
 /***********************************/
 /* Application Database Index Page */
 /***********************************/
+
 include("path.php");
 require(BASE."include/"."incl.php");
 
@@ -33,7 +34,7 @@ stomping out Wine issues will be greatly appreciated.</p>
 
 <p>
 If you have anything to contribute (screenshots, howtos), contact us at:
-<a href="mailto:appdb@winehq.org">appdb@winehq.org</a><br>
+<a href="mailto:appdb@winehq.org">appdb@winehq.org</a><br />
 Note that this address is not for end-user support, for end user support please contact the
 wine-users mailing list or the wine newsgroup, for more information visit
 <a href="http://www.winehq.com/site/forums">this page</a>
@@ -56,9 +57,10 @@ wine-users mailing list or the wine newsgroup, for more information visit
     echo "There are <b>$numApps</b> applications currently in the database with\n";
     echo "<a href='appview.php?appId=$voteAppId'>$voteAppName</a> being the\n";
     echo "top <a href='votestats.php'>voted</a> application.\n";
-
-
 ?>
+
+<br /><br />
+
 <h2>Wine 0.9 Supported Applications List</h2>
 
 <p>This is a working version of the application lists which we hope to
@@ -68,7 +70,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
 
 <h3>The Gold List</h3> 
 <p>Applications which install and run virtually flawless on a 
-        out-of-the-box Wine installation make it to the Gold list: <br>
+        out-of-the-box Wine installation make it to the Gold list: </p>
 <table class=gold>
     <tr class=rowtitle>
     <th>Application</th><th>Version</th><th>Description</th><th>Tucows top</th><th>Notes</th><th>Screenshot</th>
@@ -173,10 +175,10 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
         <td><span class=todo>[TODO]</span></td>
     </tr>
 </table>
-</p>
+<br />
 <h3>The Silver List</h3> 
 <p>The Silver list contains apps which we hope we can easily fix so they make it
-   to Gold status:<br>
+   to Gold status:</p>
 <table class=silver>
     <tr class=rowtitle>
     <th>Application</th><th>Version</th><th>Description</th><th>Tucows top</th><th>Notes</th><th>Screenshot</th>
@@ -266,8 +268,8 @@ echo "<td><a href='".$apidb_root."appview.php?appId=288'>WinMX</a></td>";
         <td><span class=todo>[TODO]</span></td>
     </tr>
 </table>
-</p>
 
+<br /><br />
 
 <h2>Other Wine Application Compatibility Sites</h2>
 <p>
diff --git a/votestats.php b/votestats.php
index 5f719f1..ed6d928 100644
--- a/votestats.php
+++ b/votestats.php
@@ -18,7 +18,7 @@ if($HTTP_POST_VARS)
 apidb_header("Vote Stats - Top $topNumber Applications");
 
 /* display the selection for the top number of apps to view */
-echo "<form method=post name=message>";
+echo "<form method=\"post\" name=\"message\" action=\"".$_SERVER['PHP_SELF']."\">";
 echo "<b>Number of top apps to display:</b>";
 echo "<select name='topNumber'>";
 $topNumberArray = array(25, 50, 100, 200);
@@ -118,11 +118,11 @@ if($subs)
 }
 echo "</select>";
 
-echo "<input type=submit value='Refresh'>";
+echo "<input type=\"submit\" value=\"Refresh\" />";
 echo "</form>";
 
-echo "<br>";
-echo "<br>";
+echo "<br />";
+echo "<br />";
 
 /***************************************************/
 /* build a list of the apps in the chosen category */
@@ -157,8 +157,8 @@ if($result)
     {
         if ($c % 2 == 1) { $bgcolor = "color0"; } else { $bgcolor = "color1"; }
         $link = "<a href='appview.php?appId=$row->appId'>$row->appName</a>";
-	echo "<tr class='".$bgcolor."'><td width='90%'>$c. $link </td> <td> $row->count </td></tr>\n";
-	$c++;
+        echo "<tr class='".$bgcolor."'><td width='90%'>$c. $link </td> <td> $row->count </td></tr>\n";
+        $c++;
     }
 
     echo html_table_end();
@@ -168,7 +168,7 @@ if($result)
     /* think that something went wrong with the server */
     if($c == 1)
     {
-        echo "<h2><center>No apps found in this category</center></h2>";
+        echo "<h2 align=\"center\">No apps found in this category</h2>";
     }
  
     echo "<center><a href='help/?topic=voting'>What does this screen mean?</a></center>\n";