diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html
index 6550a8276..bd50dc066 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.html
@@ -2,17 +2,20 @@
     <div class="container">
         <article class="row">
 
-            <section class="col-sm-10">
+            <section class="col-lg-7 col-md-6 col-xs-12">
                 <a class="navbar-brand" routerLink="catalog">
                     <img src="../images/brand.png" />
                 </a>
             </section>
 
-            <section class="col-sm-2">
-                <esh-basket-status *ngIf="Authenticated"></esh-basket-status>
+            <section class="col-lg-4 col-md-5 col-xs-12">
                 <esh-identity></esh-identity>
             </section>
 
+            <section class="col-lg-1 col-xs-12">
+                <esh-basket-status *ngIf="Authenticated"></esh-basket-status>
+            </section>
+
         </article>
     </div>
 </header>
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html
index 17ab09824..f15dda395 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.html
@@ -1,8 +1,35 @@
-<button *ngIf="!authenticated" class="identity-login" (click)="login()">Login</button>
-<div *ngIf="authenticated" class="identity-user">
-    <div><span>{{userName}}</span></div><div style="float: right;top: 0;right: -15px;position: absolute;"><img src="../../../../images/arrow-down.png" class="identity-downArrow"></div>
-    <div class="identity-userDropdown">
-        <div [routerLink]="['orders']">MY ORDERS<img src="../../../../images/my_orders.png"></div>
-        <div (click)="logoutClicked($event)">LOG OUT<img src="../../../../images/logout.png"></div>
-    </div>
+<div class="esh-identity">
+    <section class="esh-identity-section"
+             *ngIf="!authenticated">
+        <div class="esh-identity-item"
+             (click)="login()">
+
+            <div class="esh-identity-name esh-identity-name--upper">Login</div>
+        </div>
+    </section>
+
+    <section class="esh-identity-section"
+         *ngIf="authenticated">
+
+        <div class="esh-identity-name">{{userName}}</div>
+        <img class="esh-identity-image" src="../../../../images/arrow-down.png">
+    </section>
+
+    <section class="esh-identity-drop"
+             *ngIf="authenticated">
+
+        <div class="esh-identity-item"
+             [routerLink]="['orders']">
+
+            <div class="esh-identity-name esh-identity-name--upper">My orders</div>
+            <img class="esh-identity-image" src="../../../../images/my_orders.png">
+        </div>
+
+        <div class="esh-identity-item"
+             (click)="logoutClicked($event)">
+
+            <div class="esh-identity-name esh-identity-name--upper">Log Out</div>
+            <img class="esh-identity-image" src="../../../../images/logout.png">
+        </div>
+    </section>
 </div>
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
index 4e8072812..edec0e452 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
@@ -1,63 +1,55 @@
-.identity {
-    &-user {
-        position: absolute !important;
-        top: 30px;
-        right: 120px;
-        cursor: pointer;
+@import "../../../variables";
 
-        &:hover .identity-userDropdown {
-            display: block;
-        }
-    }
+.esh-identity {
+    line-height: 3rem;
+    position: relative;
+    text-align: right;
 
-    &-userDropdown {
-        display: none;
-        position: absolute;
-        background-color: #FFFFFF;
-        min-width: 160px;
-        box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-        right: -15px;
-        z-index: 3;
+    &-section {
+        display: inline-block;
+        width: 100%;
+    }
 
-        &:hover {
-            display: block;
-        }
+    &-name {
+        display: inline-block;
 
-        & div {
-            color: black;
-            padding: 12px 16px;
-            text-decoration: none;
-            display: block;
-            text-align: right;
+        &--upper {
             text-transform: uppercase;
+        }
 
-            &:hover {
-                color: #83d01b;
-            }
+        @media screen and (max-width: $media-screen-s) {
+            font-size: $font-size-s;
         }
     }
 
-    &-downArrow {
-        height: 7px;
-        width: 10px;
+    &-image {
         display: inline-block;
-        margin-left: 20px;
+    }
 
-        &:hover > identity.userDropdown {
-            display: block;
-        }
+    &-drop {
+        background: $color-background-brighter;
+        height: 0;
+        min-width: 14rem;
+        right: 0;
+        overflow: hidden;
+        padding: .5rem;
+        position: absolute;
+        top: 2rem;
+        transition: height $animation-speed-default;
+    }
+
+    &:hover &-drop {
+        height: 6rem;
+        transition: height $animation-speed-default;
     }
 
-    &-login {
-        border: 1px solid #00a69c;
-        height: 36px !important;
-        margin-right: 10px;
-        margin-top: 10px;
-        background-color: #fff;
-        color: #00a69c;
-        text-transform: uppercase;
-        max-width: 140px;
-        width: 140px;
-        padding-top: 8px !important;
+    &-item {
+        cursor: pointer;
+        transition: color $animation-speed-default;
+
+        &:hover {
+            color: $color-secondary-dark;
+            transition: color $animation-speed-default;
+        }
     }
 }