diff --git a/src/App/dtml/manage_navbar.dtml b/src/App/dtml/manage_navbar.dtml
index a65e93bb78..e3c79b8146 100644
--- a/src/App/dtml/manage_navbar.dtml
+++ b/src/App/dtml/manage_navbar.dtml
@@ -9,16 +9,6 @@
 	><a href="#" onclick="javascript:toggle_menu()" target="_parent"
 			><i class="fa fa-bars">&nbsp;</i></a>
 	</div>
-	<script>
-		function toggle_menu() {
-			if (document.referrer.endsWith('/manage')) {
-				window.parent.location.href="manage_main";
-			} else {
-				window.parent.location.href="manage";
-			};
-		}
-	</script>
-
 	<a class="navbar-brand" href="#" onclick="window.open('http://www.zope.org');">
 		<span class="product">ZOPE 4.0</span>
 	</a>
@@ -35,11 +25,12 @@
 							data-title-active="Select type to add"
 							data-title-inactive="STATUS INACTIVE: New Object can only be Added in the List View"
 							title="Select type to add"
-							onchange="location.href='<dtml-var "REQUEST.get('URL1','')">/'+this.options[this.selectedIndex].value;this.selectedIndex = 0">
-							<option value="" selected="selected">Select type to add</option>
+							onchange="addItem( elm=this, url1='<dtml-var "REQUEST.get('URL1','')">'); this.selectedIndex = 0;"
+							><option value="" selected="selected">Select type to add</option>
 							<dtml-if "_.len(filtered_meta_types) > 1"
 								><dtml-in filtered_meta_types mapping sort=name
-									><dtml-if action><option value="&dtml.html_quote-action;">&dtml-name;</option></dtml-if
+									><dtml-if action><option value="&dtml.html_quote-action;">&dtml-name;</option>
+									</dtml-if
 								></dtml-in
 							></dtml-if>
 						</select>
@@ -48,11 +39,30 @@
 		</dtml-if>
 	</ul>
 
-		<a href="manage_zmi_logout" title="Logout"
-			class="ml-4 d-none d-sm-block">
-			<i class="fas fa-sign-out-alt"></i>
-		</a>
+	<a href="manage_zmi_logout" title="Logout"
+		class="ml-4 d-none d-sm-block">
+		<i class="fas fa-sign-out-alt"></i>
+	</a>
 
 </header>
 
+<!-- ZMI-MODAL DIALOG -->
+<div class="modal fade" id="zmi-modal" tabindex="-1" role="dialog" aria-labelledby="#" aria-hidden="true">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+			</div>
+			<div class="modal-body">
+				... Loading Form ...
+			</div>
+			<div class="modal-footer">
+					&nbsp;
+			</div>
+		</div>
+	</div>
+</div>
+
 </dtml-unless>
\ No newline at end of file
diff --git a/src/App/dtml/manage_page_footer.dtml b/src/App/dtml/manage_page_footer.dtml
index 4dd4daaf1d..17d6286daf 100644
--- a/src/App/dtml/manage_page_footer.dtml
+++ b/src/App/dtml/manage_page_footer.dtml
@@ -1,87 +1,4 @@
+<dtml-unless "REQUEST.get('zmi_dialog','window')=='modal'">
 </body>
