diff --git a/src/app/app.component.html b/src/app/app.component.html
index c6796f9..266b2f1 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -2,17 +2,15 @@
   <loading [full]="true"></loading>
 </div>
 <div *ngIf="loading == false">
-  <div class="sidebar_main_swipe" [class.sidebar_main_active]="open && hasSidebar" [class.sidebar_mini]="!open && hasSidebar"
+  <div id="modal-container"></div>
+  <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
+          [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
+  <div class="sidebar_main_swipe uk-flex" [class.sidebar_main_active]="open && hasSidebar" [class.sidebar_mini]="!open && hasSidebar"
        [class.sidebar_hover]="hover">
-    <div id="modal-container"></div>
-    <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
-            [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
-    <div>
       <dashboard-sidebar *ngIf="hasSidebar" [items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
       <main>
         <router-outlet></router-outlet>
       </main>
-    </div>
   </div>
 </div>
 
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 69bbccd..660387b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 69bbccd0097df2aec4771c101be3e559e6c3d505
+Subproject commit 660387b8da13f36a656d7965a0147d7302fb3749
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 9e58421..0a58acb 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af
+Subproject commit 0a58acbbd45074327642e132cd7deae31188a978