diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php
index 4c57a3ad..a43500fa 100644
--- a/app/Http/Controllers/Botanic/Admin/VarietyController.php
+++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php
@@ -55,10 +55,11 @@ class VarietyController extends Controller
 		return Varieties::destroy($id);
 	}
 
-	public function getImages(Request $request, $id = false)
+	public function getImages(Request $request, $id = false, $can_edit = true)
 	{
 		$id = $id ? $id : $request->input('id');
 		$data['images'] = Varieties::getImages($id);
+		$data['can_edit'] = $can_edit;
 		return view('components.uploader.mini-gallery-items', $data);
 	}
 
diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php
index f13a840b..87ccb064 100644
--- a/app/Repositories/Shop/Articles.php
+++ b/app/Repositories/Shop/Articles.php
@@ -31,7 +31,7 @@ class Articles
 
 	public static function getMeta(&$data = [])
 	{
-		$data['products'] = ( ($data['product_type'] ?? false) == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions();
+		$data['products'] = ( ($data['article']['product_type'] ?? false) == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions();
 		$data['categories_options'] = Categories::getOptions();
 		$data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens();
 		$data['families_options'] = ArticleFamilies::getOptions();
diff --git a/resources/views/Botanic/Admin/Varieties/form.blade.php b/resources/views/Botanic/Admin/Varieties/form.blade.php
index 2ab01ea3..6ecab2ad 100644
--- a/resources/views/Botanic/Admin/Varieties/form.blade.php
+++ b/resources/views/Botanic/Admin/Varieties/form.blade.php
@@ -7,25 +7,25 @@
 		<div class="row">
 			<div class="col-6">
 				{{ Form::label('name', 'Nom') }}
-				@include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
+				@include('components.input', ['name' => 'name', 'value' => $name ?? null, 'required' => true])
 			</div>
 			<div class="col-6">
 				{{ Form::label('genre', 'Espèce') }}
-				@include('components.select', ['name' => 'specie_id', 'list' => $species, 'value' => isset($specie_id) ? $specie_id : null, 'class' => 'select2 form-control', 'required' => false])
+				@include('components.select', ['name' => 'specie_id', 'list' => $species, 'value' => $specie_id ?? null, 'class' => 'select2 form-control', 'required' => false])
 			</div>
 		</div>
 
 		{{ Form::label('tags', 'Tags') }}
-		@include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => isset($tags) ? $tags : null, 'class' => 'select2 form-control', 'multiple' => true])
+		@include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $tags ?? null, 'class' => 'select2 form-control', 'multiple' => true])
 
 
 		{{ Form::label('description', 'Description') }}
-		@include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'rows' => 5, 'required' => false])		
+		@include('components.textarea', ['name' => 'description', 'value' => $description ?? null, 'class' => 'editor', 'rows' => 5, 'required' => false])		
 
 	</div>
 
 	<div class="col-md-4">
-		@include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => (isset($id)) ? $id : false]), 'delete_url' => route('Botanic.Admin.Varieties.deleteImage') ])
+		@include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => $id ?? false]), 'delete_url' => route('Botanic.Admin.Varieties.deleteImage'), 'name' => 'images'])
 	</div>
 
 </div>
diff --git a/resources/views/Shop/Admin/Articles/form.blade.php b/resources/views/Shop/Admin/Articles/form.blade.php
index 85543e6e..e08e1a18 100644
--- a/resources/views/Shop/Admin/Articles/form.blade.php
+++ b/resources/views/Shop/Admin/Articles/form.blade.php
@@ -78,6 +78,7 @@
 @include('boilerplate::load.tinymce')
 @include('load.appender')
 @include('load.toggle')
+@include('load.form.save')
 
 @push('js')
 	<script>
@@ -92,6 +93,8 @@
 				// handleAdmin.toggle(id, $(this).prop('checked'));
 			});
 
+			initSaveForm('.save', '#article-form');
+
 		});
 	</script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
index 79ef2709..3d5a528a 100644
--- a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
+++ b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
@@ -37,6 +37,7 @@
 		<div class="row">
 			<div class="col-12">
 				{{ Form::label('tags', 'Tags') }}<br>
