diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html
index 2bc14cc1..2fbc01b3 100644
--- a/data/interfaces/brink/config.html
+++ b/data/interfaces/brink/config.html
@@ -112,15 +112,19 @@
 						<!--API-->
 							<tr>
 								<td><h2>API:</h2>
-									<small><label for="api_switch">Enabled/Disabled</label></small></td>
-								<td><input class="switch" type="checkbox" name="api_switch" id="api_enabled" value="1" ${config['api_enabled']} /></td>
+									<small><label for="api_enabled">Enabled/Disabled</label></small></td>
+								<td><input class="switch" type="checkbox" name="api_enabled" id="api_enabled" value="1" ${config['api_enabled']} /></td>
 							</tr>
-							<tr id="api_switch">
+							<tr id="api_enabled_switch">
 								<td>
-									<small>Visit <a href="https://github.com/rembo10/headphones/tree/" target="_blank"><span>D</span>repo</a> for more information.</small>
-								</td>
-								<td>
-									<input type="text" name="api_key" value="${config['api_key']}" size="30"><input class="submit" type="button" value="Generate" id="generate_api">
+									<table>
+										<tr>
+											<td colspan="2">
+											<small>Current API:<strong id="api_key">${config['api_key']}</strong></small>
+											<input class="submit" type="button" value="Generate" id="generate_api" />
+											</td>
+										</tr>
+									</table>
 								</td>
 							</tr>
 						<!--end API-->
@@ -294,9 +298,9 @@
 					<tr>
 						<td>
 							<h2><a href="http://www.nzbmatrix.com" target="_blank"><span class="wsr">D</span>NZBMatrix</a></h2>
-							<br /><small><label for="nzbmatrix_switch">Enabled/Disabled</label></small>
+							<br /><small><label for="nzbmatrix">Enabled/Disabled</label></small>
 						</td>
-						<td><input class="switch" type="checkbox" name="nzbmatrix_switch" value="1" ${config['use_nzbmatrix']} /></td>
+						<td><input class="switch" type="checkbox" name="nzbmatrix" value="1" ${config['use_nzbmatrix']} /></td>
 					</tr>
 				</table>
 				<table id="nzbmatrix_switch">
@@ -312,27 +316,28 @@
 				<!--end NZB Matrix-->
 
 				<!--Newznab-->
-				<table class="configtable">
-					<tr>
-						<td>
-							<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>
-					<td>
+				<div class="group">
+					<table class="configtable">
+						<tr>
+							<td>
+								<h2><a href="http://www.newznab.com/" target="_blank"><span class="wsr">D</span>Newznab Providers</a></h2>
+								<small><label for="newznab">Enabled/Disabled</label></small>
+							</td>
+							<td><input class="switch" type="checkbox" name="newznab" value="1" ${config['use_newznab']} /></td>
+						</tr>
+					</table>
+					<div class="group">
+					<div id="newznab_switch">
 						<table id="newznab1">
-							<tr>
-								<td>
-									<label>Newznab Host</label>
+							<tr><td>
+									<label>Host:</label>
 									<input type="text" name="newznab_host" value="${config['newznab_host']}" size="30">
 									<br /><small>e.g. http://nzb.su</small>
 								</td>
 							</tr>
 							<tr>
 								<td>
-									<label>Newznab API</label>
+									<label>API</label>
 									<input type="text" name="newznab_apikey" value="${config['newznab_api']}" size="36">
 								</td>
 							</tr>
@@ -346,6 +351,7 @@
 								<td><input class="newznab-edit-extras" type="button" value ="Edit Extras"/></td>
 							</tr>
 						</table>
+					</div>
 						<div id="newznab-dialog">
 							%for newznab in config['extra_newznabs']:
 							<table id="newznab${newznab_number}">
@@ -375,30 +381,33 @@
 							%endfor
 							<input type="button" value="Add Newznab" class="add_newznab" id="add_newznab" />
 						</div>
-						</td>
-					</tr>
-				</table>
+					</div>
+				</div>
 				<!--end Newznab-->
 
 				<!--NZBs.org-->
-				<table>
-					<tr>
-						<td>
-							<h2><a href="http://nzbs.org/" target="_blank"><span class="wsr">D</span>Nzbs</a></h2>
-							<small></small>
-						</td>
-						<td><input class="switch" type="checkbox" name="nzbsorg" value="1" ${config['use_nzbsorg']} /><small><label for="nzbsorg"></label></small></td>
-					</tr>
-				</table>
-				<table id="nzbsorg">
-					<tr>
-						<td><label for="nzbsorg_hash">API Key:</label></td>
-						<td><input type="text" name="nzbsorg_hash" value="${config['nzbsorg_hash']}" size="30" maxlength="40"></td>
-					</tr>
-				</table>
+				<div class="group">
+					<table>
+						<tr>
+							<td><h2><a href="http://nzbs.org/" target="_blank"><span class="wsr">D</span>Nzbs.org</a></h2>
+								<small><label for="nzbsorg"></label></small>
+							</td>
+							<td><input class="switch" type="checkbox" name="nzbsorg" value="1" ${config['use_nzbsorg']} /></td>
+						</tr>
+					</table>
+					<group>
+					<table id="nzbsorg_switch">
+						<tr>
+							<td><label for="nzbsorg_hash">API Key:</label></td>
+							<td><input type="text" name="nzbsorg_hash" value="${config['nzbsorg_hash']}" size="30" maxlength="40"></td>
+						</tr>
+					</table>
+					</group>
+				</div>
 				<!--end NZBs.org-->
 				
 				<!--Newzbin-->
