Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N -r14910 -r14913
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14910)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(.../compare.elm.tpl)	(revision 14913)
@@ -13,25 +13,8 @@
 		<span class="bullet"></span>
 	</h2>
 	<div class="good-item border-radius-bottom comparing-items">
-		<inp2:m_DefineElement name="compare_product_element">
-			<dl>
-				<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="Name"/></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>
+		<inp2:p_ListProducts list_name="compare_products" render_as="compare_product_element" no_table="1"/>
 
-					<p class="button-delete">
-						<a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a>
-					</p>
-				</dd>
-			</dl>
-		</inp2:m_DefineElement>
-
-		<inp2:p_ListProducts list_name="compare_products" render_as="sidebox_product_element" no_table="1"/>
-
 		<p class="form buttons">
 			<input type="button" value="Compare" id="compare-products-btn" class="green-button" />&nbsp;&nbsp;&nbsp;
 			<input type="button" value="Clear" id="cancel-compare-btn" class="grey-button" />
Index: branches/1.0.x/elements/product_elements.elm.tpl
===================================================================
diff -u -N -r14907 -r14913
--- branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14907)
+++ branches/1.0.x/elements/product_elements.elm.tpl	(.../product_elements.elm.tpl)	(revision 14913)
@@ -1,21 +1,21 @@
 <inp2:m_DefineElement name="product_list_element">
-<li>
-	<div class="item">
-		<inp2:m_if check="Field" name="IsNew">
-			<div class="ribbon new"></div>
-		<inp2:m_elseif check="Field" name="IsPop" />
-			<div class="ribbon top"></div>
-		<inp2:m_elseif check="Field" name="Featured" db="1" />
-			<div class="ribbon sale"></div>
-		</inp2:m_if>
+	<li>
+		<div class="item">
+			<inp2:m_if check="Field" name="IsNew">
+				<div class="ribbon new"></div>
+			<inp2:m_elseif check="Field" name="IsPop" />
+				<div class="ribbon top"></div>
+			<inp2:m_elseif check="Field" name="Featured" db="1" />
+				<div class="ribbon sale"></div>
+			</inp2:m_if>
 
-		<div class="img">
-			<a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="69" MaxHeight="69"/></a>
-		</div>
-		<div class="descr">
-			<h3><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></h3>
-			<p><inp2:Field field="Description" html_escape="1" cut_first="200"/></p>
-			<div class="optional">
+			<div class="img">
+				<a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="69" MaxHeight="69"/></a>
+			</div>
+			<div class="descr">
+				<h3><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" html_escape="1"/></a></h3>
+				<p><inp2:Field field="Description" html_escape="1" cut_first="200"/></p>
+				<div class="optional">
 				<span class="stars">
 					<inp2:VotesIndicator small_style="small-star"/>
 				</span>
@@ -25,24 +25,36 @@
 				<span class="comp">
 					<label><input type="checkbox" class="compare-checkbox" value="<inp2:Field name='ProductId'/>"<inp2:m_if check="InCompare"> checked</inp2:m_if>/><em>Compare</em></label>
 				</span>
+				</div>
 			</div>
+			<div class="price-block">
+				<p><s class="under"><inp2:Field name="MSRP" currency="selected" decimal_tag="span"/></s></p>
+				<p class="redprice"><em class="price"><inp2:Field name="Price" currency="selected" decimal_tag="span"/></em></p>
+				<p><a href="<inp2:AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" rel="nofollow"><span>Add to Cart</span></a></p>
+			</div>
 		</div>
-		<div class="price-block">
-			<p><s class="under"><inp2:Field name="MSRP" currency="selected" decimal_tag="span"/></s></p>
-			<p class="redprice"><em class="price"><inp2:Field name="Price" currency="selected" decimal_tag="span"/></em></p>
-			<p><a href="<inp2:AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" rel="nofollow"><span>Add to Cart</span></a></p>
-		</div>
-	</div>
-</li>
+	</li>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="sidebox_product_element">
-<dl class="<inp2:m_if check='m_Param' name='is_last'>last</inp2:m_if>">
-	<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>
-		<p><a href="<inp2:AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" rel="nofollow"><span>Add to Cart</span></a></p>
-	</dd>
-</dl>
+	<dl class="<inp2:m_if check='m_Param' name='is_last'>last</inp2:m_if>">
+		<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>
+			<p><a href="<inp2:AddToCartLink template='elements/ajax/cart_bubble' product_template='__default__'/>" class="addtocart" rel="nofollow"><span>Add to Cart</span></a></p>
+		</dd>
+	</dl>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="compare_product_element">
+	<dl>
+		<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="Name"/></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="button-delete"><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-delete.png" width="13" height="13" alt="" /></a></p>
+		</dd>
+	</dl>
 </inp2:m_DefineElement>
\ No newline at end of file