+				@include('Shop.Admin.Articles.partials.product.tags')
 				@include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $article['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
 			</div>
 		</div>		
@@ -44,18 +45,15 @@
 		<div class="row">
 			<div class="col-12">
 				{{ Form::label('description', 'Description') }}
-				@if (!empty($article['product']['description']))
-					@component('components.layout.box-collapse', ['id' => 'product_description', 'title' => 'Description produit'])
-						{{ $article['product']['description'] }}
-					@endcomponent
-				@endif
+				@include('Shop.Admin.Articles.partials.product.description')
 				@include('components.textarea', ['name' => 'description', 'value' => $article['description'] ?? null, 'class' => 'editor', 'required' => true])
 			</div>
 		</div>
 
 	</div>
 	<div class="col-md-4">
-		@include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => $article['id'] ?? false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage'), 'title' => 'Photos' ])
+		@include('Shop.Admin.Articles.partials.product.images', ['name' => 'product_images'])
+		@include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => $article['id'] ?? false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage'), 'title' => 'Photos', 'name' => 'images' ])
 	</div>
 </div>
 
diff --git a/resources/views/Shop/Admin/Articles/partials/product/description.blade.php b/resources/views/Shop/Admin/Articles/partials/product/description.blade.php
new file mode 100644
index 00000000..a69076ef
--- /dev/null
+++ b/resources/views/Shop/Admin/Articles/partials/product/description.blade.php
@@ -0,0 +1,5 @@
+@if (!empty($article['product']['description']))
+	@component('components.layout.box-collapse', ['id' => 'product_description', 'title' => 'Description produit'])
+		{{ $article['product']['description'] }}
+	@endcomponent
+@endif
\ No newline at end of file
diff --git a/resources/views/Shop/Admin/Articles/partials/product/images.blade.php b/resources/views/Shop/Admin/Articles/partials/product/images.blade.php
new file mode 100644
index 00000000..70cf15d6
--- /dev/null
+++ b/resources/views/Shop/Admin/Articles/partials/product/images.blade.php
@@ -0,0 +1 @@
+@include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => $article['product_id'] ?? false]), 'title' => 'Photos produits', 'prefix' => 'product_', 'can_edit' => false ])
diff --git a/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php b/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php
new file mode 100644
index 00000000..291eca02
--- /dev/null
+++ b/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php
@@ -0,0 +1,7 @@
+@if (!empty($article['product']['tags']))
+	@component('components.layout.box-collapse', ['id' => 'product_tags', 'title' => 'Tags produit'])
+		@foreach ($article['product']['tags'] as $tag)
+			{{ $tag->name }}
+		@endforeach
+	@endcomponent
+@endif
\ No newline at end of file
diff --git a/resources/views/components/layout/box-collapse.blade.php b/resources/views/components/layout/box-collapse.blade.php
index 1abc518f..e7bbd930 100644
--- a/resources/views/components/layout/box-collapse.blade.php
+++ b/resources/views/components/layout/box-collapse.blade.php
@@ -3,7 +3,7 @@
 		<div class="row">
 			<div class="col-6">
 				<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#{{ $id }}" aria-expanded="false" aria-controls="{{ $id }}">
-					<i class="fa fa-chevron-right"></i>
+					<i class="fa {{ ($collapsed ?? true) ? 'fa-chevron-right' : 'fa-chevron-down' }}"></i>
 				</button>
 				{!! $title ?? null !!} 
 				@if (isset($required) && $required)
@@ -19,7 +19,9 @@
 			</div>
 		</div>
 	</div>
-	<div id="{{ $id }}" class="card-body collapse {{ $class_body ?? '' }}">
+	<div id="{{ $id }}" class="card-body collapse {{ ($collapsed ?? true) ? '' : 'show' }} {{ $class_body ?? '' }}">
 		{{ $slot }}
 	</div>
 </div>
+
+@include('load.layout.chevron')
diff --git a/resources/views/components/uploader/mini-gallery-items.blade.php b/resources/views/components/uploader/mini-gallery-items.blade.php
index 6a52e64e..1fbb8cd0 100644
--- a/resources/views/components/uploader/mini-gallery-items.blade.php
+++ b/resources/views/components/uploader/mini-gallery-items.blade.php
@@ -2,23 +2,23 @@
 	@foreach($images as $key => $image)
 		<figure class="mr-2">
 			<img src="{{ $image['url'] }}" class="img-thumbnail img-caption" style="max-height:92px;">
