Index: branches/1.0.x/designs/section.tpl
===================================================================
diff -u -N -r14990 -r14992
--- branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14990)
+++ branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14992)
@@ -53,7 +53,7 @@
 					level2icons = {header: 'ui-icon-circle-arrow-l2e', headerSelected: 'ui-icon-circle-arrow-l2s'},
 					level3icons = {header: 'ui-icon-circle-arrow-l3e', headerSelected: 'ui-icon-circle-arrow-l3s'};
 
-				$('#accordion-menu').accordion({icons: icons});
+//				$('#accordion-menu').accordion({icons: icons});
 				$('#level2-menu').accordion({icons: level2icons});
 
 				$('.level3-menu').accordion({
Index: branches/1.0.x/elements/products_menu.elm.tpl
===================================================================
diff -u -N -r14766 -r14992
--- branches/1.0.x/elements/products_menu.elm.tpl	(.../products_menu.elm.tpl)	(revision 14766)
+++ branches/1.0.x/elements/products_menu.elm.tpl	(.../products_menu.elm.tpl)	(revision 14992)
@@ -82,9 +82,7 @@
 						$me.addClass('active');
 					}
 
-					$('#level-content').load(
-						$me.attr('products_url')
-					)
+					$('#level-content').load($me.attr('products_url'));
 
 					$e.preventDefault();
 				}
Index: branches/1.0.x/elements/side_boxes/categories.elm.tpl
===================================================================
diff -u -N -r14859 -r14992
--- branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14859)
+++ branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14992)
@@ -3,13 +3,16 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="third_level_elem">
-	<li><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></li>
+	<li<inp2:m_if check='IsActive'> class="active"</inp2:m_if>>
+		<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a>
+	</li>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="subcategory_elem">
-	<li <inp2:m_if check='IsCurrent'>class="active"</inp2:m_if>>
+	<li<inp2:m_if check='IsActive'> class="active"</inp2:m_if>>
 		<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a>
-		<inp2:m_if check='IsCurrent'>
+
+		<inp2:m_if check='IsActive'>
 			<inp2:m_if check="TotalRecords" requery="1" list_name="third_level">
 				<ul>
 					<inp2:ListCategories list_name="third_level" render_as="third_level_elem" max_items="20" no_table="1"/>
@@ -20,19 +23,22 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="category_elem">
-	<h3><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></h3>
-	<inp2:m_if check="TotalRecords" requery="1" list_name="second_level">
-		<div>
-			<ul>
-				<inp2:ListCategories list_name="second_level" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
-			</ul>
-		</div>
+	<h3<inp2:m_if check='IsActive'> class="active"</inp2:m_if>><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></h3>
+
+	<inp2:m_if check='IsActive'>
+		<inp2:m_if check="TotalRecords" requery="1" list_name="second_level">
+			<div>
+				<ul>
+					<inp2:ListCategories list_name="second_level" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
+				</ul>
+			</div>
+		</inp2:m_if>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <div class="block">
 	<h2><em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span></h2>
-	
+
 	<div id="accordion-menu">
 		<inp2:m_Cache key="prefix:c;skip_var:t,page,per_page,sort_by">
 			<inp2:c_ListCategories render_as="category_elem" sort_by="Priority,Desc" per_page="-1" no_table="1" parent_cat_id="Root" module="In-Commerce"/>
Index: branches/1.0.x/index.tpl
===================================================================
diff -u -N -r14928 -r14992
--- branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14928)
+++ branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14992)
@@ -37,34 +37,24 @@
 <!--## /MAIN CONTENT ##-->
 
 <inp2:m_DefineElement name="add_to_head">
-	<script>
-	$(function() {
-		var icons = {
-			header: "ui-icon-circle-arrow-e",
-			headerSelected: "ui-icon-circle-arrow-s"
-		};
-		var level2icons = {
-			header: "ui-icon-circle-arrow-l2e",
-			headerSelected: "ui-icon-circle-arrow-l2s"
-		};
-		var level3icons = {
-			header: "ui-icon-circle-arrow-l3e",
-			headerSelected: "ui-icon-circle-arrow-l3s"
-		};
-		$( "#accordion-menu" ).accordion({
-			icons: icons,
-			autoHeight: false
-		});
-		$( "#level2-menu" ).accordion({
-			icons: level2icons
-		});
-		$( ".level3-menu" ).accordion({
-			icons: level3icons,
-			header: 'h4',
-			autoHeight: false,
-			event: "mouseover"
-		});
-	});
+	<script type="text/javascript">
+		$(document).ready(
+			function() {
+				var icons = {header: 'ui-icon-circle-arrow-e', headerSelected: 'ui-icon-circle-arrow-s'},
+					level2icons = {header: 'ui-icon-circle-arrow-l2e', headerSelected: 'ui-icon-circle-arrow-l2s'},
+					level3icons = {header: 'ui-icon-circle-arrow-l3e', headerSelected: 'ui-icon-circle-arrow-l3s'};
+
+//				$( '#accordion-menu' ).accordion({icons: icons, autoHeight: false});
+				$( '#level2-menu' ).accordion({icons: level2icons});
+
+				$( '.level3-menu' ).accordion({
+					icons: level3icons,
+					header: 'h4',
+					autoHeight: false,
+					event: 'mouseover'
+				});
+			}
+		);
 	</script>
 </inp2:m_DefineElement>
 
Index: branches/1.0.x/products/shop_all.tpl
===================================================================
diff -u -N -r14768 -r14992
--- branches/1.0.x/products/shop_all.tpl	(.../shop_all.tpl)	(revision 14768)
+++ branches/1.0.x/products/shop_all.tpl	(.../shop_all.tpl)	(revision 14992)
@@ -1,3 +1,4 @@
+<inp2:m_NoDebug/>
 <inp2:m_DefaultParam category=""/>
 
 <inp2:m_ifnot check="m_Param" name="category">
@@ -10,7 +11,7 @@
 			href="<inp2:ProductLink template='__default__'/>"
 			image="<inp2:ImageSrc primary='1' MaxWidth='80' DefaultWidth='80' html_escape='1'/>"
 			price="<inp2:Field name='Price' currency='selected'/>"
-			cart_link="<inp2:AddToCartLink template='in-commerce/checkout/shop_cart' product_template='__default__'/>"
+			cart_link="<inp2:AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>"
 		>
 			<inp2:Field name="Name"/>
 		</a>
@@ -31,8 +32,21 @@
 					$('.image', '#level-good').attr('src', $me.attr('image'));
 					$('.price', '#level-good').html( $me.attr('price') );
 					$('.addtocart', '#level-good').attr('href', $me.attr('cart_link') );
+
+					$('.addedtocart', '#level-good').removeClass('addedtocart').addClass('addtocart').html('<span>Add to Cart</span>');
 				}
 			);
+
+			$('.addtocart', '#level-good').click(add_to_cart_handler);
+
+			<inp2:m_if check="p_TotalRecords">
+				$('a:first', '#level-content').mouseover();
+
+				$('#level-good').show();
+			<inp2:m_else/>
+				$('#level-good').hide();
+			</inp2:m_if>
+
 		}
 	);
 </script>
\ No newline at end of file