diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 308de1af44..d05b65b760 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -1,4 +1,4 @@
-<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="emby-collapse,jqmtable,scripts/autoorganizetv,paper-input,paper-checkbox,jqmlistview">
+<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="emby-collapse,jqmtable,scripts/autoorganizetv,paper-input,paper-checkbox">
 
     <div data-role="content">
         <div class="content-primary">
@@ -8,30 +8,28 @@
                 <p>${AutoOrganizeHelp}</p>
 
                 <p>${AutoOrganizeTvHelp}</p>
-                <ul data-role="listview" class="ulForm" style="margin-bottom: 0!important;">
-                    <li>
-                        <br />
-                        <paper-checkbox id="chkEnableTvSorting">${OptionEnableEpisodeOrganization}</paper-checkbox>
-                    </li>
-                    <li>
-                        <paper-input id="txtWatchFolder" label="${LabelWatchFolder}" style="width:85%;display:inline-block;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                        <div class="fieldDescription">
-                            <div>${LabelWatchFolderHelp}</div>
-                        </div>
-                    </li>
-                    <li>
-                        <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>
-                        <paper-input type="text" id="txtSeasonFolderPattern" name="txtSeasonFolderPattern" label="${LabelSeasonFolderPattern}" required></paper-input>
-                        <div class="fieldDescription seasonFolderFieldDescription"></div>
-                    </li>
-                    <li>
-                        <paper-input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" label="${LabelSeasonZeroFolderName}" required></paper-input>
-                    </li>
-                </ul><br />
+                <div>
+                    <br />
+                    <paper-checkbox id="chkEnableTvSorting">${OptionEnableEpisodeOrganization}</paper-checkbox>
+                </div>
+                <div>
+                    <paper-input id="txtWatchFolder" label="${LabelWatchFolder}" style="width:85%;display:inline-block;"></paper-input>
+                    <button type="button" is="paper-icon-button-light" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                    <div class="fieldDescription">
+                        <div>${LabelWatchFolderHelp}</div>
+                    </div>
+                </div>
+                <div>
+                    <paper-input type="number" id="txtMinFileSize" name="txtMinFileSize" label="${LabelMinFileSizeForOrganize}" pattern="[0-9]*" min="0" required></paper-input>
+                    <div class="fieldDescription">${LabelMinFileSizeForOrganizeHelp}</div>
+                </div>
+                <div>
+                    <paper-input type="text" id="txtSeasonFolderPattern" name="txtSeasonFolderPattern" label="${LabelSeasonFolderPattern}" required></paper-input>
+                    <div class="fieldDescription seasonFolderFieldDescription"></div>
+                </div>
+                <div>
+                    <paper-input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" label="${LabelSeasonZeroFolderName}" required></paper-input>
+                </div><br />
 
                 <div is="emby-collapse" title="${HeaderEpisodeFilePattern}">
                     <div class="collapseContent">
@@ -129,35 +127,28 @@
                 </div>
 
                 <br /><br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <label for="copyOrMoveFile" class="selectLabel">${LabelTransferMethod}</label>
-                        <select id="copyOrMoveFile" data-mini="true">
-                            <option value="true">${OptionCopy}</option>
-                            <option value="false">${OptionMove}</option>
-                        </select>
-                        <div class="fieldDescription">${LabelTransferMethodHelp}</div>
-                    </li>
-                    <li>
-                        <br />
-                        <paper-checkbox type="checkbox" id="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</paper-checkbox>
-                    </li>
-                    <li>
-                        <paper-input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" label="${LabelDeleteLeftOverFiles}"></paper-input>
-                        <div class="fieldDescription">${LabelDeleteLeftOverFilesHelp}</div>
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkDeleteEmptyFolders">${LabelDeleteEmptyFolders}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
-                    </li>
-                </ul>
+                <div>
+                    <label for="copyOrMoveFile" class="selectLabel">${LabelTransferMethod}</label>
+                    <select id="copyOrMoveFile" data-mini="true">
+                        <option value="true">${OptionCopy}</option>
+                        <option value="false">${OptionMove}</option>
+                    </select>
+                    <div class="fieldDescription">${LabelTransferMethodHelp}</div>
+                </div>
+                <div>
+                    <br />
+                    <paper-checkbox type="checkbox" id="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</paper-checkbox>
+                </div>
+                <div>
+                    <paper-input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" label="${LabelDeleteLeftOverFiles}"></paper-input>
+                    <div class="fieldDescription">${LabelDeleteLeftOverFilesHelp}</div>
+                </div>
+                <div>
+                    <paper-checkbox id="chkDeleteEmptyFolders">${LabelDeleteEmptyFolders}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
+                </div>
 
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                    </li>
-
-                </ul>
+                <div><button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
             </form>
 
         </div>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
