diff -r ff3b21d62eb8 -r a282eebbc5e0 server/src/main/webapp/WEB-INF/templates/admin/spacesList.html
--- a/server/src/main/webapp/WEB-INF/templates/admin/spacesList.html	Tue May 14 14:10:23 2013 +0200
+++ b/server/src/main/webapp/WEB-INF/templates/admin/spacesList.html	Tue Apr 23 16:54:18 2013 +0200
@@ -39,27 +39,27 @@
         </div>
         <div id="objects-content">
           <ul class="object-tools">
-            <li><a href="spacesAdd.html" th:href="@{/admin/spaces/edit/}" th:text="#{renkanAdmin.space_add}">Add space</a></li>
+            <li><a href="spaceAdd.html" th:href="@{/admin/users/edit/}" th:text="#{renkanAdmin.user_add}">Add user</a></li>
           </ul>
           <table>
             <thead>
               <tr>
-                <th th:text="#{renkanAdmin.object_name}" class="spaces-table-title">Name</th>
-                <th th:text="#{renkanAdmin.object_name}" class="spaces-table-created">Created</th>
-                <th th:text="#{renkanIndex.space_proj_count}">Project count</th>
-                <th th:text="#{renkanIndex.space_url}">url</th>
-                <th th:text="#{renkanAdmin.object_edit}" class="spaces-table-actions">Edit</th>
-                <th th:text="#{renkanAdmin.object_delete}" class="spaces-table-actions">Delete</th>
+                <th th:text="#{renkanAdmin.object_name}" class="object-table-title">Name</th>
+                <th th:text="#{renkanAdmin.object_created}" class="object-table-created">Created</th>
+                <th th:text="#{renkanAdmin.space_proj_count}" class="object-proj-count">Project count</th>
+                <th th:text="#{renkanIndex.space_url}" class="object-url">url</th>
+                <th th:text="#{renkanAdmin.object_edit}" class="object-table-actions">Edit</th>
+                <th th:text="#{renkanAdmin.object_delete}" class="object-table-actions">Delete</th>
               </tr>
             </thead>
             <tbody>
               <tr th:each="object: ${page.content}" th:with="spaceProjCount=${#maps.containsKey(projectsCount, object.id)}? ${projectsCount[object.id]} : 0">
-                <td th:text="${object.title}" class="spaces-table-title" >title</td>
-                <td th:text="${object.created}?${#dates.format(object.created, #messages.msg('date.format'))}:'n/a'" class="spaces-table-created">created</td>
-                <td th:text="${spaceProjCount}">nb. proj</td>
-                <td><a href="../renkanIndex.html" th:href="@{'/s/'+${object.id}}" th:text="#{renkanIndex.space_url}">url</a></td>
-                <td><a href="spaceEdit.html" th:href="@{'/admin/spaces/edit/'+${object.id}}" th:text="#{renkanAdmin.object_edit_link}" class="spaces-table-actions">Edit</a></td>
-                <td><a href="#" th:if="${spaceProjCount==0}" th:href="@{'/admin/spaces/delete/'+${object.id}}" th:text="#{renkanAdmin.object_delete_link}" class="spaces-table-actions">Delete</a><span th:if="${spaceProjCount>0}" class="spaces-table-actions spaces-table-actions-disabled" th:text="#{renkanAdmin.object_delete_link}">Delete</span></td>
+                <td th:text="${object.title}" class="object-table-title" >title</td>
+                <td th:text="${object.created}?${#dates.format(object.created, #messages.msg('date.format'))}:'n/a'" class="object-table-created">created</td>
+                <td th:text="${spaceProjCount}" class="object-proj-count">nb. proj</td>
+                <td class="object-url"><a href="../renkanIndex.html" th:href="@{'/s/'+${object.id}}" th:text="#{renkanIndex.space_url}" >url</a></td>
+                <td><a href="spaceEdit.html" th:href="@{'/admin/spaces/edit/'+${object.id}}" th:text="#{renkanAdmin.object_edit_link}" class="object-table-actions">Edit</a></td>
+                <td><a href="#" th:if="${spaceProjCount==0}" th:href="@{'/admin/spaces/delete/'+${object.id}}" th:text="#{renkanAdmin.object_delete_link}" class="object-table-actions">Delete</a><span th:if="${spaceProjCount>0}" class="object-table-actions object-table-actions-disabled" th:text="#{renkanAdmin.object_delete_link}">Delete</span></td>
               </tr>
             </tbody>
           </table>