diff --git a/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml b/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml
index 6d6806a1..4e7631e3 100644
--- a/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml
+++ b/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml
@@ -4,6 +4,7 @@
                     xmlns:controls="clr-namespace:TCC.UI.Controls"
                     xmlns:converters="clr-namespace:Nostrum.WPF.Converters;assembly=Nostrum.WPF"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:extensions="clr-namespace:Nostrum.WPF.Extensions;assembly=Nostrum.WPF"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:widgets="clr-namespace:TCC.ViewModels.Widgets"
                     xmlns:widgets1="clr-namespace:TCC.UI.Windows.Widgets"
@@ -16,6 +17,30 @@
                     UseLayoutRounding="True"
                     mc:Ignorable="d">
 
+    <FrameworkElement.Resources>
+        <Style x:Key="CommandButtonStyle"
+               BasedOn="{StaticResource NostrumMainButtonStyle}"
+               TargetType="Button">
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="Padding" Value="8" />
+            <Setter Property="FontWeight" Value="DemiBold" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Foreground" Value="WhiteSmoke" />
+            <Setter Property="extensions:ButtonExtensions.HighlightBrush" Value="#1fff" />
+        </Style>
+        <Style x:Key="CommandButtonIconStyle"
+               BasedOn="{StaticResource {x:Type Path}}"
+               TargetType="Path">
+            <Setter Property="Height" Value="18" />
+            <Setter Property="Width" Value="18" />
+            <Setter Property="Fill" Value="WhiteSmoke" />
+            <Setter Property="Margin" Value="0 0 8 0" />
+            <Setter Property="Stretch" Value="Uniform" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+        </Style>
+    </FrameworkElement.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -113,91 +138,100 @@
                         BorderBrush="{StaticResource RevampBorderBrush}"
                         CornerRadius="5"
                         Opacity="0"
-                        Style="{StaticResource DefaultBorderStyle}"
-                        Visibility="{Binding Formed, Converter={converters:BoolToVisibility}}">
-                    <StackPanel Orientation="Horizontal">
+                      Visibility="{Binding Formed, Converter={converters:BoolToVisibility}}"  
+                        Style="{StaticResource DefaultBorderStyle}">
+                    <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Horizontal" Margin="8 4">
+                            <Path Width="14" Height="14" Data="{StaticResource SvgUsers}"></Path>
+                            <TextBlock Text="Group commands" Margin="4 0 0 0" Foreground="#5fff"/>
+                        </StackPanel>
+                        <Separator Background="#1fff" Margin="0 1"/>
                         <Button x:Name="LootWindowButton"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
                                 Command="{Binding ShowLootWindowCommand}"
-                                Style="{StaticResource NostrumContentOpacityButtonStyle}"
+                                Style="{StaticResource CommandButtonStyle}"
                                 ToolTip="Show loot window">
-                            <Path Width="15"
-                                  Height="15"
-                                  Margin="3 3"
-                                  Data="{StaticResource SvgLoot}"
-                                  Fill="#fff" />
+                            <StackPanel Orientation="Horizontal">
+                                <Path Data="{StaticResource SvgLoot}"
+                                      Style="{StaticResource CommandButtonIconStyle}" />
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="Loot window" />
+                            </StackPanel>
                         </Button>
                         <Button x:Name="SettingsButton"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                Click="ShowAbnormalSettings"
-                                Style="{StaticResource NostrumContentOpacityButtonStyle}"
+                                Command="{Binding ConfigureAbnormalitiesCommand}"
+                                Style="{StaticResource CommandButtonStyle}"
                                 ToolTip="Configure buffs">
-                            <Path Width="15"
-                                  Height="15"
-                                  Margin="3 3"
-                                  Data="{StaticResource SvgSettings}"
-                                  Fill="#fff" />
+                            <StackPanel Orientation="Horizontal">
+                                <Path Data="{StaticResource SvgSettings}"
+                                      Style="{StaticResource CommandButtonIconStyle}" />
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="Buffs settings" />
+
+                            </StackPanel>
                         </Button>
                         <Button x:Name="LeaveButton"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                Click="LeaveParty"
