diff --git a/data/interfaces/brink/artist.html b/data/interfaces/brink/artist.html
index 5ae49fa8..d2ddac43 100644
--- a/data/interfaces/brink/artist.html
+++ b/data/interfaces/brink/artist.html
@@ -9,16 +9,16 @@
 	<script>
 		$(document).ready(function(){
 			$('#getExtras').click(function() {
-				$('#dialog').dialog();
+				$('#extras-dialog').dialog();
 				return false;
 			});
 			$('#modifyExtras').click(function() {
-				$('#dialog').dialog();
+				$('#extras-dialog').dialog();
 			});
 		});
 	</script>
 
-	<div id="dialog" title="Choose Which Extras to Fetch" style="display:none" class="configtable">
+	<div id="extras-dialog" title="Choose Which Extras to Fetch" style="display:none" class="configtable">
 		<form action="getExtras" method="get" class="ajax">
 			<input type="hidden" name="ArtistID" value="${artist['ArtistID']}">
 			<input type="hidden" name="newstyle" value="true">
@@ -74,8 +74,8 @@
   			<option value="Downloaded">Downloaded</option>
 		</select>
 		<input type="submit" value="GO">
-		<small><span class="wsr Tag"></span> Click CTRL + LMOUSE on albums to select.</small>
 	</p>
+	<small><span class="wsr Tag"></span> Click CTRL + LMOUSE on albums to select them in grid view.</small>
 	<div id="gridView">
 	%for album in albums:
 		<%
@@ -154,16 +154,7 @@
 				<td id="albumart">
 				<div class="album-art-small">
 					<a href="albumPage?AlbumID=${album['AlbumID']}" title="${album['AlbumID']}">
-						<div class="status">
-							%if album['Status'] == 'Skipped':
-								<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Mark Wanted"><span>O</span></a>
-							%elif album['Status'] == 'Wanted':
-								<a class="wsr" href="unqueueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Unmark Wanted"><span>N</span></a>
-							%else:
-								<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}" title="Retry"><span>*</span></a>
-								<a class="wsr" href="queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}&new=True" title="Try new"><span>J</span></a>
-							%endif
-						</div>
+						<img />
 					</a>
 				</div>
 				</td>
@@ -272,6 +263,14 @@
 				getAlbumInfo(artistname,albumname,element,2);
 			});
 		});
+		$("table#album_table").each(function() {
+			$(this).fadeIn("slow", function(){
+				var element = $(this).find("img");
+				var artistname = $(".artist-art img").attr("alt");
+				var albumname = $(this).find("#albumname").text();
+				getAlbumInfo(artistname,albumname,element,2);
+			});
+		});
 	}
 	</script>
 </%def>
diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html
index 7aceed00..460259ea 100644
--- a/data/interfaces/brink/config.html
+++ b/data/interfaces/brink/config.html
@@ -1,6 +1,7 @@
 <%inherit file="base.html"/>
 <%!
 	import headphones
+	import string
 %>
 
 <%def name="headIncludes()">
@@ -311,57 +312,70 @@
 				<!--end NZB Matrix-->
 
 				<!--Newznab-->
-				<table id="newznab" class="configtable">
+				<table class="configtable">
 					<tr>
 						<td>
-							<h2><a href="http://www.newznab.com/" target="_blank"><span class="wsr">D</span>Newznab</a></h2>
+							<h2><a href="http://www.newznab.com/" target="_blank"><span class="wsr">D</span>Newznab Providers</a></h2>
 							<br /><small><label for="newznab">Enabled/Disabled</label></small>
 						</td>
 						<td><input class="switch" type="checkbox" name="newznab" value="1" ${config['use_newznab']} /></td>
 					</tr>
 					<tr>
-						<div id="newznab">
-							<div class="config" id="newznab1">
-								<div class="row">
+					<td>
+						<table id="newznab1">
+							<tr>
+								<td>
 									<label>Newznab Host</label>
 									<input type="text" name="newznab_host" value="${config['newznab_host']}" size="30">
 									<br /><small>e.g. http://nzb.su</small>
-								</div>
-								<div class="row">
+								</td>
+							</tr>
+							<tr>
+								<td>
 									<label>Newznab API</label>
 									<input type="text" name="newznab_apikey" value="${config['newznab_api']}" size="36">
-								</div>
-								<div class="row checkbox">
-									<input id="newznab_enabled" type="checkbox" name="newznab_enabled" onclick="initConfigCheckbox($(this));" value="1" ${config['newznab_enabled']} />
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<input id="newznab_enabled" type="checkbox" name="newznab_enabled" value="1" ${config['newznab_enabled']} />
 									<label>Enabled</label>