+				<div class="group">
 				<table>
 					<tr>
 						<td>
@@ -410,16 +419,19 @@
 						</td>
 					</tr>
 				</table>
-				<table id="newsbin" class="configtable">
-					<tr>
-						<td><label for="newzbin_uid">UID:</label></td>
-						<td><input type="text" name="newzbin_uid" value="${config['newzbin_uid']}" size="30" maxlength="40" /></td>
-					</tr>
-					<tr>
-						<td><label for="newzbin_password">Password:</label></td>
-						<td><input type="text" name="newzbin_password" value="${config['newzbin_pass']}" size="36" maxlength="40" /></td>
-					</tr>
-				</table>
+				<group>
+					<table id="newzbin_switch">
+						<tr>
+							<td><label for="newzbin_uid">UID:</label></td>
+							<td><input type="text" name="newzbin_uid" value="${config['newzbin_uid']}" size="30" maxlength="40" /></td>
+						</tr>
+						<tr>
+							<td><label for="newzbin_password">Password:</label></td>
+							<td><input type="text" name="newzbin_password" value="${config['newzbin_pass']}" size="36" maxlength="40" /></td>
+						</tr>
+					</table>
+				</group>
+				</div>
 				<!--end Newzbin-->
 					
 				<!--Torrents-->
@@ -782,10 +794,6 @@
 							</td>
 							<td><input class="switch" type="checkbox" name="nma_enabled" id="nma" value="1" ${config['nma_enabled']} /></td>
 						</tr>
-						<tr>
-							<td><label for="nma_onsnatch">Notify on snatch?</label></td>
-								<td><input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /></td>
-						</tr>
 					</table>
 					<table id="nmaoptions">
 						<tr>
@@ -798,6 +806,11 @@
 							<td><a href="https://play.google.com/store/apps/details?id=com.usk.app.notifymyandroid">Get NotifyMyAndroid</a></td>
 						</tr>
 						
+						<tr>
+							<td><label for="nma_onsnatch">Notify on snatch?</label></td>
+								<td><input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /></td>
+						</tr>
+						
 						<!--Priority-->
 						<tr>
 							<td><label for="nma_priority">Priority:</label></td>
@@ -909,6 +922,18 @@
 <%def name="javascriptIncludes()">
 	<script>
 		$(document).ready(function(){
+			$('#api_key').click(function(){ $('#api_key').select() });
+			$("#generate_api").click(function(){
+				$.get('generateAPI', 
+					function(data){
+						if (data.error != undefined) {
+							alert(data.error);
+							return;
+						}
+						$('#api_key').val(data);
+				});
+			});
+		
 			$("#newznab-dialog").hide();
 			$(".newznab-edit-extras").click(function(){
 				$("#newznab-dialog").dialog();
diff --git a/data/interfaces/brink/css/style.css b/data/interfaces/brink/css/style.css
index cf4a1b77..4bd53141 100644
--- a/data/interfaces/brink/css/style.css
+++ b/data/interfaces/brink/css/style.css
@@ -344,9 +344,26 @@ input[type="checkbox"]:checked:after{
 
 /*config*/
 div#config_wrapper { margin: auto; width: 640px;}
-div#config_wrapper div table { width: 100%; border-collapse:separate; border-spacing: 10px; }
-div#config_wrapper div table tr td:first-child{ width: 240px; }
-div#config_wrapper div table tr td{ vertical-align: middle; }
+div#config_wrapper > div > table { width: 100%; border-collapse:separate; border-spacing: 10px; }
+div#config_wrapper > div > table tr td:first-child{ width: 240px; }
+div#config_wrapper > div > table tr td{ vertical-align: middle; }
+group,
+div.group {
+	padding: 5px;
+	background-color: rgba(0,0,0,0.1);
+	border: 1px solid rgba(255,255,255,0.1);
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-o-border-radius: 10px;
+	display: block;
+}
+div.group table {
+margin-left: 10px;
+}
+div.group:first-child {
+margin-left: 0px;
+}
 /*end config*/
 
 /* Artist Table Style*/
diff --git a/data/interfaces/brink/js/configscript.js b/data/interfaces/brink/js/configscript.js
index 6a99b799..71d0bee4 100644
--- a/data/interfaces/brink/js/configscript.js
+++ b/data/interfaces/brink/js/configscript.js
@@ -43,7 +43,7 @@ $(document).ready(function(){
 	$( '.switch' ).each(function(){
 		//set Label name to current active state
 		var labelName = 'label[for="' + $( this ).attr( "name" ) + '"]';
-		var switchId = $( this ).attr( "name" );
+		var switchId = $( this ).attr( "name" ) + "_switch";
 		if ( $( this ).is(':checked') ){
 			$( labelName ).text( 'Enabled' );
 			$("#" + switchId ).show();