-                                Style="{StaticResource NostrumContentOpacityButtonStyle}"
+                                Command="{Binding LeaveGroupCommand}"
+                                Style="{StaticResource CommandButtonStyle}"
+                              Visibility="{Binding ShowLeaveButton, Converter={converters:BoolToVisibility}}"  
                                 ToolTip="Leave party">
-                            <Path Width="15"
-                                  Height="15"
-                                  Margin="3 3"
-                                  Data="{StaticResource SvgRemoveCircle}"
-                                  Fill="{StaticResource HpBrush}"
-                                  Visibility="{Binding ShowLeaveButton, Converter={converters:BoolToVisibility}}" />
+                            <StackPanel Orientation="Horizontal">
+                                <Path Data="{StaticResource SvgRemoveCircle}"
+                                      Fill="{StaticResource HpBrush}"
+                                      Style="{StaticResource CommandButtonIconStyle}" />
+                                <TextBlock VerticalAlignment="Center"
+                                           Foreground="{StaticResource HpBrush}"
+                                           Text="Leave group" />
+                            </StackPanel>
                         </Button>
-                    </StackPanel>
-                </Border>
-                <Border x:Name="GroupButtons"
-                        Grid.Column="2"
-                        Margin="4 0 0 0"
-                        VerticalAlignment="Top"
-                        Background="{StaticResource RevampBackgroundBrush}"
-                        BorderBrush="{StaticResource RevampBorderBrush}"
-                        CornerRadius="5"
-                        Opacity="0"
-                        Style="{StaticResource DefaultBorderStyle}"
-                        Visibility="{Binding ShowLeaderButtons, Converter={converters:BoolToVisibility}}">
-                    <StackPanel Orientation="Horizontal">
-
-                        <!--<Button Style="{StaticResource NostrumContentOpacityButtonStyle}" x:Name="LootSettingsButton" Padding="10 0" Visibility="Collapsed"
-                            ToolTip="Loot options" Click="LootSettingsButtonClicked" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center">
-                            <Path Data="{StaticResource SvgGift}" Fill="#fff" Margin="3 3" Width="15" Height="15"/>
-                        </Button>-->
+                        <Grid Margin="0 2"
+                              Visibility="{Binding ShowLeaderButtons, Converter={converters:BoolToVisibility}}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Separator Margin="5 2"
+                                       Background="#2fff" />
+                            <Path Grid.Column="1"
+                                  Width="8"
+                                  Height="8"
+                                  Data="{StaticResource SvgCrown}"
+                                  Fill="Orange" />
+                            <Separator Grid.Column="2"
+                                       Margin="5 2"
+                                       Background="#2fff" />
+                        </Grid>
                         <Button x:Name="ResetButton"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                Click="ResetButtonClicked"
-                                Style="{StaticResource NostrumContentOpacityButtonStyle}"
-                                ToolTip="Reset instance">
-                            <Path Width="15"
-                                  Height="15"
-                                  Margin="3 3"
-                                  Data="{StaticResource SvgReload}"
-                                  Fill="#fff" />
+                                Command="{Binding ResetInstanceCommand}"
+                                Style="{StaticResource CommandButtonStyle}"
+                                ToolTip="Reset instance"
+                                Visibility="{Binding ShowLeaderButtons, Converter={converters:BoolToVisibility}}">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Data="{StaticResource SvgReload}"
+                                      Style="{StaticResource CommandButtonIconStyle}" />
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="Reset instance" />
+
+                            </StackPanel>
                         </Button>
                         <Button x:Name="DisbandButton"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Center"
