diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index 99764f18..c44919e8 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -83,17 +83,18 @@
 
     <!-- GNS3 menu -->
     <mat-menu #mainMenu="matMenu" [overlapTrigger]="false">
-      <button mat-menu-item [routerLink]="['/controller', controller.id, 'projects']">
-        <mat-icon>work</mat-icon>
-        <span>Go to projects</span>
-      </button>
       <button mat-menu-item [routerLink]="['/controllers']">
         <mat-icon>developer_board</mat-icon>
-        <span>Go to controllers</span>
+        <span>Controllers</span>
       </button>
+      <button mat-menu-item [routerLink]="['/controller', controller.id, 'projects']">
+        <mat-icon>work</mat-icon>
+        <span>Projects</span>
+      </button>
+      
       <button mat-menu-item routerLink="/controller/{{ controller.id }}/preferences">
         <mat-icon>settings_applications</mat-icon>
-        <span>Go to preferences</span>
+        <span>Template preferences</span>
       </button>
       <button mat-menu-item routerLink="/controller/{{ controller.id }}/systemstatus">
         <mat-icon>info</mat-icon>
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index e55a3392..c50dde3a 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -7,7 +7,6 @@
       <mat-icon svgIcon="gns3"></mat-icon>
     </button>
 
-    <button mat-button routerLink="/controllers">Controllers</button>
 
     <button *ngIf="!recentlyOpenedProjectId && controllerIdProjectList" mat-button (click)="listProjects()">
       Projects
@@ -71,17 +70,13 @@
     </mat-menu>
     <!-- GNS3 menu -->
     <mat-menu #mainMenu="matMenu" [overlapTrigger]="false">
-      <button mat-menu-item [routerLink]="['/controller', controllerId, 'projects']">
-        <mat-icon>work</mat-icon>
-        <span>Go to projects</span>
-      </button>
       <button mat-menu-item [routerLink]="['/controllers']">
         <mat-icon>developer_board</mat-icon>
-        <span>Go to controllers</span>
+        <span>Controllers</span>
       </button>
-      <button mat-menu-item routerLink="/controller/{{ controllerId }}/preferences">
-        <mat-icon>settings_applications</mat-icon>
-        <span>Go to preferences</span>
+      <button mat-menu-item [routerLink]="['/controller', controllerId, 'projects']">
+        <mat-icon>work</mat-icon>
+        <span>Projects</span>
       </button>
       <button mat-menu-item routerLink="/controller/{{ controllerId }}/systemstatus">
         <mat-icon>info</mat-icon>
@@ -91,10 +86,6 @@
         <mat-icon>settings</mat-icon>
         <span>Go to settings</span>
       </button>
-      <button mat-menu-item [routerLink]="['/controller', controllerId, 'image-manager']">
-        <mat-icon>collections</mat-icon>
-        <span>Image manager</span>
-      </button>
     </mat-menu>
   </mat-toolbar>
 </header>