diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
index 9a89b42c6..68a6de158 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
@@ -25,6 +25,7 @@
 .widgets-layerZones {
     font-size: 1.4em;
     float: left;
+    float: right;
     width: 60%;
     border: 1px solid #eaeaea;
     border:1px solid #ccc;
@@ -60,8 +61,7 @@
 .widgets-layers {
     font-size: 1.4em;
     border:1px solid #ccc;
-    border-left:none;
-    float: left;
+    border-right:none;
 }
 
 .widgets-layers ul {
@@ -69,7 +69,8 @@
 	border: 1px solid #f1f1f1;
 }
 
-.widgets-layers ul li {
+.widgets-layers ul li 
+{
     padding: .6em .4em;
     border:1px solid #F1F1F1;
 }
@@ -78,9 +79,9 @@
 	background: #c3d9ff;
 }
 
-.widgets-layers .widgets-editLayer img {
-    float: right;
-    margin: 0 0 0 1em;
+.widgets-layers .widgets-currentLayer a {
+	color: #333;
+	font-weight: 600;
 }
 
 .widgets-layerZones ul li ul {
@@ -90,6 +91,7 @@
 
 .new-layer {
     padding: .6em;
+    background: #F5F5F5;
 }
 
 .new-layer a {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
index 19d953a03..c1c176b29 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -54,17 +54,17 @@
                         @foreach (var layer in Model.Layers) {
                             if (layer.Id == Model.CurrentLayer.Id) {
                                 <li class="widgets-currentLayer widgets-editLayer">
-                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
-                                    <a href="@Url.Action("EditLayer", new { @layer.Id })">
+                                 <a href="@Url.Action("EditLayer", new { @layer.Id })">
                                         <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
                                     </a>
+                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
                                 </li>
                             } else {
                                 <li class="widgets-editLayer">
-                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
-                                    <a href="@Url.Action("EditLayer", new { @layer.Id })">
+                                <a href="@Url.Action("EditLayer", new { @layer.Id })">
                                         <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
                                     </a>
+                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
                                 </li>
                             }
                         }