Index: trunk/blocks/archives_block.php
===================================================================
--- trunk/blocks/archives_block.php	(revision 120)
+++ trunk/blocks/archives_block.php	(revision 121)
@@ -28,8 +28,10 @@
 
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$a_month = _MB_XPRESS_ARC_MONTH ;
 		$a_week = _MB_XPRESS_ARC_WEEK ;		
 
-		$form .= "<br />" . yes_no_radio_option('options[1]', _MB_XPRESS_ARC_TYPE , $type,$a_month,$a_week);
+		$form .= "<br />" . yes_no_radio_option('options[2]', _MB_XPRESS_ARC_TYPE , $type,$a_month,$a_week);
 		$form .= "<br />" . _MB_XPRESS_COUNT . "  <input type='text' name='options[3]' value='" . $limit . "' />";
 		$form .= "<br />" . yes_no_radio_option('options[4]', _MB_XPRESS_SHOW_NUM_OF_POST , $show_post_count);
Index: trunk/blocks/authors_block.php
===================================================================
--- trunk/blocks/authors_block.php	(revision 120)
+++ trunk/blocks/authors_block.php	(revision 121)
@@ -28,4 +28,6 @@
 			
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$form .= yes_no_radio_option('options[2]', _MB_XPRESS_SHOW_NUM_OF_POST , $optioncount);
 		$form .= "<br />" . yes_no_radio_option('options[3]', _MB_XPRESS_EXCLUEDEADMIN , $exclude_admin);
Index: trunk/blocks/calender_block.php
===================================================================
--- trunk/blocks/calender_block.php	(revision 120)
+++ trunk/blocks/calender_block.php	(revision 121)
@@ -26,6 +26,8 @@
 
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-		$form .= _MB_XPRESS_SUN_COLOR .": <input type='text' name='options[1]' value='" . $sun_color . "' /><br />\n";
-		$form .= _MB_XPRESS_SAT_COLOR .": <input type='text' name='options[2]' value='" . $sat_color . "' /><br />\n";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
+		$form .= _MB_XPRESS_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";
+		$form .= _MB_XPRESS_SAT_COLOR .": <input type='text' name='options[3]' value='" . $sat_color . "' /><br />\n";
 
 		return $form;
Index: trunk/blocks/page_block.php
===================================================================
--- trunk/blocks/page_block.php	(revision 120)
+++ trunk/blocks/page_block.php	(revision 121)
@@ -27,4 +27,6 @@
 
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$form .= _MB_XPRESS_SORT_COLUMN ."\n";
 		$form .= "<select name='options[2]' size='1'>\n";
Index: trunk/blocks/popular_posts_block.php
===================================================================
--- trunk/blocks/popular_posts_block.php	(revision 120)
+++ trunk/blocks/popular_posts_block.php	(revision 121)
@@ -27,4 +27,6 @@
 
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
 		$form .= _MB_MONTH_RANGE .": <input type='text' name='options[3]' value='" . $show_month_range . "' /><br />\n";
Index: trunk/blocks/recent_comments_block.php
===================================================================
--- trunk/blocks/recent_comments_block.php	(revision 120)
+++ trunk/blocks/recent_comments_block.php	(revision 121)
@@ -27,4 +27,6 @@
 		
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
 		$form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' />";
Index: trunk/blocks/recent_posts_content_block.php
===================================================================
--- trunk/blocks/recent_posts_content_block.php	(revision 120)
+++ trunk/blocks/recent_posts_content_block.php	(revision 121)
@@ -30,4 +30,6 @@
 		
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";
 		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
 		$form .= yes_no_radio_option('options[3]', _MB_XPRESS_P_EXCEPT , $except) . "<br />\n";
Index: trunk/blocks/recent_posts_list_block.php
===================================================================
--- trunk/blocks/recent_posts_list_block.php	(revision 120)
+++ trunk/blocks/recent_posts_list_block.php	(revision 121)
@@ -28,4 +28,6 @@
 
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";	
 		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
 		$form .= _MB_XPRESS_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
Index: trunk/blocks/search_block.php
===================================================================
--- trunk/blocks/search_block.php	(revision 120)
+++ trunk/blocks/search_block.php	(revision 121)
@@ -25,5 +25,7 @@
 		
 		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-		$form .= _MB_XPRESS_SEARCH_LENGTH .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />";
+	    $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+		$form .= "<br />";		
+		$form .= _MB_XPRESS_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
 //	    $form .="<br /><input type='text' size='60' name='options[2]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 
Index: trunk/templates/source/archives_block.html
===================================================================
--- trunk/templates/source/archives_block.html	(revision 120)
+++ trunk/templates/source/archives_block.html	(revision 121)
@@ -12,7 +12,8 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_archive_block">
-		<{$block.err_message}>
 		<{if $block.config.is_archive_doropdown}>
 			<{$block.archive_dropdown}>
