keycloak-memoizeit

diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
index 2a8a779..7f0930b 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
+++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
@@ -61,6 +61,7 @@
         <link href="${resourceUrl}/node_modules/patternfly/dist/css/patternfly-additions.min.css" rel="stylesheet"
               media="screen, print">
 
+        <script src="${resourceUrl}/node_modules/jquery/dist/jquery.min.js"></script>
         <script src="${resourceUrl}/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="${resourceUrl}/node_modules/patternfly/dist/js/patternfly.min.js"></script>
         <script src="${authUrl}/js/keycloak.js"></script>
@@ -135,6 +136,7 @@
 <!--Top Nav -->
 
 <!-- Home Page --->
+    
     <div class="cards-pf" id="welcomeScreen">
         <div class="text-center">
           <h1>Welcome to Keycloak Account Management</h1>
@@ -211,6 +213,13 @@
             </div>
         </div>
     </div>
+        
+        <script>
+            var winHash = window.location.hash;
+            if (winHash.startsWith('#/') && !winHash.startsWith('#/&state')) {
+                document.getElementById("welcomeScreen").style.visibility='hidden';
+            }
+        </script>
 
         <app-root></app-root>
     </body>

diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.html b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.html
index 0669b26..a343908 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.html
+++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.html
@@ -21,13 +21,12 @@
             <li *ngIf="referrer.exists()">
                 <a class="nav-item-iconic" href="{{referrer.getUri()}}"><span class="pficon-arrow"></span> {{'backTo' | translate:referrer.getName()}}</a>
             </li>
-            <li class="dropdown" (click)="logout()">
+            <li class="dropdown" >
                 <a class="dropdown-toggle nav-item-iconic" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                     <span title="Username" class="fa pficon-user"></span>
                     <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                    <li><a href="#">Preferences</a></li>
                     <li><a href="#" (click)="logout()">{{'doSignOut' | translate}}</a></li>
                 </ul>
             </li>

diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.ts b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.ts
index 65f3ea0..f2895bf 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.ts
+++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/app/top-nav/top-nav.component.ts
@@ -21,6 +21,7 @@ import {ResponsivenessService} from "../responsiveness-service/responsiveness.se
 import {Referrer} from "../page/referrer";
 
 declare const resourceUrl: string;
+declare const baseUrl: string;
 declare const referrer: string;
 declare const referrer_uri: string;
 
@@ -48,7 +49,7 @@ export class TopNavComponent implements OnInit {
     }
 
     private logout() {
-        this.keycloakService.logout();
+        this.keycloakService.logout(baseUrl);
     }
 
 }