diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.js b/dashboard-ui/components/fileorganizer/fileorganizer.js
index 12d5a60a1b..f1f9beea22 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.js
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.js
@@ -385,7 +385,7 @@
             html += '<div style="padding:0; margin: 10px 0px 0px 0px"><paper-tabs hidescrollbuttons selected="0">';
             html += '<paper-tab id="popupTab1" class="episodeTabButton">TV Episode</paper-tab>';
             html += '<paper-tab id="popupTab2" class="movieTabButton">Movie</paper-tab>';
-            html += '</paper-tabs></div>'
+            html += '</paper-tabs></div>';
 
             html += '<div class="editorContent" style="margin:auto;">';
             html += Globalize.translateDocument(template);
@@ -441,19 +441,8 @@
             removeOnClose: true
         });
 
-        dlg.setAttribute('with-backdrop', 'with-backdrop');
-        dlg.setAttribute('role', 'alertdialog');
-
-        // without this safari will scroll the background instead of the dialog contents
-        // but not needed here since this is already on top of an existing dialog
-        dlg.setAttribute('modal', 'modal');
-
-        dlg.setAttribute('noAutoFocus', 'noAutoFocus');
-        dlg.entryAnimation = 'scale-up-animation';
-        dlg.exitAnimation = 'fade-out-animation';
         dlg.classList.add('ui-body-a');
         dlg.classList.add('background-theme-a');
-        dlg.classList.add('smoothScrollY');
 
         return dlg;
     }
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
index cedd5cd843..cf560c836f 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.template.html
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
@@ -1,8 +1,15 @@
-<div class="popupTabPage">
+<div class="dialogHeader">
+    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
+    <div class="dialogHeaderTitle">
+        ${HeaderInviteUser}
+    </div>
+</div>
+
+<div class="popupTabPage">
     <form class="episodeCorrectionForm">
         <p><span class="inputFile"></span></p>
-        <div class="layout horizontal center-center" style="margin: 1em 0 1em; min-width: 350px;" id="divSelectSeries">
-            <div style="width: 100%;">
+        <div class="layout horizontal center-center" style="margin: 1em 0 1em;" id="divSelectSeries">
+            <div>
                 <label for="selectSeries">${LabelSeries}</label>
                 <select id="selectSeries" data-mini="true"></select>
             </div>
@@ -10,7 +17,7 @@
                 New
             </button>
         </div>
-        <div style="margin: 1em 0 1em; min-width: 350px; display: none" id="divNewSeries">
+        <div style="margin: 1em 0 1em; display: none" id="divNewSeries">
             <label for="txtSelectedNewSeries2">New Series</label>
             <input id="txtSelectedNewSeries2" class="txt-readonly" disabled />
             <div class="fieldDescription"><span id="spanTargetFolder"></span></div>
@@ -31,7 +38,7 @@
         <div id="divRememberCorrection" style="margin: 1em 0;">
             <label style="display:block">${TabSmartMatch}</label>
             <input type="checkbox" id="chkRememberCorrection" name="chkRememberCorrection" data-mini="true" />
-            <label for="chkRememberCorrection" style="max-width: 350px">${LabelOrganizeSmartMatchOption}: <span class="extractedName" style="font-weight: bold; font-style: italic" /></label>
+            <label for="chkRememberCorrection">${LabelOrganizeSmartMatchOption}: <span class="extractedName" style="font-weight: bold; font-style: italic" /></label>
         </div>
         <p>
             <button type="submit" data-theme="b" data-icon="check" data-mini="true">
@@ -46,7 +53,7 @@
 
     <form class="createSeriesForm">
         <p><span class="inputFile"></span></p>
-        <div style="margin: 1em 0 1em; min-width: 350px;">
+        <div style="margin: 1em 0 1em;">
             <label for="txtNewSeriesName">${LabelSeries}</label>
             <input id="txtNewSeriesName" required="required" />
         </div>
@@ -65,7 +72,7 @@
                  Therefore class text-readonly is used instead to prevent keyboard input -->
             <input id="txtSelectedNewSeries" class="txt-readonly" required="required" />
         </div>
-        <div style="margin: 1em 0 1em; min-width: 350px;">
+        <div style="margin: 1em 0 1em;">
             <label for="selectSeriesFolder">Destination Folder</label>
             <select id="selectSeriesFolder" data-mini="true" required="required"></select>
         </div>