Index: trunk/templates/source/authors_block.html
===================================================================
--- trunk/templates/source/authors_block.html	(revision 120)
+++ trunk/templates/source/authors_block.html	(revision 121)
@@ -10,7 +10,8 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_authors_block">
-		<{$block.err_message}>
 		<ul>
 		<{foreach from=$block.contents item=content}>
Index: trunk/templates/source/calender_block.html
===================================================================
--- trunk/templates/source/calender_block.html	(revision 120)
+++ trunk/templates/source/calender_block.html	(revision 121)
@@ -5,7 +5,8 @@
    ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_calender_block">
-		<{$block.err_message}>
 		<{$block.calender}>
 	</div>
Index: trunk/templates/source/page_block.html
===================================================================
--- trunk/templates/source/page_block.html	(revision 120)
+++ trunk/templates/source/page_block.html	(revision 121)
@@ -10,7 +10,8 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
 	<{$block.err_message}>
-	<div class='xpress_page_block>
+	<div class='xpress_page_block'>
 		<ul>
 		<{foreach from=$block.contents item=content}>
Index: trunk/templates/source/popular_posts_block.html
===================================================================
--- trunk/templates/source/popular_posts_block.html	(revision 120)
+++ trunk/templates/source/popular_posts_block.html	(revision 121)
@@ -23,7 +23,8 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_popular_post_block">
-		<{$block.err_message}>
 		<ul>
 		<{foreach from=$block.contents item=content}>
Index: trunk/templates/source/recent_comments_block.html
===================================================================
--- trunk/templates/source/recent_comments_block.html	(revision 120)
+++ trunk/templates/source/recent_comments_block.html	(revision 121)
@@ -26,7 +26,8 @@
    ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_recent_comments_block">
-		<{$block.err_message}>
 		<ul>
 		<{foreach from=$block.contents item=content}>
Index: trunk/templates/source/recent_posts_content_block.html
===================================================================
--- trunk/templates/source/recent_posts_content_block.html	(revision 120)
+++ trunk/templates/source/recent_posts_content_block.html	(revision 121)
@@ -24,7 +24,8 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_recent_post_content_block">
-		<{$block.err_message}>
 		<ul>
 		<{foreach from=$block.contents item=content}>
Index: trunk/templates/source/recent_posts_list_block.html
===================================================================
--- trunk/templates/source/recent_posts_list_block.html	(revision 120)
+++ trunk/templates/source/recent_posts_list_block.html	(revision 121)
@@ -24,5 +24,7 @@
 ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_recent_post_list_block">
 		<{$block.err_message}>
Index: trunk/templates/source/search_block.html
===================================================================
--- trunk/templates/source/search_block.html	(revision 120)
+++ trunk/templates/source/search_block.html	(revision 121)
@@ -5,7 +5,8 @@
    ************************* End of usage ************************ *}>
 <{* Start Template *}>
+
 <div class="xpress_block">
+	<{$block.err_message}>
 	<div class="xpress_search_block">
-		<{$block.err_message}>
 		<{$block.search}>
 	</div>
Index: trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 120)
+++ trunk/wp-content/themes/xpress_default/blocks/page_block_theme.php	(revision 121)
@@ -5,5 +5,5 @@
 	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
 	$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_page_block.html' : trim( $options[1] );
-	$sort_column = empty( $options[2] ) ? 0 : $options[1] ;
+	$sort_column = empty( $options[2] ) ? 0 : $options[2] ;
 	$sort_order_asc = empty( $options[3] ) ? 0 : 1 ;
 	$show_date = empty( $options[4] ) ? 0 : 1 ;
Index: trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php	(revision 120)
+++ trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php	(revision 121)
@@ -93,8 +93,8 @@
 			$new_mark = '';
 			if ($elapse < $red_sec ) {
-				$new_mark = '<em style="color: red; font-size: small;">New!</em>';
+				$new_mark = '<em style="color: red; font-size: small;">New! </em>';
 
 			} else if ($elapse < $green_sec) {
-				$new_mark = '<em style="color: green; font-size: small;">New!</em>';
+				$new_mark = '<em style="color: green; font-size: small;">New! </em>';
 			}
 			
Index: trunk/wp-content/themes/xpress_default/blocks/search_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/search_block_theme.php	(revision 120)
+++ trunk/wp-content/themes/xpress_default/blocks/search_block_theme.php	(revision 121)
@@ -5,5 +5,5 @@
 	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
 	$this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_search.html' : trim( $options[1] );
-	$input_length = empty( $options[2] ) ? '18' : $options[1] ;
+	$input_length = empty( $options[2] ) ? '18' : $options[2] ;
 	$mydirpath = get_xpress_dir_path();