- Cleaned up php files (removed useless inlines styles, replaced header td with th...)

- Cleaned up css (removed some unused classes)
- Changed quick search size and added ability to customize it
- Removed width=100% in preferences tables
- Corrected missing closing tag in sidebar
- Minor corrections

43 files changed, 79 insertions, 77 deletions

diff --git a/templates/header.inc.php b/templates/header.inc.php
index 32009c36..4042eed4 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -61,12 +61,12 @@ if (Config::get('use_rss')) { ?>
 	<div id="topbar"><!-- This is the topbar row -->
 		<div id="topbarleft">
 		<a href="http://www.ampache.org">
-		<img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" border="0" title="Ampache: For the love of music" alt="Ampache: For the love of music" />
+		<img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="Ampache: For the love of music" alt="Ampache: For the love of music" />
 		</a>
 		</div><!--End topbarleft -->
 		<div id="topbarright">
 			<?php show_box_top('','box box_topbarright'); ?>
-			<b><?php echo _('You are currently logged in as') . " " . $GLOBALS['user']->fullname; ?></b>
+			<span id="loginInfo"><?php echo _('You are currently logged in as') . " " . $GLOBALS['user']->fullname; ?></span>
 			<?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?>
 			<?php show_box_bottom(); ?>
 		</div> <!-- End topbarright -->
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index e171b507..81f6ccc1 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -24,7 +24,7 @@
 
 
 <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php">
-<table cellpadding="5" cellspacing="0" border="0">
+<table cellpadding="5" cellspacing="0">
 <tr>
 	<td><?php echo _('Name'); ?>:</td>
 	<td>
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php
index 16661417..2d685a10 100644
--- a/templates/show_add_catalog.inc.php
+++ b/templates/show_add_catalog.inc.php
@@ -27,7 +27,7 @@ $default_sort = "%a/%A";
 <p><?php echo _("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p>
 <?php Error::display('general'); ?>
 <form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
-<table class="tabledata" cellpadding="0" border="0" cellspacing="0">
+<table class="tabledata" cellpadding="0" cellspacing="0">
 <tr>
 	<td><?php echo _('Catalog Name'); ?>: </td>
 	<td><input size="60" type="text" name="name" value="<?php echo $_REQUEST['name']; ?>" /></td>
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index 54d261d8..be030a02 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -23,7 +23,7 @@
 <?php show_box_top(_('Adding a New User')); ?>
 <?php Error::display('general'); ?>
 <form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>">
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td>
 		<?php echo  _('Username'); ?>:
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index b2421511..f68e97d0 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -31,7 +31,7 @@ $title		= scrub_out($album->name) . '&nbsp;(' . $album->year . ')&nbsp;--&nbsp;'
         if ($album_name != _('Unknown (Orphaned)')) {
 		$aa_url = $web_path . "/image.php?id=" . $album->id . "&amp;type=popup&amp;sid=" . session_id();
 		echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popup_art('$aa_url'); return false;\">";
-		echo "<img border=\"0\" src=\"" . $web_path . "/image.php?id=" . $album->id . "&amp;thumb=2&amp;sid=" . session_id() . "\" alt=\"Album Art\" height=\"128\" />";
+		echo "<img src=\"" . $web_path . "/image.php?id=" . $album->id . "&amp;thumb=2&amp;sid=" . session_id() . "\" alt=\"Album Art\" height=\"128\" />";
 		echo "</a>\n";
         }
 	?>
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index dc7afc47..37ecca54 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -38,7 +38,7 @@ while ($i <= $rows) {
 ?>
 			<td align="center">
 				<a href="<?php echo $image_url; ?>" target="_blank">
-				<img src="<?php echo $image_url; ?>" alt="Album Art" border="0" height="175" width="175" /><br />
+				<img src="<?php echo $image_url; ?>" alt="Album Art" height="175" width="175" /><br />
 				</a>
 				<p align="center">
 				[<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&amp;image=<?php echo $key; ?>&amp;album_id=<?php echo urlencode($_REQUEST['album_id']); ?>">Select</a>]
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 7753816e..807175c7 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -26,7 +26,7 @@
 <?php if (Browse::get_filter('show_art')) { ?>
 <td height="87">
         <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&amp;album=<?php echo $album->id; ?>">
-                <img height="75" width="75" border="0" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>"
+                <img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>"
         </a>
 <?php } ?>
 <td><?php echo $album->f_name_link; ?></td>
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index 0df1393f..d63353e3 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -21,7 +21,7 @@
 $web_path = Config::get('web_path');
 $ajax_url = Config::get('ajax_url'); 
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td colspan="7">
 	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index f6fdac15..224d3ce0 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -21,7 +21,7 @@
 $web_path = Config::get('web_path');
 
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td colspan="5">
 	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index 009a0daa..e1cbdcaf 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -31,7 +31,7 @@ $htmllang = str_replace("_","-",Config::get('lang'));
 <body onLoad="self.resizeTo(document.images[0].width+30, document.images[0].height+70)">
 <?php
 echo "<a href=\"javascript:window.close()\" title=\"" . _('Click to close window') . "\">";
-echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&amp;sid=" . session_id() . "\" border=\"0\" />";
+echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&amp;sid=" . session_id() . "\" />";
 echo "</a>";
 ?>
 </body>
diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php
index cbacdf6a..b00a3dba 100644
--- a/templates/show_duplicates.inc.php
+++ b/templates/show_duplicates.inc.php
@@ -24,7 +24,7 @@ $web_path = conf('web_path');
 ?>
 <?php show_box_top(_('Find Duplicates')); ?>
 <form name="duplicates" action="<?php echo conf('web_path'); ?>/admin/duplicates.php" method="post" enctype="multipart/form-data" >
-<table cellspacing="0" cellpadding="3" border="0" width="450">
+<table cellspacing="0" cellpadding="3" width="450">
         <tr>
                 <td valign="top"><?php echo _('Search Type'); ?>:</td>
                 <td>
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index be988776..8e74fa0d 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="7">
 <form method="post" id="edit_album_<?php echo $album->id; ?>">
-<table border="0" cellpadding="3" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <tr>
 <td>
 	<input type="textbox" name="name" value="<?php echo scrub_out($album->name); ?>" />
diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php
index a3fef3f1..d262179e 100644
--- a/templates/show_edit_artist_row.inc.php
+++ b/templates/show_edit_artist_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="5">
 <form method="post" id="edit_artist_<?php echo $artist->id; ?>">
-<table border="0" cellpadding="3" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <tr>
 <td>
 	<input type="textbox" name="name" value="<?php echo scrub_out($artist->f_name); ?>" />
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index 7ee1767a..867daa1c 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -21,7 +21,7 @@
 ?>
 <?php show_box_top(_('Settings for') . ' ' . $catalog->name . ' (' . $catalog->path . ')'); ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
-<table cellspacing="0" cellpadding="0" border="0">
+<table cellspacing="0" cellpadding="0">
 <tr>
 	<td><?php echo _('Name'); ?>:</td>
 	<td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td>
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index d32aaebf..0a88bc57 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="6">
 <form method="post" id="edit_live_stream_<?php echo $radio->id; ?>">
-<table border="0" cellpadding="3" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <tr>
 	<th><?php echo _('Name'); ?></th>
 	<th><?php echo _('Stream URL'); ?></th>
diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index 69e59ed0..edc8e63f 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="5">
 <form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="#">
-<table border="0" cellpadding="0" cellspacing="0">
+<table cellpadding="0" cellspacing="0">
 <tr>
 	<td>
 	<input type="textbox" name="name" size="9" value="<?php echo scrub_out($playlist->name); ?>" />
diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php
index 4e713168..4c34cf9c 100644
--- a/templates/show_edit_playlist_song_row.inc.php
+++ b/templates/show_edit_playlist_song_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="8">
 <form method="post" id="edit_song_<?php echo $song->id; ?>" action="#">
-<table border="0" cellpadding="3" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <tr>
 <td>
 	<input type="textbox" name="name" value="<?php echo scrub_out($song->title); ?>" />
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 4880de6c..e3d1a89e 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -21,7 +21,7 @@
 ?>
 <td colspan="8">
 <form method="post" id="edit_song_<?php echo $song->id; ?>">
-<table border="0" cellpadding="3" cellspacing="0">
+<table cellpadding="3" cellspacing="0">
 <td>
 	<input type="textbox" name="name" value="<?php echo scrub_out($song->title); ?>" />
 </td>
diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php
index 1c227cca..60b0e95f 100644
--- a/templates/show_edit_user.inc.php
+++ b/templates/show_edit_user.inc.php
@@ -23,7 +23,7 @@
 <?php show_box_top(_('Editing existing User')); ?>
 <?php Error::display('general'); ?>
 <form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>">
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td>
 		<?php echo _('Username'); ?>:
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 39fb7f96..3008ed4c 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -24,7 +24,7 @@
  * Takes an array of genre objects and displays them out
  */
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td colspan="5">
 		<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php
index 8e0b8ceb..d80e167f 100644
--- a/templates/show_import_playlist.inc.php
+++ b/templates/show_import_playlist.inc.php
@@ -22,7 +22,7 @@
 ?>
 <form method="post" name="import_playlist" action="<?php echo conf('web_path'); ?>/playlist.php" enctype="multipart/form-data">
 <?php show_box_top(_('Importing a Playlist from a File')); ?>
-<table border="0" cellpadding="0" cellspacing="0">
+<table cellpadding="0" cellspacing="0">
 <tr>
         <td>
 		<?php echo _('Filename'); ?>:
diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php
index 416e2991..d3b2a010 100644
--- a/templates/show_ip_history.inc.php
+++ b/templates/show_ip_history.inc.php
@@ -28,7 +28,7 @@
 	<a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a>
 <?php }?>
 </div>
-<table border="0">
+<table>
 <tr class="table-header">
         <td align="center">
      		<?php echo _('Date'); ?>
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index d46a3b15..037d91c1 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -21,7 +21,7 @@
 $web_path = Config::get('web_path');
 
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td colspan="6">
 	<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php
index 01548bcd..49c6a309 100644
--- a/templates/show_local_catalog_info.inc.php
+++ b/templates/show_local_catalog_info.inc.php
@@ -22,7 +22,7 @@
 
 ?>
 <?php show_box_top(_('Catalog Statistics')); ?>
-<table cellspacing="1" cellpadding="3" border="0"> 
+<table cellspacing="1" cellpadding="3"> 
 <tr class="table-header">
 	<td><?php echo _('Connected Users'); ?></td>
 	<td><?php echo _('Total Users'); ?></td>
diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index 3e158f3b..fb95a343 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -23,7 +23,7 @@
 ?>
 <?php show_box_top(_('Add Localplay Instance')); ?>
 <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance">
-<table border="0" cellpadding="3" cellspacing="0" class="table-data">
+<table cellpadding="3" cellspacing="0" class="tabledata">
 <?php foreach ($fields as $key=>$field) { ?>
 <tr>
 	<td><?php echo $field['description']; ?></td>
diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php
index 68611d45..3e8cd613 100644
--- a/templates/show_localplay_controllers.inc.php
+++ b/templates/show_localplay_controllers.inc.php
@@ -21,7 +21,7 @@
 $web_path = Config::get('web_path'); 
 ?>
 <!-- Plugin we've found --> 
-<table class="tabledata" border="0" cellspacing="0">
+<table class="tabledata" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Name'); ?></th>
 	<th><?php echo _('Description'); ?></th>
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index cb4331d4..d7956506 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -49,6 +49,6 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full,'25'));
 	<?php if (Config::get('show_album_art')) { ?>
 <td class="np_cell_right">
     <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
+    <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="Album Art" height="75" width="75" /></a>
 </td>
 <?php } // end play album art ?>
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index 47a083e2..3d2ce215 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -22,7 +22,7 @@
 $web_path = conf('web_path'); 
 
 ?>
-<table border="0" cellpadding="14" cellspacing="0" class="text-box">
+<table cellpadding="14" cellspacing="0" class="text-box">
 <tr>
 <td>
 	<input class="button" type="button" value="<?php echo _('Play Selected'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/stream.php?action=play_selected');" />
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index ce577508..000c5f28 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -20,7 +20,7 @@
 
 */
 ?>
-<table class="tabledata" cellspacing="0" cellpadding="0" border="0"> <!-- Playlist Table -->
+<table class="tabledata" cellspacing="0" cellpadding="0"> <!-- Playlist Table -->
 <tr>
         <td colspan="5">
                 <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php
index fea2af15..a87e3f9b 100644
--- a/templates/show_plugins.inc.php
+++ b/templates/show_plugins.inc.php
@@ -21,7 +21,7 @@
 $web_path = Config::get('web_path'); 
 ?>
 <!-- Plugin we've found --> 
-<table class="tabledata" border="0" cellspacing="0">
+<table class="tabledata" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Name'); ?></th>
 	<th><?php echo _('Description'); ?></th>
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php
index b6f2f169..e435c005 100644
--- a/templates/show_preference_box.inc.php
+++ b/templates/show_preference_box.inc.php
@@ -26,7 +26,7 @@ if (($GLOBALS['user']->has_access(100) OR !Config::get('use_auth')) AND $_REQUES
 	$is_admin = true; 
 }
 ?>
-<table class="tabledata" border="0" cellpadding="0" cellspacing="0" width="100%">
+<table class="tabledata" cellpadding="0" cellspacing="0">
 <tr class="odd">
 	<th colspan="5" class="header2" align="left"><?php echo $preferences['title']; ?></th>
 </tr>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 6e6296d0..428d7ccc 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -21,7 +21,7 @@
 ?>
 <form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php">
 <?php show_box_top(_('Play Random Selection')); ?>
-<table class="table-data" border="0" cellspacing="0" cellpadding="3">
+<table class="table-data" cellspacing="0" cellpadding="3">
 <tr>
 	<td><?php echo _('Item count'); ?></td>
 	<td>
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 6a15e58a..99d49bff 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -31,7 +31,7 @@ $web_path = Config::get('web_path');
         <div class="random_album">
                 <a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $album_id; ?>">
                 <?php if (Config::get('show_album_art')) { ?>
-                <img src="<?php echo $web_path; ?>/image.php?thumb=3&amp;id=<?php echo $album_id; ?>" width="80" height="80" border="0" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
+                <img src="<?php echo $web_path; ?>/image.php?thumb=3&amp;id=<?php echo $album_id; ?>" width="80" height="80" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
                 <?php } else { ?>
                 <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?>
                 <?php } ?>
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index e7250a74..0e1ee595 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -25,11 +25,11 @@ $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days a
 ?>
 <table class="table-data" cellspacing="0">
 <tr class="table-header">
-	<td><?php echo _('Username'); ?></td>
-	<td><?php echo _('Song'); ?></td>
-	<td><?php echo _('Album'); ?></td>
-	<td><?php echo _('Artist'); ?></td>
-	<td><?php echo _('Last Played'); ?></td>
+	<th><?php echo _('Username'); ?></th>
+	<th><?php echo _('Song'); ?></th>
+	<th><?php echo _('Album'); ?></th>
+	<th><?php echo _('Artist'); ?></th>
+	<th><?php echo _('Last Played'); ?></th>
 </tr>
 <?php foreach ($data as $row) { 
 	$row_user = new User($row['user']);
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index 0dda6a47..9e97591b 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -25,7 +25,7 @@
 ?>
 <?php show_box_top(_('Search Ampache') . "..."); ?>
 <form name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
-<table class="tabledata" cellspacing="0" cellpadding="3" border="0">
+<table class="tabledata" cellspacing="0" cellpadding="3">
 <tr class="table-header">
 	<td colspan="4">&nbsp;</td>
 </tr>
diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php
index f62cbf0d..63322f37 100644
--- a/templates/show_search_bar.inc.php
+++ b/templates/show_search_bar.inc.php
@@ -22,12 +22,12 @@
 ?>
 <div id="sb_Subsearch">
         <form name="search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline">
-        <input type="text" name="search_string" value="" size="5" />
-        <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" />
+        <input type="text" name="search_string" id="searchString"/>
         <input type="hidden" name="action" value="quick_search" />
         <input type="hidden" name="method" value="fuzzy" />
         <input type="hidden" name="object_type" value="song" />
-	<a href="<?php echo $web_path; ?>/search.php" class="smallbutton"><?php echo _('Advanced Search'); ?></a>
+        <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" id="searchBtn" />
+      	<a href="<?php echo $web_path; ?>/search.php" class="smallbutton" id="advSearchBtn"><?php echo _('Advanced Search'); ?></a>
         </form>
 </div>
 
diff --git a/templates/show_similar_artists.inc b/templates/show_similar_artists.inc
index d48f5bf7..5ab3753e 100644
--- a/templates/show_similar_artists.inc
+++ b/templates/show_similar_artists.inc
@@ -23,7 +23,7 @@ $web_path = conf('web_path');
 <?php show_box_top(_('Similar Artists')); ?>
 <form name="artists" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/artists.php?action=rename_similar&artist=<?php echo $artist_id;?>" style="Display:inline;">
 	<h3><?php _('Please check the artists you want to merge with the current one'); ?> (<span style='text-decoration: underline;'><?php echo $artist_name;?></span>)</h3>
-	<table class="tabledata" cellspacing="0" cellpadding="0" border="0">
+	<table class="tabledata" cellspacing="0" cellpadding="0">
 	<tr class="table-header">
 		<th>&nbsp;&nbsp;Select</th>
 		<th><?php echo _("Artist"); ?></th>
@@ -82,7 +82,7 @@ if ($show) {
 <?php show_box_bottom(); ?>
 <?php show_box_top(_('Advanced Options')); ?>
 <form name='advanced' action='<?php echo $web_path; ?>/artists.php?action=show_similar&artist=<?php echo $artist_id; ?>' method='POST'>
-<table class="border" cellspacing="0" cellpadding="0" border="0" style='margin-left: 10px; margin-top: 20px;'>
+<table class="border" cellspacing="0" cellpadding="0" style='margin-left: 10px; margin-top: 20px;'>
 <!--Advanced-->
 	<tr class="<?php echo flip_class(); ?>">
 		<th colspan='2' style='text-align: left;'>Normalize options</th>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 32d8f327..dbde51d7 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -32,7 +32,7 @@
 <h1><?php echo _('Ampache Debug'); ?></h1>
 <p><?php echo _('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p>
 </div>
-<table align="center" border="0" cellpadding="3" cellspacing="0">
+<table align="center" cellpadding="3" cellspacing="0">
 <tr>
 	<td><font size="+1"><?php echo _('CHECK'); ?></font></td>
 	<td>
diff --git a/templates/show_tv_nowplaying.inc.php b/templates/show_tv_nowplaying.inc.php
index 10cf1f43..27dceac9 100644
--- a/templates/show_tv_nowplaying.inc.php
+++ b/templates/show_tv_nowplaying.inc.php
@@ -32,7 +32,7 @@ foreach ($results as $row) {
 <tr>
 	<td>
 		<a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-		<img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&amp;fast=1" width="275" height="275" />
+		<img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&amp;fast=1" width="275" height="275" />
 		</a>
 	</td>
 </tr>
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index 9ba5dbfc..1765fb6b 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -24,7 +24,7 @@ $create_date    = $client->create_date ? date("m\/d\/y - H:i",$client->create_da
 $client->format(); 
 ?>
 <?php show_box_top($client->fullname); ?>
-<table border="0" cellspacing="0">
+<table cellspacing="0">
 <tr>
 	<td valign="top">
 		<strong><?php echo _('Full Name'); ?>:</strong> <?php echo $client->fullname; ?><br />
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index aa43af4e..d150c2da 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -38,7 +38,7 @@ $htmllang = str_replace("_","-",conf('lang'));
 <div id="topbar">
 	<div align="center">
 	<a href="http://www.ampache.org/">
-        <img src="<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache.gif" border="0" title="Ampache: For the love of music" alt="Ampache: For the love of music" />
+        <img src="<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache.gif" title="Ampache: For the love of music" alt="Ampache: For the love of music" />
 	</a>
 	</div>
 </div>
@@ -53,7 +53,7 @@ $email = scrub_in($_REQUEST['email']);
 <div align="center">
 <?php show_box_top(_('Ampache New User Registration')); ?>
 <form name="update_user" method="post" action="<?php echo conf('web_path'); ?>/register.php" enctype="multipart/form-data">
-<table width='700px' cellpadding='0' cellspacing='0' border='0'>
+<table width='700px' cellpadding='0' cellspacing='0'>
 <?php
 /*  If we should show the user agreement */
 if(conf('user_agreement')){ ?>
@@ -63,7 +63,7 @@ if(conf('user_agreement')){ ?>
 	</tr>
 	<tr>
 		<td>
-			<table border="0" cellpadding="2" cellspacing="0">
+			<table cellpadding="2" cellspacing="0">
 			<tr>
 				<td>
 					<span class="box-title"><?php echo _('User Agreement'); ?></span>
@@ -92,7 +92,7 @@ if(conf('user_agreement')){ ?>
 	<td valign="top">
 		<p class="box-title"><?php echo _('User Information'); ?></p>
 
-		<table width='99%' cellpadding='0' cellspacing='0' border='0'>
+		<table width='99%' cellpadding='0' cellspacing='0'>
 		<tr>
 			<td align='right'>
 				<?php echo _('Username'); ?>:
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index d2571cbe..8b44a75f 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -22,35 +22,37 @@
 $web_path = Config::get('web_path');
 
 ?>
-<table class="tabledata" cellpadding="0" cellspacing="0" border="0">
+<table class="tabledata" cellpadding="0" cellspacing="0">
 <tr class="table-header" align="center">
-        <td colspan="11">
+        <th colspan="11">
         <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
-        </td>
+        </th>
 </tr>
 <tr class="table-header">
-	<td align="center">
-		<b><?php echo _('Fullname'); ?></b>
-		<b>(<?php echo _('Username'); ?>)</b>
-	</td>
-        <td align="center">
-		<b><?php echo _('Last Seen'); ?></b>
-	</td>
-        <td align="center">
-		<b><?php echo _('Registration Date'); ?></b>
-	</td>
-        <td align="center">
-		<b><?php echo _('Activity'); ?></b>
-	</td>
+	<th>
+		<?php echo _('Fullname'); ?>
+		(<?php echo _('Username'); ?>)
+	</th>
+  <th>
+		<?php echo _('Last Seen'); ?>
+	</th>
+  <th>
+		<?php echo _('Registration Date'); ?>
+	</th>
+  <th>
+		<?php echo _('Activity'); ?>
+	</th>
 	<?php if (Config::get('track_user_ip')) { ?>
-        <td align="center">
-		<b><?php echo _('Last Ip'); ?></b>
-	</td>
+  <th>
+		<?php echo _('Last Ip'); ?>
+	</th>
 	<?php } ?>
-	<td align="center"><strong><?php echo _('Action'); ?></strong></td>
-        <td align="center">
-		<b><?php echo _('On-line'); ?></b>
-	</td>
+	<th>
+    <?php echo _('Action'); ?>
+  </th>
+  <th>
+		<?php echo _('On-line'); ?>
+	</th>
 </tr>
 <?php
 foreach ($object_ids as $user_id) { 
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 6592c5e0..dc04b797 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -14,8 +14,8 @@
   </li>
   <li><h4><?php echo _('Access Control'); ?></h4>
     <ul class="sb3" id="sb_admin_acl">
-      <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add ACL'); ?></li>
-      <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo _('Show ACL(s)'); ?></a>
+      <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add ACL'); ?></a></li>
+      <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo _('Show ACL(s)'); ?></a></li>
     </ul>
   </li>
   <li><h4><?php echo _('Other Tools'); ?></h4>