diff --git a/Components/Index.razor b/Components/Index.razor
new file mode 100644
index 0000000..56e6c47
--- /dev/null
+++ b/Components/Index.razor
@@ -0,0 +1,37 @@
+@page "/"
+@page "/{Id}"
+@using Microsoft.Extensions.Caching.Distributed
+
+@inject IDistributedCache Db
+@inject NavigationManager Navigation
+
+Startpage - Just Short It
+
+
- @if (Model.Id is null) {
-
Welcome to Just Short It!
-
The KISS single-user URL shortener!
-
Start shorting URLs
- } else {
-
@Model.ErrorMessage
- }
-
diff --git a/Pages/Index.cshtml.cs b/Pages/Index.cshtml.cs
deleted file mode 100644
index adca7c5..0000000
--- a/Pages/Index.cshtml.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Text;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Caching.Distributed;
-
-namespace JustShortIt.Pages;
-
-public class IndexModel : PageModel {
- private ILogger