-                                Click="DisbandButtonClicked"
-                                Style="{StaticResource NostrumContentOpacityButtonStyle}"
-                                ToolTip="Disband">
-                            <Path Width="15"
-                                  Height="15"
-                                  Margin="3 3"
-                                  Data="{StaticResource SvgDisband}"
-                                  Fill="{StaticResource HpBrush}" />
+                                Command="{Binding DisbandGroupCommand}"
+                                Style="{StaticResource CommandButtonStyle}"
+                                ToolTip="Disband"
+                                Visibility="{Binding ShowLeaderButtons, Converter={converters:BoolToVisibility}}">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Data="{StaticResource SvgDisband}"
+                                      Fill="{StaticResource HpBrush}"
+                                      Style="{StaticResource CommandButtonIconStyle}" />
+                                <TextBlock VerticalAlignment="Center"
+                                           Foreground="{StaticResource HpBrush}"
+                                           Text="Disband group" />
+
+                            </StackPanel>
                         </Button>
+
                     </StackPanel>
                 </Border>
-
             </Grid>
 
             <ContentControl MaxHeight="500"
diff --git a/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml.cs b/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml.cs
index 840bbe27..ad48c757 100644
--- a/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml.cs
+++ b/TCC.Core/UI/Windows/Widgets/GroupWindow.xaml.cs
@@ -1,63 +1,29 @@
 using System;
-using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
-using TCC.Interop.Proxy;
 using TCC.ViewModels.Widgets;
 
 namespace TCC.UI.Windows.Widgets;
 
 public partial class GroupWindow
 {
-    private readonly GroupWindowViewModel _vm;
-
     public GroupWindow(GroupWindowViewModel vm)
     {
         DataContext = vm;
-        _vm = vm;
         InitializeComponent();
         BoundaryRef = Boundary;
         ButtonsRef = Buttons;
         MainContent = WindowContent;
-        Init(_vm.Settings!);
-    }
-
-    //TODO: to commands in VM
-    private void DisbandButtonClicked(object sender, RoutedEventArgs e)
-    {
-        if(!_vm.AmILeader) return;
-        StubInterface.Instance.StubClient.DisbandGroup(); //ProxyOld.DisbandParty();
-    }
-
-    //TODO: to commands in VM
-    private void ResetButtonClicked(object sender, RoutedEventArgs e)
-    {
-        if(!_vm.AmILeader) return;
-        StubInterface.Instance.StubClient.ResetInstance(); //ProxyOld.ResetInstance();
+        Init(vm.Settings!);
     }
 
     private void GroupWindow_OnMouseEnter(object sender, MouseEventArgs e)
     {
         GroupButtonsSingle.BeginAnimation(OpacityProperty, new DoubleAnimation(1, TimeSpan.FromMilliseconds(300)));
-        GroupButtons.BeginAnimation(OpacityProperty, new DoubleAnimation(1, TimeSpan.FromMilliseconds(300)));
     }
 
     private void GroupWindow_OnMouseLeave(object sender, MouseEventArgs e)
     {
         GroupButtonsSingle.BeginAnimation(OpacityProperty, new DoubleAnimation(0, TimeSpan.FromMilliseconds(300)) { BeginTime = TimeSpan.FromMilliseconds(500) });
-        GroupButtons.BeginAnimation(OpacityProperty, new DoubleAnimation(0, TimeSpan.FromMilliseconds(300)) { BeginTime = TimeSpan.FromMilliseconds(500) });
-    }
-
-    //TODO: to commands in VM
-    private void LeaveParty(object sender, RoutedEventArgs e)
-    {
-        StubInterface.Instance.StubClient.LeaveGroup(); //ProxyOld.LeaveParty();
-    }
-
-    //TODO: to commands in VM
-    private void ShowAbnormalSettings(object sender, RoutedEventArgs e)
-    {
-        new GroupAbnormalConfigWindow().ShowWindow();
-        //WindowManager.GroupAbnormalConfigWindow.ShowWindow();
     }
 }
\ No newline at end of file
diff --git a/TCC.Core/ViewModels/Widgets/GroupWindowViewModel.cs b/TCC.Core/ViewModels/Widgets/GroupWindowViewModel.cs
index 4de26598..936a9fb4 100644
--- a/TCC.Core/ViewModels/Widgets/GroupWindowViewModel.cs
+++ b/TCC.Core/ViewModels/Widgets/GroupWindowViewModel.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using System.Windows.Threading;
 using JetBrains.Annotations;
 using Nostrum.WPF;
 using Nostrum.WPF.Factories;
