Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14739)
@@ -22,16 +22,14 @@
 	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> align="<inp2:m_param name="align"/>" />
 </inp2:m_DefineElement>
 
-
-
-<!--## Unused for now
-<inp2:m_DefineElement name="content_box" type="text">
-	<h2 class="movable-header"><inp2:m_param name="header"/></h2>
-	<div class="<inp2:m_Param name="type"/>">
+<inp2:m_DefineElement name="content_box" content_class="" header_class="">
+	<h2 class="<inp2:m_Param name='header_class'/>"><inp2:m_param name="header"/></h2>
+	<div class="<inp2:m_Param name='content_class'/>">
 		<inp2:m_param name="content"/>
 	</div>
 </inp2:m_DefineElement>
 
+<!--## Unused for now
 <inp2:m_DefineElement name="side_box" add_class="">
 	<div class="block <inp2:m_Param name='add_class'/>">
 		<h2><inp2:m_param name="header"/></h2>	
Index: branches/1.0.x/elements/sorting.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 14739)
@@ -17,12 +17,14 @@
 			<option value="">Rating</option>
 			<option value="">Populate</option>
 		</select>&nbsp;&nbsp;
-		Per Page:
-		<select>
-			<option value="" selected="selected">10</option>
-			<option value="">20</option>
-			<option value="">30</option>
-		</select>&nbsp;&nbsp;
+		<form method="post" action="<inp2:m_FormAction/>">
+			Per Page:
+			<select name="<inp2:{$prefix}_VarName type='PerPage'/>">
+				<option value="10" <inp2:{$prefix}_PerPageSelected per_page="10" selected='selected="selected"'/>>10</option>
+				<option value="20" <inp2:{$prefix}_PerPageSelected per_page="20" selected='selected="selected"'/>>20</option>
+				<option value="50" <inp2:{$prefix}_PerPageSelected per_page="50" selected='selected="selected"'/>>50</option>
+			</select>&nbsp;&nbsp;
+		</form>
 		<a href="#">Show All</a>
 	</div>
 	<div class="display_switch">
Index: branches/1.0.x/designs/section.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14733)
+++ branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14739)
@@ -19,23 +19,78 @@
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	
-		<div class="block no-border-bottom">
+		<div class="block no-border-bottom" style="margin-bottom:0;">
 		
 			<inp2:m_Include template="elements/navigation_bar.elm"/>
 			
-			<inp2:m_Include template="elements/content_boxes/categories.elm"/>
+			<inp2:m_Include template="elements/content_boxes/categories.elm" data_exists="1" />
 			
 		</div>
 		
 		<inp2:m_Cache key="prefix:p;currency;guest_only">
 		
-			<inp2:m_Include template="elements/products.elm" list_name="products_in_category"/>
+			<inp2:m_Include template="elements/product_elements.elm" strip_nl="2"/>
+			
+			<inp2:m_Include template="elements/content_boxes/products.elm" list_name="products_in_category" prefix="p" data_exists="1" />
 		
-		</div>
+		</inp2:m_Cache>
 			
 </inp2:m_DefineElement>
 <!--## /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
+		});
+		$( "#level2-menu" ).accordion({
+			icons: level2icons
+		});
+		$( ".level3-menu" ).accordion({
+			icons: level3icons,
+			header: 'h4',
+			autoHeight: false,
+			event: "mouseover"
+		});
+		$("a.switch_thumb").toggle(function(){
+			$(this).addClass("swap");
+			$("ul.display").fadeOut("fast", function() {
+				$("div.items").removeClass("border-radius").addClass("items-alt");
+				$(this).fadeIn("fast").addClass("thumb_view");
+			});
+		}, function () {
+			$(this).removeClass("swap");
+			$("ul.display").fadeOut("fast", function() {
+				$("div.items").addClass("border-radius").removeClass("items-alt");
+				$(this).fadeIn("fast").removeClass("thumb_view");
+			});
+		});
+
+		$( "#slider-vertical" ).slider({
+			orientation: "vertical",
+			range: true,
+			min: 0,
+			max: 1000,
+			step: 100,
+			values: [ 0, 400 ]
+		});
+	});
+	</script>
+</inp2:m_DefineElement>
+
 <!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
+<inp2:m_include template="designs/default_design.des" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/side_boxes/categories.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14739)
@@ -1,27 +1,37 @@
+<inp2:m_DefineElement name="more_link_elem">
+	<li><a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_Phrase label="lu_more_Products"/>...</a></li>
+</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>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="subcategory_elem">
+	<li <inp2:m_if check='IsCurrent'>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:InitList requery="1" list_name="third_level" max_items="20" no_table="1"/>
+			<inp2:m_if check="TotalRecords" list_name="third_level">
+				<ul>
+					<inp2:ListCategories requery="1" list_name="" render_as="third_level_elem" max_items="20" no_table="1"/>
+				</ul>
+			</inp2:m_if>
+		</inp2:m_if>
+	</li>	
+</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>
+	<div>
+		<ul>
+			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
+		</ul>
+	</div>
+</inp2:m_DefineElement>
+
 <div class="block">
-	<h2><em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span></h2>	
+	<h2><em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span></h2>
 	
