diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidDetails.razor
index 0181fe2..f4a371d 100644
--- a/Lieb/Pages/Raids/RaidDetails.razor
+++ b/Lieb/Pages/Raids/RaidDetails.razor
@@ -17,7 +17,7 @@
     @if (_user != null && _isRaidSignUpAllowed) 
     {
         <div class="signUpStatusTooltip">
-            @if(_raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId).Any())
+            @if(_raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId && s.SignUpType != SignUpType.SignedOff).Any())
             {
                 <span class="oi oi-badge" style="color:green"></span>  
                     <span class="tooltiptext">You are signed up</span>  
@@ -70,7 +70,7 @@
         </span>
 
 
-        <RaidRoles _raid=@_raid _user=@_user _isRaidSignUpAllowed=@_isRaidSignUpAllowed/>
+        <RaidRoles _Parent=@this _raid=@_raid _user=@_user _isRaidSignUpAllowed=@_isRaidSignUpAllowed/>
 
         <div>
             <AuthorizeView>
@@ -123,10 +123,16 @@
     {
         NavigationManager.NavigateTo($"raidedit/{_raid.RaidId}");
     }
-    
+
     async Task RandomizeClicked()
     {
         await RaidRandomizerService.RandomizeRaid(_raid.RaidId);
         _raid = RaidService.GetRaid(_raid.RaidId);
     }
+
+    public void HasChanged()
+    {
+        _raid = RaidService.GetRaid(_raid.RaidId);
+        this.StateHasChanged();
+    }
 }
diff --git a/Lieb/Pages/Raids/RaidRoles.razor b/Lieb/Pages/Raids/RaidRoles.razor
index 3d761aa..f86a927 100644
--- a/Lieb/Pages/Raids/RaidRoles.razor
+++ b/Lieb/Pages/Raids/RaidRoles.razor
@@ -9,15 +9,15 @@
         bool flexExists = _raid.SignUps.Where(s => s.SignUpType == SignUpType.Flex).Any();
     }
     <thead>
-        <tr @onclick="() => ExpandAll()">
+        <tr @onclick="() => ToggleAll()">
             <th>
-                @if(@_expandableRoles.FirstOrDefault().IsRowExpanded)
+                @if(_allExpanded)
                 {
-                    <span class="oi oi-chevron-top" style="margin-right:7px"> </span>
+                    <span class="oi oi-collapse-up" style="margin-right:7px"> </span>
                 }
                 else
                 {
-                    <span class="oi oi-chevron-bottom" style="margin-right:7px"> </span>
+                    <span class="oi oi-expand-down" style="margin-right:7px"> </span>
                 }
                 Role
             </th>
@@ -37,7 +37,7 @@
         {
             <tr>
                 @{
-                <td class="tdRole" @onclick="() => role.IsRowExpanded = !role.IsRowExpanded">
+                <td class="tdRole" @onclick="() => ToggleRow(role)">
                     @if(@role.IsRowExpanded)
                     {
                         <span class="oi oi-chevron-top" style="margin-right:7px"> </span>
@@ -56,7 +56,7 @@
                 <td class="tdSignUp">
                     @{List<SignUpType> signUpTypes =new List<SignUpType>(){SignUpType.SignedUp, SignUpType.Maybe, SignUpType.Backup};}
                     <CascadingValue Value="this">
-                        <SignedUpUsers _raid=@_raid _usableAccounts=@_usableAccounts _liebUserId=@_liebUserId _currentRoleId=@role.Role.PlannedRaidRoleId _signUpTypes=@signUpTypes _showToolTip=@true></SignedUpUsers>
+                        <SignedUpUsers _raid=@_raid _usableAccounts=@_usableAccounts _liebUserId=@_liebUserId _currentRoleId=@role.Role.PlannedRaidRoleId _signUpTypes=@signUpTypes _showToolTip=@true _showUserColor=@true></SignedUpUsers>
                     </CascadingValue>
                 </td>
                 @if (flexExists)
@@ -87,6 +87,8 @@
            
 
 @code {
+    [Parameter]
+    public RaidDetails _Parent { get; set; }
 
     [Parameter]
     public Raid _raid { get; set; }
@@ -103,6 +105,8 @@
 
     private List<ExpandableRole> _expandableRoles;
 
+    private bool _allExpanded = false;
+
     private class ExpandableRole
     {
         public PlannedRaidRole Role;
@@ -143,7 +147,7 @@
         {
             await RaidService.SignUp(_raid.RaidId, _liebUserId, _usableAccounts.FirstOrDefault().GuildWars2AccountId, role.PlannedRaidRoleId, signUpType);
         }
-        _raid = RaidService.GetRaid(_raid.RaidId);
+        _Parent.HasChanged();
     }
 
     public async Task ChangeAccount(ChangeEventArgs e)
@@ -154,12 +158,18 @@
         this.StateHasChanged();
     }
 
-    public async Task ExpandAll()
+    private async Task ToggleRow(ExpandableRole role)
+    {
+        role.IsRowExpanded = !role.IsRowExpanded;
+        _allExpanded = !_expandableRoles.Where(r => !r.IsRowExpanded).Any();
+    }
+
+    private async Task ToggleAll()
     {
-        bool newStatus = !_expandableRoles.FirstOrDefault().IsRowExpanded;
         foreach(ExpandableRole role in _expandableRoles)
         {
-            role.IsRowExpanded = newStatus;
+            role.IsRowExpanded = !_allExpanded;
         }
+        _allExpanded = !_allExpanded;
     }
 }
diff --git a/Lieb/Pages/Raids/SignedUpUsers.razor b/Lieb/Pages/Raids/SignedUpUsers.razor
index 9a4f573..a00d8a0 100644
--- a/Lieb/Pages/Raids/SignedUpUsers.razor
+++ b/Lieb/Pages/Raids/SignedUpUsers.razor
@@ -29,7 +29,7 @@
                         </select> @signUpStatus 
                     </td>
                 }
-                else if(isUser)
+                else if(isUser && _showUserColor)
                 {
                     <td class="nametooltip username">
                         @signUp.GuildWars2Account.AccountName @signUpStatus
@@ -74,4 +74,7 @@
 
     [Parameter]
     public bool _showToolTip { get; set; } = false;
+
+    [Parameter]
+    public bool _showUserColor { get; set; } = false;
 }