diff --git a/functions.php b/functions.php
index 2c8309003..c20bba7f3 100644
--- a/functions.php
+++ b/functions.php
@@ -1436,7 +1436,7 @@
 		print "<select name=\"$id\" id='$id' $attributes>";
 		foreach (array_keys($values) as $v) {
 			if ($v == $default)
-				$sel = "selected";
+				$sel = 'selected="selected"';
 			 else
 			 	$sel = "";
 			
@@ -5729,13 +5729,13 @@
 
 	function rounded_table_start($classname, $header = "&nbsp;") {
 		print "<table width='100%' class='$classname' cellspacing='0' cellpadding='0'>";
-		print "<tr><td class='c1'>&nbsp;</td><td class='top'>$header</td><td class='c2'>&nbsp;</tr>";
+		print "<tr><td class='c1'>&nbsp;</td><td class='top'>$header</td><td class='c2'>&nbsp;</td></tr>";
 		print "<tr><td class='left'>&nbsp;</td><td class='content'>";
 	}
 
 	function rounded_table_end($footer = "&nbsp;") {
 		print "</td><td class='right'>&nbsp;</td></tr>";
-		print "<tr><td class='c4'>&nbsp;</td><td class='bottom'>$footer</td><td class='c3'>&nbsp;</tr>";
+		print "<tr><td class='c4'>&nbsp;</td><td class='bottom'>$footer</td><td class='c3'>&nbsp;</td></tr>";
 		print "</table>";
 	}
 
diff --git a/prefs.php b/prefs.php
index 0ae1ff71e..dd14d8b69 100644
--- a/prefs.php
+++ b/prefs.php
@@ -22,11 +22,11 @@
 <html>
 <head>
 	<title>Tiny Tiny RSS : Preferences</title>
-	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>">
+	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
 	<?php	$user_theme = $_SESSION["theme"];
 		if ($user_theme) { ?>
-		<link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css">
+		<link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css"/>
 	<?php } ?>
 
 	<?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?>
@@ -36,7 +36,7 @@
 		<link type="text/css" href="<?php echo $user_css_url ?>"/> 
 	<?php } ?>
 
-	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
+	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
 	<script type="text/javascript" src="prototype.js"></script>
 	<script type="text/javascript" src="scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
@@ -46,15 +46,17 @@
 	<script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script>
 	<script type="text/javascript" src="prefs.js?<?php echo $dt_add ?>"></script>
 
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
 	<script type="text/javascript">
+	//<![CDATA[
 		if (navigator.userAgent.match("Opera")) {
 			document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
 		}
 		if (navigator.userAgent.match("Gecko") && !navigator.userAgent.match("KHTML")) {
 			document.write('<link rel="stylesheet" type="text/css" href="gecko.css">');
 		}
+	//]]>
 	</script>
 </head>
 
@@ -84,7 +86,7 @@
 	<?php rounded_table_end(); ?>
 </div>
 
-<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie">
+<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
 <script type="text/javascript">
 if (document.addEventListener) {
@@ -93,7 +95,7 @@ if (document.addEventListener) {
 window.onload = init;
 </script>
 
-<ul id="debug_output" style='display : none'></ul>
+<ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
 
 <div id="fatal_error"><div id="fatal_error_inner">
 	<h1>Fatal Error</h1>
@@ -119,7 +121,7 @@ window.onload = init;
 		</div> -->
 
 		<div class='prefKbdHelp'>
-			<img src="images/small_question.png" alt="?"> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})">Keyboard shortcuts</a>
+			<img src="images/small_question.png" alt="?"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})">Keyboard shortcuts</a>
 		</div>
 
 		<div class="firstTab">&nbsp;</div>
diff --git a/tt-rss.php b/tt-rss.php
index 33d7392b8..6c4430398 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -23,7 +23,7 @@
 <head>
 	<title>Tiny Tiny RSS</title>
 
-	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>">
+	<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
 
 	<?php	$user_theme = $_SESSION["theme"];
 		if ($user_theme) { ?>
@@ -37,7 +37,7 @@
 		<link rel="stylesheet" type="text/css" href="<?php echo $user_css_url ?>"/> 
 	<?php } ?>
 
-	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
+	<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
 	<script type="text/javascript" src="prototype.js"></script>
 	<script type="text/javascript" src="scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
@@ -47,19 +47,22 @@
 	<script type="text/javascript" src="feedlist.js?<?php echo $dt_add ?>"></script>
 	<script type="text/javascript" src="viewfeed.js?<?php echo $dt_add ?>"></script>
 
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
 	<script type="text/javascript">
+	//<![CDATA[
 		if (navigator.userAgent.match("Opera")) {
 			document.write('<link rel="stylesheet" type="text/css" href="opera.css">');
 		}
 		if (navigator.userAgent.match("Gecko") && !navigator.userAgent.match("KHTML")) {
 			document.write('<link rel="stylesheet" type="text/css" href="gecko.css">');
 		}
+		window.onresize=resize_headlines;
+	//]]>
 	</script>
 </head>
 
