Index: trunk/themes/default2007/platform/elements/header.tpl
===================================================================
diff -u -r8627 -r8759
--- trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8627)
+++ trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8759)
@@ -14,7 +14,7 @@
 								<inp2:m_DefineElement name="lang_elem">
 									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
 								</inp2:m_DefineElement>
-								<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
+								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
 							</select>
 						</form>
 					</td>
@@ -29,7 +29,7 @@
 								<inp2:m_DefineElement name="currency">
 									<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
 								</inp2:m_DefineElement>
-								<inp2:curr_ListCurrencies render_as="currency" row_start_render_as="html:" row_end_render_as="html:"/>
+								<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
 							</select>
 						</form>
 					</td>
Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -r8751 -r8759
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8751)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8759)
@@ -1,119 +1,97 @@
 <table class="top-menu fullwidth">
 	<tr>
 		<td align="left">
-
-			<table style="width:auto">
+			<table style="width: auto;">
 				<tr>
-					<!-- menu: Home -->
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="index" m_cat_id="0"/>
-					</inp2:m_Capture>
-
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" alt="" /><br />
-					</inp2:m_Capture>
-
-				<!--	<inp2:m_Capture to_var="menu_title">
-						Home
-					</inp2:m_Capture>
-
-					<inp2:m_IsActive template="index" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
-
-					<inp2:m_ModuleInclude template="elements/menu"/>-->
-
 					<td>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
 						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
 
 						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
-
 						<div id="xmlMenuDiv"><span style="color:#ffffff">Loading menu...</span></div>
-		        <script>
-		        	<inp2:m_DefineElement name="dmenu_element">
-								<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
-								<inp2:m_Random result_to_var="rand"/>
-								<inp2:m_Set m_cat_id="$root_cat"/>
-								<item id="sub-elem<inp2:m_Param name="root_cat"/>"
-									url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
-									ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
-									enb="true" title=""
-									subid="sub<inp2:m_Param name="root_cat"/>"
-									suburl="<inp2:m_link template="platform/elements/subcats.xml"
-									 m_cat_id="$root_cat"
-									 c_menu_Page="1" pass="m,c.menu"
-									 level="0" max_level="4" rand="$rand"
-									/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
-							</inp2:m_DefineElement>
 
-		        	<inp2:m_DefineElement name="menu_xml">
-								<menumgr id="mgr" flowoverformelement="false" defaulteffect="slide" icpath="">
-								  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_">
-								    <items>
-								    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[Home]]></item>
-								    	<inp2:m_ModuleInclude template="elements/menu.xml" />
-								    </items>
-								  </menubar>
-								</menumgr>
-		        	</inp2:m_DefineElement>
+				        <script type="text/javascript">
+				        	<inp2:m_DefineElement name="dmenu_element">
+										<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
+										<inp2:m_Random result_to_var="rand"/>
+										<inp2:m_Set m_cat_id="$root_cat"/>
+										<item id="sub-elem<inp2:m_Param name="root_cat"/>"
+											url="<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root"/>"
+											ico="['<inp2:m_TemplatesBase module="$module"/>img/<inp2:m_Param name="icon"/>']"
+											enb="true" title=""
+											subid="sub<inp2:m_Param name="root_cat"/>"
+											suburl="<inp2:m_link template="platform/elements/subcats.xml"
+											 m_cat_id="$root_cat"
+											 c_menu_Page="1" pass="m,c.menu"
+											 level="0" max_level="4" rand="$rand"
+											/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
+									</inp2:m_DefineElement>
 
-		        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
-		        	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
-		        	<inp2:m_Set m_cat_id="$current_category"/>
+				        	<inp2:m_DefineElement name="menu_xml">
+										<menumgr id="mgr" flowoverformelement="false" defaulteffect="slide" icpath="">
+										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_">
+										    <items>
+										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
+										    	<inp2:m_ModuleInclude template="elements/menu.xml" />
+										    </items>
+										  </menubar>
+										</menumgr>
+				        	</inp2:m_DefineElement>
 
-		        	menu_mgr.renderMenus();
-		        	menu_mgr.renderMenubar('xmlMenuDiv');
-		        </script>
+				        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
+				        	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
+				        	<inp2:m_Set m_cat_id="$current_category"/>
+							<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
+
+				        	menu_mgr.renderMenus();
+				        	menu_mgr.renderMenubar('xmlMenuDiv');
+				        </script>
 					</td>
 				</tr>
 			</table>
