diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 10433b67e..afbeb6c62 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -9,7 +9,7 @@
         <div data-role="content">
 
             <div class="content-primary">
-                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-bottom: 20px!important;">
+                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-bottom: 30px!important;">
                     <a href="metadata.html" data-role="button">Basics</a>
                     <a href="metadataimages.html?type=movies" data-role="button" class="categoryTab moviesTab">Movies</a>
                     <a href="metadataimages.html?type=tv" data-role="button" class="categoryTab tvTab">TV</a>
@@ -27,90 +27,96 @@
 
                 <br />
                 <div class="tabContent">
-                    <form class="metadataImagesConfigurationForm">
+                    <form class="metadataImagesConfigurationForm" style="margin-top: .5em;">
 
-                        <div class="metadataReaders" style="margin-bottom: 2em;">
+                        <div class="metadataReaders" style="margin-bottom: 2.5em;">
                         </div>
-                        <div class="metadataFetchers" style="margin-bottom: 2em;">
+                        <div class="metadataFetchers" style="margin-bottom: 2.5em;">
                         </div>
-                        <div class="metadataSavers" style="margin-bottom: 2em;">
+                        <div class="metadataSavers" style="margin-bottom: 2.5em;">
                         </div>
-                        <div class="imageFetchers" style="margin-bottom: 2em;">
+                        <div class="imageFetchers" style="margin-bottom: 2.5em;">
                         </div>
 
-                        <div class="backdropFields" style="margin-bottom: 2em; display: none;">
+                        <div data-role="collapsible">
+                            <h2>Image Settings</h2>
                             <div>
-                                <label for="txtMaxBackdrops">Max number of backdrops per item: </label>
-                                <input type="number" id="txtMaxBackdrops" name="txtMaxBackdrops" pattern="[0-9]*" required="required" min="0" data-mini="true" />
-                            </div>
+                                <br />
+                                <div class="backdropFields" style="margin-bottom: 2em; display: none;">
+                                    <div>
+                                        <label for="txtMaxBackdrops">Maximum number of backdrops per item: </label>
+                                        <input type="number" id="txtMaxBackdrops" name="txtMaxBackdrops" pattern="[0-9]*" required="required" min="0" data-mini="true" />
+                                    </div>
 
-                            <div>
-                                <label for="txtMinBackdropDownloadWidth">Minimum backdrop download width: </label>
-                                <input type="number" id="txtMinBackdropDownloadWidth" name="txtMinBackdropDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
+                                    <div>
+                                        <label for="txtMinBackdropDownloadWidth">Minimum backdrop download width: </label>
+                                        <input type="number" id="txtMinBackdropDownloadWidth" name="txtMinBackdropDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
+                                    </div>
+                                </div>
+
+                                <div class="screenshotFields" style="margin-bottom: 2em; display: none;">
+                                    <div>
+                                        <label for="txtMaxScreenshots">Maximum number of screenshots per item: </label>
+                                        <input type="number" id="txtMaxScreenshots" name="txtMaxScreenshots" pattern="[0-9]*" required="required" min="0" data-mini="true" />
+                                    </div>
+
+                                    <div>
+                                        <label for="txtMinScreenshotDownloadWidth">Minimum screenshot download width: </label>
+                                        <input type="number" id="txtMinScreenshotDownloadWidth" name="txtMinScreenshotDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
+                                    </div>
+                                </div>
+
+                                <fieldset data-role="controlgroup" style="border-bottom: 1px solid #ddd;">
+                                    <legend>Fetch Images:</legend>
+                                    <div class="imageType" data-imagetype="Primary" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadPrimary" name="chkDownloadPrimary" />
+                                        <label for="chkDownloadPrimary">Primary</label>
+                                    </div>
+
+
+                                    <div class="imageType" data-imagetype="Art" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadArt" name="chkDownloadArt" />
+                                        <label for="chkDownloadArt">Art</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="BoxRear" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkBack" name="chkBack" />
+                                        <label for="chkBack">Back</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Banner" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadBanner" name="chkDownloadBanner" />
+                                        <label for="chkDownloadBanner">Banner</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Box" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadBox" name="chkDownloadBox" />
+                                        <label for="chkDownloadBox">Box</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Disc" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadDisc" name="chkDownloadDisc" />
+                                        <label for="chkDownloadDisc">Disc</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Logo" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadLogo" name="chkDownloadLogo" />
+                                        <label for="chkDownloadLogo">Logo</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Menu" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMenu" name="chkDownloadMenu" />
+                                        <label for="chkDownloadMenu">Menu</label>
+                                    </div>
+
+                                    <div class="imageType" data-imagetype="Thumb" style="display: none;">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadThumb" name="chkDownloadThumb" />
+                                        <label for="chkDownloadThumb">Thumb</label>
+                                    </div>
+                                </fieldset>
                             </div>
                         </div>
 
