diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 785f84291..63f9661e3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -123,9 +123,9 @@ module ProjectsHelper
     selection.each do |board|
       node = capture(board, level, &block)
       node << render_boards_tree(boards, board, level+1, &block)
-      s << content_tag('div', node)
+      s << node
     end
-    content_tag('div', s, :class => 'sort-level')
+    s
   end
 
   def render_api_includes(project, api)
diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb
index bf0b786fd..3f2d2395e 100644
--- a/app/views/projects/settings/_boards.html.erb
+++ b/app/views/projects/settings/_boards.html.erb
@@ -3,31 +3,34 @@
 <% end %>
 
 <% if @project.boards.any? %>
-<div class="table-list boards">
-  <div class="table-list-header">
-    <div class="table-list-cell"><%= l(:label_board) %></div>
-  </div>
-  <%= render_boards_tree(@project.boards) do |board, level| %>
-  <div class="table-list-row">
-    <div class="table-list-cell name" style="padding-left: <%= 2 + level * 16 %>px">
-      <%= link_to board.name, project_board_path(@project, board) %>
-    </div>
-    <div class="table-list-cell description"><%= board.description %></div>
-    <div class="table-list-cell buttons">
-    <% if User.current.allowed_to?(:manage_boards, @project) %>
-      <%= reorder_handle(board) %>
-      <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
-      <%= delete_link project_board_path(@project, board) %>
-    <% end %>
-    </div>
-  </div>
-  <% end %>
-</div>
-
-<%= javascript_tag do %>
-  $(function() { $("div.sort-level").positionedItems(); });
+<table class="list boards">
+<thead><tr>
+  <th><%= l(:field_name) %></th>
+  <th><%= l(:field_description) %></th>
+  <th></th>
+</tr></thead>
+<tbody>
+<%= render_boards_tree(@project.boards) do |board, level| %>
+<tr>
+  <td class="name" style="padding-left: <%= 2 + level * 16 %>px">
+    <%= link_to board.name, project_board_path(@project, board) %>
+  </td>
+  <td class="description"><%= board.description %></td>
+  <td class="buttons">
+<% if User.current.allowed_to?(:manage_boards, @project) %>
+    <%= reorder_handle(board) %>
+    <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
+    <%= delete_link project_board_path(@project, board) %>
 <% end %>
-
+  </td>
+</tr>
+<% end %>
+</tbody>
+</table>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
+
+<%= javascript_tag do %>
+  $(function() { $("table.boards tbody").positionedItems(); });
+<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 330b1d486..04089594e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -236,8 +236,8 @@ div + .drdn-items {border-top:1px solid #ccc;}
 #project-jump .drdn-items>a:hover {background-color:#759FCF; color:#fff !important;}
 
 /***** Tables *****/
-table.list, .table-list { border: 1px solid #e4e4e4; width: 100%; margin-bottom: 4px; border-radius: 3px; border-spacing: 0; overflow: hidden;}
-table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
+table.list { border: 1px solid #e4e4e4; width: 100%; margin-bottom: 4px; border-radius: 3px; border-spacing: 0; overflow: hidden;}
+table.list th { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
 table.list td {text-align:center; vertical-align:middle; padding-right:10px;}
 table.list td.id { width: 2%; text-align: center;}
 table.list td.name, table.list td.description, table.list td.subject, table.list td.parent-subject, table.list td.comments, table.list td.roles, table.list td.attachments, table.list td.text,  table.list td.short_description {text-align: left;}
@@ -258,9 +258,6 @@ table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
 table.list tr.overdue td.due_date  { color: #c22; }
 #role-permissions-trackers table.list th {white-space:normal;}
 
-.table-list-cell {display: table-cell; vertical-align: top; padding:2px; }
-.table-list div.buttons {width: 15%;}
-
 tr.project td.name a { white-space:nowrap; }
 tr.project.closed, tr.project.archived { color: #aaa; }
 tr.project.closed a, tr.project.archived a { color: #aaa; }
@@ -381,7 +378,9 @@ a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat:
 table.boards a.board { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
 table.boards td.last-message {text-align:left;font-size:80%;}
 
-div.table-list.boards .table-list-cell.name {width: 30%;}
+table.list.boards td {vertical-align: top;}
+table.list.boards td.name {width: 30%;}
+table.list.boards td.buttons {width: 15%;}
 
 #query_form_content {font-size:90%;}
 #query_form_with_buttons > p.contextual {font-size:12px; margin:12px 0px;}