diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml
index 6fbeed82a77120860b213496313b64c2f6fb48a3..49acedc8c79979413016533633ce36a5c90d45e0 100644
--- a/app/views/admin/groups/index.html.haml
+++ b/app/views/admin/groups/index.html.haml
@@ -12,13 +12,14 @@
 
 %table
   %thead
-    %th
-      Name
-      %i.icon-sort-down
-    %th Path
-    %th Projects
-    %th Owner
-    %th.cred Danger Zone!
+    %tr
+      %th
+        Name
+        %i.icon-sort-down
+      %th Path
+      %th Projects
+      %th Owner
+      %th.cred Danger Zone!
 
   - @groups.each do |group|
     %tr
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 832bc352b5676db9dfef61094e0cecf78c9d94ac..310cfa53890fd8d0ed0dd818f2a7bb2e310de17c 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -9,14 +9,15 @@
 
 %table
   %thead
-    %th
-      Name
-      %i.icon-sort-down
-    %th Path
-    %th Team Members
-    %th Last Commit
-    %th Edit
-    %th.cred Danger Zone!
+    %tr
+      %th
+        Name
+        %i.icon-sort-down
+      %th Path
+      %th Team Members
+      %th Last Commit
+      %th Edit
+      %th.cred Danger Zone!
 
   - @projects.each do |project|
     %tr
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 63de1d3af56174404c96d045e6dd936435c4feee..1df4f590bcb40169dcdbecf6b611f61f182c677a 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -21,15 +21,16 @@
 
 %table
   %thead
-    %th Admin
-    %th
-      Name
-      %i.icon-sort-down
-    %th Username
-    %th Email
-    %th Projects
-    %th Edit
-    %th.cred Danger Zone!
+    %tr
+      %th Admin
+      %th
+        Name
+        %i.icon-sort-down
+      %th Username
+      %th Email
+      %th Projects
+      %th Edit
+      %th.cred Danger Zone!
 
   - @admin_users.each do |user|
     %tr
diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml
index 1f191f5ad3cf7e323844104440738f42f2208ee4..c4975c72ef299c051570c5bab3cf6b4db7735196 100644
--- a/app/views/milestones/show.html.haml
+++ b/app/views/milestones/show.html.haml
@@ -59,10 +59,11 @@
   .span6
     %table.milestone-issue-filter
       %thead
-        %th
-          %ul.nav.nav-pills
-            %li.active= link_to('Open Issues', '#')
-            %li=link_to('All Issues', '#')
+        %tr
+          %th
+            %ul.nav.nav-pills
+              %li.active= link_to('Open Issues', '#')
+              %li=link_to('All Issues', '#')
       - @issues.each do |issue|
         %tr{data: {closed: issue.closed}}
           %td
@@ -74,10 +75,11 @@
   .span6
     %table.milestone-merge-requests-filter
       %thead
-        %th
-          %ul.nav.nav-pills
-            %li.active= link_to('Open Merge Requests', '#')
-            %li=link_to('All Merge Requests', '#')
+        %tr
+          %th
+            %ul.nav.nav-pills
+              %li.active= link_to('Open Merge Requests', '#')
+              %li=link_to('All Merge Requests', '#')
       - @merge_requests.each do |merge_request|
         %tr{data: {closed: merge_request.closed}}
           %td
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 02ae3d90c40b131dfe25d97c223949dca2475a92..a632bb3b0d7bb83d02d24086e2434292e0a119af 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -16,10 +16,11 @@
   - else
     %table#tree-slider{class: "table_#{@hex_path} tree-table" }
       %thead
-        %th Name
-        %th Last Update
-        %th Last Commit
-        %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
+        %tr
+          %th Name
+          %th Last Update
+          %th Last Commit
+          %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
 
       - if tree.up_dir?
         %tr.tree-item