-                        <div class="screenshotFields" style="margin-bottom: 2em; display: none;">
-                            <div>
-                                <label for="txtMaxScreenshots">Max number of screenshots per item: </label>
-                                <input type="number" id="txtMaxScreenshots" name="txtMaxScreenshots" pattern="[0-9]*" required="required" min="0" data-mini="true" />
-                            </div>
-
-                            <div>
-                                <label for="txtMinScreenshotDownloadWidth">Minimum screenshot download width: </label>
-                                <input type="number" id="txtMinScreenshotDownloadWidth" name="txtMinScreenshotDownloadWidth" pattern="[0-9]*" required="required" min="0" data-mini="true" />
-                            </div>
-                        </div>
-
-                        <fieldset data-role="controlgroup" style="border-bottom: 1px solid #ddd;">
-                            <legend>Fetch Images:</legend>
-                            <div class="imageType" data-imagetype="Primary" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadPrimary" name="chkDownloadPrimary" />
-                                <label for="chkDownloadPrimary">Primary</label>
-                            </div>
-
-
-                            <div class="imageType" data-imagetype="Art" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadArt" name="chkDownloadArt" />
-                                <label for="chkDownloadArt">Art</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="BoxRear" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkBack" name="chkBack" />
-                                <label for="chkBack">Back</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Banner" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadBanner" name="chkDownloadBanner" />
-                                <label for="chkDownloadBanner">Banner</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Box" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadBox" name="chkDownloadBox" />
-                                <label for="chkDownloadBox">Box</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Disc" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadDisc" name="chkDownloadDisc" />
-                                <label for="chkDownloadDisc">Disc</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Logo" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadLogo" name="chkDownloadLogo" />
-                                <label for="chkDownloadLogo">Logo</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Menu" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadMenu" name="chkDownloadMenu" />
-                                <label for="chkDownloadMenu">Menu</label>
-                            </div>
-
-                            <div class="imageType" data-imagetype="Thumb" style="display: none;">
-                                <input type="checkbox" data-mini="true" id="chkDownloadThumb" name="chkDownloadThumb" />
-                                <label for="chkDownloadThumb">Thumb</label>
-                            </div>
-                        </fieldset>
-
                         <br />
                         <br />
                         <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index 106d08449..8a2b9871b 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -209,6 +209,7 @@
         }
 
         html += '</fieldset>';
+        html += '<div class="fieldDescription">Choose the file formats to save your metadata to.</div>';
 
         $('.metadataSavers', page).html(html).show().trigger('create');
     }
@@ -257,20 +258,42 @@
             return;
         }
 
-        html += '<fieldset data-role="controlgroup">';
-        html += '<legend>Local Metadata Readers:</legend>';
+        html += '<div class="ui-controlgroup-label" style="margin-bottom:0;padding-left:2px;">Preferred Local Metadata:</div>';
+        html += '<ul data-role="listview" data-inset="true" data-mini="true" style="margin-top:.5em;margin-bottom:.5em;">';
 
         for (var i = 0, length = plugins.length; i < length; i++) {
 
             var plugin = plugins[i];
 
-            var id = 'chkMetadataLocal' + i;
+            if (i > 0) {
+                html += '<li data-mini="true" class="localReaderOption" data-pluginname="' + plugin.Name + '">';
 
-            html += '<input type="checkbox" name="' + id + '" id="' + id + '" data-mini="true">';
-            html += '<label for="' + id + '">' + plugin.Name + '</label>';
+                html += '<a href="#" style="font-size:13px;font-weight:normal;">' + plugin.Name + '</a>';
+
+                html += '<a class="btnLocalReaderUp" data-pluginindex="' + i + '" href="#" style="font-size:13px;font-weight:normal;" data-icon="arrow-u">Up</a>';
+
+                html += '</li>';
+            }
+            else if (plugins.length > 1) {
+                html += '<li data-mini="true" class="localReaderOption" data-pluginname="' + plugin.Name + '">';
+
+                html += '<a href="#" style="font-size:13px;font-weight:normal;">' + plugin.Name + '</a>';
+
+                html += '<a class="btnLocalReaderDown" data-pluginindex="' + i + '" href="#" style="font-size:13px;font-weight:normal;" data-icon="arrow-d">Down</a>';
+
+                html += '</li>';
+            }
+            else {
+                html += '<li data-mini="true" class="localReaderOption" data-pluginname="' + plugin.Name + '">';
+
+                html += plugin.Name;
+
+                html += '</li>';
+            }
         }
 
