diff --git a/WatchIt.WebAPI/WatchIt.WebAPI.WorkerServices/DeleteExpiredRefreshTokensService.cs b/WatchIt.WebAPI/WatchIt.WebAPI.WorkerServices/DeleteExpiredRefreshTokensService.cs
index 7c43b54..00c8d99 100644
--- a/WatchIt.WebAPI/WatchIt.WebAPI.WorkerServices/DeleteExpiredRefreshTokensService.cs
+++ b/WatchIt.WebAPI/WatchIt.WebAPI.WorkerServices/DeleteExpiredRefreshTokensService.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using WatchIt.Database;
@@ -5,13 +6,36 @@ using WatchIt.Database.Model.Account;
 
 namespace WatchIt.WebAPI.WorkerServices;
 
-public class DeleteExpiredRefreshTokensService(ILogger<DeleteExpiredRefreshTokensService> logger, DatabaseContext database) : BackgroundService
+public class DeleteExpiredRefreshTokensService : BackgroundService
 {
+    #region SERVICES
+
+    private readonly ILogger<DeleteExpiredRefreshTokensService> _logger;
+    private readonly IServiceScopeFactory _serviceScopeFactory;
+    
+    #endregion
+    
+    
+    
+    #region CONSTRUCTORS
+
+    public DeleteExpiredRefreshTokensService(ILogger<DeleteExpiredRefreshTokensService> logger, IServiceScopeFactory serviceScopeFactory)
+    {
+        _logger = logger;
+        _serviceScopeFactory = serviceScopeFactory;
+    }
+    
+    #endregion
+    
+    
+    
+    #region PUBLIC METHODS
+    
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         while (!stoppingToken.IsCancellationRequested)
         {
-            logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+            _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
             
             Task delayTask = Task.Delay(300000, stoppingToken);
             Task actionTask = Action();
@@ -22,9 +46,16 @@ public class DeleteExpiredRefreshTokensService(ILogger<DeleteExpiredRefreshToken
 
     protected async Task Action()
     {
-        IEnumerable<AccountRefreshToken> tokens = database.AccountRefreshTokens.Where(x => x.ExpirationDate < DateTime.UtcNow);
-        database.AccountRefreshTokens.AttachRange(tokens);
-        database.AccountRefreshTokens.RemoveRange(tokens);
-        await database.SaveChangesAsync();
+        using (IServiceScope scope = _serviceScopeFactory.CreateScope())
+        {
+            DatabaseContext database = scope.ServiceProvider.GetService<DatabaseContext>();
+            
+            IEnumerable<AccountRefreshToken> tokens = database.AccountRefreshTokens.Where(x => x.ExpirationDate < DateTime.UtcNow);
+            database.AccountRefreshTokens.AttachRange(tokens);
+            database.AccountRefreshTokens.RemoveRange(tokens);
+            await database.SaveChangesAsync();
+        }
     }
+    
+    #endregion
 }
\ No newline at end of file
diff --git a/WatchIt.WebAPI/WatchIt.WebAPI/Program.cs b/WatchIt.WebAPI/WatchIt.WebAPI/Program.cs
index c09a658..212d435 100644
--- a/WatchIt.WebAPI/WatchIt.WebAPI/Program.cs
+++ b/WatchIt.WebAPI/WatchIt.WebAPI/Program.cs
@@ -121,7 +121,7 @@ public static class Program
     
     private static WebApplicationBuilder SetupDatabase(this WebApplicationBuilder builder)
     {
-        builder.Services.AddDbContext<DatabaseContext>(x => x.UseLazyLoadingProxies().UseNpgsql(builder.Configuration.GetConnectionString("Default")), ServiceLifetime.Singleton);
+        builder.Services.AddDbContext<DatabaseContext>(x => x.UseLazyLoadingProxies().UseNpgsql(builder.Configuration.GetConnectionString("Default")), ServiceLifetime.Transient);
         return builder;
     }
 
@@ -134,15 +134,15 @@ public static class Program
     private static WebApplicationBuilder SetupServices(this WebApplicationBuilder builder)
     {
         // Utility
-        builder.Services.AddSingleton<IConfigurationService, ConfigurationService>();
-        builder.Services.AddSingleton<ITokensService, TokensService>();
-        builder.Services.AddSingleton<IUserService, UserService>();
+        builder.Services.AddTransient<IConfigurationService, ConfigurationService>();
+        builder.Services.AddTransient<ITokensService, TokensService>();
+        builder.Services.AddTransient<IUserService, UserService>();
         
         // Controller
-        builder.Services.AddSingleton<IAccountsControllerService, AccountsControllerService>();
-        builder.Services.AddSingleton<IGenresControllerService, GenresControllerService>();
-        builder.Services.AddSingleton<IMoviesControllerService, MoviesControllerService>();
-        builder.Services.AddSingleton<IMediaControllerService, MediaControllerService>();
+        builder.Services.AddTransient<IAccountsControllerService, AccountsControllerService>();
+        builder.Services.AddTransient<IGenresControllerService, GenresControllerService>();
+        builder.Services.AddTransient<IMoviesControllerService, MoviesControllerService>();
+        builder.Services.AddTransient<IMediaControllerService, MediaControllerService>();
         
         return builder;
     }
diff --git a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs
index 8e46e30..3646136 100644
--- a/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs
+++ b/WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/JWTAuthenticationStateProvider.cs
@@ -113,8 +113,13 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
     private async Task<string?> Refresh(string refreshToken)
     {
         AuthenticateResponse? response = null;
+
+        void SetResponse(AuthenticateResponse data)
+        {
+            response = data;
+        }
         
-        await _accountsService.AuthenticateRefresh((data) => response = data);
+        await _accountsService.AuthenticateRefresh(SetResponse);
 
         if (response is not null)
         {
@@ -151,8 +156,9 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
     
     public static DateTime ConvertFromUnixTimestamp(int timestamp)
     {
-        DateTime origin = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-        return origin.AddSeconds(timestamp);
+        DateTime date = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+        date = date.AddSeconds(timestamp);
+        return date;
     }
     
     #endregion
diff --git a/WatchIt.Website/WatchIt.Website/App.razor b/WatchIt.Website/WatchIt.Website/App.razor
index 50e5622..eb24a1c 100644
--- a/WatchIt.Website/WatchIt.Website/App.razor
+++ b/WatchIt.Website/WatchIt.Website/App.razor
@@ -9,8 +9,8 @@
     <link rel="icon" type="image/png" href="favicon.png"/>
     
     <!-- CSS -->
-    <link rel="stylesheet" href="app.css?version=0.7"/>
-    <link rel="stylesheet" href="WatchIt.Website.styles.css?version=0.7"/>
+    <link rel="stylesheet" href="app.css?version=0.13"/>
+    <link rel="stylesheet" href="WatchIt.Website.styles.css?version=0.12"/>
     
     <!-- BOOTSTRAP -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
@@ -25,8 +25,8 @@
 </head>
 
 <body>
-<Routes @rendermode="InteractiveServer"/>
-<script src="_framework/blazor.web.js"></script>
+    <Routes @rendermode="InteractiveServer"/>
+    <script src="_framework/blazor.web.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor
index 231d622..f1e87af 100644
--- a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor
+++ b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor
@@ -4,22 +4,36 @@
         <br/>
         <InputFile id="posterInput" class="form-control my-1" OnChange="LoadPoster" disabled=@(!Id.HasValue) autocomplete="off"/>
         
-        @if (_posterChanged)
+        @if (_posterChanged || !string.IsNullOrWhiteSpace(_actualPosterBase64))
         {
-            <div id="posterButtons" class="container-fluid mt-2">
-                <div class="row">
-                    <button type="button" class="col btn btn-secondary me-1" @onclick="SavePoster" disabled=@(!Id.HasValue) autocomplete="off">Save poster</button>
-                    <button type="button" class="col btn btn-danger ms-1" @onclick="CancelPoster" disabled=@(!Id.HasValue) autocomplete="off">Drop changes</button>
+            <div id="posterButtons" class="container-fluid mt-2 p-0">
+                <div class="row gx-1">
+                    @if (_posterChanged)
+                    {
+                        <div class="col">
+                            <button type="button" class="btn btn-secondary btn-block btn-stretch-x" @onclick="SavePoster" disabled=@(!Id.HasValue || _posterLoading) autocomplete="off">Save poster</button>
+                        </div>
+                        <div class="col">
+                            <button type="button" class="btn btn-danger btn-block btn-stretch-x" @onclick="CancelPoster" disabled=@(!Id.HasValue || _posterLoading) autocomplete="off">Drop changes</button>
+                        </div>
+                    }
+                    else if (!string.IsNullOrWhiteSpace(_actualPosterBase64))
+                    {
+                        <div class="col">
+                            <button type="button" class="btn btn-danger btn-block btn-stretch-x" @onclick="DeletePoster" disabled=@(!Id.HasValue || _posterLoading) autocomplete="off">Delete poster</button>
+                        </div>
+                    }
+                    @if (_posterLoading)
+                    {
+                        <div class="col-auto">
+                            <div class="d-flex align-items-center justify-content-center">
+                                <div class="spinner-border" role="status"></div>
+                            </div>
+                        </div>
+                    }
                 </div>
             </div>
         }
-        else
-        {
-            if (!string.IsNullOrWhiteSpace(_actualPosterBase64))
-            {
-                <button id="posterButtons" type="button" class="btn btn-danger form-control mt-1" @onclick="DeletePoster" disabled=@(!Id.HasValue) autocomplete="off">Delete poster</button>
-            }
-        }
     </div>
     <div class="col rounded-3 panel panel-regular m-1 p-3">
         <EditForm Model="Data" FormName="MediaInfo">
@@ -73,6 +87,8 @@
     </div>
 </div>
 
+
+
 <style>
     #posterInput, #posterButtons {
         width: 300px;
diff --git a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.cs b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.cs
index 68d7e8b..e99b263 100644
--- a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.cs
+++ b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.cs
@@ -37,6 +37,7 @@ public partial class MediaFormComponent : ComponentBase
     private bool _posterChanged = false;
     private string? _posterBase64 = null;
     private string? _posterMediaType = null;
+    private bool _posterLoading = false;
     
     #endregion
 
@@ -84,6 +85,7 @@ public partial class MediaFormComponent : ComponentBase
             _actualPosterBase64 = _posterBase64;
             _actualPosterMediaType = _posterMediaType;
             _posterChanged = false;
+            _posterLoading = false;
         }
 
         MediaPosterRequest data = new MediaPosterRequest
@@ -92,6 +94,7 @@ public partial class MediaFormComponent : ComponentBase
             MimeType = _posterMediaType
         };
 
+        _posterLoading = true;
         await MediaWebAPIService.PutPoster(Id.Value, data, SuccessAction);
     }
 
@@ -104,8 +107,10 @@ public partial class MediaFormComponent : ComponentBase
             _posterChanged = false;
             _posterBase64 = null;
             _posterMediaType = null;
+            _posterLoading = false;
         }
 
