diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index f2a8effa802e9d23189299cf14a6eb7a0e051564..98683e222c0faf29ea01c830232ec7f3d47bffab 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -8,21 +8,25 @@
           (click)="hideCommentsList=false; searchBox.value=''">
     <mat-icon>close</mat-icon>
   </button>
+
   <span class="fill-remaining-space"></span>
-  <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && userRole === 1 && comments.length > 0"
-    [matTooltip]="'Export comments'" (click)="openExportDialog()">
-    <mat-icon class="searchBarIcon" color="accent">cloud_download</mat-icon>
-  </button>
 
-  <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value"
-          color="accent" (click)="openCreateDialog()">
-    <mat-icon class="searchBarIcon">add_circle</mat-icon>
-  </button>
+  <div class="button-bar" fxLayoutAlign="center center">
+    <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && userRole === 1 && comments.length > 0"
+            [matTooltip]="'Export comments'" (click)="openExportDialog()">
+      <mat-icon class="searchBarIcon" color="accent">cloud_download</mat-icon>
+    </button>
 
-  <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && comments.length > 0"
-          color="accent" [matMenuTriggerFor]="filterMenu">
-    <mat-icon class="searchBarIcon">sort</mat-icon>
-  </button>
+    <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value"
+            color="accent" (click)="openCreateDialog()">
+      <mat-icon class="searchBarIcon">add_circle</mat-icon>
+    </button>
+
+    <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && comments.length > 0"
+            color="accent" [matMenuTriggerFor]="filterMenu">
+      <mat-icon class="searchBarIcon">sort</mat-icon>
+    </button>
+  </div>
 
   <mat-menu #filterMenu="matMenu" xPosition="before">
     <div id="filterIcon">
@@ -56,9 +60,10 @@
   </mat-menu>
 </div>
 
-<mat-card class="outer-card" *ngIf="comments.length > 0">
+<mat-card class="outer-card" *ngIf="showComments().length > 0">
   <app-comment *ngFor="let current of showComments()" [comment]="current"></app-comment>
 </mat-card>
-<div fxLayout="row" fxLayoutAlign="center center" class="no-comments">
-  <h4 *ngIf="comments.length < 1">{{ 'comment-page.no-comments' | translate }}</h4>
+
+<div *ngIf="comments.length < 1" fxLayout="row" fxLayoutAlign="center center" class="no-comments">
+  <h4>{{ 'comment-page.no-comments' | translate }}</h4>
 </div>
diff --git a/src/app/components/shared/comment-list/comment-list.component.scss b/src/app/components/shared/comment-list/comment-list.component.scss
index ba0f6026dfe156f6a5560cd9e1573d4f1ba2ff24..60184789ed3a2fbca5bdbca7d70866b979d9947e 100644
--- a/src/app/components/shared/comment-list/comment-list.component.scss
+++ b/src/app/components/shared/comment-list/comment-list.component.scss
@@ -40,7 +40,7 @@ input {
   height: 45px !important;
   text-align: center;
   min-width: 50px;
-  margin: 10px 2% 0 0;
+  margin: 0 2% 0 0;
 }
 
 .close {
@@ -61,3 +61,7 @@ input {
 h4  {
   color: var(--text-1);
 }
+
+.button-bar {
+  margin-right: 2%;
+}