diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 062351bd..b0b0fd51 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -73,14 +73,13 @@
                   <li class="uk-nav-header uk-parent" [class.uk-active]="isTheActiveMenu(menu)"
                       *ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)">
                     <!--a routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
-                    <a *ngIf="menu.rootItem.route.length > 0 && isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired "
+                    <a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired)"
                        routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"
                        [routerLinkActiveOptions]="{exact: true}"
                        [queryParams]="menu.rootItem.params" [fragment]="menu.rootItem.fragment"
                        class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
                     <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0"
-                       routerLinkActive="uk-link" href="{{menu.rootItem.url}}" target="_blank"
-                       class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
+                       routerLinkActive="uk-link" href="{{menu.rootItem.url}}" target="{{menu.rootItem.url.includes('http') ? '_blank' : '_self'}}">{{menu.rootItem.title}}</a>
                     <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) ||  (menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage))"
                        class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
 
@@ -92,8 +91,7 @@
                              routerLink="{{submenu.route}}" [queryParams]=submenu.params [fragment]="submenu.fragment"
                              class="uk-offcanvas-close custom-offcanvas-close">{{submenu.title}}</a>
                           <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0" routerLinkActive="uk-link"
-                             href="{{submenu.url}}" target="_blank"
-                             class="uk-offcanvas-close custom-offcanvas-close">{{submenu.title}}</a>
+                             href="{{submenu.url}}" target="{{submenu.url.includes('http') ? '_blank' : '_self'}}">{{submenu.title}}</a>
                           <ul *ngIf="submenu.items && submenu.items.length > 0" class="uk-nav-sub">
                             <ng-container *ngFor="let subsubmenu of submenu.items">
                               <li>
@@ -203,7 +201,7 @@
                      [queryParams]="menu.rootItem.params"
                      [fragment]="menu.rootItem.fragment"> {{menu.rootItem.title}}</a>
                   <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0" routerLinkActive="uk-link"
-                     href="{{menu.rootItem.url}}" target="_blank" aria-expanded="false">{{menu.rootItem.title}}</a>
+                     href="{{menu.rootItem.url}}" target="{{menu.rootItem.url.includes('http') ? '_blank' : '_self'}}" aria-expanded="false">{{menu.rootItem.title}}</a>
                   <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || ( menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)) "
                      class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
                   <div *ngIf="menu.items.length > 0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left"
@@ -220,7 +218,7 @@
                                  routerLink="{{submenu.route}}" [queryParams]="submenu.params"
                                  [fragment]="submenu.fragment">{{submenu.title}}</a>
                               <a *ngIf="submenu.route.length == 0 && submenu.url.length > 0" routerLinkActive="uk-link"
-                                 href="{{submenu.url}}" target="_blank">{{submenu.title}}</a>
+                                 href="{{submenu.url}}" target="{{submenu.url.includes('http') ? '_blank' : '_self'}}">{{submenu.title}}</a>
                               <ul *ngIf="submenu.items && submenu.items.length > 0" class="uk-nav-sub">
                                 <ng-container *ngFor="let subsubmenu of submenu.items">
                                   <li>