diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css
index 97fa0836..65c75ede 100644
--- a/gui/slick/css/dark.css
+++ b/gui/slick/css/dark.css
@@ -840,12 +840,15 @@ div.buttontext p {
 home_newShow.tmpl
 ========================================================================== */
 #addShowForm, #recommendedShowsForm {
-    margin-left: auto;
-    margin-right: auto;
+	width: 800px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 10px 0;
+	font-size:13px;
 }
 
 #newShowPortal {
-	width: 800px;
+	width: 960px;
 	padding: 10px 0;
 	margin-right: auto;
 	margin-left: auto;
@@ -872,7 +875,6 @@ home_addExistingShow.tmpl
 }
 
 ul#rootDirStaticList {
-    width: 90%;
     margin-right: auto;
     margin-left: auto;
     text-align: left;
@@ -2615,7 +2617,7 @@ div.stepsguide {
 
 div.stepsguide .step {
 	float: left;
-	width: 266px;
+	width: 33%;
 	font: bold 24px Arial;
 }
 
@@ -2657,7 +2659,7 @@ div.formpaginate .prev, div.formpaginate .next {
 }
 
 .stepDiv {
-	padding: 15px;
+	padding: 15px 0;
 }
 
 /* step 3 related */
@@ -2670,13 +2672,14 @@ div.formpaginate .prev, div.formpaginate .next {
 
 #customQualityWrapper div.component-group-desc {
 	float: left;
-	width: 165px;
+	width: 172px;
+	margin-right: 10px;
 }	
 
 #customQualityWrapper div.component-group-desc p {
 	width: 85%;
 	margin: .8em 0;
-	font-size: 1.2em;
+	font-size: 1.13em;
 	color: #666;
 }
 
diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css
index 666b6ea2..96f3fa95 100644
--- a/gui/slick/css/light.css
+++ b/gui/slick/css/light.css
@@ -822,12 +822,15 @@ div.buttontext p {
 home_newShow.tmpl
 ========================================================================== */
 #addShowForm, #recommendedShowsForm {
-    margin-left: auto;
-    margin-right: auto;
+	width: 800px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 10px 0;
+	font-size:13px;
 }
 
 #newShowPortal {
-	width: 800px;
+	width: 960px;
 	padding: 10px 0;
 	margin-right: auto;
 	margin-left: auto;
@@ -854,7 +857,6 @@ home_addExistingShow.tmpl
 }
 
 ul#rootDirStaticList {
-    width: 90%;
     margin-right: auto;
     margin-left: auto;
     text-align: left;
@@ -2583,7 +2585,7 @@ div.stepsguide {
 
 div.stepsguide .step {
 	float: left;
-	width: 266px;
+	width: 33%;
 	font: bold 24px Arial;
 }
 
@@ -2625,7 +2627,7 @@ div.formpaginate .prev, div.formpaginate .next {
 }
 
 .stepDiv {
-	padding: 15px;
+	padding: 15px 0;
 }
 
 /* step 3 related */
@@ -2638,13 +2640,14 @@ div.formpaginate .prev, div.formpaginate .next {
 
 #customQualityWrapper div.component-group-desc {
 	float: left;
-	width: 165px;
+	width: 172px;
+	margin-right: 10px;
 }	
 
 #customQualityWrapper div.component-group-desc p {
 	width: 85%;
 	margin: .8em 0;
-	font-size: 1.2em;
+	font-size: 1.13em;
 	color: #666;
 }
 
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index a5ca2119..c6808db9 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -848,12 +848,15 @@ div.buttontext p {
 home_newShow.tmpl
 ========================================================================== */
 #addShowForm, #recommendedShowsForm {
+	width: 800px;
 	margin-left: auto;
 	margin-right: auto;
+	padding: 10px 0;
+	font-size:13px;
 }
 
 #newShowPortal {
-	width: 800px;
+	width: 960px;
 	padding: 10px 0;
 	margin-right: auto;
 	margin-left: auto;
@@ -880,7 +883,6 @@ home_addExistingShow.tmpl
 }
 
 ul#rootDirStaticList {
-	width: 90%;
 	margin-right: auto;
 	margin-left: auto;
 	text-align: left;