-			@if ($can_edit ?? true)
-				<figcaption class="text-center pt-2">
-					<button type="button" class="btn btn-xs btn-outline-secondary">
-						<i class="fas fa-expand-alt"></i>
-					</button>
+			<figcaption class="text-center pt-2">
+				<button type="button" class="btn btn-xs btn-outline-secondary">
+					<i class="fas fa-expand-alt"></i>
+				</button>
+				@if ($can_edit ?? true)
 					<button type="button" class="btn btn-xs btn-outline-danger">
 						<i class="fas fa-trash" data-index="{{ $key }}"></i>
 					</button>
-				</figcaption>
-			@endif
+				@endif
+			</figcaption>
 		</figure>
 	@endforeach
 @endif
 
-@if ($can_edit ?? true)
-	<script>
+<script>
+	@if ($can_edit ?? true)
 		{{ $prefix ?? '' }}handleDeleteImages();
-		{{ $prefix ?? '' }}handleEnlargeImages();
-	</script>
-@endif
\ No newline at end of file
+	@endif
+	{{ $prefix ?? '' }}handleEnlargeImages();
+</script>
diff --git a/resources/views/components/uploader/mini-gallery.blade.php b/resources/views/components/uploader/mini-gallery.blade.php
index 599cfd96..b7cfe711 100644
--- a/resources/views/components/uploader/mini-gallery.blade.php
+++ b/resources/views/components/uploader/mini-gallery.blade.php
@@ -16,33 +16,36 @@
 
 @push('js')
 	<script>
-		function {{ $prefix ?? '' }}handleDeleteImages() {
-			$('#{{ $prefix ?? '' }}uploader-mini-gallery .fa-trash').click(function() {
-				id = $('#id').val();
-				index = $(this).data('index');
-				console.log(id);
-				$.ajax({
-					type: 'post',
-					url: "{{ $delete_url }}",
-					data: {
-						id: id,
-						index: index
-					},
-					success: function(data) {
-						loadImages();
-					}
-				});
-			})
-		}
-
+		@if ($can_edit ?? true)
+			function {{ $prefix ?? '' }}handleDeleteImages() {
+				$('#{{ $prefix ?? '' }}uploader-mini-gallery .fa-trash').click(function() {
+					id = $('#id').val();
+					index = $(this).data('index');
+					console.log(id);
+					$.ajax({
+						type: 'post',
+						url: "{{ $delete_url ?? '' }}",
+						data: {
+							id: id,
+							index: index
+						},
+						success: function(data) {
+							loadImages();
+						}
+					});
+				})
+			}
+		@endif
+		
 		function {{ $prefix ?? '' }}handleEnlargeImages() {
 			$('#{{ $prefix ?? '' }}uploader-mini-gallery .fa-expand-alt').click(function() {
-				$img = $(this).parents('figure').find('.img-thumbnail');
+			$img = $(this).parents('figure').find('.img-thumbnail');
 				url = $img.attr('src');
 				console.log(url);
 				$('#{{ $prefix ?? '' }}mini-gallery-lightbox .lightbox').attr('src', url);
 				$('#{{ $prefix ?? '' }}mini-gallery-lightbox').modal('show');
 			})
 		}
+
 	</script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/components/uploader/widget.blade.php b/resources/views/components/uploader/widget.blade.php
index 84c032c9..78db77f8 100644
--- a/resources/views/components/uploader/widget.blade.php
+++ b/resources/views/components/uploader/widget.blade.php
@@ -1,49 +1,44 @@
 @include('boilerplate::load.fileinput')
 
-<div class="card">
-	<div class="card-header">
-		<h3 class="card-title">{{ $title }}</h3>
-		<div class="card-tools">
-			
-		</div>
-	</div>
-	<div class="card-body pt-3 pb-0">
-		@if (isset($article['id']))
-			@include('components.uploader.mini-gallery')
-		@endif
+@component('components.layout.box-collapse', ['id' => ($prefix ?? '') . $name ?? 'images', 'title' => $title ?? 'Photos', 'collapsed' => $collapsed ?? false])
+
+	@include('components.uploader.mini-gallery')
+
+	@if ($can_edit ?? true)
+		<div id="{{ $prefix ?? '' }}uploader-new-images"></div>
+		@include('components.uploader.block_image_new', ['name' => ($name ?? 'images') . '[]'])
+	@endif
 
