diff --git a/app/Observer/UserObserver.php b/app/Observers/UserObserver.php
similarity index 100%
rename from app/Observer/UserObserver.php
rename to app/Observers/UserObserver.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index dca968bb5..982b462ec 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,8 +4,7 @@ namespace App\Providers;
 
 use App\Observers\UserObserver;
 use App\User;
-use Auth;
-use Horizon;
+use Auth, Horizon, URL;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
@@ -43,17 +42,8 @@ class AppServiceProvider extends ServiceProvider
         });
 
         Blade::directive('prettySize', function ($expression) {
-            $size = intval($expression);
-            $precision = 0;
-            $short = true;
-            $units = $short ?
-                ['B', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'] :
-                ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-            for ($i = 0; ($size / 1024) > 0.9; $i++, $size /= 1024) {
-            }
-            $res = round($size, $precision).$units[$i];
-
-            return "<?php echo '$res'; ?>";
+            $size = \App\Util\Lexer\PrettyNumber::size($expression);
+            return "<?php echo '$size'; ?>";
         });
 
         Blade::directive('maxFileSize', function () {