index 9556fdf2a3..86e4d811c0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css
@@ -4,7 +4,7 @@
 
 .collapseContent {
     border-width: 0 1px 1px 1px;
-    padding: 1em 1.25em;
+    padding: 1.25em 1.25em;
     height: 0;
     transition-property: height;
     transition-duration: 300ms;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css
index 6fb8fa488a..731cb4ab47 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-tabs/emby-tabs.css
@@ -1,7 +1,7 @@
 .emby-tab-button {
     background: transparent;
-    border: 2px solid transparent !important;
-    border-width: 0 0 2px 0 !important;
+    border: 2px solid transparent;
+    border-width: 0 0 2px 0;
     cursor: pointer;
     outline: none !important;
     width: auto;
@@ -24,13 +24,13 @@
     overflow: hidden;
 }
 
-.emby-tab-button:focus {
-    font-weight: bold !important;
-}
+    .emby-tab-button:focus {
+        font-weight: bold !important;
+    }
 
 .emby-tab-button-active {
     color: #52B54B !important;
-    border-color: #52B54B !important;
+    border-color: #52B54B;
 }
 
 .emby-tabs-slider {
diff --git a/dashboard-ui/components/dockedtabs/dockedtabs.css b/dashboard-ui/components/dockedtabs/dockedtabs.css
index 1c975aed36..3a166ce3e6 100644
--- a/dashboard-ui/components/dockedtabs/dockedtabs.css
+++ b/dashboard-ui/components/dockedtabs/dockedtabs.css
@@ -14,6 +14,8 @@
     padding: 0 !important;
     margin: 0 !important;
     text-align: center;
+    border-color: transparent !important;
+    border-width: 0 !important;
 }
 
 .dockedtabs-tab-button, .dockedtabs-tab-button-foreground {
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 8e545658e6..23315296be 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -593,7 +593,6 @@ progress {
 
 .ui-body-b .emby-collapsible-content, .ui-body-b .collapseContent {
     border-width: 0;
-    padding: 1em 1.25em;
     background-color: #222;
 }
 
@@ -621,7 +620,6 @@ progress {
 
 .ui-body-a .emby-collapsible-content, .ui-body-a .collapseContent {
     border-width: 0;
-    padding: 1em 1.25em;
     background-color: #fff;
 }
 
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index ff0add52c3..66177ba2bf 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -44,46 +44,42 @@
 
                 <div is="emby-collapse" title="${HeaderAdvanced}">
                     <div class="collapseContent">
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <paper-input type="text" id="txtCachePath" label="${LabelCachePath}" style="display: inline-block; width: 85%;"></paper-input>
-                                <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="autoSize">
-                                    <i class="md-icon">search</i>
-                                </button>
-                                <div class="fieldDescription">${LabelCachePathHelp}</div>
-                            </li>
-                        </ul>
+                        <div>
+                            <paper-input type="text" id="txtCachePath" label="${LabelCachePath}" style="display: inline-block; width: 85%;"></paper-input>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="autoSize">
+                                <i class="md-icon">search</i>
+                            </button>
+                            <div class="fieldDescription">${LabelCachePathHelp}</div>
+                        </div>
                     </div>
                 </div>
 
                 <div is="emby-collapse" title="${HeaderAutomaticUpdates}">
                     <div class="collapseContent">
                         <br />
-                        <ul data-role="listview" class="ulForm">
-                            <li class="fldAutomaticUpdates">
-                                <div data-role="controlgroup">
-                                    <input type="checkbox" id="chkEnableAutomaticServerUpdates" data-mini="true" />
-                                    <label for="chkEnableAutomaticServerUpdates">${OptionEnableAutomaticServerUpdates}</label>
-                                </div>
-                            </li>
-                            <li>
-                                <label class="lnlAutomaticUpdateLevel selectLabel" for="selectAutomaticUpdateLevel"></label>
-                                <select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel">
-                                    <option value="Release">${OptionRelease}</option>
-                                    <option value="Beta">${OptionBeta}</option>
-                                    <option value="Dev">${OptionDev}</option>
-                                </select>
-                                <div id="devBuildWarning" class="fieldDescription warningFieldDescription" style="display: none;">
-                                    ${DevBuildWarning}
-                                </div>
-                            </li>
-                            <li id="fldEnableAutomaticRestart" style="display: none;">
-                                <paper-checkbox id="chkEnableAutomaticRestart">${LabelAllowServerAutoRestart}</paper-checkbox>
-                                <div class="fieldDescription paperCheckboxFieldDescription">
-                                    ${LabelAllowServerAutoRestartHelp}
-                                </div>
-                            </li>
-                        </ul>
+                        <div class="fldAutomaticUpdates">
+                            <div data-role="controlgroup">
+                                <input type="checkbox" id="chkEnableAutomaticServerUpdates" data-mini="true" />
+                                <label for="chkEnableAutomaticServerUpdates">${OptionEnableAutomaticServerUpdates}</label>
+                            </div>
+                        </div>
+                        <div>
+                            <label class="lnlAutomaticUpdateLevel selectLabel" for="selectAutomaticUpdateLevel"></label>
+                            <select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel">
+                                <option value="Release">${OptionRelease}</option>
+                                <option value="Beta">${OptionBeta}</option>
+                                <option value="Dev">${OptionDev}</option>
+                            </select>
+                            <div id="devBuildWarning" class="fieldDescription warningFieldDescription" style="display: none;">
+                                ${DevBuildWarning}
+                            </div>
+                        </div>
+                        <div id="fldEnableAutomaticRestart" style="display: none;">
+                            <paper-checkbox id="chkEnableAutomaticRestart">${LabelAllowServerAutoRestart}</paper-checkbox>
+                            <div class="fieldDescription paperCheckboxFieldDescription">
+                                ${LabelAllowServerAutoRestartHelp}
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -92,16 +88,14 @@
                         <p>${HeaderBrandingHelp}</p>
                         <br />
 
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <paper-input type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}"></paper-input>
-                                <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>
-                            </li>
-                            <li>
-                                <paper-textarea id="txtCustomCss" label="${LabelCustomCss}" class="mono"></paper-textarea>
-                                <div class="fieldDescription">${LabelCustomCssHelp}</div>
-                            </li>
-                        </ul>
+                        <div>
+                            <paper-input type="text" id="txtLoginDisclaimer" label="${LabelLoginDisclaimer}"></paper-input>
+                            <div class="fieldDescription">${LabelLoginDisclaimerHelp}</div>
+                        </div>
+                        <div>
+                            <paper-textarea id="txtCustomCss" label="${LabelCustomCss}" class="mono"></paper-textarea>
+                            <div class="fieldDescription">${LabelCustomCssHelp}</div>
+                        </div>
                     </div>
                 </div>
 
@@ -119,22 +113,17 @@
                             ${OptionDisableForDevelopmentHelp}
                         </div>
                         <br /><br />
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <paper-input type="text" id="txtDashboardSourcePath" label="${LabelDashboardSourcePath}" style="display: inline-block; width: 80%;"></paper-input>
-                                <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                                <div class="fieldDescription">${LabelDashboardSourcePathHelp}</div>
-                            </li>
-                        </ul>
+                        <div>
+                            <paper-input type="text" id="txtDashboardSourcePath" label="${LabelDashboardSourcePath}" style="display: inline-block; width: 80%;"></paper-input>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                            <div class="fieldDescription">${LabelDashboardSourcePathHelp}</div>
+                        </div>
                     </div>
                 </div>
                 <br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                    </li>
-
-                </ul>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                </div>
             </form>
 
         </div>
diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css
index 4cb8c0f5b8..2cb4cf359b 100644
--- a/dashboard-ui/devices/ios/ios.css
+++ b/dashboard-ui/devices/ios/ios.css
@@ -41,21 +41,11 @@ body:not(.dashboardDocument) .mainDrawerButton {
     background-color: #000;
 }
 
-.libraryViewNav .emby-tab-button {
+.emby-tab-button {
     font-weight: 400;
     text-transform: none;
-}
-
-.emby-tab-button-selection-bar {
-    display: none !important;
-}
-
-.libraryViewNav .emby-tab-button-active {
-    color: #52B54B !important;
-}
-
-.emby-tab-button-active {
     border-color: transparent !important;
+    border-width: 0 !important;
 }
 
 .criticReviewPaperList {
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 13169eac05..8cbc3074b8 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -4,55 +4,54 @@
         <div class="content-primary">
             <form class="librarySettingsForm">
 
-                <ul data-role="listview" class="ulForm">
-                    <li class="fldLibraryMonitor hide">
-                        <label for="selectEnableRealtimeMonitor" class="selectLabel">${LabelEnableRealtimeMonitor}</label>
-                        <select id="selectEnableRealtimeMonitor" data-mini="true">
-                            <option value="Auto">${OptionAuto}</option>
-                            <option value="Enabled">${OptionYes}</option>
-                            <option value="Disabled">${OptionNo}</option>
-                        </select>
-                        <div class="fieldDescription">
-                            ${LabelEnableRealtimeMonitorHelp}
-                        </div>
-                    </li>
-                    <li>
-                        <label for="selectDateAdded" class="selectLabel">${LabelDateAddedBehavior}</label>
-                        <select id="selectDateAdded" data-mini="true">
-                            <option value="0">${OptionDateAddedImportTime}</option>
-                            <option value="1">${OptionDateAddedFileTime}</option>
-                        </select>
-                        <div class="fieldDescription">${LabelDateAddedBehaviorHelp}</div>
-                    </li>
-                    <li>
-                        <paper-input id="txtMetadataPath" label="${LabelMetadataPath}" style="width:85%;display:inline-block;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                        <div class="fieldDescription">${LabelMetadataPathHelp}</div>
-                        <br />
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkSaveMetadataHidden">${OptionSaveMetadataAsHidden}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${OptionSaveMetadataAsHiddenHelp}</div>
-                        <br />
-                    </li>
-                </ul>
-
+                <div class="fldLibraryMonitor hide">
+                    <label for="selectEnableRealtimeMonitor" class="selectLabel">${LabelEnableRealtimeMonitor}</label>
+                    <select id="selectEnableRealtimeMonitor" data-mini="true">
+                        <option value="Auto">${OptionAuto}</option>
+                        <option value="Enabled">${OptionYes}</option>
+                        <option value="Disabled">${OptionNo}</option>
+                    </select>
+                    <div class="fieldDescription">
+                        ${LabelEnableRealtimeMonitorHelp}
+                    </div>
+                </div>
+                <br /><br />
+                <div>
+                    <label for="selectDateAdded" class="selectLabel">${LabelDateAddedBehavior}</label>
+                    <select id="selectDateAdded" data-mini="true">
+                        <option value="0">${OptionDateAddedImportTime}</option>
+                        <option value="1">${OptionDateAddedFileTime}</option>
+                    </select>
+                    <div class="fieldDescription">${LabelDateAddedBehaviorHelp}</div>
+                </div>
+                <br />
+                <div>
+                    <paper-input id="txtMetadataPath" label="${LabelMetadataPath}" style="width: 85%; display: inline-block;"></paper-input>
+                    <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
+                    <div class="fieldDescription">${LabelMetadataPathHelp}</div>
+                    <br/>
+                </div>
+                <br />
+                <div>
+                    <paper-checkbox id="chkSaveMetadataHidden">${OptionSaveMetadataAsHidden}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionSaveMetadataAsHiddenHelp}</div>
+                    <br />
+                </div>
+                <br />
                 <div is="emby-collapse" title="${HeaderChapters}">
                     <div class="collapseContent">
                         <br />
-                        <ul data-role="listview" class="ulForm" style="margin-bottom:0!important;">
-                            <li>
-                                <div class="paperListLabel">${HeaderExtractChapterImagesFor}</div>
-                                <div class="paperCheckboxList">
-                                    <paper-checkbox id="chkChaptersMovies">${OptionMovies}</paper-checkbox>
+                        <div>
+                            <div class="paperListLabel">${HeaderExtractChapterImagesFor}</div>
+                            <div class="paperCheckboxList">
+                                <paper-checkbox id="chkChaptersMovies">${OptionMovies}</paper-checkbox>
 
-                                    <paper-checkbox id="chkChaptersEpisodes">${OptionEpisodes}</paper-checkbox>
+                                <paper-checkbox id="chkChaptersEpisodes">${OptionEpisodes}</paper-checkbox>
 
-                                    <paper-checkbox id="chkChaptersOtherVideos">${OptionOtherVideos}</paper-checkbox>
-                                </div>
-                                <div class="fieldDescription paperCheckboxFieldDescription">${ExtractChapterImagesHelp}</div>
-                            </li>
-                        </ul>
+                                <paper-checkbox id="chkChaptersOtherVideos">${OptionOtherVideos}</paper-checkbox>
+                            </div>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${ExtractChapterImagesHelp}</div>
+                        </div>
                         <br />
                         <div>
                             <paper-checkbox id="chkExtractChaptersDuringLibraryScan">${LabelExtractChaptersDuringLibraryScan}</paper-checkbox>
@@ -65,27 +64,25 @@
                 <div is="emby-collapse" title="${HeaderPeople}">
                     <div class="collapseContent">
                         <br />
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <div class="paperListLabel">${HeaderDownloadPeopleMetadataFor}</div>
-                                <div class="paperCheckboxList">
-                                    <paper-checkbox id="chkPeopleActors">${OptionActors}</paper-checkbox>
+                        <div>
+                            <div class="paperListLabel">${HeaderDownloadPeopleMetadataFor}</div>
+                            <div class="paperCheckboxList">
+                                <paper-checkbox id="chkPeopleActors">${OptionActors}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleComposers">${OptionComposers}</paper-checkbox>
+                                <paper-checkbox id="chkPeopleComposers">${OptionComposers}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleDirectors">${OptionDirectors}</paper-checkbox>
+                                <paper-checkbox id="chkPeopleDirectors">${OptionDirectors}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleGuestStars">${OptionGuestStars}</paper-checkbox>
+                                <paper-checkbox id="chkPeopleGuestStars">${OptionGuestStars}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleProducers">${OptionProducers}</paper-checkbox>
+                                <paper-checkbox id="chkPeopleProducers">${OptionProducers}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleWriters">${OptionWriters}</paper-checkbox>
+                                <paper-checkbox id="chkPeopleWriters">${OptionWriters}</paper-checkbox>
 
-                                    <paper-checkbox id="chkPeopleOthers">${OptionOthers}</paper-checkbox>
-                                </div>
-                                <div class="fieldDescription paperCheckboxFieldDescription">${HeaderDownloadPeopleMetadataForHelp}</div>
-                            </li>
-                        </ul>
+                                <paper-checkbox id="chkPeopleOthers">${OptionOthers}</paper-checkbox>
+                            </div>
+                            <div class="fieldDescription paperCheckboxFieldDescription">${HeaderDownloadPeopleMetadataForHelp}</div>
+                        </div>
                     </div>
                 </div>
 
@@ -99,17 +96,14 @@
 
                 <div is="emby-collapse" title="Fanart.tv">
                     <div class="collapseContent">
-                        <ul data-role="listview" class="ulForm">
-                            <li>
-                                <paper-input type="text" id="txtFanartApiKey" label="${LabelFanartApiKey}"></paper-input>
-                                <div class="fieldDescription">${LabelFanartApiKeyHelp}</div>
-                                <div class="fieldDescription"><a href="https://fanart.tv/2015/01/personal-api-keys" target="_blank">${ButtonLearnMore}</a></div>
-                            </li>
-                        </ul>
+                        <div>
+                            <paper-input type="text" id="txtFanartApiKey" label="${LabelFanartApiKey}"></paper-input>
+                            <div class="fieldDescription">${LabelFanartApiKeyHelp}</div>
+                            <div class="fieldDescription"><a href="https://fanart.tv/2015/01/personal-api-keys" target="_blank">${ButtonLearnMore}</a></div>
+                        </div>
                     </div>
                 </div>
 
-                <br />
                 <br />
                 <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f9ab6f1266..55b1527ef6 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1969,7 +1969,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/dashboardgeneral.html',
-            dependencies: ['emby-collapse', 'paper-textarea', 'paper-input', 'paper-checkbox', 'jqmlistview'],
+            dependencies: ['emby-collapse', 'paper-textarea', 'paper-input', 'paper-checkbox'],
             controller: 'scripts/dashboardgeneral',
             autoFocus: false,
             roles: 'admin'
@@ -2158,7 +2158,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/librarysettings.html',
-            dependencies: ['emby-collapse', 'paper-input', 'paper-checkbox', 'emby-button', 'jqmlistview'],
+            dependencies: ['emby-collapse', 'paper-input', 'paper-checkbox', 'emby-button'],
             autoFocus: false,
             roles: 'admin',
             controller: 'scripts/librarysettings'