diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index a26cb615..020aa294 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -91,7 +91,7 @@ module IssuesHelper
              content_tag('td', progress_bar(el.done_ratio, :width => '80px')),
              :class => "issue issue-#{el.id} #{"self" if el == issue} hascontextmenu #{level > 0 ? "idnt idnt-#{level}" : nil}")
     end
-    s << '</form></table>'
+    s << '</table></form>'
     s
   end
 
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 8600fbb9..0ee16b66 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -39,12 +39,16 @@
         <% if User.current.allowed_to?(:view_time_entries, @project) %>
         <th class="spent-time"><%=l(:label_spent_time)%>:</th>
         <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
+        <% else %>
+        <th></th><td></td>
         <% end %>
     </tr>
     <tr>
         <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
         <% if @issue.estimated_hours %>
         <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
+        <% else %>
+        <th></th><td></td>
         <% end %>
     </tr>
     <%= render_custom_fields_rows(@issue) %>