-<script>
-// Wrap form element with fluid-container if missing
-	$(function() {
-		if ( $('main.container-fluid').length==0 ) {
-			$('body>form,body>p').wrap('<main class="container-fluid"></main>');
-		}
-	});
-
-// QUICKFIX OBJECT ICONS (as long as not set systematically in the class definitions)
-	var zmi_icons = {
-		"User Folder":{ "title":"Access Control List", "class":"fa fa-user-friends" },
-		"UserFolder":{ "title":"Access Control List", "class":"fa fa-user-friends" },
-		"PluggableAuthService":{ "title":"Pluggable Auth Service", "class":"fa fa-users-cog" },
-		"User":{ "title":"User", "class":"fa fa-user" },
-		"TemporaryFolder":{ "title":"Folder", "class":"far fa-folder" },
-		"Filesystem Directory View":{ "title":"Filesystem Directory View", "class":"far fa-folder-open" },
-		"Ordered":{ "title":"Folder (Ordered)", "class":"far fa-folder zmi-icon-folder-ordered" },
-		"Folder":{ "title":"Folder", "class":"far fa-folder" },
-		"Script":{ "title":"Script (Python)", "class":"fa fa-terminal" },
-		"ExternalMethod":{ "title":"External Python Method", "class":"fa fa-external-link-square" },
-		"DTML Document":{ "title":"DTML Document", "class":"far fa-file-alt" },
-		"DTML Method":{ "title":"DTML Document", "class":"far fa-file-alt" },
-		"Page Template":{ "title":"Page Template", "class":"far fa-file-code" },
-		"File":{ "title":"File Object", "class":"far fa-file-archive" },
-		"Mail":{ "title":"Mail Folder", "class":"far fa-envelope" },
-		"Image":{ "title":"Image", "class":"far fa-file-image" },
-		"Control":{ "title":"Control Panel", "class":"fa fa-cogs" },
-		"Database":{ "title":"Database", "class":"far fa-database" },
-		"ZSQLiteDA":{ "title":"Database", "class":"far fa-database" },
-		"ZMySQLDA":{ "title":"MySQL-Database Adapter", "class":"far fa-database" },
-		"Product":{ "title":"Installed Product", "class":"fa fa-gift" },
-		"ZSQL":{ "title":"ZSQL-Method", "class":"far fa-puzzle-piece" },
-		"Debug Manager":{ "title":"Debug Manager", "class":"fas fa-bug" },
-		"Site Error Log":{ "title":"Site Error Log", "class":"fas fa-bug" },
-		"Browser Id Manager":{ "title":"Browser Id Manager", "class":"far fa-id-card" },
-		"ZMS":{ "title":"ZMS Root", "class":"fas fa-home" },
-		"ZMSObject.png":{ "title":"ZMS Content", "class":"far fa-file" },
-		"Monster":{ "title":"Virtual Host Monster", "class":"fa fa-code-branch" },
-		"ZCatalog":{ "title":"ZCatalog", "class":"far fa-search" },
-		"Session Data Manager":{ "title":"Session Data Manager", "class":"fas fa-history" },
-		"Cookie Crumbler":{ "title":"Cookie Crumbler", "class":"far fa-user-circle" },
-		"Broken object":{ "title":"Broken object", "class":"fas fa-ban text-danger" }
-	}
-
-	// EXECUTE: Process ZMI Icons
-	for ( i in zmi_icons ) {
-			var i_name = i;
-			var i_title =zmi_icons[i].title;
-			var i_class =zmi_icons[i].class;
-			if ( $('i[title*="'+i_name+'"]').hasClass('icon-broken') ) {
-				i_class += ' zmi-icon-broken'
-			};
-			$('i[title*="'+i_name+'"]').replaceWith('<i data-title="'+i_title+'" class="'+i_class+'"></i>');
-	}
-	
-
-// OTHER ICONS
-	$('i[title*="/p_/pl"]').replaceWith('<i data-title="Expand..." class="far fa-plus-square"></i>');
-	$('i[title*="/p_/mi"]').replaceWith('<i data-title="Collapse..." class="far fa-minus-square"></i>');
-	$('i[title*="/p_/davlocked"]').replaceWith('<i data-title="WebDAV" class="fa fa-retweet"></i>');
-	$('img[src*="misc_"]').replaceWith('<i class="fa fa-circle-blank"></i>');
-	$('img[src*="zms_"]').replaceWith('<i class="fa fa-circle-blank"></i>');
-
-	$('#menu_tree td[width="16"] a:contains("+")').html(('<i title="Expand..." class="fas fa-caret-right text-muted"></i>'));
-	$('#menu_tree td[width="16"] a:contains("-")').html(('<i title="Collapse..." class="fas fa-caret-down text-muted"></i>'));
-
-// SHOW SOME MENUS ONLY ON LIST PAGES AS ACTIVE
-	if ($('.nav a[href="manage_findForm"]').length > 0 ) {
-		$('#addItemSelect, #toggle_menu').css('opacity',1);
-		$('#addItemSelect').removeAttr('disabled');
-		$('#addItemSelect').attr( 'title', $('#addItemSelect').attr('data-title-active') );
-		$('#toggle_menu').attr( 'title', $('#toggle_menu').attr('data-title-active') );
-	} else {
-		$('#addItemSelect, #toggle_menu').css('opacity',.5);
-		$('#addItemSelect').attr('disabled','disabled');
-		$('#addItemSelect').attr( 'title', $('#addItemSelect').attr('data-title-inactive') );
-		$('#toggle_menu').attr( 'title', $('#toggle_menu').attr('data-title-inactive') );
-	}
-
-// HELP ICON
-	$('a[href*="HelpSys"]').empty()
-		.append('<i class="fa fa-question-sign"></i>')
-		.css('border-color','transparent');
-
-</script>
 </html>
