diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index 3cd038cd09..c24fcf6ba6 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -306,6 +306,10 @@ button::-moz-focus-inner {
     text-align: left;
 }
 
+.dialog .cardText {
+    text-overflow: initial;
+}
+
 .cardText-secondary {
     font-size: 86%;
 }
diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js
index 83ae4d09c6..f2ad88e713 100644
--- a/src/components/channelMapper/channelMapper.js
+++ b/src/components/channelMapper/channelMapper.js
@@ -79,7 +79,7 @@ define(['dom', 'dialogHelper', 'loading', 'connectionManager', 'globalize', 'act
 
         function getEditorHtml() {
             var html = '';
-            html += '<div class="formDialogContent">';
+            html += '<div class="formDialogContent smoothScrollY">';
             html += '<div class="dialogContentInner dialog-content-centered">';
             html += '<form style="margin:auto;">';
             html += '<h1>' + globalize.translate('HeaderChannels') + '</h1>';
diff --git a/src/components/dialogHelper/dialoghelper.css b/src/components/dialogHelper/dialoghelper.css
index df2adf075f..98cfef1c5d 100644
--- a/src/components/dialogHelper/dialoghelper.css
+++ b/src/components/dialogHelper/dialoghelper.css
@@ -126,25 +126,10 @@
 }
 
 @media all and (min-width: 80em) and (min-height: 45em) {
-    .dialog-medium {
-        width: 80%;
-        height: 80%;
-    }
-
-    .dialog-medium-tall {
-        width: 80%;
-        height: 90%;
-    }
-
     .dialog-small {
         width: 60%;
         height: 80%;
     }
-
-    .dialog-fullscreen-border {
-        width: 90%;
-        height: 90%;
-    }
 }
 
 .noScroll {
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index 7f13f89ef5..3b1bd4ea80 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -253,7 +253,7 @@ define(['loading', 'dialogHelper', 'dom', 'globalize', 'listViewStyle', 'emby-in
                     var systemInfo = responses[0];
                     var initialPath = responses[1];
                     var dlg = dialogHelper.createDialog({
-                        size: 'medium-tall',
+                        size: 'small',
                         removeOnClose: true,
                         scrollY: false
                     });
diff --git a/src/components/formdialog.css b/src/components/formdialog.css
index 788331da94..94695f4865 100644
--- a/src/components/formdialog.css
+++ b/src/components/formdialog.css
@@ -19,6 +19,10 @@
     margin-bottom: 0;
 }
 
+.formDialogHeaderTitle:first-child {
+    margin-left: 1em;
+}
+
 .formDialogContent:not(.no-grow) {
     flex-grow: 1;
 }
@@ -46,10 +50,16 @@
     right: 0;
     display: flex;
     position: absolute;
-    padding: 1.25em 1em;
+    padding: 1em 1em;
 
     /* Without this emby-checkbox is able to appear on top */
     z-index: 1;
+    align-items: flex-end;
+    justify-content: flex-end;
+    flex-wrap: wrap;
+}
+
+.layout-tv .formDialogFooter {
     align-items: center;
     justify-content: center;
     flex-wrap: wrap;
@@ -69,8 +79,12 @@
 
 .formDialogFooterItem {
     margin: 0.5em !important;
-    flex-grow: 1;
     text-align: center;
+    flex-basis: 12em;
+}
+
+.layout-tv .formDialogFooterItem {
+    flex-grow: 1;
     flex-basis: 0;
 }
 
diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js
index b30f1bf31c..220e4148cc 100644
--- a/src/components/imageDownloader/imageDownloader.js
+++ b/src/components/imageDownloader/imageDownloader.js
@@ -334,7 +334,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image
             if (layoutManager.tv) {
                 dialogOptions.size = 'fullscreen';
             } else {
-                dialogOptions.size = 'fullscreen-border';
+                dialogOptions.size = 'small';
             }
 
             var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/components/imageDownloader/imageDownloader.template.html b/src/components/imageDownloader/imageDownloader.template.html
index 6ca2a2418c..b88ea73923 100644
--- a/src/components/imageDownloader/imageDownloader.template.html
+++ b/src/components/imageDownloader/imageDownloader.template.html
@@ -5,7 +5,7 @@
     </h3>
 </div>
 
-<div class="formDialogContent">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap" style="margin: 2em 0;">
 
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.js b/src/components/imageOptionsEditor/imageOptionsEditor.js
index cd8345fbb3..257921dfa2 100644
--- a/src/components/imageOptionsEditor/imageOptionsEditor.js
+++ b/src/components/imageOptionsEditor/imageOptionsEditor.js
@@ -87,7 +87,7 @@ define(['globalize', 'dom', 'dialogHelper', 'emby-checkbox', 'emby-select', 'emb
                 xhr.onload = function (e) {
                     var template = this.response;
                     var dlg = dialogHelper.createDialog({
-                        size: 'medium-tall',
+                        size: 'small',
                         removeOnClose: true,
                         scrollY: false
                     });
diff --git a/src/components/imageUploader/imageUploader.js b/src/components/imageUploader/imageUploader.js
index 5d1c0275cb..e078a9fa30 100644
--- a/src/components/imageUploader/imageUploader.js
+++ b/src/components/imageUploader/imageUploader.js
@@ -137,7 +137,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
             if (layoutManager.tv) {
                 dialogOptions.size = 'fullscreen';
             } else {
-                dialogOptions.size = 'fullscreen-border';
+                dialogOptions.size = 'small';
             }
 
             var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/components/imageUploader/imageUploader.template.html b/src/components/imageUploader/imageUploader.template.html
index 75f5723751..9c6a139c04 100644
--- a/src/components/imageUploader/imageUploader.template.html
+++ b/src/components/imageUploader/imageUploader.template.html
@@ -5,7 +5,7 @@
     </h3>
 </div>
 
-<div class="formDialogContent">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner">
 
         <form class="uploadItemImageForm" style="max-width: 100%;">
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 606cdfa716..228060b8bf 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -457,7 +457,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                 if (layoutManager.tv) {
                     dialogOptions.size = 'fullscreen';
                 } else {
-                    dialogOptions.size = 'fullscreen-border';
+                    dialogOptions.size = 'small';
                 }
 
                 var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html
index 1bf34f1aac..ce24e724bd 100644
--- a/src/components/imageeditor/imageeditor.template.html
+++ b/src/components/imageeditor/imageeditor.template.html
@@ -5,7 +5,7 @@
     </h3>
 </div>
 
-<div class="formDialogContent">
+<div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner">
 
         <div id="imagesContainer">
diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js
index 8710936028..b335d1dfd3 100644
--- a/src/components/itemidentifier/itemidentifier.js
+++ b/src/components/itemidentifier/itemidentifier.js
@@ -348,7 +348,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
                 currentItemType = currentItem.Type;
 
                 var dialogOptions = {
-                    size: 'fullscreen-border',
+                    size: 'small',
                     removeOnClose: true,
                     scrollY: false
                 };
@@ -429,7 +429,7 @@ define(['dialogHelper', 'loading', 'connectionManager', 'require', 'globalize',
         require(['text!./itemidentifier.template.html'], function (template) {
 
             var dialogOptions = {
-                size: 'fullscreen-border',
+                size: 'small',
                 removeOnClose: true,
                 scrollY: false
             };
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index b941f2fcb8..bbef6e1f07 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -187,7 +187,7 @@ define(['loading', 'dialogHelper', 'dom', 'jQuery', 'components/libraryoptionsed
                 xhr.onload = function (e) {
                     var template = this.response;
                     var dlg = dialogHelper.createDialog({
-                        size: 'medium-tall',
+                        size: 'small',
                         modal: false,
                         removeOnClose: true,
                         scrollY: false
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index c4da19ccd7..554cf4cc0f 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -204,7 +204,7 @@ define(['jQuery', 'loading', 'dialogHelper', 'dom', 'components/libraryoptionsed
             xhr.onload = function (e) {
                 var template = this.response;
                 var dlg = dialogHelper.createDialog({
-                    size: 'medium-tall',
+                    size: 'small',
                     modal: false,
                     removeOnClose: true,
                     scrollY: false
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 899bab778d..52f030cd23 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -245,50 +245,6 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         });
     }
 
-    function showMoreMenu(context, button, user) {
-
-        require(['itemContextMenu'], function (itemContextMenu) {
-
-            var item = currentItem;
-
-            itemContextMenu.show({
-
-                item: item,
-                positionTo: button,
-                edit: false,
-                editImages: true,
-                editSubtitles: true,
-                sync: false,
-                share: false,
-                play: false,
-                queue: false,
-                user: user
-
-            }).then(function (result) {
-
-                if (result.deleted) {
-                    afterDeleted(context, item);
-
-                } else if (result.updated) {
-                    reload(context, item.Id, item.ServerId);
-                }
-            });
-        });
-    }
-
-    function afterDeleted(context, item) {
-
-        var parentId = item.ParentId || item.SeasonId || item.SeriesId;
-
-        if (parentId) {
-            reload(context, parentId, item.ServerId);
-        } else {
-            require(['appRouter'], function (appRouter) {
-                appRouter.goHome();
-            });
-        }
-    }
-
     function onEditorClick(e) {
 
         var btnRemoveFromEditorList = dom.parentWithClass(e.target, 'btnRemoveFromEditorList');
@@ -307,6 +263,12 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         return connectionManager.getApiClient(currentItem.ServerId);
     }
 
+    function bindAll(elems, eventName, fn) {
+        for (var i = 0, length = elems.length; i < length; i++) {
+            elems[i].addEventListener(eventName, fn);
+        }
+    }
+
     function init(context, apiClient) {
 
         context.querySelector('.externalIds').addEventListener('click', function (e) {
@@ -322,19 +284,16 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             }
         });
 
-        context.querySelector('.btnCancel').addEventListener('click', function () {
+        if (!layoutManager.desktop) {
+            context.querySelector('.btnBack').classList.remove('hide');
+            context.querySelector('.btnClose').classList.add('hide');
+        }
 
+        bindAll(context.querySelectorAll('.btnCancel'), 'click', function (event) {
+            event.preventDefault();
             closeDialog(false);
         });
 
-        context.querySelector('.btnMore').addEventListener('click', function (e) {
-
-            getApiClient().getCurrentUser().then(function (user) {
-                showMoreMenu(context, e.target, user);
-            });
-
-        });
-
         context.querySelector('.btnHeaderSave').addEventListener('click', function (e) {
 
             context.querySelector('.btnSave').click();
@@ -349,8 +308,8 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             }
         });
 
-        context.removeEventListener('click', onEditorClick);
-        context.addEventListener('click', onEditorClick);
+        context.removeEventListener('submit', onEditorClick);
+        context.addEventListener('submit', onEditorClick);
 
         var form = context.querySelector('form');
         form.removeEventListener('submit', onSubmit);
@@ -1077,7 +1036,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             if (layoutManager.tv) {
                 dialogOptions.size = 'fullscreen';
             } else {
-                dialogOptions.size = 'medium-tall';
+                dialogOptions.size = 'small';
             }
 
             var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/components/metadataEditor/metadataEditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
index 7845824281..4b4e2cf965 100644
--- a/src/components/metadataEditor/metadataEditor.template.html
+++ b/src/components/metadataEditor/metadataEditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel btnBack autoSize hide" tabindex="-1"><span class="material-icons arrow_back"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${Edit}
     </h3>
@@ -8,8 +8,8 @@
             <span class="material-icons check"></span>
             <span>${Save}</span>
         </button>
-        <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
-            <span class="material-icons more_vert"></span>
+        <button is="paper-icon-button-light" class="btnCancel btnClose autoSize" tabindex="-1">
+            <span class="material-icons close"></span>
         </button>
     </div>
 </div>
@@ -57,11 +57,13 @@
                 <div id="fldAlbum" class="hide inputContainer">
                     <input is="emby-input" id="txtAlbum" type="text" label="${LabelAlbum}" />
                 </div>
-                <div id="fldParentIndexNumber" class="hide inputContainer">
-                    <input is="emby-input" id="txtParentIndexNumber" type="number" />
-                </div>
-                <div id="fldIndexNumber" class="hide inputContainer">
-                    <input is="emby-input" id="txtIndexNumber" type="number" pattern="[0-9]*" />
+                <div class="inlineForm">
+                    <div id="fldParentIndexNumber" class="hide inputContainer">
+                        <input is="emby-input" id="txtParentIndexNumber" type="number" />
+                    </div>
+                    <div id="fldIndexNumber" class="hide inputContainer">
+                        <input is="emby-input" id="txtIndexNumber" type="number" pattern="[0-9]*" />
+                    </div>
                 </div>
                 <div id="fldCommunityRating" class="hide inputContainer">
                     <input is="emby-input" id="txtCommunityRating" type="number" step=".1" min="0" max="10" label="${LabelCommunityRating}" />
@@ -129,24 +131,28 @@
                 <div id="fldSeriesRuntime" class="inputContainer hide">
                     <input is="emby-input" id="txtSeriesRuntime" type="number" label="${LabelRuntimeMinutes}" />
                 </div>
-                <div id="fldOfficialRating" class="selectContainer hide">
-                    <select is="emby-select" id="selectOfficialRating" label="${LabelParentalRating}"></select>
+                <div class="inlineForm">
+                    <div id="fldOfficialRating" class="selectContainer hide">
+                        <select is="emby-select" id="selectOfficialRating" label="${LabelParentalRating}"></select>
+                    </div>
+                    <div id="fldCustomRating" class="selectContainer hide">
+                        <select is="emby-select" id="selectCustomRating" label="${LabelCustomRating}"></select>
+                    </div>
                 </div>
-                <div id="fldCustomRating" class="selectContainer hide">
-                    <select is="emby-select" id="selectCustomRating" label="${LabelCustomRating}"></select>
-                </div>
-                <div id="fldOriginalAspectRatio" class="inputContainer hide">
-                    <input is="emby-input" id="txtOriginalAspectRatio" type="text" label="${LabelOriginalAspectRatio}" />
-                </div>
-                <div id="fld3dFormat" class="selectContainer hide">
-                    <select is="emby-select" id="select3dFormat" label="${Label3DFormat}">
-                        <option value=""></option>
-                        <option value="HalfSideBySide">HSBS</option>
-                        <option value="HalfTopAndBottom">HTAB</option>
-                        <option value="FullSideBySide">FSBS</option>
-                        <option value="FullTopAndBottom">FTAB</option>
-                        <option value="MVC">MVC</option>
-                    </select>
+                <div class="inlineForm">
+                    <div id="fldOriginalAspectRatio" class="inputContainer hide">
+                        <input is="emby-input" id="txtOriginalAspectRatio" type="text" label="${LabelOriginalAspectRatio}" />
+                    </div>
+                    <div id="fld3dFormat" class="selectContainer hide">
+                        <select is="emby-select" id="select3dFormat" label="${Label3DFormat}">
+                            <option value=""></option>
+                            <option value="HalfSideBySide">HSBS</option>
+                            <option value="HalfTopAndBottom">HTAB</option>
+                            <option value="FullSideBySide">FSBS</option>
+                            <option value="FullTopAndBottom">FTAB</option>
+                            <option value="MVC">MVC</option>
+                        </select>
+                    </div>
                 </div>
 
                 <div id="fldDisplayOrder" class="fldDisplaySetting selectContainer hide">
@@ -160,14 +166,16 @@
                 <h2>
                     ${HeaderSpecialEpisodeInfo}
                 </h2>
-                <div class="inputContainer">
-                    <input is="emby-input" id="txtAirsBeforeSeason" type="number" pattern="[0-9]*" label="${LabelAirsBeforeSeason}" />
-                </div>
-                <div class="inputContainer">
-                    <input is="emby-input" id="txtAirsAfterSeason" type="number" pattern="[0-9]*" label="${LabelAirsAfterSeason}" />
-                </div>
-                <div class="inputContainer">
-                    <input is="emby-input" id="txtAirsBeforeEpisode" type="number" pattern="[0-9]*" label="${LabelAirsBeforeEpisode}" />
+                <div class="inlineForm">
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtAirsBeforeSeason" type="number" pattern="[0-9]*" label="${LabelAirsBeforeSeason}" />
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtAirsAfterSeason" type="number" pattern="[0-9]*" label="${LabelAirsAfterSeason}" />
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtAirsBeforeEpisode" type="number" pattern="[0-9]*" label="${LabelAirsBeforeEpisode}" />
+                    </div>
                 </div>
             </div>
 
@@ -240,8 +248,11 @@
             </div>
             <br />
             <div class="formDialogFooter">
+                <button is="emby-button" class="raised button-cancel block btnCancel formDialogFooterItem">
+                    <span>${Cancel}</span>
+                </button>
                 <button is="emby-button" type="submit" class="raised button-submit block btnSave formDialogFooterItem">
-                    <span>${Save}</span>
+                    <span>${SaveChanges}</span>
                 </button>
             </div>
 
diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js
index e71a7441cd..fc6a0595f2 100644
--- a/src/components/metadataEditor/personEditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -21,7 +21,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
                 if (layoutManager.tv) {
                     dialogOptions.size = 'fullscreen';
                 } else {
-                    dialogOptions.size = 'medium-tall';
+                    dialogOptions.size = 'small';
                 }
 
                 var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html
index dbe9131d70..e960d97a0f 100644
--- a/src/dlnaprofile.html
+++ b/src/dlnaprofile.html
@@ -272,7 +272,7 @@
             </form>
         </div>
     </div>
-    <div data-role="popup" id="popupEditDirectPlayProfile" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="popupEditDirectPlayProfile" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="editDirectPlayProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderDirectPlayProfile}</h3>
@@ -312,7 +312,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="transcodingProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="transcodingProfilePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="transcodingProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderTranscodingProfile}</h3>
@@ -394,7 +394,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="containerProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="containerProfilePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="containerProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderContainerProfile}</h3>
@@ -426,7 +426,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="codecProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="codecProfilePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="codecProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderCodecProfile}</h3>
@@ -455,7 +455,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="responseProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="responseProfilePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="editResponseProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderResponseProfile}</h3>
@@ -495,7 +495,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="identificationHeaderPopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="identificationHeaderPopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="identificationHeaderForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderIdentificationHeader}</h3>
@@ -525,7 +525,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="xmlAttributePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="xmlAttributePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="xmlAttributeForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderXmlDocumentAttribute}</h3>
@@ -548,7 +548,7 @@
             </div>
         </form>
     </div>
-    <div data-role="popup" id="subtitleProfilePopup" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="subtitleProfilePopup" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="subtitleProfileForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3 class="sectionTitle">${HeaderSubtitleProfile}</h3>
diff --git a/src/elements/emby-input/emby-input.css b/src/elements/emby-input/emby-input.css
index 18ad37a87a..195e680279 100644
--- a/src/elements/emby-input/emby-input.css
+++ b/src/elements/emby-input/emby-input.css
@@ -29,6 +29,27 @@
     margin-bottom: 1.8em;
 }
 
+.inlineForm {
+    display: flex;
+}
+
+.inlineForm .inputContainer,
+.inlineForm .selectContainer {
+    flex-basis: 0;
+    flex-grow: 1;
+    margin: 0 0.5em 1.8em;
+}
+
+.inlineForm .inputContainer:first-child,
+.inlineForm .selectContainer:first-child {
+    margin-left: 0;
+}
+
+.inlineForm .inputContainer:last-child,
+.inlineForm .selectContainer:last-child {
+    margin-right: 0;
+}
+
 .inputLabel {
     display: inline-block;
     margin-bottom: 0.25em;
diff --git a/src/scheduledtask.html b/src/scheduledtask.html
index f88f6a04c6..c7e82594ce 100644
--- a/src/scheduledtask.html
+++ b/src/scheduledtask.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div data-role="popup" id="popupAddTrigger" class="dialog dialog-fixedSize dialog-medium-tall hide" style="position: fixed; top: 10%;">
+    <div data-role="popup" id="popupAddTrigger" class="dialog dialog-fixedSize dialog-medium hide" style="position: fixed; top: 10%;">
         <form class="addTriggerForm" style="padding:1em;">
             <div class="ui-bar-a">
                 <h3>${HeaderAddScheduledTaskTrigger}</h3>
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 7df1001667..676d825612 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1311,6 +1311,7 @@
     "Runtime": "Runtime",
     "Saturday": "Saturday",
     "Save": "Save",
+    "SaveChanges": "Save changes",
     "SaveSubtitlesIntoMediaFolders": "Save subtitles into media folders",
     "SaveSubtitlesIntoMediaFoldersHelp": "Storing subtitles next to video files will allow them to be more easily managed.",
     "ScanForNewAndUpdatedFiles": "Scan for new and updated files",