diff --git a/app/views/issues/_show_overhead.html.erb b/app/views/issues/_show_overhead.html.erb
new file mode 100644
index 0000000..997af03
--- /dev/null
+++ b/app/views/issues/_show_overhead.html.erb
@@ -0,0 +1,19 @@
+<tr class="overhead-plugin">
+  <td class="billable-hours">
+    <strong>
+      <%= l(:overhead_billable_time) -%>:
+    </strong>
+  </td>
+  <td>
+    <%= l_hours(issue.billable_time_spent) %>
+  </td>
+
+  <td class="overhead-hours">
+    <strong>
+      <%= l(:overhead_overhead_time) -%>:
+    </strong>
+  </td>
+  <td>
+    <%= l_hours(issue.overhead_time_spent) %>
+  </td>
+</tr>
diff --git a/lib/overhead_issue_hook.rb b/lib/overhead_issue_hook.rb
index 4cd242a..235c168 100644
--- a/lib/overhead_issue_hook.rb
+++ b/lib/overhead_issue_hook.rb
@@ -1,19 +1,10 @@
 class OverheadIssueHook < Redmine::Hook::ViewListener
   def view_issues_show_details_bottom(context={})
     if context[:project].module_enabled?('budget_module')
-      billable_label = content_tag(:td,
-                                   content_tag(:strong, l(:overhead_billable_time)+":"),
-                                   :class => 'billable-hours')
-      billable_spent = content_tag(:td, l_hours(context[:issue].billable_time_spent))      
-
-      overhead_label = content_tag(:td,
-                                   content_tag(:strong, l(:overhead_overhead_time)+":"),
-                                   :class => 'overhead-hours')
-      overhead_spent = content_tag(:td, l_hours(context[:issue].overhead_time_spent))      
-
-      return content_tag(:tr,
-                         billable_label + billable_spent + overhead_label + overhead_spent,
-                         :class => 'overhead-plugin')
+      return context[:controller].send(:render_to_string, {
+                                         :partial => 'issues/show_overhead',
+                                         :locals => {:issue => context[:issue]}
+                                       })
     else
       return ''
     end