Index: trunk/themes/default2007/platform/designs/navigation_bar.tpl
===================================================================
diff -u -N -r8368 -r8478
--- trunk/themes/default2007/platform/designs/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 8368)
+++ trunk/themes/default2007/platform/designs/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 8478)
@@ -1,21 +1,35 @@
 <inp2:m_DefineElement name="root_category">
-	<a href="<inp2:c_CategoryLink template="index" />"><inp2:c_RootCategoryName/></a>
+	[Home Icon] <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="module_root_category">
-	<inp2:m_param name="separator"/> 
-	<a href="<inp2:c_CategoryLink template="index" />"><inp2:m_param name="cat_name"/></a>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="category_link">
-	<inp2:m_param name="separator"/> 
+	<inp2:m_param name="separator"/>
 	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_param name="cat_name"/></a>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="template_link">
+	<inp2:m_param name="separator"/>
+	<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_phrase name="$title"/></a>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="current_category">
 	<inp2:m_param name="separator"/>
 	<span> <inp2:m_param name="cat_name"/></span>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="current_template">
+	<inp2:m_param name="separator"/>
+	<span> <inp2:m_phrase name="$title"/></span>
+</inp2:m_DefineElement>
 
-<inp2:c_CategoryPath separator="&gt;" render_as="category_link" current_render_as="current_category" module_root_render_as="module_root_category" root_cat_render_as="root_category" />
\ No newline at end of file
+<table style="width: 100%;">
+		<tr>
+			<td style="background-color: #0FFFFF">
+				<inp2:m_if check="m_Param" name="titles">
+					<inp2:c_NavigationBar separator="&gt;" render_as="template_link" current_render_as="current_template" root_cat_render_as="root_category" titles="$titles" templates="$templates"/>
+				<inp2:m_else/>
+					<inp2:c_CategoryPath separator="&gt;" render_as="category_link" current_render_as="current_category" root_cat_render_as="root_category" />
+				</inp2:m_if>
+			</td>
+		</tr>
+</table>
\ No newline at end of file
Index: trunk/themes/default2007/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r8441 -r8478
--- trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8441)
+++ trunk/themes/default2007/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 8478)
@@ -7,6 +7,8 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
+	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
+
 	<!-- my profile -->
 	<inp2:m_DefineElement name="users_content">
 		<inp2:m_DefineElement name="header">
Index: trunk/core/units/general/main_event_handler.php
===================================================================
diff -u -N -r8397 -r8478
--- trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 8397)
+++ trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 8478)
@@ -82,7 +82,7 @@
 				}
 				$ret .= $theme_name.'/';
 			}
-			
+
 			if ($processed_params['m_cat_id'] > 0 && isset($url_params['pass_category']) && $url_params['pass_category']) {
 				$category_filename = $this->Application->getFilename('c', $processed_params['m_cat_id']);
 				$t = isset($url_params['t']) && $url_params['t'] ? $url_params['t'] : false;
@@ -116,6 +116,11 @@
 			$template = getArrayValue($url_params, 't');
 			$category_template = $processed_params['m_cat_id'] ? $this->Application->getCache('category_templates', $processed_params['m_cat_id']) : '';
 
+			if ((strtolower($template) == '__default__') && ($processed_params['m_cat_id'] == 0)) {
+				// for "Home" category set template to index when not set
+				$template = 'index';
+			}
+
 			// remove template from url if it is category index cached template
 			if ($template == $category_template || strtolower($template) == '__default__') {
 				$template = '';
Index: trunk/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r8472 -r8478
--- trunk/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 8472)
+++ trunk/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 8478)
@@ -162,6 +162,43 @@
 		}
 	}
 
+	function NavigationBar($params)
+	{
+		$titles = explode(',', $params['titles']);
+		$templates = explode(',', $params['templates']);
+
+		array_unshift($titles, $this->Application->ProcessParsedTag('m', 'RootCategoryName', $params));
+		array_unshift($templates, '');
+
+		$block_params = $this->prepareTagParams($params);
+		$current_template = $this->Application->GetVar('t');
+
+		$ret = '';
+		foreach ($templates as $template_index => $template) {
+			$block_params['current'] = ($template == $current_template);
+			$block_params['title'] = $titles[$template_index];
+			$block_params['template'] = $template;
+
+			switch ($template) {
+				case '':
+					$block_params['name'] = $params['root_cat_render_as'];
+					break;
+
+				case $current_template:
+					$block_params['name'] = $params['current_render_as'];
+					break;
+
+				default:
+					$block_params['name'] = $params['render_as'];
+					break;
+			}
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
 	function CurrentCategoryName($params)
 	{
 		$cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
Index: trunk/themes/default2007/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r8460 -r8478
--- trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8460)
+++ trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8478)
@@ -7,6 +7,8 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
+	<inp2:m_include template="platform/designs/navigation_bar" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
+
 	<!-- my account -->
 	<inp2:m_DefineElement name="my_account_content">
 		<inp2:m_DefineElement name="header">