diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 68ee29575a..0a364e3c12 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input'], function (paperDialogHelper) {
+define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper) {
 
     var currentDialog;
     var metadataEditorInfo;
@@ -43,6 +43,45 @@
         return false;
     }
 
+    function parentWithClass(elem, className) {
+
+        while (!elem.classList || !elem.classList.contains(className)) {
+            elem = elem.parentNode;
+
+            if (!elem) {
+                return null;
+            }
+        }
+
+        return elem;
+    }
+
+    function editableListViewValues(list) {
+        return list.find('.textValue').map(function () { return $(this).text(); }).get();
+    }
+
+    function addElementToEditableListview(source, sortCallback) {
+
+        require(['prompt'], function (prompt) {
+
+            prompt({
+                text: 'Value:',
+                callback: function (text) {
+                    if (text == '') return;
+                    var parent = $(source).parents('.editableListviewContainer');
+                    var list = parent.find('.paperList');
+                    var items = editableListViewValues(list);
+                    items.push(text);
+                    populateListView(list[0], items, sortCallback);
+                }
+            });
+        });
+    }
+
+    function removeElementFromListview(source) {
+        $(source).parents('paper-icon-item').remove();
+    }
+
     function init(context) {
 
         $('.btnCancel', context).on('click', function () {
@@ -50,6 +89,20 @@
             closeDialog(false);
         });
 
+        context.addEventListener('click', function (e) {
+
+            var btnRemoveFromEditorList = parentWithClass(e.target, 'btnRemoveFromEditorList');
+            if (btnRemoveFromEditorList) {
+                removeElementFromListview(btnRemoveFromEditorList);
+            }
+
+            var btnAddTextItem = parentWithClass(e.target, 'btnAddTextItem');
+            if (btnAddTextItem) {
+                addElementToEditableListview(btnAddTextItem);
+            }
+
+        });
+
         $('form', context).off('submit', onSubmit).on('submit', onSubmit);
     }
 
@@ -339,13 +392,13 @@
 
         if (item.Type == "Person") {
             context.querySelector('#txtProductionYear').label = Globalize.translate('LabelBirthYear');
-            context.querySelector("label[for='txtPremiereDate']").innerHTML = Globalize.translate('LabelBirthDate');
-            context.querySelector("label[for='txtEndDate']").innerHTML = Globalize.translate('LabelDeathDate');
+            context.querySelector("#txtPremiereDate").innerHTML = Globalize.translate('LabelBirthDate');
+            context.querySelector("#txtEndDate").innerHTML = Globalize.translate('LabelDeathDate');
             $('#fldPlaceOfBirth', context).show();
         } else {
             context.querySelector('#txtProductionYear').label = Globalize.translate('LabelYear');
-            context.querySelector("label[for='txtPremiereDate']").innerHTML = Globalize.translate('LabelReleaseDate');
-            context.querySelector("label[for='txtEndDate']").innerHTML = Globalize.translate('LabelEndDate');
+            context.querySelector("#txtPremiereDate").innerHTML = Globalize.translate('LabelReleaseDate');
+            context.querySelector("#txtEndDate").innerHTML = Globalize.translate('LabelEndDate');
             $('#fldPlaceOfBirth', context).hide();
         }
 
@@ -439,14 +492,14 @@
 
         });
 
-        populateListView($('#listCountries', context), item.ProductionLocations || []);
-        populateListView($('#listGenres', context), item.Genres);
+        populateListView($('#listCountries', context)[0], item.ProductionLocations || []);
+        populateListView($('#listGenres', context)[0], item.Genres);
         populatePeople(context, item.People || []);
 
-        populateListView($('#listStudios', context), (item.Studios || []).map(function (element) { return element.Name || ''; }));
+        populateListView($('#listStudios', context)[0], (item.Studios || []).map(function (element) { return element.Name || ''; }));
 
-        populateListView($('#listTags', context), item.Tags);
-        populateListView($('#listKeywords', context), item.Keywords);
+        populateListView($('#listTags', context)[0], item.Tags);
+        populateListView($('#listKeywords', context)[0], item.Keywords);
 
         var lockData = (item.LockData || false);
         var chkLockData = context.querySelector("#chkLockData");
