diff --git a/mod/editblock.php b/mod/editblock.php
index a0ece8133..faa283b63 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -108,12 +108,6 @@ function editblock_content(&$a) {
 	else
 		$mimeselect = mimetype_select($itm[0]['uid'],$mimetype); 
 
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Block'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
-
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -133,7 +127,7 @@ function editblock_content(&$a) {
 
 	$rp = 'blocks/' . $channel['channel_address'];
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_BUILDBLOCK,
@@ -181,6 +175,13 @@ function editblock_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Block'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 8ab5aab22..a39611a58 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -101,12 +101,6 @@ function editlayout_content(&$a) {
 		$layout_title = $item_id[0]['sid'];
 
 	$plaintext = true;
-
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Layout'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
 	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
@@ -132,7 +126,7 @@ function editlayout_content(&$a) {
 
 	$rp = 'layouts/' . $which;
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_PDL,
@@ -178,6 +172,14 @@ function editlayout_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Layout'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }
diff --git a/mod/editpost.php b/mod/editpost.php
index db0a86df1..e907a07d0 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -100,7 +100,7 @@ function editpost_content(&$a) {
 		$cipher = 'aes256';
 
 
-	$editor .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
 		'$share' => t('Edit'),
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 7fc17471c..0e5df2c47 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -1,4 +1,5 @@
 {{if $header}}
+<div class="generic-content-wrapper">
 <div class="section-title-wrapper">
 	{{if $menu_id}}
 	<div class="pull-right">
@@ -27,3 +28,6 @@
 		<div class="clear"></div>
 	</form>
 </div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index cdc022c5c..8715d6391 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,37 +1,42 @@
 {{if $header}}
-<div class="section-title-wrapper">
-	<h2>{{$header}}</h2>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+{{/if}}
+	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
+			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+			{{if $mitem_id}}
+			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_desc}}
+			{{include file="field_input.tpl" field=$mitem_link}}
+			{{if $menu_names}}
+			<datalist id="menu-names">
+				{{foreach $menu_names as $menu_name}}
+				<option value="{{$menu_name}}">
+				{{/foreach}}
+			</datalist>
+			{{/if}}
+			{{include file="field_input.tpl" field=$mitem_order}}
+			{{include file="field_checkbox.tpl" field=$usezid}}
+			{{include file="field_checkbox.tpl" field=$newwin}}
+			<div class="pull-right form-group">
+				<div class="btn-group">
+					<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+					</button>
+					{{if $submit_more}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
+					{{/if}}
+					<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+				</div>
+				{{$aclselect}}
+			</div>
+			<div class="clear"></div>
+		</form>
+	</div>
+{{if $header}}
 </div>
 {{/if}}
-<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-	<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
-		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-		{{if $mitem_id}}
-		<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-		{{/if}}
-		{{include file="field_input.tpl" field=$mitem_desc}}
-		{{include file="field_input.tpl" field=$mitem_link}}
-		{{if $menu_names}}
-		<datalist id="menu-names">
-			{{foreach $menu_names as $menu_name}}
-			<option value="{{$menu_name}}">
-			{{/foreach}}
-		</datalist>
-		{{/if}}
-		{{include file="field_input.tpl" field=$mitem_order}}
-		{{include file="field_checkbox.tpl" field=$usezid}}
-		{{include file="field_checkbox.tpl" field=$newwin}}
-		<div class="pull-right form-group">
-			<div class="btn-group">
-				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
-				</button>
-				{{if $submit_more}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
-			</div>
-			{{$aclselect}}
-		</div>
-	</form>
-</div>
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 4e606654f..8686d4204 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,35 +1,34 @@
-<div class="section-title-wrapper">
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+		<div class="clear"></div>
 	</div>
-	<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
-	<div class="clear"></div>
+
+	{{$create}}
+
+	{{if $mlist }}
+	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+		<table id="mitem-list-table">
+			<tr>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="96%">{{$targettitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $mlist as $m }}
+			<tr id="mitem-list-item-{{$m.mitem_id}}">
+				<td width="1%">{{$m.mitem_desc}}</td>
+				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
 </div>
-
-{{$create}}
-
-{{if $mlist }}
-<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
-	<table id="mitem-list-table">
-		<tr>
-			<th width="1%">{{$nametitle}}</th>
-			<th width="96%">{{$targettitle}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-		</tr>
-		{{foreach $mlist as $m }}
-		<tr id="mitem-list-item-{{$m.mitem_id}}">
-			<td width="1%">{{$m.mitem_desc}}</td>
-			<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
-			<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-			<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
-			<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
-		</tr>
-		{{/foreach}}
-	</table>
-</div>
-{{/if}}
-
- 
-