+        _posterLoading = true;
         await MediaWebAPIService.DeletePoster(Id.Value, SuccessAction);
     }
     
diff --git a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.css b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.css
index 06d4c28..3f0fc5a 100644
--- a/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.css
+++ b/WatchIt.Website/WatchIt.Website/Components/MediaFormComponent.razor.css
@@ -1,3 +1,5 @@
-#posterInput {
+/* IDS */
+
+#posterInput, #posterButtons {
     width: 300px;
 }
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor
index c7eee6f..a594515 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor
+++ b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor
@@ -30,27 +30,4 @@
             <NoPermissionComponent/>
         }
     </div>
-}
-
-
-@code {
-    [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
-    
-    private bool _loaded = false;
-    private bool _authenticated = false;
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            User? user = await AuthenticationService.GetUserAsync();
-            if (user is not null && user.IsAdmin)
-            {
-                _authenticated = true;
-            }
-            _loaded = true;
-            StateHasChanged();
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs
index d37b34c..2a9306a 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs
+++ b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor.cs
@@ -1,6 +1,42 @@
-namespace WatchIt.Website.Pages;
+using Microsoft.AspNetCore.Components;
+using WatchIt.Website.Services.Utility.Authentication;
 
-public class AdminPage_razor
+namespace WatchIt.Website.Pages;
+
+public partial class AdminPage
 {
+    #region SERVICE
+
+    [Inject] public IAuthenticationService AuthenticationService { get; set; } = default!;
+
+    #endregion
+
+
+
+    #region FIELDS
+
+    private bool _loaded = false;
+    private bool _authenticated = false;
+
+    #endregion
     
+    
+    
+    #region PRIVATE METHODS
+    
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            User? user = await AuthenticationService.GetUserAsync();
+            if (user is not null && user.IsAdmin)
+            {
+                _authenticated = true;
+            }
+            _loaded = true;
+            StateHasChanged();
+        }
+    }
+    
+    #endregion
 }
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor
index 2ca269d..42b5202 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor
+++ b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor
@@ -101,15 +101,10 @@
     
     
     <style>