-
 		</td>
 		<td align="right">
-
-			<table style="width:auto">
+			<table style="width: auto;">
 				<tr>
 					<!-- menu: My Account -->
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
-					</inp2:m_Capture>
+					<inp2:m_RenderElement design="menu_element">
+						<inp2:m_Capture to_var="menu_href">
+							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_icon">
+							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_title">
-						My Account
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_title">
+							<inp2:m_Phrase name="lu_title_MyAccount"/>
+						</inp2:m_Capture>
 
-					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
+						<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
+					</inp2:m_RenderElement>
 					<!-- // menu: My Account -->
 
 					<!-- menu: ShoppingCart -->
+					<inp2:m_RenderElement design="menu_element">
+						<inp2:m_Capture to_var="menu_href">
+							<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_href">
-						<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0"/>
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_icon">
+							<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_icon">
-						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="menu_title">
+							<inp2:m_Phrase name="lu_title_ShoppingCart"/>
+						</inp2:m_Capture>
 
-					<inp2:m_Capture to_var="menu_title">
-						Shopping Cart
-					</inp2:m_Capture>
-
-					<inp2:m_IsActive template="in-commerce/checkout/shop_cart" result_to_var="current"/>
-					<inp2:m_RenderElement name="__this__" design="menu_element"/>
+						<inp2:m_IsActive template="in-commerce/checkout/shop_cart" result_to_var="current"/>
+					</inp2:m_RenderElement>
 					<!-- // menu: ShoppingCart -->
 				</tr>
 			</table>
-
 		</td>
 	</tr>
-</table>
-
-
+</table>
\ No newline at end of file
Index: trunk/themes/default2007/platform/login/register_confirm_pending.tpl
===================================================================
diff -u -r8599 -r8759
--- trunk/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 8759)
@@ -7,7 +7,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration,lu_title_RegistrationPendingConfirmation" templates="platform/login/register,platform/login/register_confirm_pending"/>
+
+	<!-- registration pending confirmation -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_RegistrationPendingConfirmation"/>
@@ -16,7 +18,7 @@
 		<inp2:m_phrase name="lu_user_pending_aproval_text"/>
 	</inp2:m_RenderElement>
 
-	<!-- // phrases -->
+	<!-- // registration pending confirmation -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/categories/suggest_confirm.tpl
===================================================================
diff -u -r8599 -r8759
--- trunk/themes/default2007/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/categories/suggest_confirm.tpl	(.../suggest_confirm.tpl)	(revision 8759)
@@ -3,13 +3,14 @@
 			elements="
 				platform/elements/side_boxes/login,
 				platform/elements/side_boxes/search,
-				inlink/elements/side_boxes/action_box,
 			"
 			design="blue_box"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategoryConfirm" templates="platform/categories/suggest_confirm" show_category="1"/>
+
+	<!-- suggest category confirm -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
@@ -19,7 +20,7 @@
 		<a href="<inp2:m_Link template="__default__"/>"><inp2:c_Field name="Name"/></a>
 	</inp2:m_RenderElement>
 
-	<!-- // phrases -->
+	<!-- // suggest category confirm -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/phrases_edit.tpl
===================================================================
diff -u -r8729 -r8759
--- trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8729)
+++ trunk/themes/default2007/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8759)
@@ -22,9 +22,9 @@
 			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
 
-		<form method="post" action="<inp2:m_FormAction/>">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
+		<form method="post" action="<inp2:m_FormAction/>">
 			<table class="form-data fullwidth">
 				<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -r8693 -r8759
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8693)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8759)
@@ -22,11 +22,10 @@
 			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
 
+		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 		<form method="post" action="<inp2:m_FormAction/>">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 			<table class="form-data fullwidth">
-
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login"/>
 
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
@@ -54,14 +53,13 @@
 					</td>
 				</tr>
 				<tr>
-					<td style="width:140px">
+					<td style="width: 140px;">
 						&nbsp;
 					</td>
 					<td>
 						<br />
 						<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
 						<br /><br />
-
 					</td>
 				</tr>
 			</table>
