diff --git a/src/app/components/installed-software/installed-software.component.html b/src/app/components/installed-software/installed-software.component.html
index 32d0e83e..28292ad4 100644
--- a/src/app/components/installed-software/installed-software.component.html
+++ b/src/app/components/installed-software/installed-software.component.html
@@ -8,13 +8,21 @@
   
           <ng-container matColumnDef="name">
             <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
-            <mat-cell *matCellDef="let row;">{{ row.name }}</mat-cell>
+            <mat-cell *matCellDef="let row;">
+              <ng-container *ngIf="row.type !== 'adbutler'">
+                {{ row.name }}
+              </ng-container>
+
+              <ng-container *ngIf="row.type === 'adbutler'">
+                  <app-adbutler></app-adbutler>
+              </ng-container>
+            </mat-cell>
           </ng-container>
   
           <ng-container matColumnDef="actions">
             <mat-header-cell *matHeaderCellDef></mat-header-cell>
             <mat-cell *matCellDef="let row;" style="text-align: right">
-              <app-install-software [software]="row" (installedChanged)="onInstalled($event)"></app-install-software>
+              <app-install-software [software]="row" (installedChanged)="onInstalled($event)" *ngIf="row.type !== 'adbutler'"></app-install-software>
             </mat-cell>
           </ng-container>
   
diff --git a/src/app/components/installed-software/installed-software.component.ts b/src/app/components/installed-software/installed-software.component.ts
index 2d8e098b..8ebdb4b0 100644
--- a/src/app/components/installed-software/installed-software.component.ts
+++ b/src/app/components/installed-software/installed-software.component.ts
@@ -47,7 +47,11 @@ export class InstalledSoftwareDataSource extends DataSource<any> {
   disconnect() {}
 
   refresh() {
-    this.installed.next(this.installedSoftwareService.list());
+    let installedSoftware = this.installedSoftwareService.list();
+    installedSoftware.push({
+      type: 'adbutler'
+    });
+    this.installed.next(installedSoftware);
   }
 
 }
diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
index 7e44251c..124e91f1 100644
--- a/src/app/components/servers/servers.component.html
+++ b/src/app/components/servers/servers.component.html
@@ -55,7 +55,5 @@
     </div>
 
     <div class="buttons-bar"><button mat-raised-button color="primary" (click)="createModal()">Add server</button></div>
-
-    <app-adbutler></app-adbutler>
   </div>
 </div>