layout fixes

code/MoyaWeb/WebContent/resources/templates/template1/css/style.css

@@ -7,6 +7,10 @@
 }
 }
 
 
 #menu {
 #menu {
+	padding: 1em;
+}
+
+#aside {
 	margin: 1em;
 	margin: 1em;
 	width: 200px;
 	width: 200px;
 }
 }
@@ -143,7 +147,7 @@ h1 {
 }
 }
 
 
 nav {
 nav {
-	min-width: 225px;
+	min-width: 200px;
 	background: white;
 	background: white;
 	min-height: 400px;
 	min-height: 400px;
 	border-bottom: 1px solid #aaa;
 	border-bottom: 1px solid #aaa;
@@ -155,7 +159,6 @@ nav {
 	margin-right: 1em;
 	margin-right: 1em;
 	border-right: 1px solid #aaa;
 	border-right: 1px solid #aaa;
 	border-bottom: 1px solid #aaa;
 	border-bottom: 1px solid #aaa;
-	
 	background: white;
 	background: white;
 }
 }
 
 

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -100,7 +100,7 @@
 			</section>
 			</section>
 
 
 			<aside class="flex1">
 			<aside class="flex1">
-				<div id="menu">
+				<div id="aside">
 					<div class="ui-widget-header">Login</div>
 					<div class="ui-widget-header">Login</div>
 					<div class="ui-widget-content" style="text-align: center">
 					<div class="ui-widget-content" style="text-align: center">