-<body onresize="resize_headlines()" id="ttrssMain">
+<body id="ttrssMain">
 
 <div id="overlay" style="display : block">
 	<div id="overlay_inner">
@@ -100,7 +103,7 @@ if (document.addEventListener) {
 window.onload = init;
 </script>
 
-<ul id="debug_output" style='display : none'></ul>
+<ul id="debug_output" style='display : none'><li>&nbsp;</li></ul>
 
 <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>
 
@@ -122,7 +125,7 @@ window.onload = init;
 
 	<img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" 
 		src="images/new_version.png" title="New version is available!" 
-		alt="new_version_icon">
+		alt="new_version_icon"/>
 	</div>
 	<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>	
 </div>
@@ -139,22 +142,22 @@ window.onload = init;
 
 		<div style="float : right">
 			<select id="quickMenuChooser" onchange="quickMenuChange()">
-					<option value="qmcDefault" selected><?php echo __('Actions...') ?></option>
+					<option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
 					<option value="qmcSearch"><?php echo __('Search') ?></option>
 					<!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
-					<option disabled>--------</option>
-					<option style="color : #5050aa" disabled><?php echo __('Feed actions:') ?></option>
+					<option disabled="disabled">--------</option>
+					<option style="color : #5050aa" disabled="disabled"><?php echo __('Feed actions:') ?></option>
 					<option value="qmcAddFeed"><?php echo __('&nbsp;&nbsp;Subscribe to feed') ?></option>
 					<option value="qmcEditFeed"><?php echo __('&nbsp;&nbsp;Edit this feed') ?></option>
 					<!-- <option value="qmcClearFeed"><?php echo __('&nbsp;&nbsp;Clear articles') ?></option> -->
 					<option value="qmcRescoreFeed"><?php echo __('&nbsp;&nbsp;Rescore feed') ?></option>
 					<option value="qmcRemoveFeed"><?php echo __('&nbsp;&nbsp;Unsubscribe') ?></option>
-					<option disabled>--------</option>
-					<option style="color : #5050aa" disabled><?php echo __('All feeds:') ?></option>
+					<option disabled="disabled">--------</option>
+					<option style="color : #5050aa" disabled="disabled"><?php echo __('All feeds:') ?></option>
 					<option value="qmcCatchupAll"><?php echo __('&nbsp;&nbsp;Mark as read') ?></option>
 					<option value="qmcShowOnlyUnread"><?php echo __('&nbsp;&nbsp;(Un)hide read feeds') ?></option>
-					<option disabled>--------</option>
-					<option style="color : #5050aa" disabled><?php echo __('Other actions:') ?></option>				
+					<option disabled="disabled">--------</option>
+					<option style="color : #5050aa" disabled="disabled"><?php echo __('Other actions:') ?></option>				
 					<option value="qmcAddFilter"><?php echo __('&nbsp;&nbsp;Create filter') ?></option>
 					<option value="qmcResetUI"><?php echo __('&nbsp;&nbsp;Reset UI layout') ?></option>
 					<option value="qmcResetCats"><?php echo __('&nbsp;&nbsp;Reset category order') ?></option>
@@ -163,29 +166,29 @@ window.onload = init;
 			</select>
 		</div>
 
-		<form id="main_toolbar_form" onsubmit='return false'>
+		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
 		<input type="submit" value="&lt;&lt;" 
 			id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
-			title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+			title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
 
 		<input type="submit" value="<?php echo __("Toggle Feedlist") ?>" 
 			id="toggle_feeds_btn" class="button"
-			onclick="toggle_feedlist()" style="display : none">
+			onclick="toggle_feedlist()" style="display : none"/>
 
 		&nbsp;
 
 		<?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
 
 		<?php echo __('Search:') ?>
-		<input name="query" type="search"
-			onKeyPress="return filterCR(event, viewCurrentFeed)"
-			onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
+		<input name="query" type="text"
+			onkeypress="return filterCR(event, viewCurrentFeed)"
+			onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"/>
 
 		<?php } ?>
 
 		<select name="view_mode" onchange="viewModeChanged()">
-			<option selected value="adaptive"><?php echo __('Adaptive') ?></option>
+			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
 			<option value="all_articles"><?php echo __('All Articles') ?></option>
 			<option value="marked"><?php echo __('Starred') ?></option>
 			<option value="unread"><?php echo __('Unread') ?></option>
@@ -195,7 +198,7 @@ window.onload = init;
 		<?php echo __('Order:') ?>
 
 		<select name="order_by" onchange="viewModeChanged()">
-			<option selected value="default"><?php echo __('Default') ?></option>
+			<option selected="selected" value="default"><?php echo __('Default') ?></option>
 			<option value="date"><?php echo __('Date') ?></option>
 			<option value="title"><?php echo __('Title') ?></option>
 			<option value="score"><?php echo __('Score') ?></option>
@@ -227,7 +230,7 @@ window.onload = init;
 
 		<input class="button" type="submit"
 			onclick="return viewCurrentFeed('ForceUpdate')" 
-			value="<?php echo __('Update') ?>">
+			value="<?php echo __('Update') ?>"/>
 
 		</form>
 
