diff --git a/src/Web/Views/Catalog/_pagination.cshtml b/src/Web/Views/Catalog/_pagination.cshtml
index ca94c72..6ba9f4f 100644
--- a/src/Web/Views/Catalog/_pagination.cshtml
+++ b/src/Web/Views/Catalog/_pagination.cshtml
@@ -1,32 +1,38 @@
 ﻿@model PaginationInfoViewModel
 
 <div class="esh-pager">
-    <div class="container">
-        <article class="esh-pager-wrapper row">
-            <nav>
-                <a class="esh-pager-item esh-pager-item--navigable @Model.Previous"
-                    id="Previous"                    
-                    asp-controller="Catalog"
-                    asp-action="Index"
-                    asp-route-page="@(Model.ActualPage -1)"
-                    aria-label="Previous">
-                    Previous
-                </a>
-
-                <span class="esh-pager-item">
-                    Showing @Model.ItemsPerPage of @Model.TotalItems products - Page @(Model.ActualPage + 1) - @Model.TotalPages
-                </span>
-
-                <a class="esh-pager-item esh-pager-item--navigable @Model.Next"
-                    id="Next"                    
-                    asp-controller="Catalog"
-                    asp-action="Index"
-                    asp-route-page="@(Model.ActualPage + 1)"
-                    aria-label="Next">
-                    Next
-                </a>
-            </nav>
-        </article>
-    </div>
+	<div class="container-fluid">
+		<article class="esh-pager-wrapper row">
+			<nav>
+				<div class="col-md-2 col-xs-12">
+					<a class="esh-pager-item-left esh-pager-item--navigable @Model.Previous"
+					   id="Previous"
+					   asp-controller="Catalog"
+					   asp-action="Index"
+					   asp-route-page="@(Model.ActualPage - 1)"
+					   aria-label="Previous">
+						Previous
+					</a>
+				</div>
+				
+				<div class="col-md-8 col-xs-12">
+					<span class="esh-pager-item">
+						Showing @Model.ItemsPerPage of @Model.TotalItems products - Page @(Model.ActualPage + 1) - @Model.TotalPages
+					</span>
+				</div>
+		        
+				<div class="col-md-2 col-xs-12">
+					<a class="esh-pager-item-right esh-pager-item--navigable @Model.Next"
+					   id="Next"
+					   asp-controller="Catalog"
+					   asp-action="Index"
+					   asp-route-page="@(Model.ActualPage + 1)"
+					   aria-label="Next">
+						Next
+					</a>
+				</div>
+			</nav>
+		</article>
+	</div>
 </div>
 
diff --git a/src/Web/Views/Shared/_Layout.cshtml b/src/Web/Views/Shared/_Layout.cshtml
index 85d989e..a8cb740 100644
--- a/src/Web/Views/Shared/_Layout.cshtml
+++ b/src/Web/Views/Shared/_Layout.cshtml
@@ -1,77 +1,76 @@
 ﻿<!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - Microsoft.eShopOnWeb</title>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>@ViewData["Title"] - Microsoft.eShopOnWeb</title>
 
-    <environment names="Development">
-        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-        <link rel="stylesheet" href="~/css/app.css" />        
-    </environment>
-    <environment names="Staging,Production">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
-              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
-              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
-        <link rel="stylesheet" href="~/css/app.min.css" asp-append-version="true" />
-    </environment>
-        <link rel="stylesheet" href="~/css/catalog/pager.css" />        
-        <link rel="stylesheet" href="~/css/catalog/catalog.component.css" />        
+	<environment names="Development">
+		<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+		<link rel="stylesheet" href="~/css/app.css" />
+	</environment>
+	<environment names="Staging,Production">
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
+			  asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+			  asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
+		<link rel="stylesheet" href="~/css/app.min.css" asp-append-version="true" />
+	</environment>
+	<link rel="stylesheet" href="~/css/catalog/pager.css" />
+	<link rel="stylesheet" href="~/css/catalog/catalog.component.css" />
 </head>
 <body>
-    <header class="navbar navbar-light navbar-static-top">
-        <div class="container">
-            <article class="row">
+	<header class="navbar navbar-light navbar-static-top">
+		<div class="container">
+			<article class="row">
 