-		@if ($can_edit ?? true)
-			<div id="{{ $prefix ?? '' }}uploader-new-images"></div>
-			@include('components.uploader.block_image_new', ['name' => 'images[]', 'required' => true])
-		@endif
-	</div>
 	@if ($can_edit ?? true)
 		<div class="card-footer">
 			<button type="button" class="btn btn-xs btn-primary {{ $prefix ?? '' }}add-image pull-right">Ajout <i class="fa fa-plus"></i></button>
 		</div>
 	@endif
-</div>
+
+@endcomponent
 
 @push('js')
 	<script>
-		function {{ $prefix ?? '' }}append_image() {
-			$("#{{ $prefix ?? '' }}uploader-new-images .file").fileinput();
-			$("#{{ $prefix ?? '' }}uploader-new-images .file").focus();
-		}
+		@if ($can_edit ?? true)
+			function {{ $prefix ?? '' }}append_image() {
+				$("#{{ $prefix ?? '' }}uploader-new-images .file").fileinput();
+				$("#{{ $prefix ?? '' }}uploader-new-images .file").focus();
+			}
 
-		$("#{{ $prefix ?? '' }}uploader-new-images").appender({
-			rowSection: '.{{ $prefix ?? '' }}row-new-image',
-			type: '.{{ $prefix ?? '' }}row-image',
-			addBtn: '.{{ $prefix ?? '' }}add-image',
-			appendEffect: 'fade',
-			addClass: 'animated fadeIn',
-			rowNumber: '.{{ $prefix ?? '' }}row-image-number',
-			deleteBtn: '.{{ $prefix ?? '' }}delete-new-image-btn',
-			callback: {{ $prefix ?? '' }}append_image,
-			hideSection: true
-		});
+			$("#{{ $prefix ?? '' }}uploader-new-images").appender({
+				rowSection: '.{{ $prefix ?? '' }}row-new-image',
+				type: '.{{ $prefix ?? '' }}row-image',
+				addBtn: '.{{ $prefix ?? '' }}add-image',
+				appendEffect: 'fade',
+				addClass: 'animated fadeIn',
+				rowNumber: '.{{ $prefix ?? '' }}row-image-number',
+				deleteBtn: '.{{ $prefix ?? '' }}delete-new-image-btn',
+				callback: {{ $prefix ?? '' }}append_image,
+				hideSection: true
+			});
+		@endif
 
-		function loadImages()
+		function {{ $prefix ?? '' }}loadImages()
 		{
 			$gallery = $("#{{ $prefix ?? '' }}uploader-mini-gallery");
 			if ($gallery) {
@@ -52,7 +47,7 @@
 		}
 
 		$(function() {
-			loadImages();
+			{{ $prefix ?? '' }}loadImages();
 		});
 	</script>
 @endpush
diff --git a/resources/views/load/layout/chevron.blade.php b/resources/views/load/layout/chevron.blade.php
index 9142c8b0..bb2face2 100644
--- a/resources/views/load/layout/chevron.blade.php
+++ b/resources/views/load/layout/chevron.blade.php
@@ -8,8 +8,12 @@
 					$(this).find('i').toggleClass('fa-chevron-right fa-chevron-down')
 				});
 			}
-		</script>
 
+			$(function() {
+				initChevron();
+			});
+		</script>
+		
 	@endpush
 
 	@php(define('LOAD_CHEVRON', true))
diff --git a/routes/Botanic/Admin/Varieties.php b/routes/Botanic/Admin/Varieties.php
index a1dc8cb4..8f001170 100644
--- a/routes/Botanic/Admin/Varieties.php
+++ b/routes/Botanic/Admin/Varieties.php
@@ -10,7 +10,7 @@ Route::prefix('Varieties')->name('Varieties.')->group(function () {
 	Route::get('edit/{id}', 'VarietyController@edit')->name('edit');
 	Route::post('getSelect', 'VarietyController@getOptionsWithSpecie')->name('getSelect');
 	Route::post('deleteImage', 'VarietyController@deleteImage')->name('deleteImage');
-	Route::any('getImages/{id?}', 'VarietyController@getImages')->name('getImages');
+	Route::any('getImages/{id?}/{can_edit?}', 'VarietyController@getImages')->name('getImages');
 
 	Route::any('exportExcel', 'VarietyController@exportExcel')->name('exportExcel');