+</dtml-unless>
\ No newline at end of file
diff --git a/src/App/dtml/manage_page_header.dtml b/src/App/dtml/manage_page_header.dtml
index bc921e4f66..62533d99e2 100644
--- a/src/App/dtml/manage_page_header.dtml
+++ b/src/App/dtml/manage_page_header.dtml
@@ -1,3 +1,4 @@
+<dtml-unless "REQUEST.get('zmi_dialog','window')=='modal'">
 <!doctype html>
 <html lang="en">
 <head>
@@ -20,4 +21,4 @@
 </head>
 <!-- REFACT what is a better way to get the last part of the current URL? -->
 <body id="nodeid-<dtml-var "getId()">" class="zmi zmi-<dtml-var "this().meta_type.replace(' ', '-')"> zmi-<dtml-var "URL0[_.len(URL1)+1:]">">
-
+</dtml-unless>
diff --git a/src/OFS/dtml/addOrderedFolder.dtml b/src/OFS/dtml/addOrderedFolder.dtml
index 4984d6ea8c..a829b96ba6 100644
--- a/src/OFS/dtml/addOrderedFolder.dtml
+++ b/src/OFS/dtml/addOrderedFolder.dtml
@@ -6,51 +6,35 @@
 
 <main class="container-fluid">
 
-<p class="form-help">
-    An ordered Folder contains other objects. Use Folders to organize your
-    web objects in to logical groups. The <em>create public interface</em>
-    option creates an index document inside the Folder to give the
-    Folder a default HTML representation. The <em>create user folder</em>
-    option creates a User Folder inside the Folder to hold authorization
-    information for the Folder.
-</p>
-
-<form action="manage_addOrderedFolder" method="post" class="zmi-orderedfolder">
-
-<table cellspacing="0" cellpadding="2" border="0">
-  <tr>
-    <td align="left" valign="top">
-    <label for="id" class="form-label">
-    Id
-    </label>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" class="form-control" name="id" id="id" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <label for="title" class="form-label">
-    Title
-    </label>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" class="form-control" name="title" id="title" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    </td>
-    <td align="left" valign="top">
-    <div class="controls">
-    <input class="btn btn-primary" type="submit" name="submit"
-     value="Add" />
-    </div>
-    </td>
-  </tr>
-</table>
+	<p class="form-help">
+		An ordered Folder contains other objects. Use Folders to organize your
+		web objects in to logical groups. The <em>create public interface</em>
+		option creates an index document inside the Folder to give the
+		Folder a default HTML representation. The <em>create user folder</em>
+		option creates a User Folder inside the Folder to hold authorization
+		information for the Folder.
+	</p>
+
+	<form action="manage_addOrderedFolder" method="post" class="zmi-orderedfolder">
+
+		<div class="form-group row">
+			<label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+			<div class=" col-sm-9 col-md-10">
+				<input id="id" class="form-control" type="text" name="id" />
+			</div>
+		</div>
+
+		<div class="form-group row">
+			<label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+			<div class=" col-sm-9 col-md-10">
+				<input id="type" class="form-control" type="text" name="title" />
+			</div>
+		</div>
+	
+		<div class="zmi-controls">
+			<input class="btn btn-primary" type="submit" name="submit" value=" Add " />
+		</div>
+
 </form>
 
 </main>
diff --git a/src/OFS/dtml/fileEdit.dtml b/src/OFS/dtml/fileEdit.dtml
index 7c77ede2f5..eb1f1d13d4 100644
--- a/src/OFS/dtml/fileEdit.dtml
+++ b/src/OFS/dtml/fileEdit.dtml
@@ -18,7 +18,7 @@
 			<label for="title" class="form-label	col-sm-3 col-md-2">Title</label>
 			<div class="col-sm-9 col-md-10">
 				<input id="title" class="form-control" type="text" name="title" 
-					value="<dtml-if title>&dtml-title;</dtml-if>">
+					value="<dtml-if title>&dtml-title;</dtml-if>" />
 			</div>
 		</div>
 