@@ -613,17 +666,35 @@
     }
 
     function populateListView(list, items, sortCallback) {
-        //items = items || [];
-        //if (typeof (sortCallback) === 'undefined') {
-        //    items.sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); });
-        //} else {
-        //    items = sortCallback(items);
-        //}
-        //var html = '';
-        //for (var i = 0; i < items.length; i++) {
-        //    html += '<li data-mini="true"><a class="data">' + items[i] + '</a><a href="#" onclick="EditItemMetadataPage.removeElementFromListview(this)" class="btnRemoveFromEditorList"></a></li>';
-        //}
-        //list.html(html).listview('refresh');
+
+        items = items || [];
+        if (typeof (sortCallback) === 'undefined') {
+            items.sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); });
+        } else {
+            items = sortCallback(items);
+        }
+        var html = '';
+        for (var i = 0; i < items.length; i++) {
+            html += '<paper-icon-item>';
+
+            html += '<paper-fab mini style="background-color:#444;" icon="live-tv" item-icon></paper-fab>';
+
+            html += '<paper-item-body>';
+
+            html += '<div class="textValue">';
+            html += items[i];
+            html += '</div>';
+
+            html += '</paper-item-body>';
+
+            html += '<paper-icon-button icon="delete" data-index="' + i + '" class="btnRemoveFromEditorList"></paper-icon-button>';
+
+            html += '</paper-icon-item>';
+
+            //html += '<li data-mini="true"><a class="data">' + items[i] + '</a><a href="#" onclick="EditItemMetadataPage.removeElementFromListview(this)" class="btnRemoveFromEditorList"></a></li>';
+        }
+
+        list.innerHTML = html;
     }
 
     function populatePeople(context, people) {
@@ -793,7 +864,8 @@
 
                     var template = this.response;
                     var dlg = paperDialogHelper.createDialog({
-                        removeOnClose: true
+                        removeOnClose: true,
+                        size: 'small'
                     });
 
                     dlg.classList.add('formDialog');
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index cbc375ef9b..8867d0dab3 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -76,9 +76,8 @@
             <div id="fldShortOverview" style="display: none;">
                 <paper-input id="txtShortOverview" type="text" label="${LabelShortOverview}"></paper-input>
             </div>
-            <div id="fldPremiereDate" style="display: none;">
-                <label for="txtPremiereDate" class="likePaperLabel">${LabelReleaseDate}</label>
-                <input id="txtPremiereDate" type="date" class="likePaperText" data-role="none" />
+            <div id="fldPremiereDate">
+                <paper-input id="txtPremiereDate" label="${LabelReleaseDate}" type="date"></paper-input>
             </div>
             <div id="fldYear" style="display: none;">
                 <paper-input id="txtProductionYear" type="number" label="${LabelYear}"></paper-input>
@@ -86,9 +85,8 @@
             <div id="fldPlaceOfBirth" style="display: none;">
                 <paper-input id="txtPlaceOfBirth" type="text" label="${LabelPlaceOfBirth}"></paper-input>
             </div>
-            <div id="fldEndDate" style="display: none;">
-                <label for="txtEndDate" class="likePaperLabel">${LabelEndDate}</label>
-                <input id="txtEndDate" type="date" class="likePaperText" data-role="none" />
+            <div id="fldEndDate">
+                <paper-input id="txtEndDate" label="${LabelEndDate}" type="date"></paper-input>
             </div>
             <div id="fldAirDays" style="display: none;">
                 <p>${LabelAirDays}</p>
@@ -210,74 +208,67 @@
             </div>
         </div>
 
-        <div data-role="collapsible" data-mini="true" id="countriesCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderCountries}</h3>
-            <div data-role="editableListviewContainer">
-                <div>
-                    <div style="display: inline-block; width: 80%;">
-                        <input type="text" class="txtEditableListview" />
-                    </div>
-                    <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
-                </div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listCountries"></ul>
-            </div>
+        <div id="countriesCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderCountries}
+            </h1>
+            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
+            <div class="paperList" id="listCountries"></div>
         </div>
-        <div data-role="collapsible" data-mini="true" id="genresCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderGenres}</h3>
-            <div data-role="editableListviewContainer">
-                <div>
-                    <div style="display: inline-block; width: 80%;">
-                        <input type="text" class="txtEditableListview" />
-                    </div>
-                    <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
-                </div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listGenres"></ul>
-            </div>
+        <div id="genresCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderGenres}
+            </h1>
+            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
+            <div class="paperList" id="listGenres"></div>
         </div>
-        <div data-mini="true" data-role="collapsible" id="peopleCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderPeople}</h3>
+        <div data-mini="true" data-role="collapsible" id="peopleCollapsible" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderPeople}
+            </h1>
+            <paper-button raised id="btnAddPerson" class="btnAddPerson submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
             <div>
-                <br />
-                <button type="button" id="btnAddPerson" data-icon="plus" data-mini="true" data-theme="a">${ButtonAdd}</button>
-                <br />
                 <ul data-role="listview" data-inset="true" data-split-icon="delete" id="peopleList"></ul>
             </div>
         </div>
-        <div data-mini="true" data-role="collapsible" id="keywordsCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderPlotKeywords}</h3>
-            <div data-role="editableListviewContainer">
-                <div>
-                    <div style="display: inline-block; width: 80%;">
-                        <input type="text" class="txtEditableListview" />
-                    </div>
-                    <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
-                </div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listKeywords"></ul>
-            </div>
+        <div id="keywordsCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderPlotKeywords}
+            </h1>
+            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
+            <div class="paperList" id="listKeywords"></div>
         </div>
-        <div data-role="collapsible" data-mini="true" id="studiosCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderStudios}</h3>
-            <div data-role="editableListviewContainer">
-                <div>
-                    <div style="display: inline-block; width: 80%;">
-                        <input type="text" class="txtEditableListview" />
-                    </div>
-                    <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
-                </div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listStudios"></ul>
-            </div>
+        <div id="studiosCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderStudios}
+            </h1>
+            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
+            <div class="paperList" id="listStudios"></div>
         </div>
-        <div data-mini="true" data-role="collapsible" id="tagsCollapsible" style="display: none; margin-top: 1em;">
-            <h3>${HeaderTags}</h3>
-            <div data-role="editableListviewContainer">
-                <div>
-                    <div style="display: inline-block; width: 80%;">
-                        <input type="text" class="txtEditableListview" />
-                    </div>
-                    <paper-icon-button icon="add" onclick="EditItemMetadataPage.addElementToEditableListview(this)"></paper-icon-button>
-                </div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listTags"></ul>
-            </div>
+        <div id="tagsCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
+            <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
+                ${HeaderTags}
+            </h1>
+            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                <iron-icon icon="add"></iron-icon>
+                <span>${ButtonAdd}</span>
+            </paper-button>
+            <div class="paperList" id="listTags"></div>
         </div>
         <div id="metadataSettingsCollapsible" style="display: none; margin-top: 3em;">
             <h1>${HeaderMetadataSettings}</h1>