diff --git a/frontend/src/app/pages/domains/domains.component.html b/frontend/src/app/pages/domains/domains.component.html
index 1b426d6..8bd3657 100644
--- a/frontend/src/app/pages/domains/domains.component.html
+++ b/frontend/src/app/pages/domains/domains.component.html
@@ -1,5 +1,15 @@
-<div class="row">
-    <app-pagesize class="ml-auto" [pagesizes]="gs.pageSizes" [currentPagesize]="gs.pageSize" (pagesizeChange)="onPagesizeChange($event)"></app-pagesize>
+<div class="row justify-content-end">
+    <div class="col-12 col-md-6" *ngIf="gs.isAdmin">
+        <div class="btn-group btn-group-sm">
+            <button disabled class="btn btn-secondary">Add domain</button>
+            <button class="btn btn-secondary">MASTER</button>
+            <button class="btn btn-secondary">NATIVE</button>
+            <button class="btn btn-secondary">SLAVE</button>
+        </div>
+    </div>
+    <div class="col-12 col-md-6 mt-2 mt-md-0">
+        <app-pagesize class="float-md-right" [pagesizes]="gs.pageSizes" [currentPagesize]="gs.pageSize" (pagesizeChange)="onPagesizeChange($event)"></app-pagesize>
+    </div>
 </div>
 <div class="row">
     <div class="col-12">
diff --git a/frontend/src/app/partials/navbar/navbar.component.html b/frontend/src/app/partials/navbar/navbar.component.html
index cb01149..c46c9f3 100644
--- a/frontend/src/app/partials/navbar/navbar.component.html
+++ b/frontend/src/app/partials/navbar/navbar.component.html
@@ -3,7 +3,7 @@
 
         <a class="navbar-brand" href="#">{{ brand }}</a>
 
-        <button *ngIf="true" class="navbar-toggler navbar-toggler-right" (click)="toggleMenu()">
+        <button *ngIf="!isEmpty()" class="navbar-toggler navbar-toggler-right" (click)="toggleMenu()">
             <span class="navbar-toggler-icon"></span>
         </button>
 
diff --git a/frontend/src/app/partials/pagesize/pagesize.component.html b/frontend/src/app/partials/pagesize/pagesize.component.html
index a5a4d14..5db1a92 100644
--- a/frontend/src/app/partials/pagesize/pagesize.component.html
+++ b/frontend/src/app/partials/pagesize/pagesize.component.html
@@ -1,4 +1,4 @@
-<nav class="mr-3 ml-auto">
+<nav>
     <ul class="pagination pagination-sm">
         <li class="disabled page-item">
             <span class="page-link">Entries per page</span>