diff --git a/AccessQueuePlayground/Components/Pages/Home.razor b/AccessQueuePlayground/Components/Pages/Home.razor
index 33cd1d9..b9dc7c2 100644
--- a/AccessQueuePlayground/Components/Pages/Home.razor
+++ b/AccessQueuePlayground/Components/Pages/Home.razor
@@ -8,7 +8,6 @@
 <PageTitle>AccessQueue Playground</PageTitle>
 
 <Button Color="ButtonColor.Success" @onclick="AddUser">Add User</Button>
-<Button Color="ButtonColor.Primary" @onclick="Refresh">Refresh</Button>
 
 @if (Status != null)
 {
@@ -23,23 +22,23 @@
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
 	</Grid>
 	<h2>Users in queue</h2>
-	<Grid TItem="User" Data="Status.QueuedUsers" Class="table table-bordered mt-3" AllowSorting>
+	<Grid TItem="User" Data="Status.QueuedUsers" Class="table table-bordered mt-3">
 		<GridColumns>
-			<GridColumn TItem="User" HeaderText="Id" PropertyName="Id" SortKeySelector="item => item.Id">
+			<GridColumn TItem="User" HeaderText="Id" PropertyName="Id">
 				@context.Id
 			</GridColumn>
-			<GridColumn TItem="User" HeaderText="Queue Postition" PropertyName="LatestResponse?.RequestsAhead" SortKeySelector="item => item.LatestResponse.RequestsAhead">
+			<GridColumn TItem="User" HeaderText="Queue Postition" PropertyName="LatestResponse?.RequestsAhead">
 				@(context.LatestResponse?.RequestsAhead ?? 0 + 1)
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
@@ -52,7 +51,7 @@
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
@@ -77,19 +76,14 @@
 		});
 	}
 
-	public void Refresh()
-	{
-		Status = Manager.GetStatus();
-	}
-
 	public void AddUser()
 	{
 		Manager.AddUser();
 		Status = Manager.GetStatus();
 	}
 
-	public void ToggleUserActive(Guid userId)
+	public void SetUserActive(Guid userId, bool isActive)
 	{
-		Manager.ToggleUserActivity(userId);
+		Manager.SetUserActive(userId, isActive);
 	}
 }
\ No newline at end of file
diff --git a/AccessQueuePlayground/Services/AccessQueueManager.cs b/AccessQueuePlayground/Services/AccessQueueManager.cs
index 69846b3..724f8f5 100644
--- a/AccessQueuePlayground/Services/AccessQueueManager.cs
+++ b/AccessQueuePlayground/Services/AccessQueueManager.cs
@@ -32,17 +32,17 @@ namespace AccessQueuePlayground.Services
             _users[id] = new User
             {
                 Id = id,
-                Active = true,
+                Active = false,
             };
             return id;
         }
 
-        public void ToggleUserActivity(Guid userId)
+        public void SetUserActive(Guid userId, bool isActive)
         {
             var user = _users[userId];
             if (user != null)
             {
-                user.Active = !user.Active;
+                user.Active = isActive;
             }
         }
 
@@ -76,6 +76,7 @@ namespace AccessQueuePlayground.Services
                     }
                 }
             }
+            newStatus.QueuedUsers.Sort((user1, user2) => user1.LatestResponse!.RequestsAhead - user2.LatestResponse!.RequestsAhead);
             _status = newStatus;
             NotifyStatusUpdated();
         }
diff --git a/AccessQueuePlayground/Services/IAccessQueueManager.cs b/AccessQueuePlayground/Services/IAccessQueueManager.cs
index 29f6b3f..db1ccb1 100644
--- a/AccessQueuePlayground/Services/IAccessQueueManager.cs
+++ b/AccessQueuePlayground/Services/IAccessQueueManager.cs
@@ -8,7 +8,7 @@ namespace AccessQueuePlayground.Services
         public Task RecalculateStatus();
         public AccessQueueStatus GetStatus();
         public Guid AddUser();
-        public void ToggleUserActivity(Guid userId);
+        public void SetUserActive(Guid userId, bool isActive);
 
     }
 }