diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 340de891e..8537e7c8f 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jQuery,jqmlistview,emby-collapse,jqmpopup,scripts/dlnaprofile,jqmcheckbox,emby-button">
+<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jQuery,emby-collapse,jqmpopup,scripts/dlnaprofile,jqmcheckbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -17,20 +17,17 @@
                 <br />
                 <div class="tabContent tabInfo">
 
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="txtName">${LabelName}</label>
-                            <input type="text" id="txtName" required="required" />
-                        </li>
-                    </ul>
-
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <label for="selectUser">${LabelUserLibrary}</label>
-                            <select id="selectUser" data-mini="true"></select>
-                            <div class="fieldDescription">${LabelUserLibraryHelp}</div>
-                        </li>
-                    </ul>
+                    <div>
+                        <label for="txtName">${LabelName}</label>
+                        <input type="text" id="txtName" required="required" />
+                    </div>
+                    <br />
+                    <div>
+                        <label for="selectUser">${LabelUserLibrary}</label>
+                        <select id="selectUser" data-mini="true"></select>
+                        <div class="fieldDescription">${LabelUserLibraryHelp}</div>
+                    </div>
+                    <br />
 
                     <fieldset data-role="controlgroup">
                         <legend>${LabelSupportedMediaTypes}</legend>
@@ -51,53 +48,60 @@
                             <br />
                             <p>${HeaderIdentificationCriteriaHelp}</p>
                             <br />
-                            <ul data-role="listview" class="ulForm">
-                                <li>
-                                    <label for="txtIdFriendlyName">${LabelFriendlyName}</label>
-                                    <input type="text" id="txtIdFriendlyName" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdManufacturer">${LabelManufacturer}</label>
-                                    <input type="text" id="txtIdManufacturer" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdManufacturerUrl">${LabelManufacturerUrl}</label>
-                                    <input type="text" id="txtIdManufacturerUrl" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdModelName">${LabelModelName}</label>
-                                    <input type="text" id="txtIdModelName" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdModelNumber">${LabelModelNumber}</label>
-                                    <input type="text" id="txtIdModelNumber" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdModelDesription">${LabelModelDescription}</label>
-                                    <input type="text" id="txtIdModelDesription" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdModelUrl">${LabelModelUrl}</label>
-                                    <input type="text" id="txtIdModelUrl" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdSerialNumber">${LabelSerialNumber}</label>
-                                    <input type="text" id="txtIdSerialNumber" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIdDeviceDescription">${LabelDeviceDescription}</label>
-                                    <input type="text" id="txtIdDeviceDescription" />
-                                    <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
-                                </li>
-                            </ul>
+                            <div>
+                                <label for="txtIdFriendlyName">${LabelFriendlyName}</label>
+                                <input type="text" id="txtIdFriendlyName" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdManufacturer">${LabelManufacturer}</label>
+                                <input type="text" id="txtIdManufacturer" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdManufacturerUrl">${LabelManufacturerUrl}</label>
+                                <input type="text" id="txtIdManufacturerUrl" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdModelName">${LabelModelName}</label>
+                                <input type="text" id="txtIdModelName" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdModelNumber">${LabelModelNumber}</label>
+                                <input type="text" id="txtIdModelNumber" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdModelDesription">${LabelModelDescription}</label>
+                                <input type="text" id="txtIdModelDesription" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdModelUrl">${LabelModelUrl}</label>
+                                <input type="text" id="txtIdModelUrl" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdSerialNumber">${LabelSerialNumber}</label>
+                                <input type="text" id="txtIdSerialNumber" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIdDeviceDescription">${LabelDeviceDescription}</label>
+                                <input type="text" id="txtIdDeviceDescription" />
+                                <div class="fieldDescription">${LabelIdentificationFieldHelp}</div>
+                            </div>
+                            <br />
 
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
@@ -113,84 +117,87 @@
                     <div is="emby-collapse" title="${HeaderDisplaySettings}">
                         <div class="collapseContent">
                             <br />