@@ -26,7 +26,7 @@
 			<label for="contenttype" class="form-label	col-sm-3 col-md-2">Content Type</label>
 			<div class="col-sm-9 col-md-10">
 				<input id="contenttype" class="form-control" type="text" name="content_type:required" 
-					value="<dtml-if content_type>&dtml-content_type;</dtml-if>">
+					value="<dtml-if content_type>&dtml-content_type;</dtml-if>" />
 				</div>
 		</div>
 
@@ -34,7 +34,7 @@
 			<label for="precondition" class="form-label	col-sm-3 col-md-2">Precondition</label>
 			<div class="col-sm-9 col-md-10">
 				<input id="precondition" class="form-control" type="text" name="precondition" 
-				value="<dtml-if precondition>&dtml-precondition;</dtml-if>">
+				value="<dtml-if precondition>&dtml-precondition;</dtml-if>" />
 			</div>
 		</div>
 
diff --git a/src/OFS/dtml/folderAdd.dtml b/src/OFS/dtml/folderAdd.dtml
index 2c5169347b..baf4b74f47 100644
--- a/src/OFS/dtml/folderAdd.dtml
+++ b/src/OFS/dtml/folderAdd.dtml
@@ -6,52 +6,36 @@
 
 <main class="container-fluid">
 
-<p class="form-help">
-A Folder contains other objects. Use Folders to organize your
-web objects in to logical groups. The <em>create public interface</em>
-option creates an index document inside the Folder to give the
-Folder a default HTML representation. The <em>create user folder</em>
-option creates a User Folder inside the Folder to hold authorization
-information for the Folder.
-</p>
-
-<FORM ACTION="manage_addFolder" METHOD="POST" class="zmi-folder">
-
-<table cellspacing="0" cellpadding="2" border="0">
-  <tr>
-    <td align="left" valign="top">
-    <label for="id" class="form-label">
-    Id
-    </label>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" class="form-control" name="id" id="id" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <label for="title" class="form-label">
-    Title
-    </label>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" class="form-control" name="title" id="title" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    </td>
-    <td align="left" valign="top">
-    <div class="controls">
-    <input class="btn btn-primary" type="submit" name="submit"
-     value="Add" />
-    </div>
-    </td>
-  </tr>
-</table>
-</form>
+	<p class="form-help">
+		A Folder contains other objects. Use Folders to organize your
+		web objects in to logical groups. The <em>create public interface</em>
+		option creates an index document inside the Folder to give the
+		Folder a default HTML representation. The <em>create user folder</em>
+		option creates a User Folder inside the Folder to hold authorization
+		information for the Folder.
+	</p>
+
+	<form action="manage_addFolder" method="post" class="zmi-folder">
+
+		<div class="form-group row">
+			<label for="id" class="form-label	col-sm-3 col-md-2">Id</label>
+			<div class="col-sm-9 col-md-10">
+				<input id="id" class="form-control" type="text" name="id" value="" />
+			</div>
+		</div>
+
+		<div class="form-group row">
+			<label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+			<div class="col-sm-9 col-md-10">
+				<input id="title" class="form-control" type="text" name="title" value="" />
+			</div>
+		</div>
+
+		<div class="zmi-controls">
+			<input class="btn btn-primary" type="submit" name="submit" value=" Add " />
+		</div>
+
+	</form>
 
 </main>
 
diff --git a/src/OFS/dtml/methodAdd.dtml b/src/OFS/dtml/methodAdd.dtml
index b07c926818..232a2247ea 100644
--- a/src/OFS/dtml/methodAdd.dtml
+++ b/src/OFS/dtml/methodAdd.dtml
@@ -7,39 +7,47 @@
            )">
 
 <p class="form-help">
-A DTML Method is used to hold scripting tags and text content.
-It can contain HTML, XML, plain text, structured-text, etcetera.
-A DTML Method can contain DTML scripting tags which operate
-in the context of the DTML Method's containing object.
-A DTML Method differs from a DTML Document in that it does not
-have properties and calls methods on its container object.
+	A DTML Method is used to hold scripting tags and text content.
+	It can contain HTML, XML, plain text, structured-text, etcetera.
+	A DTML Method can contain DTML scripting tags which operate
+	in the context of the DTML Method's containing object.
+	A DTML Method differs from a DTML Document in that it does not
+	have properties and calls methods on its container object.
+	</br />
+	You may create a new DTML Method object using the form below. 
+	You may also choose to upload an existing html file from your 
+	local computer by clicking the <em>Browse</em> button.
 </p>
 
