diff --git a/war/bootstrap/css/bootstrap-theme.css b/war/bootstrap/css/bootstrap-theme.css
diff --git a/war/bootstrap/css/bootstrap-theme.css.map b/war/bootstrap/css/bootstrap-theme.css.map
diff --git a/war/bootstrap/css/bootstrap-theme.min.css b/war/bootstrap/css/bootstrap-theme.min.css
diff --git a/war/bootstrap/css/bootstrap-theme.min.css.map b/war/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/war/bootstrap/css/bootstrap.css b/war/bootstrap/css/bootstrap.css
diff --git a/war/bootstrap/css/bootstrap.css.map b/war/bootstrap/css/bootstrap.css.map
diff --git a/war/bootstrap/css/bootstrap.min.css b/war/bootstrap/css/bootstrap.min.css
diff --git a/war/bootstrap/css/bootstrap.min.css.map b/war/bootstrap/css/bootstrap.min.css.map
diff --git a/war/bootstrap/fonts/glyphicons-halflings-regular.eot b/war/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/war/bootstrap/fonts/glyphicons-halflings-regular.svg b/war/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/war/bootstrap/fonts/glyphicons-halflings-regular.ttf b/war/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/war/bootstrap/fonts/glyphicons-halflings-regular.woff b/war/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/war/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/war/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/war/bootstrap/js/bootstrap.js b/war/bootstrap/js/bootstrap.js
diff --git a/war/bootstrap/js/bootstrap.min.js b/war/bootstrap/js/bootstrap.min.js
diff --git a/war/bootstrap/js/npm.js b/war/bootstrap/js/npm.js
@@ -0,0 +1,13 @@
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
diff --git a/war/js/j_auth.js b/war/js/j_auth.js
@@ -28,6 +28,7 @@ $(function(){
 				sTO = resData.timeout;
 				sID = resData.sessionId;
 				setCookie("sesToken", sID);
+				setCookie("mainToken", sID);
 				setCookie("sesTO", sTO);
 				setCookie("accessLevel", resData.accessLevel);
 				window.location = "workspace.html";
@@ -51,6 +52,7 @@ $(function(){
 						sTO = resData.timeout;
 						sID = resData.sessionId;
 						setCookie("sesToken", sID);
+						setCookie("mainToken", sID);
 						setCookie("sesTO", sTO);
 						setCookie("accessLevel", resData.accessLevel);
 						window.location = "workspace.html";

diff --git a/war/js/j_workspace.js b/war/js/j_workspace.js
@@ -111,9 +111,18 @@
 	});
 	//log out
 	$('#menu-logout').on('click', function(){
-		deleteCookie("sesToken");	
-		deleteCookie("sesTO");	
-		window.location = "auth.html";
+		if (getCookie('sesToken') == getCookie('mainToken')) 
+		{
+			deleteCookie("sesToken");	
+			deleteCookie("sesTO");	
+			window.location = "auth.html";
+		}
+		else
+		{
+			setCookie('mainToken', getCookie('sesToken'));
+			location.reload();
+		}
+
 	});
 	//hide order edit block
 	$('#opacity').on('click', function(){

diff --git a/war/styles/s_workspace.css b/war/styles/s_workspace.css
@@ -1,6 +1,6 @@
 body {
 	margin: 0px;
-	font-family: tahoma, arial, verdana, sans-serif, Lucida Sans;
+	font-family: roboto, tahoma, arial, verdana, sans-serif, Lucida Sans;
 	font-size: 14px; 
 	background-color: #f1f1f1;
 	z-index: 100;
@@ -386,7 +386,7 @@ td.order-create-td-res {
 	cursor: pointer;
 }
 #table-client-menu td:hover {
-	background-color: #435ea4;
+	background-color: #7593E0;
 	color: #fff;
 }
 
@@ -456,7 +456,7 @@ td.order-create-td-res {
 	cursor: pointer;
 }
 #table-product-menu td:hover {
-	background-color: #435ea4;
+	background-color: #7593E0;
 	color: #fff;
 }
 
@@ -493,13 +493,12 @@ td.order-create-td-res {
 	min-width: 930px;
 	background-color: #f1f1f1;
 }
-
+/* #688bb0; */
 #header-main {
 	height: 100%;
-	width: 95%;
-	background-color: /* #688bb0; */ #435ea4;
+	width: 100%;
+	background-color: #435ea4;
 	margin: auto;
-	border-radius: 0 0 20px 20px;
 }
 
 #header-main H1 {
@@ -513,44 +512,44 @@ td.order-create-td-res {
 
 #main {
 	height: 700px;
-	width: 90%;
-	min-width: 732px;
+	width: 100%;
+	min-width: 1150px;
 	/* border: 1px solid #d9e0e7; */
 	margin: auto;
 	margin-top: 0px;
 }
 
 #div-right {
 	height: 100%;
-	width: 70%;
-	min-width: 600px;
-	border: 1px solid #d9e0e7;
+	width: 80%;
+	min-width: 900px;
+	/*border: 1px solid #d9e0e7;*/
 	position: relative;
 	float: left;
 }
 
 /* SIDE MENU STARTS HERE */
 
 #div-side-menu {
-	width: 15%;
-	min-width: 130px;
+	width: 20%;
+	min-width: 170px;
 	height: 100%;
 	background-color: #f1f1f1;
-	position: relative;
+	/*position: relative;*/
 	float: left;
 }
 
 #ul-side-menu {
 	padding: 0;
