diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl
index 3582af625..c254fae43 100644
--- a/admin-dev/themes/template/products/form.tpl
+++ b/admin-dev/themes/template/products/form.tpl
@@ -97,7 +97,9 @@
 				// Reset settings
 				$('li.tab-row a[id*="Pack"]').hide();
 				$('li.tab-row a[id*="VirtualProduct"]').hide();
+				$('div.ppack').hide();
 				$('#is_virtual_good').removeAttr('checked');
+				$('div.is_virtual_good').hide();
 				$('#is_virtual').val(0);
 
 				var val = $(this).val();
diff --git a/admin-dev/themes/template/products/pack.tpl b/admin-dev/themes/template/products/pack.tpl
index 6e8a0e20a..d2a6012be 100644
--- a/admin-dev/themes/template/products/pack.tpl
+++ b/admin-dev/themes/template/products/pack.tpl
@@ -165,8 +165,10 @@
 <table>
 	<tr>
 		<td>
-			<input type="checkbox" name="ppack" id="ppack" value="1" {if $is_pack}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" />
-			<label class="t" for="ppack">{l s='Pack'}</label>
+			<div class="ppack">
+				<input type="checkbox" name="ppack" id="ppack" value="1" {if $is_pack}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" />
+				<label class="t" for="ppack">{l s='Pack'}</label>
+			</div>
 		</td>
 		<td>
 			<div id="ppackdiv" {if !$is_pack}style="display: none;"{/if}>
diff --git a/admin-dev/themes/template/products/virtualproduct.tpl b/admin-dev/themes/template/products/virtualproduct.tpl
index 35aeb73b8..dfeacd53c 100644
--- a/admin-dev/themes/template/products/virtualproduct.tpl
+++ b/admin-dev/themes/template/products/virtualproduct.tpl
@@ -69,13 +69,6 @@
 		}
 	});
 
-	/*$('input[name=is_virtual_good]').live('change', function() {
-		if($(this).attr('checked'))
-			$('#is_virtual').val(1);
-		else
-			$('#is_virtual').val(0);
-	});*/
-
 	$(document).ready(function() {
 		$('input').keypress(function(e) { 
 			var code = null; 
@@ -159,9 +152,10 @@
 <table cellpadding="5" cellspacing="0" border="0" style="width: 100%;">
 	<tr>
 		<td colspan="2">
-			<p><input type="checkbox" id="is_virtual_good" name="is_virtual_good" value="true" {*onclick="toggleVirtualProduct(this);"*} {if $product->is_virtual && $product->productDownload->active}checked="checked"{/if} />
+			<div class="is_virtual_good">
+				<input type="checkbox" id="is_virtual_good" name="is_virtual_good" value="true" {*onclick="toggleVirtualProduct(this);"*} {if $product->is_virtual && $product->productDownload->active}checked="checked"{/if} />
 				<label for="is_virtual_good" class="t bold">{l s='Is this a virtual product?'}</label>
-			</p>
+			</div>
 			{* [begin] virtual product *}
 			<div id="virtual_good" class="toggleVirtualPhysicalProduct" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} >
 				<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />