diff --git a/themes/default/css/product.css b/themes/default/css/product.css
index e129a2e54..97e1274fe 100644
--- a/themes/default/css/product.css
+++ b/themes/default/css/product.css
@@ -212,23 +212,24 @@ span.view_scroll_spacer {
 
 .ie7 #attributes .attribute_list span{margin-top:1px}
 
-.attribute_list #color_to_pick_list {
+#attributes .attribute_list #color_to_pick_list {
 	list-style-type:none;
 	width:125px;
 }
 
-.attribute_list #color_to_pick_list li {
+#attributes .attribute_list #color_to_pick_list li {
 	float:left;
 	margin:0 8px 8px 0;
 	padding:1px;
 	border:1px solid #ccc;
+	clear:none
 }
 
-.attribute_list #color_to_pick_list li.selected {
+#attributes .attribute_list #color_to_pick_list li.selected {
 	border:1px solid #000;
 }
 
-.attribute_list #color_to_pick_list a.color_pick {
+#attributes .attribute_list #color_to_pick_list a.color_pick {
 	display:block;
 	height:20px;
 	width:20px;
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 35be46b87..75205f0e5 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -80,6 +80,7 @@ var stock_management = {$stock_management|intval};
 	{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
 {/if}
 
+
 var productPriceWithoutReduction = '{$productPriceWithoutReduction}';
 var productPrice = '{$productPrice}';
 
@@ -377,14 +378,6 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 			{/if}
 
 			<div class="price">
-				{if !$priceDisplay || $priceDisplay == 2}
-					{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)}
-					{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
-				{elseif $priceDisplay == 1}
-					{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)}
-					{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
-				{/if}
-
 				<p class="our_price_display">
 				{if $priceDisplay >= 0 && $priceDisplay <= 2}
 					<span id="our_price_display">{convertPrice price=$productPrice}</span>