diff --git a/ogWebconsole/src/app/components/groups/groups.component.html b/ogWebconsole/src/app/components/groups/groups.component.html
index 3689f90..47d5587 100644
--- a/ogWebconsole/src/app/components/groups/groups.component.html
+++ b/ogWebconsole/src/app/components/groups/groups.component.html
@@ -293,6 +293,9 @@
               </button>
             </td>
           </ng-container>
+
+          
+        
           <ng-container matColumnDef="maintenace">
             <th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'maintenance' | translate }} </th>
             <td mat-cell *matCellDef="let client"> {{ client.maintenance }} </td>
@@ -322,6 +325,17 @@
 
               <mat-menu #clientMenu="matMenu">
 
+                <mat-menu restoreFocus=false #commandMenu="matMenu" xPosition="before">
+                  <button mat-menu-item *ngFor="let command of commands" (click)="executeClientCommand(command, client)">
+                  <span>{{ command.name }}</span>
+                  </button>
+                </mat-menu>
+      
+                <button mat-menu-item [matMenuTriggerFor]="commandMenu" (click)="fetchCommands()">
+                  <mat-icon>play_arrow</mat-icon>
+                  <span>{{ 'executeCommand' | translate }}</span>
+                </button>
+
                 <button mat-menu-item (click)="onEditClick($event, client.type, client.uuid)">
                   <mat-icon>edit</mat-icon>
                     <span>{{ 'edit' | translate }}</span>