diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidDetails.razor
index ebd078f..e0f1513 100644
--- a/Lieb/Pages/Raids/RaidDetails.razor
+++ b/Lieb/Pages/Raids/RaidDetails.razor
@@ -14,7 +14,7 @@
 
 <h5>@_raid.Title</h5>
 
-<div>@_raid.Description</div>
+<label style="white-space: pre-line">@_raid.Description</label>
 
 <div >
     <div class="times">
@@ -44,13 +44,13 @@
 
  <RaidRoles _raid=@_raid _user=@_user/>
 
-<div class="controlButtons">
-    <button @onclick="() => SignOffClicked()">Sign Off</button>
+<div>
+    <button class="controlButton" @onclick="() => SignOffClicked()">Sign Off</button>
     <AuthorizeView Policy="@Constants.Roles.RaidLead">
-        <button @onclick="() => EditClicked()">Edit</button>
+        <button class="controlButton" @onclick="() => EditClicked()">Edit</button>
         @if(_raid.RaidType != RaidType.Planned)
         {
-            <button type=button @onclick="() => RandomizeClicked()">Randomize</button>
+            <button class="controlButton" type=button @onclick="() => RandomizeClicked()">Randomize</button>
         }
     </AuthorizeView>
 </div>
diff --git a/Lieb/Pages/Raids/RaidDetails.razor.css b/Lieb/Pages/Raids/RaidDetails.razor.css
index b288231..a2ddf23 100644
--- a/Lieb/Pages/Raids/RaidDetails.razor.css
+++ b/Lieb/Pages/Raids/RaidDetails.razor.css
@@ -2,8 +2,8 @@
     background-color: rgb(38 38 38);
     border-radius: 25px;
     padding: 25px;
-    width: 900px;
-    /*width: fit-content;*/
+    /*width: 900px;*/
+    width: stretch;
     color: lightgray;
 }
 
@@ -27,7 +27,7 @@ h5 {
 }
 
 