@@ -2659,7 +2661,7 @@ div.stepsguide {
 
 div.stepsguide .step {
 	float: left;
-	width: 266px;
+	width: 33%;
 	font: bold 24px Arial;
 }
 
@@ -2701,7 +2703,7 @@ div.formpaginate .prev, div.formpaginate .next {
 }
 
 .stepDiv {
-	padding: 15px;
+	padding: 15px 0;
 }
 
 #tabs .nocheck,
@@ -2711,7 +2713,7 @@ div.formpaginate .prev, div.formpaginate .next {
 
 #tabs label span.component-title,
 .stepDiv label span.component-title {
-	padding-bottom: 6px;
+	padding-bottom: 10px;
 	float: left;
 	width: 172px;
 	margin-right: 10px;
@@ -2721,11 +2723,17 @@ div.formpaginate .prev, div.formpaginate .next {
 
 #tabs label span.component-desc,
 .stepDiv label span.component-desc {
-	padding-bottom: 6px;
+	padding-bottom: 10px;
 	font-size: 12px;
 	font-weight: normal;
-	display:inline-block;
-	width:475px;
+	display: block;
+	width: 475px;
+	margin-left: 182px;
+}
+
+div.field-pair input {
+	margin-right: 6px;
+	float: left;
 }
 
 /* step 3 related */
@@ -2738,13 +2746,14 @@ div.formpaginate .prev, div.formpaginate .next {
 
 #customQualityWrapper div.component-group-desc {
 	float: left;
-	width: 165px;
+	width: 172px;
+	margin-right: 10px;
 }	
 
 #customQualityWrapper div.component-group-desc p {
 	width: 85%;
 	margin: .8em 0;
-	font-size: 1.2em;
+	font-size: 1.13em;
 	color: #666;
 }
 
diff --git a/gui/slick/interfaces/default/home_addExistingShow.tmpl b/gui/slick/interfaces/default/home_addExistingShow.tmpl
index e08660a5..44f97392 100644
--- a/gui/slick/interfaces/default/home_addExistingShow.tmpl
+++ b/gui/slick/interfaces/default/home_addExistingShow.tmpl
@@ -11,8 +11,6 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl")
 
-<form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8">
-
 <script type="text/javascript" src="$sbRoot/js/qualityChooser.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/addExistingShow.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
@@ -35,35 +33,51 @@
 	<h1 class="title">$title</h1>
 #end if
 
-<div id="tabs">
-    <ul>
-        <li><a href="#tabs-1">Manage Directories</a></li>
-        <li><a href="#tabs-2">Customize Options</a></li>
-    </ul>
-    <div id="tabs-1" class="existingtabs">
-        #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_rootDirs.tmpl")
-    </div>
-    <div id="tabs-2" class="existingtabs">
-        #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl")
-    </div>
+<div id="newShowPortal">
+	<div id="config-components">
+	    <ul>
+			<li><a href="#core-component-group1">Add Existing Show</a></li>
+		</ul>
+
+	<div id="core-component-group1" class="tab-pane active component-group">
+
+	<form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8">
+
+	<div id="tabs">
+		<ul>
+			<li><a href="#tabs-1">Manage Directories</a></li>
+			<li><a href="#tabs-2">Customize Options</a></li>
+		</ul>
+		<div id="tabs-1" class="existingtabs">
+			#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_rootDirs.tmpl")
+		</div>
+		<div id="tabs-2" class="existingtabs">
+			#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl")
+		</div>
+	</div>
+	<br />
+
+	<p>SickRage can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction.
+	If you would rather have SickRage prompt you to customize each show, then use the checkbox below.</p>
+
+	<p><input type="checkbox" name="promptForSettings" id="promptForSettings" /> <label for="promptForSettings">Prompt me to set settings for each show</label></p>
+
+	<hr />
+
+	<p><b>Displaying folders within these directories which aren't already added to SickRage:</b></p>
+
+	<ul id="rootDirStaticList"><li></li></ul>
+
+	<br />
+	<div id="tableDiv"></div>
+	<br />
+	<br />
+	<input class="btn btn-primary" type="button" value="Submit" id="submitShowDirs" />
+
+	</form>
+
+	</div>
+	</div>
 </div>
-<br />
 
-<p>SickRage can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction.<br />
-If you would rather have SickRage prompt you to customize each show, then use the checkbox below.</p>
-
-<p><input type="checkbox" name="promptForSettings" id="promptForSettings" /> <label for="promptForSettings">Prompt me to set settings for each show</label></p>
-
-<hr />
-
-<h5><b>Displaying folders within these directories which aren't already added to SickRage:</b></h5>
-
-<ul id="rootDirStaticList"><li></li></ul>
-
-<br />
-<div id="tableDiv"></div>
-<br />
-<input class="btn btn-primary" type="button" value="Submit" id="submitShowDirs" />
-
-</form>
 #include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl")
diff --git a/gui/slick/interfaces/default/home_massAddTable.tmpl b/gui/slick/interfaces/default/home_massAddTable.tmpl
index 920e5695..c3023512 100644
--- a/gui/slick/interfaces/default/home_massAddTable.tmpl
+++ b/gui/slick/interfaces/default/home_massAddTable.tmpl
@@ -3,11 +3,6 @@
 
 <table id="addRootDirTable" class="sickbeardTable tablesorter">
   <thead><tr><th class="col-checkbox"><input type="checkbox" id="checkAll" checked=checked></th><th>Directory</th><th width="20%">Show Name (tvshow.nfo)<th width="20%">Indexer</td></tr></thead>
-  <tfoot>
-    <tr>
-      <th rowspan="1" colspan="4" align="left"><a href="#" style="padding-left: 10px;" class="showManage">Manage Directories</a></th>
-    </tr>
-  </tfoot>
   <tbody>
 #for $curDir in $dirList:
 #if $curDir['added_already']:
diff --git a/gui/slick/interfaces/default/home_newShow.tmpl b/gui/slick/interfaces/default/home_newShow.tmpl
index 3dea99e0..0e9f7e57 100644
--- a/gui/slick/interfaces/default/home_newShow.tmpl
+++ b/gui/slick/interfaces/default/home_newShow.tmpl
@@ -25,11 +25,17 @@
    #end if
    
 <div id="newShowPortal">
+	<div id="config-components">
+	    <ul>
+			<li><a href="#core-component-group1">Add New Show</a></li>
+		</ul>
 
+	<div id="core-component-group1" class="tab-pane active component-group">
+				
 	<div id="displayText">aoeu</div>
 	<br />
 
-	<form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8" style="width: 800px;">
+	<form id="addShowForm" method="post" action="$sbRoot/home/addShows/addNewShow" accept-charset="utf-8">
 
 	<fieldset class="sectionwrap">
 		<legend class="legendStep">Find a show on the TVDB or TVRAGE</legend>
@@ -46,7 +52,7 @@
 			#else:
 				
 				<input type="text" id="nameToSearch" value="$default_show_name" class="form-control form-control-inline input-sm input350" />
-				&nbsp;
+				&nbsp;&nbsp;
 				<select name="indexerLang" id="indexerLangSelect" class="form-control form-control-inline input-sm">
 					<option value="en" selected="selected">en</option>
 				</select><b>*</b>
@@ -60,7 +66,7 @@
 				&nbsp;
 				<input class="btn btn-inline" type="button" id="searchName" value="Search" />
 				
-				<br />
+				<br /><br />
 				<b>*</b> This will only affect the language of the retrieved metadata file contents and episode filenames.<br />
 				This <b>DOES NOT</b> allow SickRage to download non-english TV episodes!<br />
 				<br />
@@ -107,6 +113,6 @@
 
 <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
 
-</div></div>
+</div></div></div></div>
 
 #include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl")
diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
index 568346c3..eded7f5f 100644
--- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl
+++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
@@ -3,49 +3,58 @@
 #from sickbeard import subtitles
 
 		#if $sickbeard.USE_SUBTITLES:
-        <div class="field-pair alt">
-            <input type="checkbox" name="subtitles" id="subtitles" #if $sickbeard.SUBTITLES_DEFAULT then "checked=\"checked\"" else ""# />
+        <br><div class="field-pair">
             <label for="subtitles" class="clearfix">
                 <span class="component-title">Subtitles</span>
-                <span class="component-desc">Download subtitles for this show?</span>
+                <span class="component-desc">
+                     <input type="checkbox" name="subtitles" id="subtitles" #if $sickbeard.SUBTITLES_DEFAULT then "checked=\"checked\"" else ""# />
+                    <p>Download subtitles for this show?</p>
+                </span>
             </label>
         </div>
         #end if
         
         <div class="field-pair">
-            <label for="statusSelect" class="nocheck clearfix">
-                <span class="component-title">
+            <label for="statusSelect">
+                <span class="component-title">Set the initial status<br /> of missing episodes</span>
+                <span class="component-desc">
                     <select name="defaultStatus" id="statusSelect" class="form-control form-control-inline input-sm">
                     #for $curStatus in [$SKIPPED, $WANTED, $ARCHIVED, $IGNORED]:
                         <option value="$curStatus" #if $sickbeard.STATUS_DEFAULT == $curStatus then 'selected="selected"' else ''#>$statusStrings[$curStatus]</option>
                     #end for
                     </select>
                 </span>
-                <span class="component-desc">Set the initial status of missing episodes</span>
             </label>
         </div>
 
         <div class="field-pair alt">
-            <input class="cb" type="checkbox" name="flatten_folders" id="flatten_folders" #if $sickbeard.FLATTEN_FOLDERS_DEFAULT then "checked=\"checked\"" else ""# />
             <label for="flatten_folders" class="clearfix">
                 <span class="component-title">Flatten Folders</span>
-                <span class="component-desc">Disregard sub-folders?</span>
+                <span class="component-desc">
+                    <input class="cb" type="checkbox" name="flatten_folders" id="flatten_folders" #if $sickbeard.FLATTEN_FOLDERS_DEFAULT then "checked=\"checked\"" else ""# />
+                    <p>Disregard sub-folders?</p>
+                </span>
             </label>
         </div>
 
 		<div class="field-pair alt">
-            <input type="checkbox" name="anime" id="anime" #if $sickbeard.ANIME_DEFAULT then "checked=\"checked\"" else ""# />
             <label for="anime" class="clearfix">
                 <span class="component-title">Anime</span>
-                <span class="component-desc">Is this show an Anime?</span>
+                <span class="component-desc">
+                    <input type="checkbox" name="anime" id="anime" #if $sickbeard.ANIME_DEFAULT then "checked=\"checked\"" else ""# />
+                    <p>Is this show an Anime?<p>
+                </span>
             </label>
         </div>
 
         <div class="field-pair alt">
-            <input type="checkbox" name="scene" id="scene" #if $sickbeard.SCENE_DEFAULT then "checked=\"checked\"" else ""# />
+
             <label for="scene" class="clearfix">
                 <span class="component-title">Scene Numbering</span>
-                <span class="component-desc">Is this show scene numbered?</span>
+                <span class="component-desc">
+                    <input type="checkbox" name="scene" id="scene" #if $sickbeard.SCENE_DEFAULT then "checked=\"checked\"" else ""# />
+				    <p>Is this show scene numbered?</p>
+                </span>
             </label>
         </div>
 
@@ -58,6 +67,8 @@
         <div class="field-pair alt">
             <label for="saveDefaultsButton" class="nocheck clearfix">
                 <span class="component-title"><input class="btn btn-inline" type="button" id="saveDefaultsButton" value="Save Defaults" disabled="disabled" /></span>
-                <span class="component-desc">Persist current values as the defaults</span>
+                <span class="component-desc">
+                    <p>Use current values as the defaults</p>
+                </span>
             </label>
-        </div>
+        </div><br>
diff --git a/gui/slick/interfaces/default/inc_qualityChooser.tmpl b/gui/slick/interfaces/default/inc_qualityChooser.tmpl
index 7ed6589e..329879c9 100644
--- a/gui/slick/interfaces/default/inc_qualityChooser.tmpl
+++ b/gui/slick/interfaces/default/inc_qualityChooser.tmpl
@@ -2,9 +2,10 @@
 #from sickbeard.common import Quality, qualityPresets, qualityPresetStrings
 
 <div class="field-pair">
-    <label for="qualityPreset" class="nocheck clearfix">
+    <label for="qualityPreset">
 #set $overall_quality = $Quality.combineQualities($anyQualities, $bestQualities)
-<span class="component-title">
+<span class="component-title">Preferred quality of episodes to be download</span>
+<span class="component-desc">
 #set $selected = None
 <select id="qualityPreset" class="form-control form-control-inline input-sm">
 <option value="0">Custom</option>
@@ -13,7 +14,6 @@
 #end for
 </select>
 </span>
-<span class="component-desc">Preferred quality of episodes to be download</span>
 
     </label>
 </div>
@@ -21,11 +21,11 @@
 <div id="customQualityWrapper">
 	<div id="customQuality">
 	    <div class="component-group-desc">
-	        <p>One of the <b>Initial</b> quality selections must be obtained before SickRage will attempt to process the <b>Archive</b> selections.</p>
+	        <p>One of the <b>Initial</b> quality selections must be obtained before SickRage will attempt to search and process the <b>Archive</b> selections.</p>
 	    </div>
 
-        <div style="padding-right: 40px; text-align: center;" class="float-left">
-            <h4>Initial</h4>
+        <div style="padding-right: 40px; text-align: left; float: left;">
+            <h5>Initial</h4>
             #set $anyQualityList = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings)
             <select id="anyQualities" name="anyQualities" multiple="multiple" size="$len($anyQualityList)" class="form-control form-control-inline input-sm">
             #for $curQuality in sorted($anyQualityList):
@@ -34,8 +34,8 @@
             </select>
         </div>
 
-        <div style="text-align: center;" class="float-left">
-            <h4>Archive</h4>
+        <div style="text-align: left; float: left;">
+            <h5>Archive</h4>
             #set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
             <select id="bestQualities" name="bestQualities" multiple="multiple" size="$len($bestQualityList)" class="form-control form-control-inline input-sm">
             #for $curQuality in sorted($bestQualityList):
diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl
index 184ab8c8..6ac7b15a 100644
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@@ -227,7 +227,7 @@
                                 <li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm shutdown"><i class="menu-icon-shutdown"></i>&nbsp;Shutdown</a></li>
 							</ul>
 						</li>
-			            <li id="donate"><a href="http://sr-upgrade.appspot.com" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href); return false;"><img src="$sbRoot/images/donate.jpg" alt="[donate]" /></a></li>
+			            <li id="donate"><a href="http://sr-upgrade.appspot.com" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href); return false;"><img src="$sbRoot/images/donate.jpg" alt="[donate]" class="navbaricon hidden-xs" /></a></li>
 					</ul>
 
 				</div><!-- /.navbar-collapse -->