diff --git a/www/css/main.css b/www/css/main.css
index 36d06ca..c3a159a 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -547,7 +547,10 @@ a.wheremi:hover div.wheremi {
 #tools {
   position: absolute;
   right: 10px;
-  top: 90px;
+  top: 80px;
+	z-index: 8;
+}
+#tools div, .leaflet-control-layers a, .leaflet-control-layers-expanded .leaflet-control-layers-list {
 	-moz-border-radius: 7px;
 	-webkit-border-radius: 7px;
 	border-radius: 7px;
@@ -555,33 +558,45 @@ a.wheremi:hover div.wheremi {
 	-webkit-box-shadow: 0 0 7px #999;
 	box-shadow: 0 0 7px #999;
 	background: #f8f8f9;
-	z-index: 6;
 }
-#tools #tools-button {
+#tools div.a, .leaflet-control-layers a {
+	float: right;
+	width: 36px;
+}
+#tools div.a a {
   background-image: url("../img/tools.png");
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 	display: block;
   height: 36px;
-  width: 36px;
 }
-#tools div {
+#tools div.p {
 	display: none;
 }
-#tools div a {
+#tools div.p a {
   color: #0078A8;
 }
-#tools div p {
+#tools div.p p {
   margin-bottom: 0.7em;
 }
-#tools.on #tools-button {
-	display: none;
-}
-#tools.on div {
+#tools.on div.p, .leaflet-control-layers-expanded .leaflet-control-layers-list {
 	display: block;
-	padding: 16px 10px 6px 10px;
+	padding: 16px 40px 6px 10px;
+	margin-right: 40px;
 }
 
+div.leaflet-control-layers {
+  background: none;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+	box-shadow: none;
+  padding: 0;
+}
+div.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+  display: block;
+}
+
+
 /*
  * Toolbar
  */
diff --git a/www/map.php b/www/map.php
index be764b4..db539bd 100644
--- a/www/map.php
+++ b/www/map.php
@@ -50,8 +50,10 @@
     <div id="mappan">
       <div id="map"></div>
       <div id="tools" onmouseover="this.className='on';" onmouseout="this.className='';">
-        <a id="tools-button" href="#" title="Инструменты"></a>
-        <div>
+        <div class="a">
+          <a id="tools-button" href="#" title="Инструменты"></a>
+        </div>
+        <div class="p">
           <p><a href="#" title="Маркер" onClick="osm.markers.addPoint()">Маркер</a></p>
           <p><a id="EditJOSM" href="#" title="Редактировать">Редактировать (в JOSM)</a></p>
         </div>