diff --git a/include/text.php b/include/text.php
index 791254e52..f1f6d41f0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1595,18 +1595,20 @@ function layout_select($channel_id, $current = '') {
 		intval($channel_id),
 		intval(ITEM_PDL)
 	);
+
 	if($r) {
-		$o = t('Select a page layout: ');
-		$o .= '<select name="layout_mid" id="select-layout_mid" >';
-		$empty_selected = (($current === '') ? ' selected="selected" ' : '');
-		$o .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
+		$empty_selected = (($current === false) ? ' selected="selected" ' : '');
+		$options .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
 		foreach($r as $rr) {
 			$selected = (($rr['mid'] == $current) ? ' selected="selected" ' : '');
-			$o .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
+			$options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
 		}
-		$o .= '</select>';
 	}
 
+	$o = replace_macros(get_markup_template('field_select_raw.tpl'), array(
+		'$field'	=> array('layout_mid', t('Page layout'), $selected, t('You can create your own with the layouts tool'), $options)
+	));
+
 	return $o;
 }
 
@@ -1639,13 +1641,14 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
 		}		
 	}
 
-	$o = t('Page content type: ');
-	$o .= '<select name="mimetype" id="mimetype-select">';
 	foreach($x as $y) {
-		$select = (($y == $current)	? ' selected="selected" ' : '');
-		$o .= '<option name="' . $y . '"' . $select . '>' . $y . '</option>';
+		$selected = (($y == $current) ? ' selected="selected" ' : '');
+		$options .= '<option name="' . $y . '"' . $selected . '>' . $y . '</option>';
 	}
-	$o .= '</select>';
+
+	$o = replace_macros(get_markup_template('field_select_raw.tpl'), array(
+		'$field'	=> array('mimetype', t('Page content type'), $selected, '', $options)
+	));
 
 	return $o;
 }
@@ -2105,7 +2108,7 @@ function design_tools() {
 	$who = $channel['channel_address'];
 
 	return replace_macros(get_markup_template('design_tools.tpl'), array(
-		'$title' => t('Design'),
+		'$title' => t('Design Tools'),
 		'$who' => $who,
 		'$sys' => $sys,
 		'$blocks' => t('Blocks'),
diff --git a/mod/blocks.php b/mod/blocks.php
index 1b7a3588f..e0f32f4f1 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -78,16 +78,11 @@ function blocks_content(&$a) {
 		return;
 	}
 
+	$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
 
-	if(feature_enabled($owner,'expert')) {
-		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
-		if(! $mimetype)
-			$mimetype = 'choose';	
+	if(! $mimetype) {
+		$mimetype = 'choose';
 	}
-	else {
-		$mimetype = 'text/bbcode';
-	}
-
 
 	$x = array(
 		'webpage' => ITEM_BUILDBLOCK,
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index e81cde479..e30a33171 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -126,7 +126,7 @@ function editwebpage_content(&$a) {
 		$plaintext = true;
 
 	if(get_config('system','page_mimetype'))
-	    $mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
+		$mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
 	else
 		$mimeselect = mimetype_select($itm[0]['uid'],$mimetype); 
 
diff --git a/mod/webpages.php b/mod/webpages.php
index b4c4e6e4e..e2b5eb3a4 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -70,13 +70,10 @@ function webpages_content(&$a) {
 		return;
 	}
 
-	if(feature_enabled($owner,'expert') || $a->is_sys) {
-		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
-		if(! $mimetype)
-			$mimetype = 'choose';
-	}
-	else {
-		$mimetype = 'text/bbcode';
+	$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+
+	if(! $mimetype) {
+		$mimetype = 'choose';
 	}
 
 	$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index af1ef5357..32291adc7 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -7,13 +7,14 @@
 }
 
 #webpage-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
 	white-space: nowrap;
 }
 
 #webpage-list-table td:nth-child(1){
 	padding: 7px 3px 7px 10px;
-	white-space: nowrap;
 }
+
 #webpage-list-table th:nth-child(5),
 #webpage-list-table td:nth-child(5){
 	padding: 7px 3px;
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 4e5b3e0e4..9d440eb64 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -13,7 +13,7 @@
 </div>
 {{/if}}
 {{if $pages}}
-<div id="pagelist-content-wrapper" class="generic-content-wrapper-styled">
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
 	<table id="webpage-list-table">
 		<tr>
 			<th width="1%">{{$pagelink_txt}}</th>