-        html {
-            height: 100%;
-        }
-
         body {
-            background-image: url('@_background');
-
             height: 100%;
-
+            
+            background-image: url('@_background');
             background-position: center;
             background-repeat: no-repeat;
             background-size: cover;
diff --git a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.css b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.css
index 93f6b3c..35fd5d3 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.css
+++ b/WatchIt.Website/WatchIt.Website/Pages/AuthPage.razor.css
@@ -1,7 +1,13 @@
-body {
-    background-size: cover;
+/* TAGS */
+
+html {
+    height: 100%;
 }
 
+
+
+/* CLASSES */
+
 .logo {
     font-size: 60px;
     margin: 10px;
diff --git a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs
index e93d120..3383e8e 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs
+++ b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor.cs
@@ -1,6 +1,6 @@
 namespace WatchIt.Website.Pages;
 
-public class HomePage_razor
+public partial class HomePage
 {
     
 }
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MovieDataPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MovieDataPage.razor
index 51d9167..5707ab5 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/MovieDataPage.razor
+++ b/WatchIt.Website/WatchIt.Website/Pages/MovieDataPage.razor
@@ -1,6 +1 @@
-@page "/movies/{id:long}"
-
-
-@code {
-    
-}
\ No newline at end of file
+@page "/movies/{id:long}"
\ No newline at end of file
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MovieEditPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MovieEditPage.razor
index 1c085c2..991f676 100644
--- a/WatchIt.Website/WatchIt.Website/Pages/MovieEditPage.razor
+++ b/WatchIt.Website/WatchIt.Website/Pages/MovieEditPage.razor
@@ -13,7 +13,7 @@
                     <h2>@(Id is null ? "Create new movie" : $"Edit movie \"{_movieInfo.Title}\"")</h2>
                 </div>
             </div>
-            <MediaForm Data=@(_movieData) SaveDataAction=SaveData Id=@(Id) SaveDataErrors=@(_movieDataErrors) SaveDataInfo=@(_movieDataInfo)/>
+            <MediaFormComponent Data=@(_movieData) SaveDataAction=SaveData Id=@(Id) SaveDataErrors=@(_movieDataErrors) SaveDataInfo=@(_movieDataInfo)/>
         }
         else
         {
diff --git a/WatchIt.Website/WatchIt.Website/wwwroot/app.css b/WatchIt.Website/WatchIt.Website/wwwroot/app.css
index dbb43ae..122f5a6 100644
--- a/WatchIt.Website/WatchIt.Website/wwwroot/app.css
+++ b/WatchIt.Website/WatchIt.Website/wwwroot/app.css
@@ -80,4 +80,8 @@ body, html {
 .dropdown-menu-left {
     right: auto;
     left: 0;
+}
+
+.btn-stretch-x {
+    width: 100%;
 }
\ No newline at end of file