@@ -16,6 +17,8 @@
 using TCC.Interop.Proxy;
 using TCC.Settings.WindowSettings;
 using TCC.UI;
+using TCC.UI.Windows;
+using TCC.UI.Windows.Configuration.Abnormalities;
 using TCC.Utils;
 using TeraDataLite;
 using TeraPacketParser.Analysis;
@@ -43,11 +46,13 @@ public class GroupWindowViewModel : TccWindowViewModel
     public ICollectionViewLiveShaping Dps { get; }
     public ICollectionViewLiveShaping Tanks { get; }
     public ICollectionViewLiveShaping Healers { get; }
+
     public bool Raid
     {
         get => _raid;
         set => RaiseAndSetIfChanged(value, ref _raid);
     }
+
     public int Size => Members.Count;
     public int ReadyCount => Members.Count(x => x.Ready == ReadyStatus.Ready);
     public int AliveCount => Members.Count(x => x.Alive);
@@ -58,6 +63,10 @@ public bool Raid
     public bool Rolling { get; set; }
 
     public ICommand ShowLootWindowCommand { get; }
+    public ICommand ConfigureAbnormalitiesCommand { get; }
+    public ICommand LeaveGroupCommand { get; }
+    public ICommand DisbandGroupCommand { get; }
+    public ICommand ResetInstanceCommand { get; }
 
     public GroupWindowViewModel(GroupWindowSettings settings) : base(settings)
     {
@@ -88,7 +97,6 @@ [new SortDescription(nameof(User.UserClass), ListSortDirection.Ascending)])
                   ])
               ?? throw new Exception("Failed to create LiveCollectionView");
 
-
         Game.Teleported += OnTeleported;
         Game.EncounterChanged += OnEncounterChanged;
         settings.SettingsUpdated += NotifySettingUpdated;
@@ -97,6 +105,38 @@ [new SortDescription(nameof(User.UserClass), ListSortDirection.Ascending)])
         settings.LayoutChanged += OnLayoutChanged;
 
         ShowLootWindowCommand = new RelayCommand(Game.ShowLootDistributionWindow);
+
+        ConfigureAbnormalitiesCommand = new RelayCommand(ConfigureAbnormalities);
+        LeaveGroupCommand = new RelayCommand(LeaveGroup);
+        DisbandGroupCommand = new RelayCommand(DisbandGroup);
+        ResetInstanceCommand = new RelayCommand(ResetInstance);
+    }
+
+    private void ResetInstance()
+    {
+        if (!AmILeader) return;
+        StubInterface.Instance.StubClient.ResetInstance();
+    }
+
+    private void DisbandGroup()
+    {
+        if (!AmILeader) return;
+        StubInterface.Instance.StubClient.DisbandGroup();
+    }
+
+    private void LeaveGroup()
+    {
+        StubInterface.Instance.StubClient.LeaveGroup();
+    }
+
+    private void ConfigureAbnormalities()
+    {
+        _dispatcher.InvokeAsync(() =>
+            {
+                if (TccWindow.Exists(typeof(AbnormalityConfigWindow))) return;
+                new AbnormalityConfigWindow().Show();
+            },
+            DispatcherPriority.Background);
     }
 
     private void OnEncounterChanged()
@@ -123,7 +163,6 @@ private void OnTeleported()
         foreach (var u in Members.ToSyncList()) u.InRange = false;
     }
 
-
     private void Members_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
         //Task.Delay(0).ContinueWith(t =>
@@ -167,6 +206,7 @@ public bool TryGetUser(string name, [MaybeNullWhen(false)] out User u)
         u = exists ? Members.ToSyncList().FirstOrDefault(x => x.Name == name) : new User(_dispatcher);
         return exists;
     }
+
     public bool TryGetUser(ulong id, [MaybeNullWhen(false)] out User u)
     {
         var exists = Exists(id);
@@ -174,6 +214,7 @@ public bool TryGetUser(ulong id, [MaybeNullWhen(false)] out User u)
         u = exists ? Members.ToSyncList().FirstOrDefault(x => x.EntityId == id) : new User(_dispatcher);
         return u != null;
     }
