Index: branches/1.0.x/elements/html_head.elm.tpl
===================================================================
diff -u -r14759 -r14766
--- branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14759)
+++ branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14766)
@@ -14,8 +14,10 @@
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 
-<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css|inc/category.css|inc/flexslider.css|inc/modal.css|inc/details.css|inc/jquery.gzoom.css|inc/pikachoose.css|inc/qtip.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
+<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css|inc/category.css|inc/flexslider.css|inc/modal.css|inc/details.css|inc/jquery.gzoom.css|inc/pikachoose.css|inc/qtip.css|inc/profile.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
 
+<!-- including "inc/profile.css" will break logged-in user's menu -->
+
 <link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/ui/jquery.ui.all.css" charset="utf-8" />
 
 <!--##
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -r14763 -r14766
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14763)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14766)
@@ -51,27 +51,9 @@
 				</div>
 			</div>
 
-			<div class="txt">
-				Welcome! Please <a href="<inp2:m_Link template='login/register' width='850' height='630'/>" class="thickbox">Register</a> for an account or
-				<div class="login">
-					<a href="" id="login">Log In</a>
-				</div>
-				<div id="login-sel" class="plashka">
-					<a href="" class="icon-close"><img src="<inp2:m_TemplatesBase />img/icon-close.gif" width="6" height="6" alt="Close" /></a>
-					<form method="post" action="#" id="login-form" class="form login-form">
-						<fieldset>
-							<p><label for="email">E-mail:</label><input type="text" id="email" name="email" value="" class="field" /></p>
-							<p><label for="password">Password:</label><input type="text" id="password" name="password" value="" class="field" /></p>
-							<p><label><input type="checkbox" id="remember" name="remember" value="1" /> <u>Remember me on this computer</u></label></p>
-							<p class="buttons">
-								<input type="submit" value="Sign in" id="signin" class="green-button" />&nbsp;&nbsp;&nbsp;
-								<a href="#" style="font-weight: normal;">Forgot password?</a>
-							</p>
-						</fieldset>
-					</form>
-				</div>
-			</div>
+			<inp2:m_include template="elements/login.elm"/>
 		</div>
+
 		<div class="cart">
 			<span class="phone" style="<inp2:m_ifnot check="ord_ItemsInCart">padding-right:338px;</inp2:m_ifnot>">1-855-WWW-PROS</span>
 			<inp2:m_if check="ord_ItemsInCart">