-								</div>
-							</div>
-							<%
-							newznab_number = 1
-							%>
+								</td>
+							</tr>
+							<tr>
+								<td><input class="newznab-edit-extras" type="button" value ="Edit Extras"/></td>
+							</tr>
+						</table>
+						<div id="newznab-dialog">
 							%for newznab in config['extra_newznabs']:
-							<div class="config" id="newznab${newznab_number}">
-								<div class="row">
-								<label>Newznab Host:</label>
-								<input type="text" name="newznab_host${newznab_number}" value="${newznab[0]}" size="30">
-								</div>
-								<div class="row">
-								<label>Newznab API:</label>
-								<input type="text" name="newznab_api${newznab_number}" value="${newznab[1]}" size="36">
-								</div>
-								<div class="row checkbox">
-								<input id="newznab_enabled" type="checkbox" name="newznab_enabled${newznab_number}" value="1" ${newznab_enabled} /><label>Enabled</label>
-								</div>
-								<div class="row">
-								<input type="button" class="remove" id="newznab${newznab_number}" value="Remove ${newznab[0]}">
-								</div>
-							</div>
-							<%
-								newznab_number += 1
-							%>
+							<table id="newznab${newznab_number}">
+								<tr>
+									<td>
+										<label>Newznab Host:</label>
+										<input type="text" name="newznab_host${newznab_number}" value="${newznab[0]}" size="30">
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<label>Newznab API:</label>
+										<input type="text" name="newznab_api${newznab_number}" value="${newznab[1]}" size="36">
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<input id="newznab_enabled" type="checkbox" name="newznab_enabled${newznab_number}" value="1" ${newznab_enabled} /><label>Enabled/Disabled</label>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										<input type="button" class="remove" id="newznab${newznab_number}" value="Remove ${newznab[0]}">
+									</td>
+								</tr>
+							</table>
 							%endfor
 							<input type="button" value="Add Newznab" class="add_newznab" id="add_newznab" />
 						</div>
+						</td>
 					</tr>
 				</table>
 				<!--end Newznab-->
@@ -812,7 +826,13 @@
 				</div><!--end Notifications-->
 				<div id="NAS">
 					<h2>Synology NAS</h2>
-					<input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label>
+					<table>
+						<tr>
+							<td>
+								<input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label>
+							</td>
+						</tr>
+					</table>
 				</div>
 				<!--Mirror-->
 				<div id="Mirror">