Index: trunk/themes/default2007/platform/categories/suggest_category.tpl
===================================================================
diff -u -r8693 -r8759
--- trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8693)
+++ trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8759)
@@ -8,9 +8,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category"/>
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category" show_category="1"/>
 
-	<!-- phrases -->
+	<!-- suggest category -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategory"/>
@@ -23,16 +23,29 @@
 			<inp2:m_if check="c_HasError" field="any">
 				<inp2:m_RenderElement name="error_message" />
 			</inp2:m_if>
+
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+
 			<form method="post" action="<inp2:m_FormAction/>">
-				<table class="form-data">
+				<table class="form-data fullwidth">
 					<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Name" title="lu_fld_Name"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="Description" cols="30" rows="5" title="lu_fld_Description"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
 
 					<tr>
-						<td colspan="3" valign="bottom" height="35">
+						<td colspan="2">
+							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
+						</td>
+					</tr>
+					<tr>
+						<td style="width: 140px;">
+							&nbsp;
+						</td>
+						<td>
+							<br />
 							<input type="hidden" name="suggest_confirm_template" value="platform/categories/suggest_confirm"/>
 							<input type="hidden" name="suggest_pending_confirm_template" value="platform/categories/suggest_pending_confirm"/>
 							<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>"/>
+							<br /><br />
 						</td>
 					</tr>
 				</table>
@@ -42,7 +55,7 @@
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 
-	<!-- // phrases -->
+	<!-- // suggest category -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/kernel/units/helpers/helpers_config.php
===================================================================
diff -u -r8444 -r8759
--- trunk/kernel/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 8444)
+++ trunk/kernel/units/helpers/helpers_config.php	(.../helpers_config.php)	(revision 8759)
@@ -1,7 +1,7 @@
 <?php
 
 	$config = Array (
-		'Prefix' => 'in-custom-helpers',
+		'Prefix' => 'in-portal-helpers',
 		'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
Index: trunk/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -r8693 -r8759
--- trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8693)
+++ trunk/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 8759)
@@ -7,24 +7,28 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration" templates="platform/login/register"/>
+
+	<!-- user registration -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_UserRegistration"/>
 		</inp2:m_Capture>
 
 		<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
+		<inp2:u_PresetFormFields/>
 		<inp2:m_if check="u_HasError" field="any">
 			<inp2:m_RenderElement name="error_message" />
 		</inp2:m_if>
 
-		<inp2:u_PresetFormFields/>
-		<form method="post" action="<inp2:m_FormAction/>">
+		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+		<form method="post" action="<inp2:m_FormAction/>">
 			<table class="form-data fullwidth">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+				<inp2:m_if check="u_UseUsernames">
+					<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+				</inp2:m_if>
 
 				<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
 					<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
@@ -43,16 +47,15 @@
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
 				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" />
+				<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" is_last="1"/>
 
-
 				<tr>
 					<td colspan="2">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
 					</td>
 				</tr>
 				<tr>
-					<td style="width:140px">
+					<td style="width: 140px;">
 						&nbsp;
 					</td>
 					<td>
@@ -69,8 +72,7 @@
 			</table>
 		</form>
 	</inp2:m_RenderElement>
-
-	<!-- // phrases -->
+	<!-- // user registration -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl
===================================================================
diff -u -r8599 -r8759
--- trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/categories/suggest_pending_confirm.tpl	(.../suggest_pending_confirm.tpl)	(revision 8759)
@@ -9,7 +9,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategoryPendingConfirm" templates="platform/categories/suggest_pending_confirm" show_category="1"/>
+
+	<!-- suggest category pending confirm -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
@@ -19,7 +21,7 @@
 		<a href="<inp2:m_Link template="__default__"/>"><inp2:c_Field name="Name"/></a>
 	</inp2:m_RenderElement>
 
-	<!-- // phrases -->
+	<!-- // suggest category pending confirm -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/login/register_confirm.tpl
===================================================================
diff -u -r8599 -r8759
--- trunk/themes/default2007/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/login/register_confirm.tpl	(.../register_confirm.tpl)	(revision 8759)
@@ -7,7 +7,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- phrases -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm"/>
+
+	<!-- registration confirmation -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
@@ -16,7 +18,7 @@
 		<inp2:m_phrase name="lu_RegistrationCompleted"/>
 	</inp2:m_RenderElement>
 
-	<!-- // phrases -->
+	<!-- // registration confirmation -->
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file