diff --git a/Moonlight/App/Database/Entities/User.cs b/Moonlight/App/Database/Entities/User.cs
index 854cdd63..d9c79b27 100644
--- a/Moonlight/App/Database/Entities/User.cs
+++ b/Moonlight/App/Database/Entities/User.cs
@@ -23,6 +23,8 @@ public class User
     public string State { get; set; } = "";
     
     public string Country { get; set; } = "";
+
+    public string ServerListLayoutJson { get; set; } = "";
     
     // States
     
diff --git a/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.Designer.cs b/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.Designer.cs
new file mode 100644
index 00000000..cc09283e
--- /dev/null
+++ b/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.Designer.cs
@@ -0,0 +1,1077 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Moonlight.App.Database;
+
+#nullable disable
+
+namespace Moonlight.App.Database.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20230623235512_AddedServerListLayoutToUser")]
+    partial class AddedServerListLayoutToUser
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.CloudPanel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ApiKey")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApiUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Host")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CloudPanels");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<long>("Data")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Ongoing")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.ToTable("DdosAttacks");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Default")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.ToTable("DockerImages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SharedDomainId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("SharedDomainId");
+
+                    b.ToTable("Domains");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Allocations")
+                        .HasColumnType("int");
+
+                    b.Property<string>("BackgroundImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ConfigFiles")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallDockerImage")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallEntrypoint")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallScript")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Startup")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StartupDetection")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StopCommand")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TagsJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("DefaultValue")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.ToTable("ImageVariables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.IpBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IpBans");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LoadingMessages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AuditLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Class")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Stacktrace")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ErrorLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SecurityLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.MySqlDatabase", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("WebSpaceId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WebSpaceId");
+
+                    b.ToTable("Databases");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.NewsEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Markdown")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NewsEntries");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Fqdn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("HttpPort")
+                        .HasColumnType("int");
+
+                    b.Property<int>("MoonlightDaemonPort")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SftpPort")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Ssl")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TokenId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Nodes");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("NodeAllocations");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NotificationClientId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NotificationClientId");
+
+                    b.ToTable("NotificationActions");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationClients");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Identifier")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Revokes");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ArchiveId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Cpu")
+                        .HasColumnType("int");
+
+                    b.Property<long>("Disk")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("DockerImageIndex")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Installing")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsCleanupException")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("MainAllocationId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("Memory")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OverrideStartup")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArchiveId");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("MainAllocationId");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<long>("Bytes")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Created")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("ServerBackups");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("ServerVariables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("CloudflareId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SharedDomains");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.StatisticsData", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Chart")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Statistics");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LimitsJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscriptions");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SupportChatMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Answer")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Attachment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsQuestion")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("QuestionType")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RecipientId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SenderId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RecipientId");
+
+                    b.HasIndex("SenderId");
+
+                    b.ToTable("SupportChatMessages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Admin")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Country")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("CurrentSubscriptionId")
+                        .HasColumnType("int");
+
+                    b.Property<ulong>("DiscordId")
+                        .HasColumnType("bigint unsigned");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HasRated")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LastVisitedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Rating")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ServerListLayoutJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SubscriptionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("SubscriptionSince")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("SupportPending")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("TokenValidTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("TotpEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("TotpSecret")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrentSubscriptionId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("CloudPanelId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Domain")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("VHostTemplate")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CloudPanelId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("WebSpaces");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
+                        .WithMany()
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Node");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Image", null)
+                        .WithMany("DockerImages")
+                        .HasForeignKey("ImageId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain")
+                        .WithMany()
+                        .HasForeignKey("SharedDomainId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+
+                    b.Navigation("SharedDomain");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Image", null)
+                        .WithMany("Variables")
+                        .HasForeignKey("ImageId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.MySqlDatabase", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.WebSpace", "WebSpace")
+                        .WithMany("Databases")
+                        .HasForeignKey("WebSpaceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("WebSpace");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Node", null)
+                        .WithMany("Allocations")
+                        .HasForeignKey("NodeId");
+
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Allocations")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient")
+                        .WithMany()
+                        .HasForeignKey("NotificationClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NotificationClient");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.ServerBackup", "Archive")
+                        .WithMany()
+                        .HasForeignKey("ArchiveId");
+
+                    b.HasOne("Moonlight.App.Database.Entities.Image", "Image")
+                        .WithMany()
+                        .HasForeignKey("ImageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation")
+                        .WithMany()
+                        .HasForeignKey("MainAllocationId");
+
+                    b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
+                        .WithMany()
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Archive");
+
+                    b.Navigation("Image");
+
+                    b.Navigation("MainAllocation");
+
+                    b.Navigation("Node");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Backups")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Variables")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SupportChatMessage", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Recipient")
+                        .WithMany()
+                        .HasForeignKey("RecipientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                        .WithMany()
+                        .HasForeignKey("SenderId");
+
+                    b.Navigation("Recipient");
+
+                    b.Navigation("Sender");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription")
+                        .WithMany()
+                        .HasForeignKey("CurrentSubscriptionId");
+
+                    b.Navigation("CurrentSubscription");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.CloudPanel", "CloudPanel")
+                        .WithMany()
+                        .HasForeignKey("CloudPanelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CloudPanel");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b =>
+                {
+                    b.Navigation("DockerImages");
+
+                    b.Navigation("Variables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b =>
+                {
+                    b.Navigation("Allocations");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.Navigation("Allocations");
+
+                    b.Navigation("Backups");
+
+                    b.Navigation("Variables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.WebSpace", b =>
+                {
+                    b.Navigation("Databases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.cs b/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.cs
new file mode 100644
index 00000000..10a12c7b
--- /dev/null
+++ b/Moonlight/App/Database/Migrations/20230623235512_AddedServerListLayoutToUser.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Moonlight.App.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedServerListLayoutToUser : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ServerListLayoutJson",
+                table: "Users",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ServerListLayoutJson",
+                table: "Users");
+        }
+    }
+}
diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
index f4aaf207..ab91e59b 100644
--- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
+++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
@@ -780,6 +780,10 @@ namespace Moonlight.App.Database.Migrations
                     b.Property<int>("Rating")
                         .HasColumnType("int");
 
+                    b.Property<string>("ServerListLayoutJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
                     b.Property<string>("State")
                         .IsRequired()
                         .HasColumnType("longtext");
diff --git a/Moonlight/App/Models/Misc/ServerGroup.cs b/Moonlight/App/Models/Misc/ServerGroup.cs
new file mode 100644
index 00000000..07694ad8
--- /dev/null
+++ b/Moonlight/App/Models/Misc/ServerGroup.cs
@@ -0,0 +1,7 @@
+namespace Moonlight.App.Models.Misc;
+
+public class ServerGroup
+{
+    public string Name { get; set; } = "";
+    public List<string> Servers { get; set; } = new();
+}
\ No newline at end of file
diff --git a/Moonlight/Pages/_Layout.cshtml b/Moonlight/Pages/_Layout.cshtml
index a4f60ffb..9cb8fdee 100644
--- a/Moonlight/Pages/_Layout.cshtml
+++ b/Moonlight/Pages/_Layout.cshtml
@@ -103,6 +103,8 @@
 <script src="/_content/CurrieTechnologies.Razor.SweetAlert2/sweetAlert2.min.js"></script>
 <script src="/_content/Blazor.ContextMenu/blazorContextMenu.min.js"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/@@shopify/draggable@1.0.0-beta.11/lib/draggable.bundle.js"></script>
+
 <script src="https://www.google.com/recaptcha/api.js"></script>
 
 <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.7.0/lib/xterm-addon-fit.min.js"></script>
diff --git a/Moonlight/Shared/Views/Servers/Index.razor b/Moonlight/Shared/Views/Servers/Index.razor
index dcc2405d..9ee4040c 100644
--- a/Moonlight/Shared/Views/Servers/Index.razor
+++ b/Moonlight/Shared/Views/Servers/Index.razor
@@ -1,13 +1,414 @@
 @page "/servers"
-@using Moonlight.App.Repositories.Servers
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Database.Entities
+@using Moonlight.App.Helpers
+@using Moonlight.App.Models.Misc
+@using Moonlight.App.Repositories
 @using Moonlight.App.Services
+@using Newtonsoft.Json
 
-@inject ServerRepository ServerRepository
+@inject Repository<Server> ServerRepository
+@inject Repository<User> UserRepository
+@inject SmartTranslateService SmartTranslateService
 @inject IServiceScopeFactory ServiceScopeFactory
+@inject IJSRuntime JsRuntime
 
-<LazyLoader Load="Load">
+<LazyLoader @ref="LazyLoader" Load="Load">
+<div class="mx-auto">
+<div class="card card-body">
+    <div class="d-flex justify-content-between">
+        <span class="badge badge-primary badge-lg px-5 me-4">Beta</span>
+        @if (EditMode)
+        {
+            <div>
+                <WButton Text="@(SmartTranslateService.Translate("Finish editing layout"))"
+                         CssClasses="btn-secondary"
+                         OnClick="async () => await SetEditMode(false)">
+                </WButton>
+                <WButton Text="@(SmartTranslateService.Translate("New group"))"
+                         WorkingText=""
+                         CssClasses="btn-primary"
+                         OnClick="AddGroup">
+                </WButton>
+            </div>
+        }
+        else
+        {
+            <WButton Text="@(SmartTranslateService.Translate("Edit layout"))"
+                     CssClasses="btn-secondary"
+                     OnClick="async () => await SetEditMode(true)">
+            </WButton>
+        }
+    </div>
+</div>
+@foreach (var group in ServerGroups)
+{
+            @*
+            <div class="card my-2">
+                <div class="card-header">
+                    <div class="card-title">
+                        @if (EditMode)
+                        {
+                            <input @bind="group.Name" class="form-control"/>
+                        }
+                        else
+                        {
+                            <span>@(group.Name)</span>
+                        }
+                    </div>
+                    @if (EditMode)
+                    {
+                        <div class="card-toolbar">
+                            <WButton Text="@(SmartTranslateService.Translate("Remove group"))"
+                                     WorkingText=""
+                                     CssClasses="btn-danger"
+                                     OnClick="async () => await RemoveGroup(group)">
+                            </WButton>
+                        </div>
+                    }
+                </div>
+                <div class="card-body">
+                    <div class="row min-h-200px draggable-zone" ml-server-group="@(group.Name)">
+                        @foreach (var id in group.Servers)
+                        {
+                            var server = AllServers.First(x => x.Id.ToString() == id);
+
+                            <div class="col-12 col-md-3 p-3 draggable" ml-server-id="@(server.Id)">
+                                <div class="card bg-secondary">
+                                    <div class="card-header">
+                                        <div class="card-title">
+                                            <h3 class="card-label">@(server.Name)</h3>
+                                        </div>
+                                        @if (EditMode)
+                                        {
+                                            <div class="card-toolbar">
+                                                <a href="#" class="btn btn-icon btn-sm btn-hover-light-primary draggable-handle">
+                                                    <i class="bx bx-md bx-move"></i>
+                                                </a>
+                                            </div>
+                                        }
+                                    </div>
+                                    <div class="card-body">
+                                        @if (EditMode)
+                                        {
+                                            <TL>Hidden in edit mode</TL>
+                                        }
+                                        else
+                                        {
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>*@
+    <div class="accordion my-3" id="serverListGroup@(group.GetHashCode())">
+        <div class="accordion-item">
+            <h2 class="accordion-header" id="serverListGroup-header@(group.GetHashCode())">
+                <button class="accordion-button fs-4 fw-semibold collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#serverListGroup-body@(group.GetHashCode())" aria-expanded="false" aria-controls="serverListGroup-body@(group.GetHashCode())">
+                    <div class="d-flex justify-content-between">
+                        <div>
+                            @if (EditMode)
+                            {
+                                <input @bind="group.Name" class="form-control"/>
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(group.Name))
+                                {
+                                    <TL>Unsorted servers</TL>
+                                }
+                                else
+                                {
+                                    <span>@(group.Name)</span>
+                                }
+                            }
+                        </div>
+                        <div>
+                            @if (EditMode)
+                            {
+                                <WButton Text="@(SmartTranslateService.Translate("Remove group"))"
+                                         WorkingText=""
+                                         CssClasses="btn-danger"
+                                         OnClick="async () => await RemoveGroup(group)">
+                                </WButton>
+                            }
+                        </div>
+                    </div>
+                </button>
+            </h2>
+            <div id="serverListGroup-body@(group.GetHashCode())" class="accordion-collapse collapse" aria-labelledby="serverListGroup-header@(group.GetHashCode())" data-bs-parent="#serverListGroup">
+                <div class="accordion-body">
+                    <div class="row min-h-200px draggable-zone" ml-server-group="@(group.Name)">
+                        @foreach (var id in group.Servers)
+                        {
+                            var server = AllServers.First(x => x.Id.ToString() == id);
+
+                            <div class="col-12 col-md-3 p-3 draggable" ml-server-id="@(server.Id)">
+                                <a class="invisible-a" href="/server/@(server.Uuid)">
+                                    <div class="card bg-secondary">
+                                        <div class="card-header">
+                                            <div class="card-title">
+                                                <span class="card-label">@(server.Name)</span>
+                                            </div>
+                                            @if (EditMode)
+                                            {
+                                                <div class="card-toolbar">
+                                                    <a href="#" class="btn btn-icon btn-sm btn-hover-light-primary draggable-handle">
+                                                        <i class="bx bx-md bx-move"></i>
+                                                    </a>
+                                                </div>
+                                            }
+                                        </div>
+                                        <div class="card-body">
+                                            @if (EditMode)
+                                            {
+                                                <TL>Hidden in edit mode</TL>
+                                            }
+                                            else
+                                            {
+                                                <span class="card-text fs-6">
+                                                    @(Math.Round(server.Memory / 1024D, 2)) GB / @(Math.Round(server.Disk / 1024D, 2)) GB / @(server.Node.Name) <span class="text-gray-700">- @(server.Image.Name)</span>
+                                                </span>
+                                                <div class="card-text my-1 fs-6 fw-bold">
+                                                    @(server.Node.Fqdn):@(server.MainAllocation.Port)
+                                                </div>
+                                                <div class="card-text fs-6">
+                                                    @if (StatusCache.ContainsKey(server))
+                                                    {
+                                                        var status = StatusCache[server];
+
+                                                        switch (status)
+                                                        {
+                                                            case "offline":
+                                                                <span class="text-danger">
+                                                                    <TL>Offline</TL>
+                                                                </span>
+                                                                break;
+                                                            case "stopping":
+                                                                <span class="text-warning">
+                                                                    <TL>Stopping</TL>
+                                                                </span>
+                                                                break;
+                                                            case "starting":
+                                                                <span class="text-warning">
+                                                                    <TL>Starting</TL>
+                                                                </span>
+                                                                break;
+                                                            case "running":
+                                                                <span class="text-success">
+                                                                    <TL>Running</TL>
+                                                                </span>
+                                                                break;
+                                                            case "failed":
+                                                                <span class="text-gray-400">
+                                                                    <TL>Failed</TL>
+                                                                </span>
+                                                                break;
+                                                            default:
+                                                                <span class="text-danger">
+                                                                    <TL>Offline</TL>
+                                                                </span>
+                                                                break;
+                                                        }
+                                                    }
+                                                    else
+                                                    {
+                                                        <span class="text-gray-400">
+                                                            <TL>Loading</TL>
+                                                        </span>
+                                                    }
+                                                </div>
+                                            }
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+</div>
+</LazyLoader>
+
+@code
+{
+    [CascadingParameter]
+    public User User { get; set; }
+
+    private Server[] AllServers;
+    private LazyLoader LazyLoader;
+    private readonly Dictionary<Server, string> StatusCache = new();
+
+    private List<ServerGroup> ServerGroups = new();
+    private bool EditMode = false;
+
+    private async Task Load(LazyLoader arg)
+    {
+        AllServers = ServerRepository
+            .Get()
+            .Include(x => x.Owner)
+            .Include(x => x.MainAllocation)
+            .Include(x => x.Node)
+            .Include(x => x.Image)
+            .Where(x => x.Owner.Id == User.Id)
+            .OrderBy(x => x.Name)
+            .ToArray();
+
+
+        if (string.IsNullOrEmpty(User.ServerListLayoutJson))
+        {
+            ServerGroups.Add(new()
+            {
+                Name = "",
+                Servers = AllServers.Select(x => x.Id.ToString()).ToList()
+            });
+        }
+        else
+        {
+            ServerGroups = (JsonConvert.DeserializeObject<ServerGroup[]>(
+                User.ServerListLayoutJson) ?? Array.Empty<ServerGroup>()).ToList();
+        }
+
+        foreach (var server in AllServers)
+        {
+            Task.Run(async () =>
+            {
+                try
+                {
+                    using var scope = ServiceScopeFactory.CreateScope();
+                    var serverService = scope.ServiceProvider.GetRequiredService<ServerService>();
+
+                    AddStatus(server, (await serverService.GetDetails(server)).State);
+                }
+                catch (Exception e)
+                {
+                    AddStatus(server, "failed");
+                }
+            });
+        }
+    }
+
+    private async Task AddGroup()
+    {
+        ServerGroups.Insert(0, new()
+        {
+            Name = "New group"
+        });
+
+        await InvokeAsync(StateHasChanged);
+        await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
+    }
+
+    private async Task RemoveGroup(ServerGroup group)
+    {
+        ServerGroups.Remove(group);
+        await EnsureAllServersInGroups();
+
+        await InvokeAsync(StateHasChanged);
+
+        await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
+    }
+
+    private async Task SetEditMode(bool toggle)
+    {
+        EditMode = toggle;
+        await InvokeAsync(StateHasChanged);
+
+        if (EditMode)
+        {
+            await EnsureAllServersInGroups();
+            await InvokeAsync(StateHasChanged);
+
+            await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
+        }
+        else
+        {
+            var json = JsonConvert.SerializeObject(await GetGroupsFromClient());
+            User.ServerListLayoutJson = json;
+            UserRepository.Update(User);
+
+            await LazyLoader.Reload();
+        }
+    }
+
+    private async Task<ServerGroup[]> GetGroupsFromClient()
+    {
+        var serverGroups = await JsRuntime.InvokeAsync<ServerGroup[]>("moonlight.serverList.getData");
+
+    // Check user data to prevent users from doing stupid stuff
+        foreach (var serverGroup in serverGroups)
+        {
+            if (serverGroup.Name.Length > 30)
+            {
+                Logger.Verbose("Server list group lenght too long");
+                return Array.Empty<ServerGroup>();
+            }
+
+            if (serverGroup.Servers.Any(x => AllServers.All(y => y.Id.ToString() != x)))
+            {
+                Logger.Verbose("User tried to add a server in his server list which he has no access to");
+                return Array.Empty<ServerGroup>();
+            }
+        }
+
+        return serverGroups;
+    }
+
+    private Task EnsureAllServersInGroups()
+    {
+        var presentInGroup = new List<Server>();
+
+        foreach (var group in ServerGroups)
+        {
+            foreach (var id in group.Servers)
+                presentInGroup.Add(AllServers.First(x => x.Id.ToString() == id));
+        }
+
+        var serversMissing = new List<Server>();
+
+        foreach (var server in AllServers)
+        {
+            if (presentInGroup.All(x => x.Id != server.Id))
+                serversMissing.Add(server);
+        }
+
+        if (serversMissing.Any())
+        {
+            var defaultGroup = ServerGroups.FirstOrDefault(x => x.Name == "");
+
+            if (defaultGroup == null)
+            {
+                defaultGroup = new ServerGroup()
+                {
+                    Name = ""
+                };
+
+                ServerGroups.Add(defaultGroup);
+            }
+
+            foreach (var server in serversMissing)
+                defaultGroup.Servers.Add(server.Id.ToString());
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private void AddStatus(Server server, string status)
+    {
+        lock (StatusCache)
+        {
+            StatusCache.Add(server, status);
+            InvokeAsync(StateHasChanged);
+        }
+    }
+}
+
+@*
 @if (AllServers.Any())
 {
     if (UseSortedServerView)
@@ -207,57 +608,4 @@ else
         </div>
     </div>
 </div>
-</LazyLoader>
-
-@code
-{
-    [CascadingParameter]
-    public User User { get; set; }
-
-    private Server[] AllServers;
-    private readonly Dictionary<Server, string> StatusCache = new();
-
-    private bool UseSortedServerView = false;
-
-    private Task Load(LazyLoader arg)
-    {
-        AllServers = ServerRepository
-            .Get()
-            .Include(x => x.Owner)
-            .Include(x => x.MainAllocation)
-            .Include(x => x.Node)
-            .Include(x => x.Image)
-            .Where(x => x.Owner.Id == User.Id)
-            .OrderBy(x => x.Name)
-            .ToArray();
-
-        foreach (var server in AllServers)
-        {
-            Task.Run(async () =>
-            {
-                try
-                {
-                    using var scope = ServiceScopeFactory.CreateScope();
-                    var serverService = scope.ServiceProvider.GetRequiredService<ServerService>();
-
-                    AddStatus(server, (await serverService.GetDetails(server)).State);
-                }
-                catch (Exception e)
-                {
-                    AddStatus(server, "failed");
-                }
-            });
-        }
-
-        return Task.CompletedTask;
-    }
-
-    private void AddStatus(Server server, string status)
-    {
-        lock (StatusCache)
-        {
-            StatusCache.Add(server, status);
-            InvokeAsync(StateHasChanged);
-        }
-    }
-}
\ No newline at end of file
+*@
\ No newline at end of file
diff --git a/Moonlight/wwwroot/assets/js/moonlight.js b/Moonlight/wwwroot/assets/js/moonlight.js
index 3d129ec8..d096446d 100644
--- a/Moonlight/wwwroot/assets/js/moonlight.js
+++ b/Moonlight/wwwroot/assets/js/moonlight.js
@@ -354,8 +354,6 @@
                 moonlight.keyListener.listener = (event) => 
                 {
                     // filter here what key events should be sent to moonlight
-                    
-                    console.log(event);
 
                     if(event.code === "KeyS" && event.ctrlKey)
                     {
@@ -370,5 +368,54 @@
             {
                 window.removeEventListener('keydown', moonlight.keyListener.listener);
             }
+        },
+        serverList: {
+            init: function ()
+            {
+                if(moonlight.serverList.Swappable)
+                {
+                    moonlight.serverList.Swappable.destroy();
+                }
+                
+                let containers = document.querySelectorAll(".draggable-zone");
+
+                if (containers.length !== 0) 
+                {
+                    moonlight.serverList.Swappable = new Draggable.Sortable(containers, {
+                        draggable: ".draggable",
+                        handle: ".draggable .draggable-handle",
+                        mirror: {
+                            //appendTo: selector,
+                            appendTo: "body",
+                            constrainDimensions: true
+                        }
+                    });
+                }
+            },
+            getData: function ()
+            {
+                let groups = new Array();
+
+                let groupElements = document.querySelectorAll('[ml-server-group]');
+                
+                groupElements.forEach(groupElement => {
+                   let group = new Object();
+                   group.name = groupElement.attributes.getNamedItem("ml-server-group").value;
+
+                   let servers = new Array();
+                   let serverElements = groupElement.querySelectorAll("[ml-server-id]");
+                   
+                   serverElements.forEach(serverElement => {
+                      let id = serverElement.attributes.getNamedItem("ml-server-id").value;
+                      
+                      servers.push(id);
+                   });
+                   
+                   group.servers = servers;
+                   groups.push(group);
+                });
+
+                return groups;
+            }
         }
     };
\ No newline at end of file