-	<inp2:m_DefineElement name="more_link_elem">
-		<li>
-			<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_Phrase label="lu_more_Products"/>...</a>
-		</li>
-	</inp2:m_DefineElement>
-	
-	<inp2:m_DefineElement name="subcategory_elem">
-		<li>
-			<a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>" <inp2:m_if check='IsCurrent'>class="active"</inp2:m_if>><inp2:Field name="Name" html_escape="1"/></a>
-		</li>	
-	</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>
-		<div>
-			<ul>
-				<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
-			</ul>
-		</div>
-	</inp2:m_DefineElement>
-	
 	<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/designs/default_design.des.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14733)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14739)
@@ -32,7 +32,7 @@
 		<div id="content">		
 			<div class="padding">
 			
-				<inp2:m_if check="m_Param" equals_to="2">
+				<inp2:m_if check="m_Param" name="columns" equals_to="2">
 			
 					<div class="leftcol">
 						<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
Index: branches/1.0.x/elements/content_boxes/products.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 14739)
@@ -1,53 +1,17 @@
-<inp2:p_InitList list_name="products_in_category" main_list="1"/>
+<inp2:m_DefaultParam prefix="p" list_name="products_in_category" type=""/>
+
+<inp2:{$prefix}_InitList list_name="$list_name" main_list="1"/>
 		
-<inp2:m_Include template="elements/sorting.elm" list_name="products_in_category"/>
+<inp2:m_Include template="elements/sorting.elm" list_name="$list_name" prefix="$prefix"/>
 
-<inp2:m_DefineElement name="product_element">
-<li>
-	<div class="item">
-		<div class="ribbon new"></div>
-		<div class="img">
-			<a href="#"><img src="/i/samples/good6.jpg" width="69" height="69" alt="" /></a>
-		</div>
-		<div class="descr">
-			<h3><a href="#">Apple iMac Desktop Customizable</a></h3>
-			<p>Suspendisse potenti. Aliquam id nisl nisi. Vivamus imperdiet, turpis ornare commodo elementum, lectus tellus fermentum eros, a tincidunt est odio eu lorem...</p>
-			<div class="optional">
-				<span class="stars"><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /><img src="/i/star-smallest.jpg" width="13" height="13" alt="" /></span>
-				<span class="reviews">
-					<a href="#">Reviews</a> (<a href="#">12</a>)&nbsp;&nbsp;&nbsp;
-				</span>
-				<span class="comp">
-					<label><input type="checkbox" name="compare-1" value="1" /><em>Compare</em></label>
-				</span>
-			</div>
-		</div>
-		<div class="price-block">
-			<p><s class="under">$2,549.<span>95</span></s></p>
-			<p class="redprice"><em class="price">$2,549.<span>95</span></em></p>
-			<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
-		</div>
-	</div>
-</li>
-</inp2:m_DefineElement>
-
-
 <div class="items border-radius">
 	<ul class="display">			
 	
-		<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
+		<inp2:{$prefix}_ListProducts list_name="$list_name" render_as="product_element"/>
 				
 	</ul>	
 	<div class="clear"></div>
 	
-	<div class="pagination">
-		<span class="prev">&nbsp;</span>
-		<a href="#" class="active">1</a>
-		<a href="#">2</a>
-		<a href="#">3</a>
-		<a href="#" class="next">&nbsp;</a>
-	</div>
+	<inp2:m_Include template="elements/pagination.elm" list_name="$list_name" prefix="$prefix"/>	
 	
-	
-</div>
-		
\ No newline at end of file
+</div>		
\ No newline at end of file
Index: branches/1.0.x/index.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14733)
+++ branches/1.0.x/index.tpl	(.../index.tpl)	(revision 14739)
@@ -95,5 +95,5 @@
 </inp2:m_DefineElement>
 
 <!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="designs/default_design.des" pass_params="1" columns="2"/>
+<inp2:m_include template="designs/default_design.des" pass_params="1"/>
 <!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/content_boxes/categories.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/content_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/content_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 14739)
@@ -3,7 +3,7 @@
 <inp2:m_DefineElement name="category_element">
 	<div class="good-item borbottom">
 		<dl>
-			<dt><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></dt>
+			<dt><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Field name="Name" html_escape="1"/></a></dt>			
 			<dd>
 				<p class="img"><a href="<inp2:CategoryLink template='__default__' m_cat_page='1'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
 			</dd>
Index: branches/1.0.x/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N -r14733 -r14739
--- branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14733)
+++ branches/1.0.x/elements/navigation_bar.elm.tpl	(.../navigation_bar.elm.tpl)	(revision 14739)
@@ -4,13 +4,12 @@
 	<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="module_root">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
+<inp2:m_DefineElement name="module_root">	
+	<i></i> <a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="nav_link">
-	<inp2:m_param name="separator"/>
+	<i></i>
 	<inp2:m_if check="m_Param" name="category">
 		<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
 	<inp2:m_else/>
@@ -19,12 +18,12 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="module_item">
-	<inp2:m_param name="separator"/> <a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
+	<i></i> <a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="current_item">
-	<inp2:m_param name="separator"/> <inp2:m_param name="title"/>
+	<i></i> <em><inp2:m_param name="title"/></em>
 </inp2:m_DefineElement>
 
-<h2><inp2:c_CategoryPath separator=" <i></i> " render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/><span></span></h2>
+<h2><inp2:c_CategoryPath separator="" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" module_root_render_as="html:" titles="$titles" templates="$templates" show_category="$show_category"/><span></span></h2>
 	
\ No newline at end of file