diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index f995a81f27..f5646f5413 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -30,21 +30,17 @@
                             <div class="fieldDescription">
                                 <div>${LabelWatchFolderHelp}</div>
                             </div>
-                            <br />
                         </li>
                         <li>
-                            <label for="txtMinFileSize">${LabelMinFileSizeForOrganize}</label>
-                            <input type="number" id="txtMinFileSize" name="txtMinFileSize" pattern="[0-9]*" required="required" min="0" />
+                            <paper-input type="number" id="txtMinFileSize" name="txtMinFileSize" label="${LabelMinFileSizeForOrganize}" pattern="[0-9]*" min="0" required></paper-input>
                             <div class="fieldDescription">${LabelMinFileSizeForOrganizeHelp}</div>
                         </li>
                         <li>
-                            <label for="txtSeasonFolderPattern">${LabelSeasonFolderPattern}</label>
-                            <input type="text" id="txtSeasonFolderPattern" name="txtSeasonFolderPattern" required="required" />
+                            <paper-input type="text" id="txtSeasonFolderPattern" name="txtSeasonFolderPattern" label="${LabelSeasonFolderPattern}" required></paper-input>
                             <div class="fieldDescription seasonFolderFieldDescription"></div>
                         </li>
                         <li>
-                            <label for="txtSeasonZeroName">${LabelSeasonZeroFolderName}</label>
-                            <input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" required="required" />
+                            <paper-input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" label="${LabelSeasonZeroFolderName}" required></paper-input>
                         </li>
                     </ul>
                     <div data-role="collapsible">
@@ -52,14 +48,12 @@
                         <div>
                             <br />
                             <div>
-                                <label for="txtEpisodePattern">${LabelEpisodePattern}</label>
-                                <input type="text" id="txtEpisodePattern" name="txtEpisodePattern" required="required" />
+                                <paper-input type="text" id="txtEpisodePattern" name="txtEpisodePattern" label="${LabelEpisodePattern}" required></paper-input>
                                 <div class="fieldDescription episodePatternDescription"></div>
                             </div>
                             <br />
                             <div>
-                                <label for="txtMultiEpisodePattern">${LabelMultiEpisodePattern}</label>
-                                <input type="text" id="txtMultiEpisodePattern" name="txtMultiEpisodePattern" required="required" />
+                                <paper-input type="text" id="txtMultiEpisodePattern" name="txtMultiEpisodePattern" label="${LabelMultiEpisodePattern}" required></paper-input>
                                 <div class="fieldDescription multiEpisodePatternDescription"></div>
                             </div>
 
@@ -143,7 +137,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="copyOrMoveFile">${LabelTransferMethod}</label>
+                            <label for="copyOrMoveFile" class="selectLabel">${LabelTransferMethod}</label>
                             <select id="copyOrMoveFile" data-mini="true">
                                 <option value="true">${OptionCopy}</option>
                                 <option value="false">${OptionMove}</option>
@@ -155,8 +149,7 @@
                             <label for="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</label>
                         </li>
                         <li>
-                            <label for="txtDeleteLeftOverFiles">${LabelDeleteLeftOverFiles}</label>
-                            <input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" />
+                            <paper-input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" label="${LabelDeleteLeftOverFiles}"></paper-input>
                             <div class="fieldDescription">${LabelDeleteLeftOverFilesHelp}</div>
                         </li>
                         <li>
diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json
index 8ebf5eeda8..f3acb5d871 100644
--- a/dashboard-ui/bower_components/emby-apiclient/.bower.json
+++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.0.34",
-  "_release": "1.0.34",
+  "version": "1.0.35",
+  "_release": "1.0.35",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.34",
-    "commit": "1bbacdd65aa7c7af955cdd7f0500a4419064a98b"
+    "tag": "1.0.35",
+    "commit": "d84b62c2a98faed179e07ef805e54cd7e6d2e036"
   },
   "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
   "_target": "~1.0.3",
diff --git a/dashboard-ui/bower_components/emby-apiclient/apiclient.js b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
index 22d55a4675..4b112ab836 100644
--- a/dashboard-ui/bower_components/emby-apiclient/apiclient.js
+++ b/dashboard-ui/bower_components/emby-apiclient/apiclient.js
@@ -3414,5 +3414,35 @@
 
             return self.getJSON(url);
         };
+
+        self.getSmartMatchInfos = function (options) {
+
+            options = options || {};
+
+            var url = self.getUrl("Library/FileOrganizations/SmartMatches", options);
+
+            return self.ajax({
+                type: "GET",
+                url: url,
+                dataType: "json"
+            });
+        };
+
+        self.deleteSmartMatchEntry = function (name, options) {
+
+            var url = self.getUrl("Library/FileOrganizations/SmartMatches", options || {});
+
+            var postData = {
+                Name: name
+            };
+
+            return self.ajax({
+
+                type: "POST",
+                url: url,
+                data: JSON.stringify(postData),
+                contentType: "application/json"
+            });
+        };
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js
index 10b0413cb5..7a922e83d2 100644
--- a/dashboard-ui/scripts/autoorganizesmart.js
+++ b/dashboard-ui/scripts/autoorganizesmart.js
@@ -19,8 +19,11 @@
             populateList(page, infos);
 
             Dashboard.hideLoadingMsg();
-        }, onApiFailure);
 
+        }, function () {
+
+            Dashboard.hideLoadingMsg();
+        });
     }
 
     function populateList(page, result) {
@@ -55,8 +58,7 @@
             if (info.OrganizerType != currentType) {
                 currentType = info.OrganizerType;
 
-                if (html.length > 0)
-                {
+                if (html.length > 0) {
                     html += "</ul>";
                 }
 
@@ -74,7 +76,7 @@
 
                 html += "<p>" + info.MatchStrings[n] + "</p>";
 
-                html += "<a id='btnDeleteMatchEntry" + info.Id + "' class='btnDeleteMatchEntry' href='#' data-id='" + info.Id + "' data-matchstring='" + info.MatchStrings[n]  + "' data-icon='delete'>" + Globalize.translate('ButtonDelete') + "</a>";
+                html += "<a id='btnDeleteMatchEntry" + info.Id + "' class='btnDeleteMatchEntry' href='#' data-id='" + info.Id + "' data-matchstring='" + info.MatchStrings[n] + "' data-icon='delete'>" + Globalize.translate('ButtonDelete') + "</a>";
 
                 html += "</a>";
 
@@ -92,8 +94,7 @@
         Dashboard.hideLoadingMsg();
 
         Dashboard.alert({
-            title: Globalize.translate('AutoOrganizeError'),
-            message: Globalize.translate('ErrorOrganizingFileWithErrorCode', e.getResponseHeader("X-Application-Error-Code"))
+            message: Globalize.translate('DefaultErrorMessage')
         });
     }