diff --git a/GrocyDemoDataGenerator.php b/GrocyDemoDataGenerator.php
index cb9fb702..eaf66973 100644
--- a/GrocyDemoDataGenerator.php
+++ b/GrocyDemoDataGenerator.php
@@ -53,6 +53,7 @@ class GrocyDemoDataGenerator
 			GrocyLogicStock::AddProduct(13, 5, date('Y-m-d', strtotime('-2 days')), GrocyLogicStock::TRANSACTION_TYPE_PURCHASE);
 			GrocyLogicStock::AddProduct(14, 5, date('Y-m-d', strtotime('+2 days')), GrocyLogicStock::TRANSACTION_TYPE_PURCHASE);
 			GrocyLogicStock::AddProduct(15, 5, date('Y-m-d', strtotime('-2 days')), GrocyLogicStock::TRANSACTION_TYPE_PURCHASE);
+			GrocyLogicStock::AddMissingProductsToShoppingList();
 		}
 	}
 }
diff --git a/version.txt b/version.txt
index 7f207341..1cc5f657 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.1
\ No newline at end of file
+1.1.0
\ No newline at end of file
diff --git a/views/consumption.js b/views/consumption.js
index 7c6b0269..25a2dbbf 100644
--- a/views/consumption.js
+++ b/views/consumption.js
@@ -57,6 +57,7 @@ $('#product_id').on('change', function(e)
 				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
 				$('#amount').attr('max', productDetails.stock_amount);
 				$('#consumption-form').validator('update');
+				$('#amount_qu_unit').text(productDetails.quantity_unit_stock.name);
 
 				Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
 				Grocy.EmptyElementWhenMatches('#selected-product-last-used-timeago', 'NaN years ago');
diff --git a/views/consumption.php b/views/consumption.php
index 0953c638..c65c55c7 100644
--- a/views/consumption.php
+++ b/views/consumption.php
@@ -16,7 +16,7 @@
 		</div>
 
 		<div class="form-group">
-			<label for="amount">Amount</label>
+			<label for="amount">Amount&nbsp;&nbsp;<span id="amount_qu_unit" class="small text-muted"></span></label>
 			<input type="number" class="form-control" id="amount" name="amount" value="1" min="1" required>
 			<div class="help-block with-errors"></div>
 		</div>
@@ -30,6 +30,7 @@
 		<button id="save-consumption-button" type="submit" class="btn btn-default">OK</button>
 
 	</form>
+
 </div>
 
 <div class="col-sm-6 col-md-5 col-lg-3 main well">
diff --git a/views/inventory.php b/views/inventory.php
index 0998b98b..64b0360b 100644
--- a/views/inventory.php
+++ b/views/inventory.php
@@ -37,6 +37,7 @@
 		<button id="save-inventory-button" type="submit" class="btn btn-default">OK</button>
 
 	</form>
+
 </div>
 
 <div class="col-sm-6 col-md-5 col-lg-3 main well">
diff --git a/views/purchase.js b/views/purchase.js
index 85691ff1..e7577bee 100644
--- a/views/purchase.js
+++ b/views/purchase.js
@@ -82,7 +82,7 @@ $('#product_id').on('change', function(e)
 				$('#selected-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
 				$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
 				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
-				$('#new_amount_qu_unit').text(productDetails.quantity_unit_stock.name);
+				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
 				
 				if (productDetails.product.default_best_before_days.toString() !== '0')
 				{
diff --git a/views/purchase.php b/views/purchase.php
index 791384f2..6a30ae29 100644
--- a/views/purchase.php
+++ b/views/purchase.php
@@ -28,7 +28,7 @@
 		</div>
 
 		<div class="form-group">
-			<label for="amount">Amount&nbsp;&nbsp;<span id="new_amount_qu_unit" class="small text-muted"></span></label>
+			<label for="amount">Amount&nbsp;&nbsp;<span id="amount_qu_unit" class="small text-muted"></span></label>
 			<input type="number" class="form-control" id="amount" name="amount" value="1" min="1" required>
 			<div class="help-block with-errors"></div>
 		</div>
@@ -36,6 +36,7 @@
 		<button id="save-purchase-button" type="submit" class="btn btn-default">OK</button>
 
 	</form>
+
 </div>
 
 <div class="col-sm-6 col-md-5 col-lg-3 main well">
diff --git a/views/shoppinglistform.js b/views/shoppinglistform.js
index 0e662952..6faeeaf3 100644
--- a/views/shoppinglistform.js
+++ b/views/shoppinglistform.js
@@ -30,6 +30,71 @@
 	}
 });
 
+$('#product_id').on('change', function(e)
+{
+	var productId = $(e.target).val();
+
+	if (productId)
+	{
+		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+			function (productDetails)
+			{
+				$('#selected-product-name').text(productDetails.product.name);
+				$('#selected-product-stock-amount').text(productDetails.stock_amount || '0');
+				$('#selected-product-stock-qu-name').text(productDetails.quantity_unit_stock.name);
+				$('#selected-product-stock-qu-name2').text(productDetails.quantity_unit_stock.name);
+				$('#selected-product-last-purchased').text((productDetails.last_purchased || 'never').substring(0, 10));
+				$('#selected-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
+				$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
+				$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
+				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
+
+				Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
+				Grocy.EmptyElementWhenMatches('#selected-product-last-used-timeago', 'NaN years ago');
+
+				if ($('#product_id').hasClass('suppress-next-custom-validate-event'))
+				{
+					$('#product_id').removeClass('suppress-next-custom-validate-event');
+				}
+				else
+				{
+					Grocy.FetchJson('/api/get-objects/shopping_list',
+						function (currentShoppingListItems)
+						{
+							if (currentShoppingListItems.filter(function (e) { return e.product_id === productId; }).length > 0)
+							{
+								$('#product_id').val('');
+								$('#product_id_text_input').val('');
+								$('#product_id_text_input').addClass('has-error');
+								$('#product_id_text_input').parent('.input-group').addClass('has-error');
+								$('#product_id_text_input').closest('.form-group').addClass('has-error');
+								$('#product-error').text('This product is already on the shopping list.');
+								$('#product-error').show();
+								$('#product_id_text_input').focus();
+							}
+							else
+							{
+								$('#product_id_text_input').removeClass('has-error');
+								$('#product_id_text_input').parent('.input-group').removeClass('has-error');
+								$('#product_id_text_input').closest('.form-group').removeClass('has-error');
+								$('#product-error').hide();
+							}
+						},
+						function(xhr)
+						{
+							console.error(xhr);
+						}
+					);
+				}
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+});
+
 $(function()
 {
 	$('.combobox').combobox({
@@ -40,28 +105,23 @@ $(function()
 	{
 		var input = $('#product_id_text_input').val().toString();
 		var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
-		
-		if (possibleOptionElement.length > 0)
-		{
+
+		if (possibleOptionElement.length > 0 && possibleOptionElement.text().length > 0) {
 			$('#product_id').val(possibleOptionElement.val());
 			$('#product_id').data('combobox').refresh();
 			$('#product_id').trigger('change');
 		}
 	});
+	
+	$('#product_id_text_input').focus();
+	$('#product_id_text_input').trigger('change');
 
-	if (Grocy.EditMode === 'create')
+	if (Grocy.EditMode === 'edit')
 	{
-		$('#product_id').val('');
-		$('#product_id_text_input').focus();
-		$('#product_id_text_input').val('');
-		$('#product_id_text_input').trigger('change');
-	}
-	else
-	{
-		$('#product_id').data('combobox').refresh();
+		$('#product_id').addClass('suppress-next-custom-validate-event');
 		$('#product_id').trigger('change');
 	}
-
+	
 	$('#shoppinglist-form').validator();
 	$('#shoppinglist-form').validator('validate');
 
diff --git a/views/shoppinglistform.php b/views/shoppinglistform.php
index 43995f36..f67335c3 100644
--- a/views/shoppinglistform.php
+++ b/views/shoppinglistform.php
@@ -1,4 +1,4 @@
-<div class="col-sm-3 col-sm-offset-3 col-md-4 col-md-offset-2 main">
+<div class="col-sm-3 col-sm-offset-3 col-md-3 col-md-offset-2 main">
 
 	<h1 class="page-header"><?php echo $title; ?></h1>
 
@@ -15,14 +15,14 @@
 			<select class="form-control combobox" id="product_id" name="product_id" value="<?php if ($mode == 'edit') echo $listItem->product_id; ?>" required>
 				<option value=""></option>
 				<?php foreach ($products as $product) : ?>
-					<option data-additional-searchdata="<?php echo $product->barcode; ?>" value="<?php echo $product->id; ?>"><?php echo $product->name; ?></option>
+					<option <?php if ($mode == 'edit' && $product->id == $listItem->product_id) echo 'selected="selected"'; ?> data-additional-searchdata="<?php echo $product->barcode; ?>" value="<?php echo $product->id; ?>"><?php echo $product->name; ?></option>
 				<?php endforeach; ?>
 			</select>
 			<div id="product-error" class="help-block with-errors"></div>
 		</div>
 
 		<div class="form-group">
-			<label for="amount">Amount</label>
+			<label for="amount">Amount&nbsp;&nbsp;<span id="amount_qu_unit" class="small text-muted"></span></label>
 			<input type="number" class="form-control" id="amount" name="amount" value="<?php if ($mode == 'edit') echo $listItem->amount; else echo '1'; ?>" min="1" required>
 			<div class="help-block with-errors"></div>
 		</div>
@@ -32,3 +32,14 @@
 	</form>
 
 </div>
+
+<div class="col-sm-6 col-md-5 col-lg-3 main well">
+	<h3>Product overview <strong><span id="selected-product-name"></span></strong></h3>
+	<h4><strong>Stock quantity unit:</strong> <span id="selected-product-stock-qu-name"></span></h4>
+
+	<p>
+		<strong>Stock amount:</strong> <span id="selected-product-stock-amount"></span> <span id="selected-product-stock-qu-name2"></span><br />
+		<strong>Last purchased:</strong> <span id="selected-product-last-purchased"></span> <time id="selected-product-last-purchased-timeago" class="timeago timeago-contextual"></time><br />
+		<strong>Last used:</strong> <span id="selected-product-last-used"></span> <time id="selected-product-last-used-timeago" class="timeago timeago-contextual"></time>
+	</p>
+</div>