-.controlButtons {
+.controlButton {
     margin-right: 10px;
 }
 
diff --git a/Lieb/Pages/Raids/RaidEdit.razor b/Lieb/Pages/Raids/RaidEdit.razor
index 3968704..502aaaa 100644
--- a/Lieb/Pages/Raids/RaidEdit.razor
+++ b/Lieb/Pages/Raids/RaidEdit.razor
@@ -28,7 +28,7 @@
     <p>
         <label>
             Description:
-            <InputTextArea @bind-Value="_raid.Description" />
+            <InputTextArea rows="8" style="width: 400px;" @bind-Value="_raid.Description" />
         </label>
     </p>
     <p>
diff --git a/Lieb/Pages/Raids/RaidEdit.razor.css b/Lieb/Pages/Raids/RaidEdit.razor.css
new file mode 100644
index 0000000..46800d1
--- /dev/null
+++ b/Lieb/Pages/Raids/RaidEdit.razor.css
@@ -0,0 +1,2 @@
+body {
+}
diff --git a/Lieb/Pages/Raids/RaidRoles.razor b/Lieb/Pages/Raids/RaidRoles.razor
index d0502cd..39bcb0b 100644
--- a/Lieb/Pages/Raids/RaidRoles.razor
+++ b/Lieb/Pages/Raids/RaidRoles.razor
@@ -14,56 +14,28 @@
     </thead>
     <tbody>
         @{
-        RaidSignUp userRole = _raid.SignUps.Where(s => s.LiebUserId == _liebUserId).FirstOrDefault();
-        bool isSignedUp = userRole != null;
+            bool isSignedUp = _raid.SignUps.Where(s => s.LiebUserId == _liebUserId && s.SignUpType != SignUpType.SignedOff).Any();
         }
         @foreach (PlannedRaidRole role in _raid.Roles.OrderBy(r => r.PlannedRaidRoleId))
         {
-            RaidSignUp[] signUps = _raid.SignUps.Where(s => s.PlannedRaidRoleId == role.PlannedRaidRoleId).ToArray();
-            int usedSpots = signUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count();
-
             <tr>
-                <td><b>@role.Name</b> (@usedSpots / @role.Spots) <br>  @role.Description </td>
-                <td>
-                    <table>
-                        @foreach (var signUp in signUps)
-                        {
-                            @if(signUp.SignUpType != SignUpType.SignedOff)
-                            {
-                                <tr>
-                                    @{bool isUser = isSignedUp && userRole.PlannedRaidRole.PlannedRaidRoleId == role.PlannedRaidRoleId && signUp.LiebUserId == _liebUserId;}
-                                    @{string signUpStatus = string.Empty;}
-                                    @if (signUp.SignUpType != SignUpType.SignedUp) signUpStatus = $" - {signUp.SignUpType}";
-
-                                    @if (isUser && _usableAccounts.Count > 1)
-                                    {
-                                        <td>@signUp.LiebUser.Name 
-                                        <select value=@signUp.GuildWars2AccountId @onchange="args => ChangeAccount(_user, args)">
-                                            @foreach (var account in _usableAccounts)
-                                            {
-                                                <option value=@account.GuildWars2AccountId>@account.AccountName</option>
-                                            }
-                                        </select> @signUpStatus </td>
-                                    }
-                                    else
-                                    {
-                                        <td>@signUp.LiebUser.Name (@signUp.GuildWars2Account.AccountName) @signUpStatus</td> 
-                                    }
-                                </tr>
-                            }
-                        }
-                    </table>
+                <td class="tdRole">
+                    <b>@role.Name</b> (@_raid.SignUps.Where(s => s.PlannedRaidRoleId == role.PlannedRaidRoleId && s.SignUpType == SignUpType.SignedUp).Count() / @role.Spots) 
+                    <br>  @role.Description
+                </td>
+                <td class="tdSignUp">
+                    <SignedUpUsers _raid=@_raid _usableAccounts=@_usableAccounts _liebUserId=@_liebUserId _currentRoleId=@role.PlannedRaidRoleId></SignedUpUsers>
                 </td>
                 @if(_liebUserId > 0)
                 {
-                    bool notIsRoleSignUpAllowed = !RaidService.IsRoleSignUpAllowed(_raid.RaidId, _user.LiebUserId, role.PlannedRaidRoleId, SignUpType.SignedUp, false);
+                    bool notIsRoleSignUpAllowed = !RaidService.IsRoleSignUpAllowed(_raid.RaidId, _liebUserId, role.PlannedRaidRoleId, SignUpType.SignedUp, false);
                     bool notIsBackupAllowed = _raid.RaidType != RaidType.Planned && notIsRoleSignUpAllowed;
-                    <td><button @onclick="() => SignUpClicked(role, _user, isSignedUp, SignUpType.SignedUp)" disabled="@notIsRoleSignUpAllowed">Sign Up</button></td>
-                    <td><button @onclick="() => SignUpClicked(role, _user, isSignedUp, SignUpType.Maybe)" disabled="@notIsRoleSignUpAllowed">Maybe</button></td>
-                    <td><button @onclick="() => SignUpClicked(role, _user, isSignedUp, SignUpType.Backup)" disabled="@notIsBackupAllowed">Backup</button></td>
-                    @if (isSignedUp && userRole.SignUpType != SignUpType.SignedOff && _raid.RaidType == RaidType.Planned)
+                    <td class="signUpButton"><button @onclick="() => SignUpClicked(role, SignUpType.SignedUp)" disabled="@notIsRoleSignUpAllowed">Sign Up</button></td>
+                    <td class="signUpButton"><button @onclick="() => SignUpClicked(role, SignUpType.Maybe)" disabled="@notIsRoleSignUpAllowed">Maybe</button></td>
+                    <td class="signUpButton"><button @onclick="() => SignUpClicked(role, SignUpType.Backup)" disabled="@notIsBackupAllowed">Backup</button></td>
+                    @if (isSignedUp && _raid.RaidType == RaidType.Planned)
                     {
-                        <td><button @onclick="() => SignUpClicked(role, _user, isSignedUp, SignUpType.Flex)">Flex</button></td>
+                        <td><button @onclick="() => SignUpClicked(role, SignUpType.Flex)">Flex</button></td>
                     }
                 }
             </tr>
@@ -93,23 +65,16 @@
         }
     }
 
-    async Task SignUpClicked(PlannedRaidRole role, LiebUser liebUser, bool isSignedUp, SignUpType signUpType)
+    async Task SignUpClicked(PlannedRaidRole role, SignUpType signUpType)
     {
-        if(isSignedUp && signUpType != SignUpType.Flex)
+        if(_raid.SignUps.Where(s => s.LiebUserId == _liebUserId).Any() && signUpType != SignUpType.Flex)
         {
-            await RaidService.ChangeSignUpType(_raid.RaidId, liebUser.LiebUserId, role.PlannedRaidRoleId, signUpType);
+            await RaidService.ChangeSignUpType(_raid.RaidId, _liebUserId, role.PlannedRaidRoleId, signUpType);
         }
         else
         {
-            await RaidService.SignUp(_raid.RaidId, liebUser.LiebUserId, _usableAccounts.FirstOrDefault().GuildWars2AccountId, role.PlannedRaidRoleId, signUpType);
+            await RaidService.SignUp(_raid.RaidId, _liebUserId, _usableAccounts.FirstOrDefault().GuildWars2AccountId, role.PlannedRaidRoleId, signUpType);
         }
         _raid = RaidService.GetRaid(_raid.RaidId);
     }