-                <section class="col-lg-7 col-md-6 col-xs-12">
-                    <a class="navbar-brand" routerLink="catalog">
-                        <a asp-area="" asp-controller="Catalog" asp-action="Index">
-                            <img src="../images/brand.png" />
-                        </a>
-                </section>
-                @await Html.PartialAsync("_LoginPartial")
-                <section class="col-lg-1 col-xs-12"><a asp-controller="Basket" asp-action="Index">Basket</a></section>
+				<section class="col-lg-7 col-md-6 col-xs-12">
+					<a asp-area="" asp-controller="Catalog" asp-action="Index" class="navbar-brand">
+						<img src="../images/brand.png" alt="eShop On Web"/>
+					</a>
+				</section>
+				@await Html.PartialAsync("_LoginPartial")
+				<section class="col-lg-1 col-md-3 col-xs-6"><a asp-controller="Basket" asp-action="Index">Basket</a></section>
 
-            </article>
-        </div>
-    </header>
+			</article>
+		</div>
+	</header>
 
-    @RenderBody()
+	@RenderBody()
 
 
-    <footer class="esh-app-footer">
-        <div class="container">
-            <article class="row">
+	<footer class="esh-app-footer">
+		<div class="container">
+			<article class="row">
 
-                <section class="col-sm-6">
-                    <img class="esh-app-footer-brand" src="../images/brand_dark.png" />
-                </section>
+				<section class="col-sm-6">
+					<img class="esh-app-footer-brand" src="../images/brand_dark.png" />
+				</section>
 
-                <section class="col-sm-6">
-                    <div class="esh-app-footer-text hidden-xs"> e-ShopOnWeb. All right reserved </div>
-                </section>
+				<section class="col-sm-6">
+					<div class="esh-app-footer-text hidden-xs"> e-ShopOnWeb. All right reserved </div>
+				</section>
 
-            </article>
-        </div>
-    </footer>
+			</article>
+		</div>
+	</footer>
 
-    <environment names="Development">
-        <script src="~/lib/jquery/dist/jquery.js"></script>
-        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
-        <script src="~/js/site.js" asp-append-version="true"></script>
-    </environment>
-    <environment names="Staging,Production">
-        <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
-                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
-                asp-fallback-test="window.jQuery">
-        </script>
-        <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.6/bootstrap.min.js"
-                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal">
-        </script>
-        <script src="~/js/site.min.js" asp-append-version="true"></script>
-    </environment>
+	<environment names="Development">
+		<script src="~/lib/jquery/dist/jquery.js"></script>
+		<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+		<script src="~/js/site.js" asp-append-version="true"></script>
+	</environment>
+	<environment names="Staging,Production">
+		<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
+				asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+				asp-fallback-test="window.jQuery">
+		</script>
+		<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.6/bootstrap.min.js"
+				asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
+				asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal">
+		</script>
+		<script src="~/js/site.min.js" asp-append-version="true"></script>
+	</environment>
 
-    @RenderSection("scripts", required: false)
+	@RenderSection("scripts", required: false)
 </body>
 </html>
diff --git a/src/Web/Views/Shared/_LoginPartial.cshtml b/src/Web/Views/Shared/_LoginPartial.cshtml
index c7df63d..86b891c 100644
--- a/src/Web/Views/Shared/_LoginPartial.cshtml
+++ b/src/Web/Views/Shared/_LoginPartial.cshtml
@@ -40,7 +40,7 @@
 }
 else
 {
-        <section class="col-lg-4 col-md-5 col-xs-12">
+        <section class="col-lg-1 col-lg-offset-3 col-md-3 col-xs-6">
             <div class="esh-identity">
                 <section class="esh-identity-section">
                     <div class="esh-identity-item">
diff --git a/src/Web/wwwroot/css/catalog/pager.css b/src/Web/wwwroot/css/catalog/pager.css
index eec6e39..b98b6de 100644
--- a/src/Web/wwwroot/css/catalog/pager.css
+++ b/src/Web/wwwroot/css/catalog/pager.css
@@ -3,8 +3,12 @@
     text-align: center;
 }
 
-.esh-pager-item {
-    margin: 0 5vw;
+.esh-pager-item-left {
+    float: left;
+}
+
+.esh-pager-item-right {
+    float: right;
 }
 
 .esh-pager-item--navigable {
