diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 38c62172..f1b4795b 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -25,7 +25,8 @@
                 <li><a href="#tabs-2">Download settings</a></li>
                 <li><a href="#tabs-3">Search providers</a></li>
                 <li><a href="#tabs-4">Quality &amp; Post Processing</a></li>
-                <li><a href="#tabs-5">Advanced Settings</a></li>
+                <li><a href="#tabs-5">Notifications</a></li>
+                <li><a href="#tabs-6">Advanced Settings</a></li>
             </ul>
             <div id="tabs-1">
 
@@ -529,6 +530,195 @@
                 <input type="button" class="configsubmit" value="Save Changes" onclick="doAjaxCall('configUpdate',$(this),'tabs',true);return false;" data-success="Changes saved successfully">
             </div>
             <div id="tabs-5">
+                <table class="configtable" summary="Notifications">
+                    <tr>
+                        <td>
+                            <fieldset>
+                                <h3>Prowl</h3>
+                                <div class="row checkbox">
+                                    <input type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} /><label>Enable Prowl Notifications</label>
+                                </div>
+                                <div id="prowloptions">
+                                    <div class="row">
+                                        <label>API key</label><input type="text" name="prowl_keys" value="${config['prowl_keys']}" size="50">
+                                    </div>
+                                    <div class="row checkbox">
+                                        <input type="checkbox" name="prowl_onsnatch" value="1" ${config['prowl_onsnatch']} /><label>Notify on snatch?</label>
+                                    </div>
+                                    <div class="row">
+                                        <label>Priority (-2,-1,0,1 or 2):</label>
+                                        <input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2">
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <h3>XBMC</h3>
+                                <div class="checkbox row">
+                                    <input type="checkbox" name="xbmc_enabled" id="xbmc" value="1" ${config['xbmc_enabled']} /><label>Enable XBMC Updates</label>
+                                </div>
+                                <div id="xbmcoptions">
+                                    <div class="row">
+                                        <label>XBMC Host:Port</label>
+                                        <input type="text" name="xbmc_host" value="${config['xbmc_host']}" size="30">
+                                        <small>e.g. http://localhost:8080. Separate hosts with commas</small>
+                                    </div>
+                                    <div class="row">
+                                        <label>XBMC Username</label><input type="text" name="xbmc_username" value="${config['xbmc_username']}" size="30">
+                                    </div>
+                                    <div class="row">
+                                        <label>XBMC Password</label><input type="password" name="xbmc_password" value="${config['xbmc_password']}" size="30">
+                                    </div>
+                                    <div class="checkbox row">
+                                        <input type="checkbox" name="xbmc_update" value="1" ${config['xbmc_update']} /><label>Update XBMC Library</label>
+                                    </div>
+                                    <div class="checkbox row">
+                                        <input type="checkbox" name="xbmc_notify" value="1" ${config['xbmc_notify']} /><label>Send Notification to XBMC</label>
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <h3>Plex Media Server</h3>
+                                <div class="checkbox row">
+                                    <input type="checkbox" name="plex_enabled" id="plex" value="1" ${config['plex_enabled']} /><label>Enable Plex Updates</label>
+                                </div>
+                                <div id="plexoptions">
+                                    <div class="row">
+                                        <label>Plex Server Host:Port</label>
+                                        <input type="text" name="plex_server_host" value="${config['plex_server_host']}" size="30">
+                                        <small>Host running Plex Media Server (eg. http://192.168.1.100:32400)</small>
+                                    </div>
+                                    <div class="row">
+                                        <label>Plex Client Host:Port</label>
+                                        <input type="text" name="plex_client_host" value="${config['plex_client_host']}" size="30">
+                                        <small>Host running Plex Client (eg. http://192.168.1.100:3000)</small>
+                                    </div>
+                                    <div class="row">
+                                        <label>Plex Username</label><input type="text" name="plex_username" value="${config['plex_username']}" size="30">
+					                    <small>Username of your Plex client API (blank for none)</small>
+                                    </div>
+                                    <div class="row">
+                                        <label>Plex Password</label><input type="password" name="plex_password" value="${config['plex_password']}" size="30">
+					                    <small>Password of your Plex client API (blank for none)</small>
+                                    </div>
+                                    <div class="checkbox row">
+                                        <input type="checkbox" name="plex_update" value="1" ${config['plex_update']} /><label>Update Plex Library</label>
+                                    </div>
+                                    <div class="checkbox row">
+                                        <input type="checkbox" name="plex_notify" value="1" ${config['plex_notify']} /><label>Send Notifications to Plex</label>
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <h3>NotifyMyAndroid</h3>
+                                <div class="checkbox row">
+                                    <input type="checkbox" name="nma_enabled" id="nma" value="1" ${config['nma_enabled']} /><label>Enable NotifyMyAndroid</label>
+                                </div>
+                                <div id="nmaoptions">
+                                    <div class="row checkbox">
+                                        <input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /><label>Notify on snatch?</label>
+                                    </div>
+                                    <div class="row">
+                                        <label>NotifyMyAndroid API Key</label>
+                                        <input type="text" name="nma_apikey" value="${config['nma_apikey']}" size="30">
+                                        <small>Separate multiple api keys with commas</small>
+                                    </div>
+                                    <div class="row">
+                                        <label>Priority</label>
+                                        <select name="nma_priority">
+                                        %for x in [-2,-1,0,1,2]:
+                                        <%
+                                            if config['nma_priority'] == x:
+                                                nma_priority_selected = 'selected'
+                                            else:
+                                                nma_priority_selected = ''
+
+                                            if x == -2:
+                                                nma_priority_value = 'Very Low'
+                                            elif x == -1:
+                                                nma_priority_value = 'Moderate'
+                                            elif x == 0:
+                                                nma_priority_value = 'Normal'
+                                            elif x == 1:
+                                                nma_priority_value = 'High'
+                                            else:
+                                                nma_priority_value = 'Emergency'
+                                        %>
+                                            <option value=${x} ${nma_priority_selected}>${nma_priority_value}</option>
+                                        %endfor
+                                        </select>
+                                    </div>
+                                </div>
+                            </fieldset>
+                            </td>
+                            <td>
+                            <fieldset>
+                                <h3>Pushalot</h3>
+                                <div class="checkbox row">
+                                    <input type="checkbox" name="pushalot_enabled" id="pushalot" value="1" ${config['pushalot_enabled']} /><label>Enable Pushalot</label>
+                                </div>
+                                <div id="pushalotoptions">
+                                    <div class="row checkbox">
+                                        <input type="checkbox" name="pushalot_onsnatch" value="1" ${config['pushalot_onsnatch']} /><label>Notify on snatch?</label>
+                                    </div>
+                                    <div class="row">
+                                        <label>Pushalot API Key</label>
+                                        <input type="text" name="pushalot_apikey" value="${config['pushalot_apikey']}" size="30">
+                                        <small>Separate multiple api keys with commas</small>
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <h3>Synology NAS</h3>
+                                <div class="checkbox row">
+                                    <input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label>
+                                </div>
+                            </fieldset>
+
+                            <fieldset>
+                                <h3>Pushover</h3>
+                                <div class="row checkbox">
+                                    <input type="checkbox" name="pushover_enabled" id="pushover" value="1" ${config['pushover_enabled']} /><label>Enable Pushover Notifications</label>
+                                </div>
+                                <div id="pushoveroptions">
+                                    <div class="row">
+                                        <label>User key</label><input type="text" name="pushover_keys" value="${config['pushover_keys']}" size="50">
+                                    </div>
+                                    <div class="row checkbox">
+                                        <input type="checkbox" name="pushover_onsnatch" value="1" ${config['pushover_onsnatch']} /><label>Notify on snatch?</label>
+                                    </div>
+                                    <div class="row">
+                                        <label>Priority (-1,0, or 1):</label>
+                                        <input type="text" name="pushover_priority" value="${config['pushover_priority']}" size="2">
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <h3>Twitter</h3>
+                                <div class="row checkbox">
+                                    <input type="checkbox" name="twitter_enabled" id="twitter" value="1" ${config['twitter_enabled']} /><label>Enable Twitter Notifications</label>
+                                </div>
+                                <div id="twitteroptions">
+                                    <div class="row checkbox">
+                                        <input type="checkbox" name="twitter_onsnatch" value="1" ${config['twitter_onsnatch']} /><label>Notify on snatch?</label>
+                                    </div>
+                                    <div class="row">
+                                        <input type="button" value="Request Authorization" id="twitterStep1" />
+                                    </div>
+                                    <div class="row">
+                                        <input type="text" id="twitter_key" value="" size="35" placeholder="Input Authorization Key" />
+                                        <input type="button" value="Verify Key" id="twitterStep2" />
+                                    </div>
+                                    <div class="row">
+                                        <input type="button" value="Test Twitter" id="testTwitter" />
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </td>
+                    </tr>
+                </table>
+                <input type="button" class="configsubmit" value="Save Changes" onclick="doAjaxCall('configUpdate',$(this),'tabs',true);return false;" data-success="Changes saved successfully">
+            </div>
+            <div id="tabs-6">
                 <table class="configtable" summary="Advanced Settings">
                     <tr>
                         <td>
@@ -759,186 +949,14 @@
                                 </div>
                             </fieldset>
 
-                            <h2>Notifications</h2>
                             <fieldset>
-                                <h3>Prowl</h3>
-                                <div class="row checkbox">
-                                    <input type="checkbox" name="prowl_enabled" id="prowl" value="1" ${config['prowl_enabled']} /><label>Enable Prowl Notifications</label>
-                                </div>
-                                <div id="prowloptions">
-                                    <div class="row">
-                                        <label>API key</label><input type="text" name="prowl_keys" value="${config['prowl_keys']}" size="50">
-                                    </div>
-                                    <div class="row checkbox">
-                                        <input type="checkbox" name="prowl_onsnatch" value="1" ${config['prowl_onsnatch']} /><label>Notify on snatch?</label>
-                                    </div>
-                                    <div class="row">
-                                        <label>Priority (-2,-1,0,1 or 2):</label>
-                                        <input type="text" name="prowl_priority" value="${config['prowl_priority']}" size="2">
-                                    </div>
+                                <legend>Songkick</legend>
+                                <div class="row">
+                                    <label>API Key:</label>
+                                    <input type="text" name="songkick_apikey" value="${config['songkick_apikey']}" size="50">
                                 </div>
                             </fieldset>
-                            <fieldset>
-                                <h3>XBMC</h3>
-                                <div class="checkbox row">
-                                    <input type="checkbox" name="xbmc_enabled" id="xbmc" value="1" ${config['xbmc_enabled']} /><label>Enable XBMC Updates</label>
-                                </div>
-                                <div id="xbmcoptions">
-                                    <div class="row">
-                                        <label>XBMC Host:Port</label>
-                                        <input type="text" name="xbmc_host" value="${config['xbmc_host']}" size="30">
-                                        <small>e.g. http://localhost:8080. Separate hosts with commas</small>
-                                    </div>
-                                    <div class="row">
-                                        <label>XBMC Username</label><input type="text" name="xbmc_username" value="${config['xbmc_username']}" size="30">
-                                    </div>
-                                    <div class="row">
-                                        <label>XBMC Password</label><input type="password" name="xbmc_password" value="${config['xbmc_password']}" size="30">
-                                    </div>
-                                    <div class="checkbox row">
-                                        <input type="checkbox" name="xbmc_update" value="1" ${config['xbmc_update']} /><label>Update XBMC Library</label>
-                                    </div>
-                                    <div class="checkbox row">
-                                        <input type="checkbox" name="xbmc_notify" value="1" ${config['xbmc_notify']} /><label>Send Notification to XBMC</label>
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <h3>Plex Media Server</h3>
-                                <div class="checkbox row">
-                                    <input type="checkbox" name="plex_enabled" id="plex" value="1" ${config['plex_enabled']} /><label>Enable Plex Updates</label>
-                                </div>
-                                <div id="plexoptions">
-                                    <div class="row">
-                                        <label>Plex Server Host:Port</label>
-                                        <input type="text" name="plex_server_host" value="${config['plex_server_host']}" size="30">
-                                        <small>Host running Plex Media Server (eg. http://192.168.1.100:32400)</small>
-                                    </div>
-                                    <div class="row">
-                                        <label>Plex Client Host:Port</label>
-                                        <input type="text" name="plex_client_host" value="${config['plex_client_host']}" size="30">
-                                        <small>Host running Plex Client (eg. http://192.168.1.100:3000)</small>
-                                    </div>
-                                    <div class="row">
-                                        <label>Plex Username</label><input type="text" name="plex_username" value="${config['plex_username']}" size="30">
-					<small>Username of your Plex client API (blank for none)</small>
-                                    </div>
-                                    <div class="row">
-                                        <label>Plex Password</label><input type="password" name="plex_password" value="${config['plex_password']}" size="30">
-					<small>Password of your Plex client API (blank for none)</small>
-                                    </div>
-                                    <div class="checkbox row">
-                                        <input type="checkbox" name="plex_update" value="1" ${config['plex_update']} /><label>Update Plex Library</label>
-                                    </div>
-                                    <div class="checkbox row">
-                                        <input type="checkbox" name="plex_notify" value="1" ${config['plex_notify']} /><label>Send Notifications to Plex</label>
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <h3>NotifyMyAndroid</h3>
-                                <div class="checkbox row">
-                                    <input type="checkbox" name="nma_enabled" id="nma" value="1" ${config['nma_enabled']} /><label>Enable NotifyMyAndroid</label>
-                                </div>
-                                <div id="nmaoptions">
-                                    <div class="row checkbox">
-                                        <input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /><label>Notify on snatch?</label>
-                                    </div>
-                                    <div class="row">
-                                        <label>NotifyMyAndroid API Key</label>
-                                        <input type="text" name="nma_apikey" value="${config['nma_apikey']}" size="30">
-                                        <small>Separate multiple api keys with commas</small>
-                                    </div>
-                                    <div class="row">
-                                        <label>Priority</label>
-                                        <select name="nma_priority">
-                                        %for x in [-2,-1,0,1,2]:
-                                        <%
-                                            if config['nma_priority'] == x:
-                                                nma_priority_selected = 'selected'
-                                            else:
-                                                nma_priority_selected = ''
-
-                                            if x == -2:
-                                                nma_priority_value = 'Very Low'
-                                            elif x == -1:
-                                                nma_priority_value = 'Moderate'
-                                            elif x == 0:
-                                                nma_priority_value = 'Normal'
-                                            elif x == 1:
-                                                nma_priority_value = 'High'
-                                            else:
-                                                nma_priority_value = 'Emergency'
-                                        %>
-                                            <option value=${x} ${nma_priority_selected}>${nma_priority_value}</option>
-                                        %endfor
-                                        </select>
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <h3>Pushalot</h3>
-                                <div class="checkbox row">
-                                    <input type="checkbox" name="pushalot_enabled" id="pushalot" value="1" ${config['pushalot_enabled']} /><label>Enable Pushalot</label>
-                                </div>
-                                <div id="pushalotoptions">
-                                    <div class="row checkbox">
-                                        <input type="checkbox" name="pushalot_onsnatch" value="1" ${config['pushalot_onsnatch']} /><label>Notify on snatch?</label>
-                                    </div>
-                                    <div class="row">
-                                        <label>Pushalot API Key</label>
-                                        <input type="text" name="pushalot_apikey" value="${config['pushalot_apikey']}" size="30">
-                                        <small>Separate multiple api keys with commas</small>
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <h3>Synology NAS</h3>
-                                <div class="checkbox row">
-                                    <input type="checkbox" name="synoindex_enabled" id="synoindex" value="1" ${config['synoindex_enabled']} /><label>Enable Synoindex</label>
-                                </div>
-                            </fieldset>
-
-                            <fieldset>
-                                <h3>Pushover</h3>
-                                <div class="row checkbox">
-                                    <input type="checkbox" name="pushover_enabled" id="pushover" value="1" ${config['pushover_enabled']} /><label>Enable Pushover Notifications</label>
-                                </div>
-                                <div id="pushoveroptions">
-                                    <div class="row">
-                                        <label>User key</label><input type="text" name="pushover_keys" value="${config['pushover_keys']}" size="50">
-                                    </div>
-                                    <div class="row checkbox">
-                                        <input type="checkbox" name="pushover_onsnatch" value="1" ${config['pushover_onsnatch']} /><label>Notify on snatch?</label>
-                                    </div>
-                                    <div class="row">
-                                        <label>Priority (-1,0, or 1):</label>
-                                        <input type="text" name="pushover_priority" value="${config['pushover_priority']}" size="2">
-                                    </div>
-                                </div>
-                            </fieldset>
-                            <fieldset>
-                                <h3>Twitter</h3>
-                                <div class="row checkbox">
-                                    <input type="checkbox" name="twitter_enabled" id="twitter" value="1" ${config['twitter_enabled']} /><label>Enable Twitter Notifications</label>
-                                </div>
-                                <div id="twitteroptions">
-                                    <div class="row checkbox">
-                                        <input type="checkbox" name="twitter_onsnatch" value="1" ${config['twitter_onsnatch']} /><label>Notify on snatch?</label>
-                                    </div>
-                                    <div class="row">
-                                        <input type="button" value="Request Authorization" id="twitterStep1" />
-                                    </div>
-                                    <div class="row">
-                                        <input type="text" id="twitter_key" value="" size="35" placeholder="Input Authorization Key" />
-                                        <input type="button" value="Verify Key" id="twitterStep2" />
-                                    </div>
-                                    <div class="row">
-                                        <input type="button" value="Test Twitter" id="testTwitter" />
-                                    </div>
-                                </div>
-                            </fieldset>
-
+                            
                             <fieldset>
                                 <legend>Musicbrainz</legend>
                                 <div class="row">
@@ -978,14 +996,6 @@
                                 </div>
                             </fieldset>
 
-                            <fieldset>
-                                <legend>Songkick</legend>
-                                <div class="row">
-                                    <label>API Key:</label>
-                                    <input type="text" name="songkick_apikey" value="${config['songkick_apikey']}" size="50">
-                                </div>
-                            </fieldset>
-
                         </td>
                     </tr>
                 </table>