diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php
index 5b1f0b72..75f3919f 100644
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -31,6 +31,7 @@ class RecipesController extends BaseController
 			{
 				$selectedRecipe = $recipe;
 				$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
+				break;
 			}
 		}
 
diff --git a/localization/de.php b/localization/de.php
index 5e84273f..d4279b5b 100644
--- a/localization/de.php
+++ b/localization/de.php
@@ -225,5 +225,6 @@ return array(
 	'English' => 'Englisch',
 	'German' => 'Deutsch',
 	'Italian' => 'Italienisch',
-	'Demo in different language' => 'Demo in anderer Sprache'
+	'Demo in different language' => 'Demo in anderer Sprache',
+	'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat'
 );
diff --git a/services/DemoDataGeneratorService.php b/services/DemoDataGeneratorService.php
index 5a72f80c..d2644bec 100644
--- a/services/DemoDataGeneratorService.php
+++ b/services/DemoDataGeneratorService.php
@@ -60,11 +60,11 @@ class DemoDataGeneratorService extends BaseService
 
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 16, 1);
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1);
-				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 18, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (1, 18, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 10, 1);
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 6, 1);
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 10, 1);
-				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 17, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (2, 17, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 20, 1);
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 10, 1);
 				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 11, 1);
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index fc703dcf..7aa337ba 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -192,7 +192,7 @@
 
 	<div class="content-wrapper">
 		<div class="container-fluid">
-			<div class="row">
+			<div class="row mb-3">
 				<div class="col content-text">
 					@yield('content')
 				</div>
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 0a8b73d9..89f3ad10 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -73,6 +73,10 @@
 				<li class="list-group-item">
 					{{ $selectedRecipePosition->amount }} {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->qu_id_stock)->name }} {{ FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name }}
 					<span class="timeago-contextual">@if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list) }} @endif</span>
+
+					@if(!empty($selectedRecipePosition->note))
+					<div class="text-muted">{{ $selectedRecipePosition->note }} </div>
+					@endif
 				</li>
 				@endforeach
 			</ul>
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index af35f308..e003c75d 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -22,15 +22,11 @@
 	</div>
 </div>
 
-<div class="row mt-3">
-	<div class="col-xs-12 col-md-6 col-xl-3">
-		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
-		<input type="text" class="form-control" id="search">
-	</div>
-</div>
-
 <div class="row">
 	<div class="col-xs-12 col-md-8 pb-3">
+		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
+		<input type="text" class="form-control" id="search">
+
 		<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">
 			<thead>
 				<tr>