diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php
index 9149989..645f16d 100644
--- a/app/Http/Controllers/MediaController.php
+++ b/app/Http/Controllers/MediaController.php
@@ -93,11 +93,14 @@ class MediaController extends Controller
         ]);
     }
 
-    public function show(Request $request) {
-        $uid = $request->uid;
-        $media = Media::where('uid', $uid)->first();
-        if (!$media)
-            abort(404);
+    /**
+     * Show media
+     *
+     * @param Media $media
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function show(Media $media)
+    {
         return redirect()->route('media_manager')->with('autoOpen', $media);
     }
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 5ea48d3..60c25ac 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Models\Media;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
@@ -23,7 +24,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Route::bind('media', function ($value) {
+            return Media::whereUid($value)->firstOrFail();
+        });
 
         parent::boot();
     }
@@ -36,10 +39,7 @@ class RouteServiceProvider extends ServiceProvider
     public function map()
     {
         $this->mapApiRoutes();
-
         $this->mapWebRoutes();
-
-        //
     }
 
     /**
diff --git a/resources/js/components/media-manager/media-editor/EditComponents.vue b/resources/js/components/media-manager/media-editor/EditComponents.vue
index b1b0598..0eb7df5 100644
--- a/resources/js/components/media-manager/media-editor/EditComponents.vue
+++ b/resources/js/components/media-manager/media-editor/EditComponents.vue
@@ -56,12 +56,12 @@
         },
         mounted() {
             console.log('EditComponent Mounted.');
-            // if (this.open !== undefined) { TODO : REMOVE ?
-            //     this.$store.commit({
-            //         type: 'updateMedia',
-            //         media: JSON.parse(this.open)
-            //     });
-            // }
+            if (this.open !== undefined) {
+                this.$store.commit({
+                    type: 'updateMedia',
+                    media: JSON.parse(this.open)
+                });
+            }
         },
         computed: {
             storeMedia () {
@@ -143,7 +143,6 @@
                 });
             },
             close(){
-                console.log('close click')
                 this.$store.commit({
                     type: 'updateMedia',
                     media: { close: true, isModified: this.storeMedia.isModified }
diff --git a/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue
index 2719c60..4fc4c86 100644
--- a/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue
+++ b/resources/js/components/media-manager/media-editor/tabs/EditComponent.vue
@@ -16,8 +16,8 @@
                                   class="is-locked">En attente de liaison Arcadia</span>
                         </div>
                     </div>
-                    <div class="row">
-                        <label>Sujet <span>*</span> : {{this.oMedia.sujet.libelle}}</label>
+                    <div class="row" v-if="oMedia.arcadia_id">
+                        <label>Sujet <span>*</span> : {{this.oMedia.sujet ? this.oMedia.sujet.libelle : '' }}</label>
                         <label>Type de média <span>*</span> : {{this.oMedia.typemedia.libelle}}</label>
                         <label>Date de création : {{this.oMedia.created_at}}</label>
                         <label>Date de modification : {{this.oMedia.updated_at}}</label>
diff --git a/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue b/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue
index 19aac59..3cea189 100644
--- a/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue
+++ b/resources/js/components/media-manager/media-editor/tabs/HistoryComponent.vue
@@ -45,7 +45,11 @@
         },
         watch: {
             storeMedia() {
-                if (Object.keys(this.storeMedia).length > 0 && (this.storeMedia.history === undefined)){
+                if (
+                    this.storeMedia.id &&
+                    Object.keys(this.storeMedia).length > 0 &&
+                    (this.storeMedia.history === undefined)
+                ){
                     const _this2 = this;
                     axios.post('/ajax/get-media-others-infos', {
                         media_id: this.storeMedia.id
diff --git a/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue b/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue
index 9349794..574b478 100644
--- a/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue
+++ b/resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue
@@ -19,7 +19,7 @@
                         </td>
                         <td class="ctas">
                             <i class="fa fa-copy" v-clipboard="item.url"></i>
-                            <a :href="item.url" :download="storeMedia.libelle.replaceAll(' ', '_').replaceAll('.','') + '_' + item.largeur + 'x' + item.hauteur + 'px'"><i class="fas fa-arrow-circle-down"></i></a>
+                            <a v-if="storeMedia.libelle" :href="item.url" :download="storeMedia.libelle.replaceAll(' ', '_').replaceAll('.','') + '_' + item.largeur + 'x' + item.hauteur + 'px'"><i class="fas fa-arrow-circle-down"></i></a>
                         </td>
                     </tr>
                     </tbody>
@@ -52,7 +52,11 @@
         },
         watch: {
             storeMedia() {
-                if (Object.keys(this.storeMedia).length > 0 && (this.storeMedia.vignettes === undefined)){
+                if (
+                    this.storeMedia.id &&
+                    Object.keys(this.storeMedia).length > 0 &&
+                    (this.storeMedia.vignettes === undefined)
+                ){
                     const _this2 = this;
                     axios.post('/ajax/get-media-others-infos', {
                         media_id: this.storeMedia.id
diff --git a/routes/web.php b/routes/web.php
index 571cfed..bcd3e8f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,24 +1,15 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Web Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register web routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| contains the "web" middleware group. Now create something great!
-|
-*/
-
 // TODO : Faire le tri des routes
 
+use App\Http\Controllers\MediaController;
+
 Route::group(['middleware' => ['auth']], function () {
     // Les pages Front
     Route::get('/', 'CommunController@index')->name('home');
-    Route::get('/gestion-des-medias', 'MediaController@index')->name('media_manager');
+    Route::get('/gestion-des-medias', [MediaController::class, 'index'])->name('media_manager');
     Route::get('/paniers', 'PanierController@index')->name('paniers');
-    Route::get('/media/{uid}', 'MediaController@show')->name('media.show');
+    Route::get('/media/{media}', [MediaController::class, 'show'])->name('media.show');
 
     // Message de contact
     Route::post('/send-message', 'CommunController@sendMessage');