-        html += '</fieldset>';
+        html += '</ul>';
+        html += '<div class="fieldDescription">Rank your preferred local metadata sources in order of priority. The first file found will be read.</div>';
 
         $('.metadataReaders', page).html(html).show().trigger('create');
     }
@@ -285,9 +308,9 @@
 
             loadTabs(page, [
 
-                { name: 'Game', type: 'Game' },
-                { name: 'Game System', type: 'GameSystem' },
-                { name: 'Game Genre', type: 'GameGenre' }
+                { name: 'Games', type: 'Game' },
+                { name: 'Game Systems', type: 'GameSystem' },
+                { name: 'Game Genres', type: 'GameGenre' }
             ]);
 
             $('.gamesTab', page).addClass('ui-btn-active');
@@ -296,9 +319,8 @@
 
             loadTabs(page, [
 
-                { name: 'Movie', type: 'Movie' },
-                { name: 'Trailer', type: 'Trailer' },
-                { name: 'Collection', type: 'BoxSet' }
+                { name: 'Movies', type: 'Movie' },
+                { name: 'Collections', type: 'BoxSet' }
             ]);
 
             $('.moviesTab', page).addClass('ui-btn-active');
@@ -308,8 +330,8 @@
             loadTabs(page, [
 
                 { name: 'Series', type: 'Series' },
-                { name: 'Season', type: 'Season' },
-                { name: 'Episode', type: 'Episode' }
+                { name: 'Seasons', type: 'Season' },
+                { name: 'Episodes', type: 'Episode' }
             ]);
 
             $('.tvTab', page).addClass('ui-btn-active');
@@ -318,11 +340,11 @@
 
             loadTabs(page, [
 
-                { name: 'Artist', type: 'MusicArtist' },
-                { name: 'Album', type: 'MusicAlbum' },
-                { name: 'Song', type: 'Audio' },
-                { name: 'Music Video', type: 'MusicVideo' },
-                { name: 'Music Genre', type: 'MusicGenre' }
+                { name: 'Artists', type: 'MusicArtist' },
+                { name: 'Albums', type: 'MusicAlbum' },
+                { name: 'Songs', type: 'Audio' },
+                { name: 'Music Videos', type: 'MusicVideo' },
+                { name: 'Music Genres', type: 'MusicGenre' }
             ]);
 
             $('.musicTab', page).addClass('ui-btn-active');
@@ -331,11 +353,12 @@
 
             loadTabs(page, [
 
-                { name: 'Person', type: 'Person' },
-                { name: 'Genre', type: 'Genre' },
-                { name: 'Studio', type: 'Studio' },
-                { name: 'Book', type: 'Book' },
-                { name: 'Adult Video', type: 'AdultVideo' }
+                { name: 'People', type: 'Person' },
+                { name: 'Genres', type: 'Genre' },
+                { name: 'Studios', type: 'Studio' },
+                { name: 'Books', type: 'Book' },
+                { name: 'Home Videos', type: 'Video' },
+                { name: 'Adult Videos', type: 'AdultVideo' }
             ]);
 
             $('.othersTab', page).addClass('ui-btn-active');
@@ -350,6 +373,12 @@
 
         });
 
+        config.LocalMetadataReaders = $('.localReaderOption', form).get().map(function (c) {
+
+            return c.getAttribute('data-pluginname');
+
+        });
+
         config.ImageOptions = $('.imageType:visible input', form).get().map(function (c) {