-                            <ul data-role="listview" class="ulForm">
-                                <li>
-                                    <label for="chkRequiresPlainFolders">${OptionPlainStorageFolders}</label>
-                                    <input type="checkbox" id="chkRequiresPlainFolders" data-mini="true" />
-                                    <div class="fieldDescription">${OptionPlainStorageFoldersHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="chkRequiresPlainVideoItems">${OptionPlainVideoItems}</label>
-                                    <input type="checkbox" id="chkRequiresPlainVideoItems" data-mini="true" />
-                                    <div class="fieldDescription">${OptionPlainVideoItemsHelp}</div>
-                                </li>
-                            </ul>
+                            <div>
+                                <label for="chkRequiresPlainFolders">${OptionPlainStorageFolders}</label>
+                                <input type="checkbox" id="chkRequiresPlainFolders" data-mini="true" />
+                                <div class="fieldDescription">${OptionPlainStorageFoldersHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="chkRequiresPlainVideoItems">${OptionPlainVideoItems}</label>
+                                <input type="checkbox" id="chkRequiresPlainVideoItems" data-mini="true" />
+                                <div class="fieldDescription">${OptionPlainVideoItemsHelp}</div>
+                            </div>
                         </div>
                     </div>
 
                     <div is="emby-collapse" title="${HeaderImageSettings}">
                         <div class="collapseContent">
                             <br />
-                            <ul data-role="listview" class="ulForm">
-                                <li>
-                                    <label for="chkEnableAlbumArtInDidl">${LabelEmbedAlbumArtDidl}</label>
-                                    <input type="checkbox" id="chkEnableAlbumArtInDidl" data-mini="true" />
-                                    <div class="fieldDescription">${LabelEmbedAlbumArtDidlHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="chkEnableSingleImageLimit">${LabelEnableSingleImageInDidlLimit}</label>
-                                    <input type="checkbox" id="chkEnableSingleImageLimit" data-mini="true" />
-                                    <div class="fieldDescription">${LabelEnableSingleImageInDidlLimitHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtAlbumArtPn">${LabelAlbumArtPN}</label>
-                                    <input type="text" id="txtAlbumArtPn" />
-                                    <div class="fieldDescription">${LabelAlbumArtHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtAlbumArtMaxWidth">${LabelAlbumArtMaxWidth}</label>
-                                    <input type="number" id="txtAlbumArtMaxWidth" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelAlbumArtMaxWidthHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtAlbumArtMaxHeight">${LabelAlbumArtMaxHeight}</label>
-                                    <input type="number" id="txtAlbumArtMaxHeight" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelAlbumArtMaxHeightHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIconMaxWidth">${LabelIconMaxWidth}</label>
-                                    <input type="number" id="txtIconMaxWidth" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelIconMaxWidthHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtIconMaxHeight">${LabelIconMaxHeight}</label>
-                                    <input type="number" id="txtIconMaxHeight" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelIconMaxHeightHelp}</div>
-                                </li>
-                            </ul>
+                            <div>
+                                <label for="chkEnableAlbumArtInDidl">${LabelEmbedAlbumArtDidl}</label>
+                                <input type="checkbox" id="chkEnableAlbumArtInDidl" data-mini="true" />
+                                <div class="fieldDescription">${LabelEmbedAlbumArtDidlHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="chkEnableSingleImageLimit">${LabelEnableSingleImageInDidlLimit}</label>
+                                <input type="checkbox" id="chkEnableSingleImageLimit" data-mini="true" />
+                                <div class="fieldDescription">${LabelEnableSingleImageInDidlLimitHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtAlbumArtPn">${LabelAlbumArtPN}</label>
+                                <input type="text" id="txtAlbumArtPn" />
+                                <div class="fieldDescription">${LabelAlbumArtHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtAlbumArtMaxWidth">${LabelAlbumArtMaxWidth}</label>
+                                <input type="number" id="txtAlbumArtMaxWidth" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelAlbumArtMaxWidthHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtAlbumArtMaxHeight">${LabelAlbumArtMaxHeight}</label>
+                                <input type="number" id="txtAlbumArtMaxHeight" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelAlbumArtMaxHeightHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIconMaxWidth">${LabelIconMaxWidth}</label>
+                                <input type="number" id="txtIconMaxWidth" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelIconMaxWidthHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtIconMaxHeight">${LabelIconMaxHeight}</label>
+                                <input type="number" id="txtIconMaxHeight" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelIconMaxHeightHelp}</div>
+                            </div>
                         </div>
                     </div>
 
                     <div is="emby-collapse" title="${HeaderPlaybackSettings}">
                         <div class="collapseContent">
                             <br />
-                            <ul data-role="listview" class="ulForm">
-                                <li>
-                                    <label for="txtMaxAllowedBitrate">${LabelMaxStreamingBitrate}</label>
-                                    <input type="number" id="txtMaxAllowedBitrate" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelMaxStreamingBitrateHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtMusicStreamingTranscodingBitrate">${LabelMusicStreamingTranscodingBitrate}</label>
-                                    <input type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" />
-                                    <div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
-                                </li>
-                                <li style="display:none;">
-                                    <label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
-                                    <input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
-                                    <div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>
-                                </li>
-                            </ul>
+                            <div>
+                                <label for="txtMaxAllowedBitrate">${LabelMaxStreamingBitrate}</label>
+                                <input type="number" id="txtMaxAllowedBitrate" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelMaxStreamingBitrateHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtMusicStreamingTranscodingBitrate">${LabelMusicStreamingTranscodingBitrate}</label>
+                                <input type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" />
+                                <div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
+                            </div>
+                            <br />
+                            <div style="display:none;">
+                                <label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
+                                <input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
+                                <div class="fieldDescription">${OptionIgnoreTranscodeByteRangeRequestsHelp}</div>
+                            </div>
                         </div>
                     </div>
 
@@ -198,60 +205,69 @@
                         <div class="collapseContent">
                             <p>${HeaderProfileServerSettingsHelp}</p>
                             <br />
-                            <ul data-role="listview" class="ulForm">
-                                <li>
-                                    <label for="txtInfoFriendlyName">${LabelFriendlyName}</label>
-                                    <input type="text" id="txtInfoFriendlyName" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoManufacturer">${LabelManufacturer}</label>
-                                    <input type="text" id="txtInfoManufacturer" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoManufacturerUrl">${LabelManufacturerUrl}</label>
-                                    <input type="text" id="txtInfoManufacturerUrl" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoModelName">${LabelModelName}</label>
-                                    <input type="text" id="txtInfoModelName" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoModelNumber">${LabelModelNumber}</label>
-                                    <input type="text" id="txtInfoModelNumber" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoModelDesription">${LabelModelDescription}</label>
-                                    <input type="text" id="txtInfoModelDesription" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoModelUrl">${LabelModelUrl}</label>
-                                    <input type="text" id="txtInfoModelUrl" />
-                                </li>
-                                <li>
-                                    <label for="txtInfoSerialNumber">${LabelSerialNumber}</label>
-                                    <input type="text" id="txtInfoSerialNumber" />
-                                </li>
-                                <li>
-                                    <label for="txtProtocolInfo">${LabelProtocolInfo}</label>
-                                    <input type="text" id="txtProtocolInfo" />
-                                    <div class="fieldDescription">${LabelProtocolInfoHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtXDlnaCap">${LabelXDlnaCap}</label>
-                                    <input type="text" id="txtXDlnaCap" />
-                                    <div class="fieldDescription">${LabelXDlnaCapHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtXDlnaDoc">${LabelXDlnaDoc}</label>
-                                    <input type="text" id="txtXDlnaDoc" />
-                                    <div class="fieldDescription">${LabelXDlnaDocHelp}</div>
-                                </li>
-                                <li>
-                                    <label for="txtSonyAggregationFlags">${LabelSonyAggregationFlags}</label>
-                                    <input type="text" id="txtSonyAggregationFlags" />
-                                    <div class="fieldDescription">${LabelSonyAggregationFlagsHelp}</div>
-                                </li>
-                            </ul>
+                            <div>
+                                <label for="txtInfoFriendlyName">${LabelFriendlyName}</label>
+                                <input type="text" id="txtInfoFriendlyName" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoManufacturer">${LabelManufacturer}</label>
+                                <input type="text" id="txtInfoManufacturer" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoManufacturerUrl">${LabelManufacturerUrl}</label>
+                                <input type="text" id="txtInfoManufacturerUrl" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoModelName">${LabelModelName}</label>
+                                <input type="text" id="txtInfoModelName" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoModelNumber">${LabelModelNumber}</label>
+                                <input type="text" id="txtInfoModelNumber" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoModelDesription">${LabelModelDescription}</label>
+                                <input type="text" id="txtInfoModelDesription" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoModelUrl">${LabelModelUrl}</label>
+                                <input type="text" id="txtInfoModelUrl" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtInfoSerialNumber">${LabelSerialNumber}</label>
+                                <input type="text" id="txtInfoSerialNumber" />
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtProtocolInfo">${LabelProtocolInfo}</label>
+                                <input type="text" id="txtProtocolInfo" />
+                                <div class="fieldDescription">${LabelProtocolInfoHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtXDlnaCap">${LabelXDlnaCap}</label>
+                                <input type="text" id="txtXDlnaCap" />
+                                <div class="fieldDescription">${LabelXDlnaCapHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtXDlnaDoc">${LabelXDlnaDoc}</label>
+                                <input type="text" id="txtXDlnaDoc" />
+                                <div class="fieldDescription">${LabelXDlnaDocHelp}</div>
+                            </div>
+                            <br />
+                            <div>
+                                <label for="txtSonyAggregationFlags">${LabelSonyAggregationFlags}</label>
+                                <input type="text" id="txtSonyAggregationFlags" />
+                                <div class="fieldDescription">${LabelSonyAggregationFlagsHelp}</div>
+                            </div>
                         </div>
                     </div>
 
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index a391dae57..0cdee8e9f 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -1,4 +1,4 @@
-<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="jqmlistview,scripts/metadataconfigurationpage,paper-checkbox,emby-button">
+<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -6,32 +6,35 @@
 
             <form class="metadataConfigurationForm">
 
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <paper-checkbox id="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkSaveLocal">${LabelSaveLocalMetadata}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkDownloadImagesInAdvance">${OptionDownloadImagesInAdvance}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
-                        <br />
-                    </li>
-                    <li>
-                        <label for="selectLanguage" class="selectLabel">${LabelMetadataDownloadLanguage}</label>
-                        <select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
-                    </li>
-                    <li>
-                        <label for="selectCountry" class="selectLabel">${LabelCountry}</label>
-                        <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
-                    </li>
-                    <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
-                    </li>
-                </ul>
+                <div>
+                    <paper-checkbox id="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
+                </div>
+                <br />
+                <div>
+                    <paper-checkbox id="chkSaveLocal">${LabelSaveLocalMetadata}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
+                </div>
+                <br />
+                <div>
+                    <paper-checkbox id="chkDownloadImagesInAdvance">${OptionDownloadImagesInAdvance}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
+                    <br />
+                </div>
+                <br />
+                <div>
+                    <label for="selectLanguage" class="selectLabel">${LabelMetadataDownloadLanguage}</label>
+                    <select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
+                </div>
+                <br />
+                <div>
+                    <label for="selectCountry" class="selectLabel">${LabelCountry}</label>
+                    <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
+                </div>
+                <br />
+                <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/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 2ddf31da3..9cd0cf528 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -1,4 +1,4 @@
-<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="jqmlistview,scripts/metadatanfo,paper-checkbox,emby-button">
+<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,emby-checkbox,emby-button,emby-select">
 
     <div data-role="content">
 
@@ -7,44 +7,42 @@
 
                 <p>${HeaderKodiMetadataHelp}</p>
                 <br />
-                <ul class="ulForm" data-role="listview">
+                <div class="selectContainer">
+                    <select is="emby-select" name="selectUser" id="selectUser" label="${LabelKodiMetadataUser}"></select>
+                    <div class="fieldDescription">${LabelKodiMetadataUserHelp}</div>
+                </div>
 
-                    <li>
-                        <label for="selectUser" class="selectLabel">${LabelKodiMetadataUser}</label>
-                        <select name="selectUser" id="selectUser" data-mini="true"></select>
-                        <div class="fieldDescription">${LabelKodiMetadataUserHelp}</div>
-                    </li>
-
-                    <li>
-                        <label for="selectReleaseDateFormat" class="selectLabel">${LabelKodiMetadataDateFormat}</label>
-                        <select name="selectReleaseDateFormat" id="selectReleaseDateFormat" data-mini="true">
-                            <option value="yyyy-MM-dd">yyyy-MM-dd</option>
-                        </select>
-                        <div class="fieldDescription">${LabelKodiMetadataDateFormatHelp}</div>
-                    </li>
-                    <li>
-                        <br />
-                        <paper-checkbox id="chkSaveImagePaths">${LabelKodiMetadataSaveImagePaths}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelKodiMetadataSaveImagePathsHelp}</div>
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkEnablePathSubstitution">${LabelKodiMetadataEnablePathSubstitution}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">
-                            <div>${LabelKodiMetadataEnablePathSubstitutionHelp}</div>
-                            <div style="margin-top: .5em;"><a href="librarypathmapping.html">${LabelKodiMetadataEnablePathSubstitutionHelp2}</a></div>
-                        </div>
-                    </li>
-                    <li>
-                        <paper-checkbox id="chkEnableExtraThumbs">${LabelKodiMetadataEnableExtraThumbs}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelKodiMetadataEnableExtraThumbsHelp}</div>
-                    </li>
-                </ul>
-                <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 class="selectContainer">
+                    <select is="emby-select" name="selectReleaseDateFormat" id="selectReleaseDateFormat" label="${LabelKodiMetadataDateFormat}">
+                        <option value="yyyy-MM-dd">yyyy-MM-dd</option>
+                    </select>
+                    <div class="fieldDescription">${LabelKodiMetadataDateFormatHelp}</div>
+                </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkSaveImagePaths" />
+                        <span>${LabelKodiMetadataSaveImagePaths}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelKodiMetadataSaveImagePathsHelp}</div>
+                </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkEnablePathSubstitution" />
+                        <span>${LabelKodiMetadataEnablePathSubstitution}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">
+                        <div>${LabelKodiMetadataEnablePathSubstitutionHelp}</div>
+                        <div style="margin-top: .5em;"><a href="librarypathmapping.html">${LabelKodiMetadataEnablePathSubstitutionHelp2}</a></div>
+                    </div>
+                </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkEnableExtraThumbs" />
+                        <span>${LabelKodiMetadataEnableExtraThumbs}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelKodiMetadataEnableExtraThumbsHelp}</div>
+                </div>
+                <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/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 4e05d24a9..802eeaea1 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -1,4 +1,4 @@
-<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="jqmlistview,scripts/playbackconfiguration,emby-input,emby-button">
+<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -25,12 +25,7 @@
 
 
                 <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>
     </div>
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index 9c8f83351..57a2019b0 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -1,4 +1,4 @@
-<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmlistview,scripts/userlibraryaccess,paper-checkbox,emby-button">
+<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userlibraryaccess,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -50,13 +50,11 @@
                     <br />
                 </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>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
-                    </li>
-                </ul>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                </div>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 5ba90445a..ef36f15a2 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -1,4 +1,4 @@
-<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmlistview,jqmpopup,scripts/userparentalcontrol,paper-checkbox,emby-button,emby-collapse">
+<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userparentalcontrol,paper-checkbox,emby-button,emby-collapse">
 
     <div data-role="content">
         <div class="content-primary">
@@ -10,13 +10,11 @@
             </div>
             <form class="userParentalControlForm">
 
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <label for="selectMaxParentalRating" class="selectLabel">${LabelMaxParentalRating}</label>
-                        <select name="selectMaxParentalRating" id="selectMaxParentalRating" data-mini="true"></select>
-                        <div class="fieldDescription">${MaxParentalRatingHelp}</div>
-                    </li>
-                </ul>
+                <div>
+                    <label for="selectMaxParentalRating" class="selectLabel">${LabelMaxParentalRating}</label>
+                    <select name="selectMaxParentalRating" id="selectMaxParentalRating" data-mini="true"></select>
+                    <div class="fieldDescription">${MaxParentalRatingHelp}</div>
+                </div>
 
                 <div>
                     <div class="blockUnratedItems">
@@ -68,36 +66,38 @@
 
                     <form class="scheduleForm" style="min-width:210px;">
 
-                        <ul data-role="listview" class="ulForm" style="margin-bottom:10px!important;">
-                            <li>
-                                <label for="selectDay">${LabelAccessDay}</label>
-                                <select id="selectDay" data-mini="true">
-                                    <option value="Sunday">${OptionSunday}</option>
-                                    <option value="Monday">${OptionMonday}</option>
-                                    <option value="Tuesday">${OptionTuesday}</option>
-                                    <option value="Wednesday">${OptionWednesday}</option>
-                                    <option value="Thursday">${OptionThursday}</option>
-                                    <option value="Friday">${OptionFriday}</option>
-                                    <option value="Saturday">${OptionSaturday}</option>
-                                    <option value="Everyday">${OptionEveryday}</option>
-                                    <option value="Weekday">${OptionWeekdays}</option>
-                                    <option value="Weekend">${OptionWeekends}</option>
-                                </select>
-                            </li>
-                            <li>
-                                <label for="selectStart">${LabelAccessStart}</label>
-                                <select class="selectHour" id="selectStart" data-mini="true"></select>
-                            </li>
-                            <li>
-                                <label for="selectEnd">${LabelAccessEnd}</label>
-                                <select class="selectHour" id="selectEnd" data-mini="true"></select>
-                            </li>
-                            <li>
-                                <input type="hidden" id="fldScheduleIndex" />
-                                <button type="submit" data-icon="plus" data-theme="b" data-mini="true">${ButtonAdd}</button>
-                                <button type="button" data-icon="delete" data-mini="true" onclick="$(this).parents('.popup').popup('close');">${ButtonCancel}</button>
-                            </li>
-                        </ul>
+                        <div>
+                            <label for="selectDay">${LabelAccessDay}</label>
+                            <select id="selectDay" data-mini="true">
+                                <option value="Sunday">${OptionSunday}</option>
+                                <option value="Monday">${OptionMonday}</option>
+                                <option value="Tuesday">${OptionTuesday}</option>
+                                <option value="Wednesday">${OptionWednesday}</option>
+                                <option value="Thursday">${OptionThursday}</option>
+                                <option value="Friday">${OptionFriday}</option>
+                                <option value="Saturday">${OptionSaturday}</option>
+                                <option value="Everyday">${OptionEveryday}</option>
+                                <option value="Weekday">${OptionWeekdays}</option>
+                                <option value="Weekend">${OptionWeekends}</option>
+                            </select>
+                        </div>
+                        <br />
+                        <div>
+                            <label for="selectStart">${LabelAccessStart}</label>
+                            <select class="selectHour" id="selectStart" data-mini="true"></select>
+                        </div>
+                        <br />
+                        <div>
+                            <label for="selectEnd">${LabelAccessEnd}</label>
+                            <select class="selectHour" id="selectEnd" data-mini="true"></select>
+                        </div>
+                        <br />
+                        <div>
+                            <input type="hidden" id="fldScheduleIndex" />
+                            <button type="submit" data-icon="plus" data-theme="b" data-mini="true">${ButtonAdd}</button>
+                            <button type="button" data-icon="delete" data-mini="true" onclick="$(this).parents('.popup').popup('close');">${ButtonCancel}</button>
+                        </div>
+                        <br />
                     </form>
 
                 </div>