Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14770 -r14772
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14772)
@@ -23,7 +23,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="image_element">
-	<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"/>" />
+	<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" /> />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content_box" content_class="" header_class="">
Index: branches/1.0.x/elements/content_boxes/special_deals.elm.tpl
===================================================================
diff -u -N -r14770 -r14772
--- branches/1.0.x/elements/content_boxes/special_deals.elm.tpl	(.../special_deals.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/content_boxes/special_deals.elm.tpl	(.../special_deals.elm.tpl)	(revision 14772)
@@ -5,7 +5,7 @@
 	<inp2:m_DefineElement name="featured_product_element">
 		<div class="good-item good-item-float">
 			<dl>
-				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1" cut_first="45"/></a></dt>
 				<dd>
 					<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
 					<p class="price-deal"><s class="under"><inp2:Field name="MSRP" currency="selected" decimal_tag="span"/></s><em class="price"><inp2:Field name="Price" currency="selected" decimal_tag="span"/></em></p>
Index: branches/1.0.x/designs/section.tpl
===================================================================
diff -u -N -r14754 -r14772
--- branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14754)
+++ branches/1.0.x/designs/section.tpl	(.../section.tpl)	(revision 14772)
@@ -29,8 +29,6 @@
 
 		<inp2:m_Cache key="prefix:p;currency;guest_only">
 
-			<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" />
 
 		</inp2:m_Cache>
Index: branches/1.0.x/products/details.tpl
===================================================================
diff -u -N -r14770 -r14772
--- branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14770)
+++ branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14772)
@@ -173,7 +173,7 @@
 				<a name="reviews"></a>
 				<div class="top-review">
 					<div class="info-review">
-						<p class="title">Reviews for <inp2:p_Field name="Name"/> (<inp2:rev_TotalRecords/>):</p>
+						<p class="title">Reviews for <inp2:p_Field name="Name" html_escape="1" cut_first="60"/> (<inp2:rev_TotalRecords/>):</p>
 
 						<!--<p class="but-review"><a href="" onclick="TINY.box.show({iframe:'addreview-success.html',width:600,height:340}); return false;" class="addreview">Add a Review</a></p>-->
 						<p class="but-review"><a href="<inp2:p_ProductLink template='products/add_review' width='600' height='340'/>" class="thickbox addreview">Add a Review</a></p>
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14766 -r14772
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14766)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14772)
@@ -55,16 +55,14 @@
 		</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">
-				<span class="items"><inp2:ord_ItemsInCart/> Items: $1,759<i>.99</i></span>
+			<span class="phone">1-855-WWW-PROS</span>
+				<span class="items"><inp2:ord_ItemsInCart/> Items: <inp2:ord_Field name="TotalAmount" currency="selected" decimal_tag="i"/></span>
 				<span class="delim">|</span>
 				<a href="<inp2:m_Link template='checkout/cart' m_cat_id='0' m_cat_page='1'/>">Checkout</a>
-			</inp2:m_if>
 		</div>
 
 		<!-- Show recently added Product by loading content with Ajax -->
-		<div class="basketStatus" style="display:none;">
+		<div class="basketStatus" style="">
 			<div class="basketArrow"></div>
 			<div class="basketContent">
 				<p class="subtitle">Added to cart:</p>
Index: branches/1.0.x/elements/content_boxes/new_products.elm.tpl
===================================================================
diff -u -N -r14770 -r14772
--- branches/1.0.x/elements/content_boxes/new_products.elm.tpl	(.../new_products.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/content_boxes/new_products.elm.tpl	(.../new_products.elm.tpl)	(revision 14772)
@@ -5,7 +5,7 @@
 	<inp2:m_DefineElement name="product_new_element">
 		<div class="good-item good-item-narrow <inp2:m_if check='m_Param' name='is_last'>good-item-narrow-last </inp2:m_if>good-item-float border-radius">
 			<dl>
-				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1" cut_first="32"/></a></dt>
 				<dd>
 					<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
 					<p class="price"><inp2:Field name="Price" currency="selected" decimal_tag="span"/></p>
Index: branches/1.0.x/designs/default_design.des.tpl
===================================================================
diff -u -N -r14759 -r14772
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14759)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14772)
@@ -8,6 +8,7 @@
 	<!--## includes system elements ##-->
 	<inp2:m_Include template="elements/forms.elm" strip_nl="2"/>
 	<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>
+	<inp2:m_Include template="elements/product_elements.elm" strip_nl="2"/>
 
 	<title><inp2:m_RenderElement name="page_title" default_element="default_page_title" no_editing="1"/></title>
 
Index: branches/1.0.x/elements/side_boxes/picks.elm.tpl
===================================================================
diff -u -N -r14747 -r14772
--- branches/1.0.x/elements/side_boxes/picks.elm.tpl	(.../picks.elm.tpl)	(revision 14747)
+++ branches/1.0.x/elements/side_boxes/picks.elm.tpl	(.../picks.elm.tpl)	(revision 14772)
@@ -6,7 +6,7 @@
 		<h2><em>Our Favorites</em><span class="pick"></span></h2>
 		<div class="good-item border-radius-bottom">
 			<dl>
-				<inp2:p_ListProducts list_name="pick_products" render_as="product_sidebox_element" no_table="1"/>
+				<inp2:p_ListProducts list_name="pick_products" render_as="sidebox_product_element" no_table="1"/>
 			</dl>
 		</div>
 	</div>
Index: branches/1.0.x/elements/product_elements.elm.tpl
===================================================================
diff -u -N -r14770 -r14772
--- branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14772)
@@ -44,7 +44,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="sidebox_product_element">
-	<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></dt>
+	<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1" cut_first="45"/></a></dt>
 	<dd>
 		<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
 		<p class="price"><inp2:Field name="Price" currency="selected" decimal_tag="span"/></p>