-<p class="form-help">
-You may create a new DTML Method object using the form below.
- You may also choose to upload an existing html file from your
- local computer by clicking the <I>Browse</I> button.
-</p>
-
-<form action="addDTMLMethod" method="post" enctype="multipart/form-data" class="zmi-add zmi-dtmlmethod">
-
-<div class="form-group row">
-    <label for="id" class="form-label col-sm-3 col-md-2">Id</label>
-    <input type="text" class="form-control col-sm-9 col-md-6" name="id" id="id" />
-</div>
-<div class="form-group row">
-    <label for="title" class="form-label col-sm-3 col-md-2">Title</label>
-    <input type="text" class="form-control col-sm-9 col-md-6" name="title" id="title" />
-</div>
-<div class="form-group row">
-    <label for="file" class="form-label col-sm-3 col-md-2">File</label>
-    <input type="file" id="file" class="form-control-file col-sm-9 col-md-6" name="file:string" size="25" value="" />
-</div>
-<div class="controls">
-    <input class="btn btn-primary" type="submit" name="submit" value=" Add " />
-    <input class="btn btn-secondary" type="submit" name="submit" value=" Add and Edit " />
-</div>
-</form>
+	<form action="addDTMLMethod" method="post" enctype="multipart/form-data" class="zmi-add zmi-dtmlmethod">
+
+		<div class="form-group row">
+			<label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+			<div class="col-sm-9 col-md-10">
+				<input type="text" class="form-control" name="id" id="id" />
+			</div>
+		</div>
+
+		<div class="form-group row">
+			<label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+			<div class="col-sm-9 col-md-10">
+				<input type="text" class="form-control" name="title" id="title" />
+			</div>
+		</div>
+
+		<div class="form-group row">
+			<label for="file" class="form-label col-sm-3 col-md-2">File</label>
+			<div class="col-sm-9 col-md-10">
+				<input type="file" id="file" class="form-control form-control-file" name="file:string" size="25" value="" />
+			</div>
+		</div>
+
+		<div class="zmi-controls">
+			<input class="btn btn-primary" type="submit" name="submit" value=" Add " />
+			<input class="btn btn-secondary" type="submit" name="submit" value=" Add and Edit " />
+		</div>
+
+	</form>
 
 </main>
 
diff --git a/src/OFS/zpt/main.zpt b/src/OFS/zpt/main.zpt
index 7fc0dbbb97..568b4e2d8a 100644
--- a/src/OFS/zpt/main.zpt
+++ b/src/OFS/zpt/main.zpt
@@ -176,8 +176,27 @@
 <!--
 	$(function() {
 
+		// +++++++++++++++++++++++++++
+		// Icon Tooltips
+		// +++++++++++++++++++++++++++
 		$('td.zmi-object-type i').tooltip({'placement':'top'});
 
+		// +++++++++++++++++++++++++++
+		// Tablefilter/Search Element
+		// +++++++++++++++++++++++++++
+		$(document).keypress( function(e) {
+			// Set Focus to Tablefilter only when Modal Dialog is not Shown
+			if ( !$('#zmi-modal').hasClass('show') ) {
+				$('#tablefilter').focus();
+				// Prevent Submitting a form by hitting Enter
+				// https://stackoverflow.com/questions/895171/prevent-users-from-submitting-a-form-by-hitting-enter
+				if ( e.which == 13 ) {
+						event.preventDefault();
+						return false;
+				};
+			};
+		})
+
 		$('#tablefilter').keyup( function (e) {
 			var tablefilter = $(this).val();
 			console.log('You pressed ' + tablefilter);
@@ -189,16 +208,6 @@
 			$('table.objectItems').find("tbody tr td.zmi-object-id a:contains(" + tablefilter+ ")").closest('tbody tr').show();
 		});
 
-		$(document).keypress( function(e) {
-			$('#tablefilter').focus();
-			// Prevent Submitting a form by hitting Enter
-			// https://stackoverflow.com/questions/895171/prevent-users-from-submitting-a-form-by-hitting-enter
-			if ( e.which == 13 ) {
-					event.preventDefault();
-					return false;
-			};
-		})
-
 	});
 //-->
 </script>