Index: branches/1.0.x/inc/js/jquery.scripts.js
===================================================================
diff -u -r14759 -r14766
--- branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14759)
+++ branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14766)
@@ -4,7 +4,7 @@
 
 function DBlocks() {
 	var $me = this;
-	this.selectors = ['#lang', '#currency', '#login', '#login-alt'];
+	this.selectors = ['#lang', '#currency', '#login', '#login-alt', '#profile'];
 
 	$(document).ready(
 		function () {
Index: branches/1.0.x/elements/menu.elm.tpl
===================================================================
diff -u -r14708 -r14766
--- branches/1.0.x/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 14766)
@@ -8,11 +8,9 @@
 		<ul id="mainmenu">
 			<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
 		</ul>
-					
+
 		<inp2:m_Include template="elements/search.elm" />
-		
-	<!--##
-		<inp2:m_Include template="elements/products_menu.elm" />
-	##-->		
+
+		<!--<inp2:m_Include template="elements/products_menu.elm" />-->
 	</div>
 </div><!-- .menu -->
\ No newline at end of file
Index: branches/1.0.x/login/register.tpl
===================================================================
diff -u -r14763 -r14766
--- branches/1.0.x/login/register.tpl	(.../register.tpl)	(revision 14763)
+++ branches/1.0.x/login/register.tpl	(.../register.tpl)	(revision 14766)
@@ -1,4 +1,4 @@
-<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/profile.css'/>" charset="<inp2:lang.current_Field name='Charset'/>"/>
+<!--<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/profile.css'/>" charset="<inp2:lang.current_Field name='Charset'/>"/>-->
 
 <script type="text/javascript">
 	FormManager.resetFields('u.register');
Index: branches/1.0.x/elements/products_menu.elm.tpl
===================================================================
diff -u -r14708 -r14766
--- branches/1.0.x/elements/products_menu.elm.tpl	(.../products_menu.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/products_menu.elm.tpl	(.../products_menu.elm.tpl)	(revision 14766)
@@ -1,95 +1,94 @@
 <div class="level2">
 	<div class="level2-bg">
 		<div id="level2-menu">
-			<h3><a href="#">Musical Instruments</a></h3>
-			<div>
-				<ul>
+
+			<inp2:m_DefineElement name="category_level3_element">
+				<li>
+					<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" products_url="<inp2:CategoryLink template='products/shop_all' m_cat_page='1'/>"><inp2:Field name="Name"/></a>
+				</li>
+			</inp2:m_DefineElement>
+
+			<inp2:m_DefineElement name="category_level2_element">
+
+				<inp2:m_if check="Field" name="CachedDescendantCatsQty">
 					<li class="level3-menu">
-						<h4><a href="#">35mm & SLR Cameras</a></h4>
+						<h4><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" products_url="<inp2:CategoryLink template='products/shop_all' m_cat_page='1'/>"><inp2:Field name="Name"/></a></h4>
 						<div>
 							<ul>
-								<li><a href="#" class="active">35mm & SLR Cameras</a></li>
-								<li><a href="#">Binoculars</a></li>
+								<inp2:ListCategories requery="1" list_name="" render_as="category_level3_element" max_items="20" no_table="1"/>
 							</ul>
 						</div>
 					</li>
-					<li class="level3-menu">
-						<h4><a href="#">Binoculars</a></h4>
-						<div>
-							<ul>
-								<li><a href="#" class="active">35mm & SLR Cameras</a></li>
-								<li><a href="#">Binoculars</a></li>
-							</ul>
-						</div>
-					</li>
-					<li><i><a href="#">Blu-Ray Players</a></i></li>
-					<li><i><a href="#">CD Players</a></i></li>
-					<li><i><a href="#">Camcorders</a></i></li>
-					<li><i><a href="#">Cell Phones</a></i></li>
-					<li><i><a href="#">Clock Radios</a></i></li>
-					<li><i><a href="#">Cordless Phones</a></i></li>
-				</ul>
-			</div>
-			<h3><a href="#">Accessories & Shoes</a></h3>
-			<div>
-				<ul>
-					<li><a href="#">35mm & SLR Cameras</a></li>
-					<li><a href="#" class="active">Binoculars</a></li>
-					<li><a href="#">Blu-Ray Players</a></li>
-					<li><a href="#">CD Players</a></li>
-					<li><a href="#">Camcorders</a></li>
-					<li><a href="#">Cell Phones</a></li>
-					<li><a href="#">Clock Radios</a></li>
-					<li><a href="#">Cordless Phones</a></li>
-				</ul>
-			</div>
-			<h3><a href="#">Home & Garden</a></h3>
-			<div>
-				<ul>
-					<li><a href="#">35mm & SLR Cameras</a></li>
-					<li><a href="#" class="active">Binoculars</a></li>
-					<li><a href="#">Blu-Ray Players</a></li>
-					<li><a href="#">CD Players</a></li>
-					<li><a href="#">Camcorders</a></li>
-					<li><a href="#">Cell Phones</a></li>
-					<li><a href="#">Clock Radios</a></li>
-					<li><a href="#">Cordless Phones</a></li>
-				</ul>
-			</div>
+				<inp2:m_else/>
+					<li><i><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" products_url="<inp2:CategoryLink template='products/shop_all' m_cat_page='1'/>"><inp2:Field name="Name"/></a></i></li>
+				</inp2:m_if>
+			</inp2:m_DefineElement>
+
+			<inp2:m_DefineElement name="category_level1_element">
+				<inp2:m_ifnot check="m_Get" name="first_category">
+					<inp2:Field name="CategoryId" result_to_var="first_category"/>
+					<inp2:m_Set first_category="$first_category"/>
+				</inp2:m_ifnot>
+
+				<h3><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" products_url="<inp2:CategoryLink template='products/shop_all' m_cat_page='1'/>"><inp2:Field name="Name"/></a></h3>
+
+				<inp2:m_if check="Field" name="CachedDescendantCatsQty">
+					<div>
+						<ul>
+							<inp2:ListCategories requery="1" render_as="category_level2_element" max_items="20" no_table="1"/>
+						</ul>
+					</div>
+				</inp2:m_if>
+			</inp2:m_DefineElement>
+
+			<inp2:m_Set first_category=""/>
+			<inp2:c_ListCategories render_as="category_level1_element" sort_by="Priority,Desc" per_page="-1" no_table="1" parent_cat_id="Root" module="In-Commerce"/>
 		</div>
+
 		<div id="level-content">
-			<ul>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
-				<li><a href="#">eTrex Venture HC</a></li>
-				<li><a href="#">Garmin Approach G5</a></li>
-				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
-			</ul>
+			<inp2:m_Get name="first_category" result_to_var="first_category"/>
+			<inp2:m_include template="products/shop_all" category="$first_category"/>
 		</div>
+
 		<div id="level-good" class="good-item">
-			<p><img src="/i/samples/good4.jpg" width="77" height="134" alt="" /></p>
+			<p><img class="image" src="<inp2:m_TemplatesBase/>img/samples/good4.jpg" alt="" /></p>
 			<p class="price">$759.<span>95</span></p>
 			<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
 		</div>
 	</div>
+
 	<div class="clear"></div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+	$(document).ready(
+		function () {
+			$('a', '#level2-menu').click(
+				function ($e) {
+					var $me = $(this),
+						$h3_parent = $me.parents('li.level3-menu:first').length > 0,
+						$h4_parent = $me.parents('h4:first').length > 0;
+
+					$('a', '#level2-menu').removeClass('active');
+
+					if ( !$h3_parent && !$h4_parent ) {
+						// level 1
+					}
+					else if ( $h3_parent && $h4_parent ) {
+						// level 2
+					}
+					else if ( $h3_parent && !$h4_parent ) {
+						// level 3
+						$me.addClass('active');
+					}
+
+					$('#level-content').load(
+						$me.attr('products_url')
+					)
+
+					$e.preventDefault();
+				}
+			);
+		}
+	);
+</script>
\ No newline at end of file
Index: branches/1.0.x/elements/forms.elm.tpl
===================================================================
diff -u -r14759 -r14766
--- branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14759)
+++ branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14766)
@@ -124,6 +124,26 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_password_single" style="" title="lu_fld_{$field}" field_type="text" no_editing="1">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input
+			type="password"
+			class="field"
+			<inp2:m_if check="{$prefix}_FieldHintLabel" title_label="$title" direct_label="$hint_label">
+				title="<inp2:$prefix_FieldHintLabel title_label='$title' direct_label='$hint_label' html_escape='1'/>"
+			</inp2:m_if/>
+			name="<inp2:{$prefix}_InputName field='$field'/>"
+			id="<inp2:{$prefix}_InputName field='$field'/>"
+			value="<inp2:{$prefix}_Field field='$field'/>"
+			tabindex="<inp2:m_get param='tab_index'/>"
+			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="max_len">
+				maxlength="<inp2:$prefix_FieldOption field='$field' option='max_len'/>"
+			</inp2:m_if>
+			style="<inp2:m_param name='style'/>"
+		/>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_password" title="lu_fld_{$field}" style="" field_type="text" no_editing="1">
 	<inp2:m_ifnot check="m_Get" name="password_js_included">
 		<script src="<inp2:m_Compress files='inc/js/passwordStrengthMeter.js'/>" type="text/javascript"></script>