-
-    async Task ChangeAccount(LiebUser liebUser, ChangeEventArgs e)
-    {
-        int accountId = int.Parse(e.Value.ToString());
-        await RaidService.ChangeAccount(_raid.RaidId, liebUser.LiebUserId, accountId);
-        _raid = RaidService.GetRaid(_raid.RaidId);
-    }
 }
diff --git a/Lieb/Pages/Raids/RaidRoles.razor.css b/Lieb/Pages/Raids/RaidRoles.razor.css
index 67347ff..d46b8f3 100644
--- a/Lieb/Pages/Raids/RaidRoles.razor.css
+++ b/Lieb/Pages/Raids/RaidRoles.razor.css
@@ -6,10 +6,31 @@ h5 {
 table {
     column-width: auto;
     color: lightgray;
+    width: fit-content;
 /*    border-top: none;
     border-bottom: none;*/
 }
 
+button {
+    width: max-content;
+}
+
+.signUpButton{
+    width: 30px;
+}
+
+.tdSignUp {
+    max-width: 400px;
+    width: fit-content;
+}
+
+
+.tdRole {
+    max-width: 500px;
+    width: fit-content;
+}
+
+
 /*.roleTable table tr:not(:first-child) > td {
     border-top: none;
 }
diff --git a/Lieb/Pages/Raids/SignedUpUsers.razor b/Lieb/Pages/Raids/SignedUpUsers.razor
new file mode 100644
index 0000000..509a5cc
--- /dev/null
+++ b/Lieb/Pages/Raids/SignedUpUsers.razor
@@ -0,0 +1,60 @@
+@using Lieb.Data
+@using Lieb.Models
+@using Lieb.Models.GuildWars2
+@using Lieb.Models.GuildWars2.Raid
+@inject RaidService RaidService
+
+
+<table>
+     @{RaidSignUp[] signUps = _raid.SignUps.Where(s => s.PlannedRaidRoleId == _currentRoleId).ToArray();}
+    @foreach (var signUp in signUps)
+    {
+        @if(signUp.SignUpType != SignUpType.SignedOff)
+        {
+            <tr>
+                @{
+                    bool isUser = signUp.LiebUserId == _liebUserId;
+                    string signUpStatus = string.Empty;
+                    @if (signUp.SignUpType != SignUpType.SignedUp) signUpStatus = $" - {signUp.SignUpType}";
+                }
+
+                @if (isUser && _usableAccounts.Count > 1)
+                {
+                    <td>@signUp.LiebUser.Name 
+                    <select value=@signUp.GuildWars2AccountId @onchange="args => ChangeAccount(args)">
+                        @foreach (var account in _usableAccounts)
+                        {
+                            <option value=@account.GuildWars2AccountId>@account.AccountName</option>
+                        }
+                    </select> @signUpStatus </td>
+                }
+                else
+                {
+                    <td>@signUp.LiebUser.Name (@signUp.GuildWars2Account.AccountName) @signUpStatus</td> 
+                }
+            </tr>
+        }
+    }
+</table>
+@code {
+
+    [Parameter]
+    public Raid _raid { get; set; }
+
+    [Parameter]
+    public int _liebUserId { get; set; } = -1;
+
+    [Parameter]
+    public List<GuildWars2Account> _usableAccounts { get; set; }
+
+    [Parameter]
+    public int _currentRoleId { get; set; }
+
+
+    async Task ChangeAccount(ChangeEventArgs e)
+    {
+        int accountId = int.Parse(e.Value.ToString());
+        await RaidService.ChangeAccount(_raid.RaidId, _liebUserId, accountId);
+        _raid = RaidService.GetRaid(_raid.RaidId);
+    }
+}
diff --git a/Lieb/Pages/User/ManageGuildWars2Account.razor b/Lieb/Pages/User/ManageGuildWars2Account.razor
index 6cafd42..d77656c 100644
--- a/Lieb/Pages/User/ManageGuildWars2Account.razor
+++ b/Lieb/Pages/User/ManageGuildWars2Account.razor
@@ -75,8 +75,8 @@
                     }
 
                     <tr>
-                        <td><input type="checkbox" checked="@isEquipped" @onchange="args => EquippedStatusChanged(build.GuildWars2BuildId, args)" /></td>
-                        <td><input type="checkbox" checked="@canTank" disabled="@(!isEquipped)" @onchange="args => TankingStatusChanged(build.GuildWars2BuildId, args)" /></td>
+                        <td class="checkboxfield"><input type="checkbox" checked="@isEquipped" @onchange="args => EquippedStatusChanged(build.GuildWars2BuildId, args)" /></td>
+                        <td class="checkboxfield"><input type="checkbox" checked="@canTank" disabled="@(!isEquipped)" @onchange="args => TankingStatusChanged(build.GuildWars2BuildId, args)" /></td>
                         <td>@build.BuildName</td>
                         <td>@build.Class.ToString()</td>
                         <td>@build.EliteSpecialization.ToString()</td>