diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
index 2b36b032f..5f7eb9f27 100644
--- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
@@ -5,38 +5,40 @@
 <h2>Manage Users</h2>
 <% using (Html.BeginForm()) { %>
     <%=Html.ValidationSummary()%>
-    <%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "floatRight topSpacer" })%>
-    <table class="items">
-        <colgroup>
-            <col id="Name" />
-            <col id="Email" />
-            <col id="Edit" />
-        </colgroup>
-        <thead>
+    <div class="manage"><%=Html.ActionLink("Add a new user", "Create", new { }, new { @class = "button" })%></div>
+    <fieldset>
+        <table class="items">
+            <colgroup>
+                <col id="Name" />
+                <col id="Email" />
+                <col id="Edit" />
+            </colgroup>
+            <thead>
+                <tr>
+                    <th scope="col">
+                        Name
+                    </th>
+                    <th scope="col">
+                        Email
+                    </th>
+                    <th scope="col">
+                    </th>
+                </tr>
+            </thead>
+            <% foreach (var row in Model.Rows)
+               { %>
             <tr>
-                <th scope="col">
-                    Name
-                </th>
-                <th scope="col">
-                    Email
-                </th>
-                <th scope="col">
-                </th>
+                <td>
+                    <%=Html.Encode(row.User.UserName)%>
+                </td>
+                <td>
+                    <%=Html.Encode(row.User.Email)%>
+                </td>
+                <td>
+                    <%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%>
+                </td>
             </tr>
-        </thead>
-        <% foreach (var row in Model.Rows)
-           { %>
-        <tr>
-            <td>
-                <%=Html.Encode(row.User.UserName)%>
-            </td>
-            <td>
-                <%=Html.Encode(row.User.Email)%>
-            </td>
-            <td>
-                <%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%>
-            </td>
-        </tr>
-        <%}%>
-    </table>
+            <%}%>
+        </table>
+    </fieldset>
 <% } %>
\ No newline at end of file