@@ -885,20 +905,14 @@
 <%def name="javascriptIncludes()">
 	<script>
 		$(document).ready(function(){
+			$("#newznab-dialog").hide();
+			$(".newznab-edit-extras").click(function(){
+				$("#newznab-dialog").dialog();
+			});
 			$(".submitForm").click(function(){
 				$("#config").submit();
 			});
 			//Newznab
-			function newznab(){
-				if( $('input[name="newznab"]').is(":checked") ){
-					$("table#newznab-group").show();
-					enit();
-				}
-				else {
-					$("table#newznab-group").hide();
-					enit();
-				}
-			}
 			var deletedNewznabs = 0;
 			$(".remove").click(function() {
 				$(this).parent().parent().remove();
@@ -906,17 +920,31 @@
 			});
 			
 			$("#add_newznab").click(function() {
-				var intId = $("#newznab_providers > div").size() + deletedNewznabs + 1;
-				var formfields = $("<div class=\"config\" id=\"newznab" + intId + "\"><div class=\"row\"><label>Newznab Host</label><input type=\"text\" name=\"newznab_host" + intId + "\" size=\"30\"></div><div class=\"row\"><label>Newznab API</label><input type=\"text\" name=\"newznab_api" + intId + "\" size=\"36\"></div><div class=\"row checkbox\"><input type=\"checkbox\" name=\"newznab_enabled" + intId + "\" value=\"1\" checked /><label>Enabled</label></div>");
-				var removeButton = $("<div class=\"row\"><input type=\"button\" class=\"remove\" value=\"Remove\" /></div>");
+				var intId = $("#newznab-dialog > table").size() + deletedNewznabs + 1;
+				alert(intId);
+				var rowStart = "<tr><td>";
+				var rowEnd = "</td></tr>";
+				var formfields = $("<table id='newznab" + intId + "'>" +
+								rowStart +
+								"<label>Newznab Host</label>" +
+								"<input type='text' name='newznab_host" + intId + "' size='30'>" +
+								rowEnd +
+								rowStart +
+										"<label>Newznab API</label>" +
+										"<input type='text' name='newznab_api" + intId + "' size='36'>" +
+								rowEnd +
+								rowStart +
+									"<input type='checkbox' name='newznab_enabled" + intId + "' value='1' checked />" + 
+									"<label>Enabled</label>" + 
+								rowEnd);
+				var removeButton = $(rowStart + "<input type='button' class='remove' value='Remove' />" + rowEnd);
 				removeButton.click(function() {
 				$(this).parent().remove();
-					deletedNewznabs = deletedNewznabs + 1;
-				
+					deletedNewznabs = deletedNewznabs - 1;
 				});
 				formfields.append(removeButton);
-				formfields.append("</div>");
-				$("#add_newznab").after(formfields);
+				formfields.append("</table>");
+				$("#add_newznab").before(formfields);
 			});
 		
 			//Mirrors
diff --git a/data/interfaces/brink/css/style.css b/data/interfaces/brink/css/style.css
index 04061876..cf4a1b77 100644
--- a/data/interfaces/brink/css/style.css
+++ b/data/interfaces/brink/css/style.css
@@ -254,11 +254,12 @@ input, textarea, select, option {
 	appearance:none;
 	-moz-appearance:none; /* Firefox */
 	-webkit-appearance:none; /* Safari and Chrome */
+	-0-appearance:none; /* Safari and Chrome */
 	padding-left: 5px;
 	padding-right: 5px;
 	font-size: .8em;
 	color: rgba(255,255,255,0.6);
-	line-height: 25px;
+	line-height: 2em;
 	font-weight: bold;
 	margin: 0;
 }
@@ -285,6 +286,8 @@ input[type="button"],
 input[type="submit"]{
 	background-color: rgba(0,0,0,.1);
 	border: 1px solid rgba(0,0,0,.3);
+	height: 2.3em;
+	display: inline;
 }
 select:hover,
 input[type="button"]:hover, 
@@ -294,6 +297,7 @@ input[type="submit"]:hover{
 }
 select option{
 	background: rgb(31,31,31);
+	border: 0;
 }
 select option:hover{
 	background: rgb(255,255,255);
@@ -433,12 +437,16 @@ table#album_table td#albumart { vertical-align: middle; text-align: left; }
 }
 .image-container .image-box img { 
 	width: 100%;
-	min-height: 100%;
+	height: 100%;
 	position: absolute;
 	top: 0px;
 	left: 0px;
 	z-index: 1;
 	border: 0;
+	box-shadow: 0px 0px 10px rgb(0,0,0);
+	-moz-box-shadow: 0px 0px 10px rgb(0,0,0);
+	-webkit-box-shadow: 0px 0px 10px rgb(0,0,0);
+	-o-box-shadow: 0px 0px 10px rgb(0,0,0);
 }
 
 .image-container .image-box input {
@@ -447,10 +455,6 @@ table#album_table td#albumart { vertical-align: middle; text-align: left; }
 	width: 100%;
 	height: 100%;
 	text-align: center;
-	box-shadow: 0px 0px 10px rgb(0,0,0);
-	-moz-box-shadow: 0px 0px 10px rgb(0,0,0);
-	-webkit-box-shadow: 0px 0px 10px rgb(0,0,0);
-	-o-box-shadow: 0px 0px 10px rgb(0,0,0);
 }
 .image-container .image-box input:checked {
 	box-shadow: 0px 0px 10px rgb(0,145,255);
@@ -458,6 +462,11 @@ table#album_table td#albumart { vertical-align: middle; text-align: left; }
 	-webkit-box-shadow: 0px 0px 10px rgb(0,145,255);
 	-0-box-shadow: 0px 0px 10px rgb(0,145,255);
 }
+.image-container .image-box .image-count {
+	width: 100%;
+	height: 100%;
+	font-size: 10em;
+}
 .image-container .image-actions {
 	display: none;
 	position: absolute;
diff --git a/data/interfaces/brink/extras.html b/data/interfaces/brink/extras.html
index cc931622..3bb120a4 100644
--- a/data/interfaces/brink/extras.html
+++ b/data/interfaces/brink/extras.html
@@ -2,12 +2,24 @@
 <%def name="body()">
 	<div class="table_wrapper">
 		<h1>Suggestions</h1>
-		<div class="cloudtag">
-			<ul id="cloud">
 			%for artist in cloudlist:
-				<li><a href="addArtist?artistid=${artist['ArtistID']}" class="tag${artist['Count']}">${artist['ArtistName']}</a></li>
+				<div class="image-container">
+					<div class="image-box">
+						<div class="image-count">${artist['Count']}</div>
+						<img />
+						<div class="image-actions">
+							%if artist['Status'] == 'Loading':
+								<a href="addArtist?artistid=${artist['ArtistID']}"><span class="wsr Like"></span></a>
+							%else:
+								${havetracks}/${totaltracks}
+							%endif	
+						</div>
+					</div>
+					<div class="image-info">
+						<b title="${artist['ArtistID']}"><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></b>
+					</div>
+				</div>
 			%endfor
-			</ul>
-		</div>
+			
 	</div>
 </%def>