diff --git a/data/css/style.css b/data/css/style.css
index e3f9ad3a..cb32fc02 100755
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -248,27 +248,31 @@ overflow: hidden;
 
 ul#subhead_menu 
 { 
-list-style: none;
+list-style-type: none;
+padding: 0px;
+margin: 0px;
 }
 
 ul#subhead_menu li 
 { 
 height: 40px;
-padding: 0px 6px 0px 6px;
+padding: 0px 9px 0px 9px;
 line-height: 40px;
 display: inline-block; 
+border-left: 1px solid #000;
+border-right: 1px solid #000;
+margin: 0;
 }
 
 ul#subhead_menu li:hover 
 { 
-padding: 0px 5px 0px 5px;
-background-image: linear-gradient(bottom, rgb(69,69,69) 0%, rgb(102,102,102) 100%);
-background-image: -o-linear-gradient(bottom, rgb(69,69,69) 0%, rgb(102,102,102) 100%);
-background-image: -moz-linear-gradient(bottom, rgb(69,69,69) 0%, rgb(102,102,102) 100%);
-background-image: -webkit-linear-gradient(bottom, rgb(69,69,69) 0%, rgb(102,102,102) 100%);
-background-image: -ms-linear-gradient(bottom, rgb(69,69,69) 0%, rgb(102,102,102) 100%);
-border-left: 1px solid #000;
-border-right: 1px solid #000;
+background-image: linear-gradient(bottom, rgb(70,0,10) 0%, rgb(60,0,20) 100%);
+background-image: -o-linear-gradient(bottom, rgb(70,0,10) 0%, rgb(60,0,20) 100%);
+background-image: -moz-linear-gradient(bottom, rgb(70,0,10) 0%, rgb(60,0,20) 100%);
+background-image: -webkit-linear-gradient(bottom, rgb(70,0,10) 0%, rgb(60,0,20) 100%);
+background-image: -ms-linear-gradient(bottom, rgb(70,0,10) 0%, rgb(60,0,20) 100%);
+border-right: 1px solid rgb(30,30,30);
+border-left: 1px solid rgb(10,10,10);
 }
 
 ul#subhead_menu li a 
@@ -386,7 +390,7 @@ line-height: 40px;
 }
 .manage_wrapper { width: 88%; margin: 20px auto 0 auto; padding: 25px; min-height: 150px; clear: both; _height: 302px; zoom: 1; }
 .table_wrapper_left { float: left; width: 40%; min-height: 100px; margin-top: 25px; }
-.table_wrapper_right{ width: 40%; min-height: 100px; margin-top: 25px; }
+.table_wrapper_right{ float: right; width: 40%; min-height: 100px; margin-top: 25px; }
 
 .configtable { font-size: 14px; line-height:18px; }
 .configtable td { width: 350px; padding: 10px; }
@@ -515,9 +519,9 @@ table#searchresults_table td#albumname { vertical-align: middle; text-align: lef
 table#searchresults_table td#artistname { vertical-align: middle; text-align: left; min-width: 300px; }
 table#searchresults_table td#score { vertical-align: middle; text-align: left; min-width: 75px; }
 
-div.progress-container { border: 1px solid #313131; width: 100px; height: 13px; margin: 2px 5px 2px 0; padding: 1px; background: #414141; color: white; }
-div.progress-container > div { background-color: #575757; height: 90%; background-image: url(../images/progress.png); }
-.havetracks { font-size: 12px; margin-left: 36px; padding-bottom: 3px; vertical-align: middle; }
+div.progress-container { border: 1px solid #313131; width: 100px; height: 15px; margin: 2px 5px 2px 0; padding: 1px; background: #414141; color: white; }
+div.progress-container > div { height: 100%; margin: 1px; }
+.havetracks { font-size: 12px; position: relative; width: 100px; text-align: center; }
 
 footer { margin: 20px auto 20px auto; }
 div#version { text-align: center; font-weight: bold; }
diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html
index f67759c9..f956fc58 100644
--- a/data/interfaces/default/manage.html
+++ b/data/interfaces/default/manage.html
@@ -17,24 +17,27 @@
 <%def name="body()">
 	<div class="table_wrapper">
 		<h1>Scan Music Library</h1><br />
-		Where do you keep your music?<br /><br />
-		You can put in any directory, and it will scan for audio files in that folder
-		(including all subdirectories)<br /><br />		For example: '/Users/name/Music'
-		<br /> <br />
-		It may take a while depending on how many files you have. You can navigate away from the page<br />
-		as soon as you click 'Submit'
+		<p>
+			Where do you keep your music?<br /><br />
+			You can put in any directory, and it will scan for audio files in that folder
+			(including all subdirectories)<br />
+			For example: '/Users/name/Music'
+		</p>
 		<br /><br />
-		<form action="musicScan" method="GET" align="center">
+		<form action="musicScan" method="GET">
 		%if headphones.MUSIC_DIR:
 			<input type="text" value="${headphones.MUSIC_DIR}" name="path" size="70" />
 		%else:
 			<input type="text" value="Enter a Music Directory to scan" onfocus="if
 			(this.value==this.defaultValue) this.value='';" name="path" size="70" />
 		%endif
-		<br>
-		<h3><input type="checkbox" name="autoadd" value="1" ${checked(headphones.ADD_ARTISTS)}>Automatically add new artists</h3>
-		<br><br>
-		<input type="submit" /></form>
+		<br />
+		<br />
+		<input type="checkbox" name="autoadd" value="1" ${checked(headphones.ADD_ARTISTS)}> Automatically add new artists
+		<br />
+		<br />
+		<input type="submit" />
+		* This process runs in the background.</form>
 	</div>
 
 	<div class="table_wrapper_left">
diff --git a/data/interfaces/default/upcoming.html b/data/interfaces/default/upcoming.html
index 51bfed4c..b3575946 100644
--- a/data/interfaces/default/upcoming.html
+++ b/data/interfaces/default/upcoming.html
@@ -18,9 +18,17 @@
 			<tr class="gradeZ">
 				<td id="albumart">
 					<div class="album-art-small">
-					<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg"></td>
+						<a href="albumPage?AlbumID=${album['AlbumID']}">
+							<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg">
+						</a>
 					</div>
-				<td id="artistname">${album['ArtistName']}</td>
+				</td>
+					
+				<td id="artistname">
+					<a href="artistPage?ArtistID=${artist['ArtistID']}">
+						${album['ArtistName']}
+					</a>
+				</td>
 				<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
 				<td id="reldate">${album['ReleaseDate']}</td>
 				<td id="type">${album['Type']}</td>
@@ -58,8 +66,17 @@
 		%for album in wanted:
 			<tr class="gradeZ">
 				<td id="select"><input type="checkbox" name="${album['AlbumID']}" class="checkbox" /></th>
-				<td id="albumart"><img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg" height="50" width="50"></td>
-				<td id="artistname">${album['ArtistName']}</td>
+				<td id="albumart">
+					<div class="album-art-small">
+					<a href="albumPage?AlbumID=${album['AlbumID']}">
+						<img src="http://ec1.images-amazon.com/images/P/${album['AlbumASIN']}.01.MZZZZZZZ.jpg">
+					</a>
+					</div>
+				</td>
+				<td id="artistname">
+					<a href="">
+						${album['ArtistName']}
+					</a></td>
 				<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
 				<td id="reldate">${album['ReleaseDate']}</td>
 				<td id="type">${album['Type']}</td>