+
     public bool TryGetUser(uint pId, uint sId, [MaybeNullWhen(false)] out User u)
     {
         var exists = Exists(pId, sId);
@@ -185,6 +226,7 @@ public bool IsLeader(string name)
     {
         return Members.FirstOrDefault(x => x.Name == name)?.IsLeader ?? false;
     }
+
     public bool AmILeader => IsLeader(Game.Me.Name) || _leaderOverride;
 
     public void SetAggro(ulong target)
@@ -216,6 +258,7 @@ private void SetAggroCircle(AggroCircle circle, AggroAction action, ulong user)
             SetAggro(user);
         }
     }
+
     internal void BeginOrRefreshAbnormality(Abnormality ab, int stacks, uint duration, uint playerId, uint serverId)
     {
         _dispatcher.InvokeAsync(() =>
@@ -229,7 +272,7 @@ internal void BeginOrRefreshAbnormality(Abnormality ab, int stacks, uint duratio
                 u.AddOrRefreshBuff(ab, duration, stacks);
                 if (u.UserClass == Class.Warrior && ab.Id is >= 100200 and <= 100203)
                 {
-                    u.Role = Role.Tank; //def stance turned on: switch warrior to tank 
+                    u.Role = Role.Tank; //def stance turned on: switch warrior to tank
                 }
             }
             else
@@ -249,7 +292,6 @@ private void EndAbnormality(Abnormality ab, uint playerId, uint serverId)
     {
         _dispatcher.InvokeAsync(() =>
         {
-
             var u = Members.ToSyncList().FirstOrDefault(x => x.PlayerId == playerId && x.ServerId == serverId);
             if (u == null) return;
 
@@ -275,6 +317,7 @@ private void ClearAbnormality(uint playerId, uint serverId)
             Members.ToSyncList().FirstOrDefault(x => x.PlayerId == playerId && x.ServerId == serverId)?.ClearAbnormalities();
         });
     }
+
     [Obsolete]
     public void AddOrUpdateMember(User p)
     {
@@ -376,7 +419,6 @@ private void SendLeaveMessage(string name)
             msg = "@0\vPartyPlayerName\v" + name + "\vparty\vparty";
         }
         SystemMessagesProcessor.AnalyzeMessage(msg, opcode);
-
     }
 
     private void RemoveMember(uint playerId, uint serverId, bool kick = false)
@@ -480,7 +522,6 @@ private void EndRoll()
     {
         Rolling = false;
 
-
         foreach (var m in Members.ToSyncList())
         {
             m.IsRolling = false;
@@ -500,9 +541,9 @@ private ulong GetWinningUser()
         return Members.ToSyncList().OrderByDescending(u => u.RollResult).First().EntityId;
         //Members.ToList().ForEach(user => user.IsWinning = user.EntityId == Members.OrderByDescending(u => u.RollResult).First().EntityId);
     }
+
     public void SetReadyStatus(ReadyPartyMember p)
     {
-
         if (_firstCheck)
         {
             foreach (var u in Members.ToSyncList())
@@ -691,7 +732,6 @@ protected override void RemoveHooks()
         PacketAnalyzer.Processor.Unhook<S_ABNORMALITY_BEGIN>(OnAbnormalityBegin);
         PacketAnalyzer.Processor.Unhook<S_ABNORMALITY_REFRESH>(OnAbnormalityRefresh);
         PacketAnalyzer.Processor.Unhook<S_ABNORMALITY_END>(OnAbnormalityEnd);
-
     }
 
     private void OnDisconnected()
@@ -759,7 +799,7 @@ private void OnCheckToReadyParty(S_CHECK_TO_READY_PARTY p)
     {
         _dispatcher.InvokeAsync(() =>
         {
-            foreach (var readyPartyMember in p.Party) 
+            foreach (var readyPartyMember in p.Party)
                 SetReadyStatus(readyPartyMember);
         });
     }