-	width: 145px;
+	width: 160px;
 	float: right;
 }
 
 #ul-side-menu li {
 	list-style: none;
-	width: 135px;
-	line-height: 22px;
-	font-size: 12px;
+	width: 160px;
+	line-height: 28px;
+	font-size: 14px;
 	padding-left: 10px;
 	cursor: pointer;
 }
@@ -597,7 +596,7 @@ td.order-create-td-res {
 }
 
 #table-orders-header {
-	background-color: #82a8bc;
+	background-color: #7593E0;
 }
 
 #table-orders td {
@@ -608,7 +607,7 @@ td.order-create-td-res {
 }
 
 .tr-order:hover {
-	background-color: #82a8bc;
+	background-color: #A7BCF2;
 	cursor: pointer;
 }
 
@@ -621,4 +620,8 @@ td.order-create-td-res {
 	text-align: center;
 	font-size: 11px;
 
+}
+
+.with-shadow {
+	box-shadow: 0 0 15px rgba(0,0,0,0.9);
 }
diff --git a/war/workspace.html b/war/workspace.html
@@ -5,6 +5,7 @@
 		<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
 
 		<link rel='stylesheet' type='text/css' href='styles/s_workspace.css' />
+		<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
 		<script type="text/javascript" src="js/cookie_func.js"></script>
 		<script>
@@ -27,7 +28,7 @@
 	<body>
 		<div id="opacity"></div>	
 
-		<div id="order-edit-payment">
+		<div id="order-edit-payment" class='with-shadow'>
 			<div id="order-payment-text-block"></div>
 			<div id="order-payment-main">	
 				<table id="table-order-payment">
@@ -52,36 +53,6 @@
 			<input type="hidden" id="input-order-Id">
 		</div>
 
-		<!-- <div id="order-create">
-			<div id="order-create-text-block"></div>
-			<div id="order-create-main">	
-				<table id="table-order-create">
-					<tbody>
-						<tr>
-							<td>Клиент</td>
-							<td id='order-client-name'></td>
-						</tr>
-						<tr>
-							<td>Продукт</td>
-							<td id='order-product-name'></td>
-						</tr>
-						<tr>
-							<td>Стоимость</td>
-							<td id='order-product-price'></td>
-						</tr>
-						<tr>
-							<td>Внесенная оплата</td>
-							<td id='order-product-paid'><input type="text" id="create-input-paid" placeholder="0.00"></td>
-						</tr>
-					</tbody>
-				</table>
-				Загрузить файлы? <input type="checkbox" name="file-upload-chb" id="file-upload-chb">
-				<div class="div-form-button" id="order-create-send">Принять</div>
-			</div>
-			<input type="hidden" id="input-order-client-id">
-			<input type="hidden" id="input-order-product-id">
-		</div> -->
-
 		<div id="lists-container">
 			<div id="client-list">
 				<p id='client-list-head'>Ваши клиенты</p>
@@ -101,7 +72,7 @@
 			</div>
 		</div>
 
-		<div id="client-menu">
+		<div id="client-menu" class='with-shadow'>
 			<div id="client-menu-text-block"></div>
 			<div id="client-menu-main">
 				<table id="table-client-menu">
@@ -111,7 +82,7 @@
 			<div class="div-form-button" id="client-menu-create">Добавить клиента</div>	
 		</div>
 
-		<div id="product-menu">
+		<div id="product-menu" class='with-shadow'>
 			<div id="product-menu-text-block"></div>
 			<div id="product-menu-main">
 				<table id="table-product-menu">
@@ -132,7 +103,7 @@
 					<li id="menu-client-open">Мои клиенты</li>
 					<li id="menu-create-order">Оформить заказ</li>
 					<li id="menu-product-page">Продукты</li>
-					<li id="menu-logout">Log Out</li>
+					<li id="menu-logout">Выйти</li>
 					<!-- <li id="menu-showses">Show cookie info</li>
 					<li id="menu-adm">Меню администратора</li>
 					<li id="menu-mod">Меню модератора</li> -->