diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 34e7ff4..3edecfb 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -45,7 +45,7 @@ public function index(Request $request)
             ->values()
             ->all();
 
-        return view('home.index', compact(
+        return view('index', compact(
             'tab',
             'limit',
             'servers',
diff --git a/app/Http/Controllers/YnhServerController.php b/app/Http/Controllers/YnhServerController.php
index dc79008..0de7b04 100644
--- a/app/Http/Controllers/YnhServerController.php
+++ b/app/Http/Controllers/YnhServerController.php
@@ -52,7 +52,7 @@ public function index(YnhServer $server, Request $request)
         $tab = $request->input('tab', 'settings');
         $limit = $request->input('limit', 40);
 
-        return view('home.pages._servers', compact(
+        return view('_server', compact(
             'tab',
             'limit',
             'server',
@@ -174,7 +174,7 @@ public function create(CreateHostRequest $request)
         }
 
         $tab = 'settings';
-        return view('home.pages._servers', compact('server', 'tab'));
+        return view('_server', compact('server', 'tab'));
     }
 
     public function delete(YnhServer $server, RemoveHostRequest $request)
diff --git a/app/View/Components/Interdependencies.php b/app/View/Components/Interdependencies.php
index 42ec452..05b7619 100644
--- a/app/View/Components/Interdependencies.php
+++ b/app/View/Components/Interdependencies.php
@@ -9,7 +9,6 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\View\Component;
-use Traversable;
 
 class Interdependencies extends Component
 {
@@ -19,7 +18,7 @@ public function __construct(?YnhServer $server = null)
     {
         /** @var User $user */
         $user = Auth::user();
-        if ($server && (is_array($server) || $server instanceof Traversable) && count($server) > 0) {
+        if (isset($server->id)) {
             $this->interdependencies = YnhNginxLogs::interdependencies(YnhServer::forUser($user), $server);
         } else {
             $this->interdependencies = YnhNginxLogs::interdependencies(YnhServer::forUser($user));
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index d052150..53a02c5 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -149,6 +149,6 @@
   "Text successfully copied to clipboard.": "Le text a été copié dans le presse-papiers.",
   "Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.": "Quelqu'un a partagé avec vous des vulnérabilités sur des actifs dont vous êtes responsable. Veuillez corriger les vulnérabilités ci-dessous et cocher la case correspondante. Un nouveau scan vérifiera que le problème a été résolu.",
   "uppercase/lowercase letters and digits only": "lettres majuscules/minuscules et chiffres uniquement",
-  "+ new": "+ créer",
+  "+ new": "+ nouvelle",
   "Size": "Taille"
 }
\ No newline at end of file
diff --git a/resources/views/home/pages/_servers.blade.php b/resources/views/_server.blade.php
similarity index 100%
rename from resources/views/home/pages/_servers.blade.php
rename to resources/views/_server.blade.php
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d069524..a57dbb2 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -15,7 +15,7 @@
                             <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
 
                             <div class="col-md-6">
-                                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
+                                <input id="name" placeholder="John Doe" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
 
                                 @if ($errors->has('name'))
                                     <span class="invalid-feedback" role="alert">
@@ -29,7 +29,7 @@
                             <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
+                                <input id="email" placeholder="j.doe@example.com" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
                                 @if ($errors->has('email'))
                                     <span class="invalid-feedback" role="alert">
diff --git a/resources/views/components/servers.blade.php b/resources/views/components/servers.blade.php
index 2097313..5c6a5f4 100644
--- a/resources/views/components/servers.blade.php
+++ b/resources/views/components/servers.blade.php
@@ -91,12 +91,11 @@
           {{ $server->ip() }}
         </td>
         <td>
-          @if($server->isFrozen() || $server->ipv6() === '
-          <unavailable>')
-            -
-            @else
-            {{ $server->ipv6() }}
-            @endif
+          @if($server->isFrozen() || $server->ipv6() === '<unavailable>')
+          -
+          @else
+          {{ $server->ipv6() }}
+          @endif
         </td>
         <td>
           @if($server->isFrozen())
diff --git a/resources/views/components/users.blade.php b/resources/views/components/users.blade.php
index a205163..097c697 100644
--- a/resources/views/components/users.blade.php
+++ b/resources/views/components/users.blade.php
@@ -58,13 +58,17 @@ class="btn btn-sm btn-outline-success dropdown-toggle dropdown-toggle-split"
               </button>
               <div class="dropdown-menu" x-placement="bottom-start">
                 @foreach($userAvailablePermissions as $permission)
-                <a onclick="addUserPermission('{{ $server->id }}', '{{ $user->id }}', '{{ $permission }}')"
+                  <?php $serverId = $server ? $server->id : $permission->server_id; ?>
+                  <?php $serverName = $server ? $server->name : $permission->server_name; ?>
+                  <?php $permissionId = $server ? $permission : $permission->permission; ?>
+                  <?php $userId = $server ? $user->id : $permission->ynh_user_id; ?>
+                <a onclick="addUserPermission('{{ $serverId }}', '{{ $userId }}', '{{ $permissionId }}')"
                    class="dropdown-item">
-                  @if(\Illuminate\Support\Str::after($permission, '.') === 'main')
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
+                  @if(\Illuminate\Support\Str::after($permissionId, '.') === 'main')
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }} / {{ $serverName }}
                   @else
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
-                  &nbsp;({{ \Illuminate\Support\Str::after($permission, '.') }})
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }}
+                  &nbsp;({{ \Illuminate\Support\Str::after($permissionId, '.') }}) / {{ $serverName }}
                   @endif
                 </a>
                 @endforeach
@@ -91,13 +95,18 @@ class="btn btn-sm btn-outline-danger dropdown-toggle dropdown-toggle-split"
               </button>
               <div class="dropdown-menu" x-placement="bottom-start">
                 @foreach($userCurrentPermissions as $permission)
-                <a onclick="removeUserPermission('{{ $server->id }}', '{{ $user->id }}', '{{ $permission }}')"
-                   class="dropdown-item">
-                  @if(\Illuminate\Support\Str::after($permission, '.') === 'main')
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
+                  <?php $serverId = $server ? $server->id : $permission->server_id; ?>
+                  <?php $serverName = $server ? $server->name : $permission->server_name; ?>
+                  <?php $permissionId = $server ? $permission : $permission->permission; ?>
+                  <?php $userId = $server ? $user->id : $permission->ynh_user_id; ?>
+                <a
+                  onclick="removeUserPermission('{{ $serverId }}', '{{ $userId }}', '{{ $permissionId }}')"
+                  class="dropdown-item">
+                  @if(\Illuminate\Support\Str::after($permissionId, '.') === 'main')
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }} / {{ $serverName }}
                   @else
-                  {{ \Illuminate\Support\Str::before($permission, '.') }}
-                  &nbsp;({{ \Illuminate\Support\Str::after($permission, '.') }})
+                  {{ \Illuminate\Support\Str::before($permissionId, '.') }}
+                  &nbsp;({{ \Illuminate\Support\Str::after($permissionId, '.') }}) / {{ $serverName }}
                   @endif
                 </a>
                 @endforeach
diff --git a/resources/views/cyber-todo.blade.php b/resources/views/cyber-todo.blade.php
index 2f4d4cd..6861d9f 100644
--- a/resources/views/cyber-todo.blade.php
+++ b/resources/views/cyber-todo.blade.php
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>My Cyber TODO (Powered by {{ config('app.name') }})</title>
+  <title>Cyber TODO (Powered by {{ config('app.name') }})</title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
   <meta name="keywords"
         content="honeypot, vulnerability scanner, assets discovery, attack surface management, shadow it">
@@ -211,7 +211,9 @@
   <div class="content">
     <h1>Cyber TODO</h1>
     <p>
-      {{ __('Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.') }}
+      {{ __('Someone has shared vulnerabilities with you on assets for which you are responsible. Please fix the
+      vulnerabilities below and check the corresponding box. A new scan will verify that the problem has been solved.')
+      }}
     </p>
     <div class="loader" id="loader"></div>
     <div id="vulnerabilities" class="list d-none"></div>
diff --git a/resources/views/home/cards/_adversarymeter.blade.php b/resources/views/home/cards/_adversarymeter.blade.php
deleted file mode 100644
index 32ee1a2..0000000
--- a/resources/views/home/cards/_adversarymeter.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@if(Auth::user()->canUseAdversaryMeter())
-<div class="card mb-3 border" style="background-color:#ff4d4d;">
-  <div class="row">
-    <div class="col text-center p-3">
-      <a href="{{ App\Modules\AdversaryMeter\Helpers\AdversaryMeter::redirectUrl() }}" target="_blank" class="text-white">
-        Launch AdversaryMeter...
-      </a>
-    </div>
-  </div>
-</div>
-@endif
\ No newline at end of file
diff --git a/resources/views/home/index.blade.php b/resources/views/index.blade.php
similarity index 100%
rename from resources/views/home/index.blade.php
rename to resources/views/index.blade.php
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
deleted file mode 100644
index 80e1659..0000000
--- a/resources/views/welcome.blade.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<!doctype html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>{{ config('app.name') }}</title>
-
-        <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #00264b;
-                color: white;
-                font-family: 'Nunito', sans-serif;
-                font-weight: 200;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .links > a {
-                color: white;
-                padding: 0 25px;
-                font-size: 13px;
-                font-weight: 600;
-                letter-spacing: .1rem;
-                text-decoration: none;
-                text-transform: uppercase;
-            }
-
-            .links > a:hover {
-              color: #f8b502;
-            }
-
-            .m-b-md {
-                margin-bottom: 30px;
-            }
-
-            .container {
-              display: flex;
-              align-items: center;
-              justify-content: center
-            }
-
-            img {
-              max-width: 100px;
-              max-height:100px;
-            }
-
-            .text {
-              font-size: 100px;
-              padding-left: 20px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
-                <div class="top-right links">
-                    @auth
-                        <a href="{{ url('/home') }}">{{ __('Home') }}</a>
-                    @else
-                        <a href="{{ route('login') }}">{{ __('Login') }}</a>
-
-                        @if (Route::has('register'))
-                            <a href="{{ route('register') }}">{{ __('Register') }}</a>
-                        @endif
-                    @endauth
-                </div>
-            @endif
-
-            <div class="content">
-                <div class=" m-b-md">
-                    <div class="container">
-                        <div class="image">
-                          <img src="{{ asset('images/logo.png') }}" alt="Cywise's logo">
-                        </div>
-                        <div class="text">
-                          {{ config('app.name') }}
-                        </div>
-                    </div>
-                </div>
-                <div class="links">
-                    <a href="{{ route('product.index') }}">{{ __('Store') }}</a>
-                    <a href="{{ config('konekt.app_shell.ui.url') }}">{{ __('Admin') }}</a>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>