diff --git a/app/views/line_items/_issue_form.html.erb b/app/views/line_items/_issue_form.html.erb
index 7429bba..27a0a03 100644
--- a/app/views/line_items/_issue_form.html.erb
+++ b/app/views/line_items/_issue_form.html.erb
@@ -2,7 +2,10 @@
 
 <% @issue.line_items.build if @issue.line_items.empty? && !readonly %>
 
-<div class="box tabular" <%= 'data-nested-form data-wrapper-selector=".line-item"' unless readonly %>>
+<div class="box tabular"
+     data-nested-form
+     data-wrapper-selector=".line-item">
+
   <p><strong><%= t :label_line_items %></strong></p>
 
   <table class="list line-items-table">
@@ -17,9 +20,11 @@
       </tr>
     </thead>
 
-    <tbody <%= 'data-nested-form-container' unless readonly %>>
+    <tbody data-nested-form-container>
       <%= f.fields_for :line_items do |item_form| %>
-        <%= render "line_items/line_item_fields", f: item_form, readonly: readonly %>
+        <%= render "line_items/line_item_fields",
+              f: item_form,
+              readonly: readonly %>
       <% end %>
     </tbody>
   </table>
@@ -27,14 +32,19 @@
   <% unless readonly %>
     <template data-nested-form-template>
       <%= f.fields_for :line_items, LineItem.new, child_index: "NEW_RECORD" do |item_form| %>
-        <%= render "line_items/line_item_fields", f: item_form, readonly: false %>
+        <%= render "line_items/line_item_fields",
+              f: item_form,
+              readonly: false %>
       <% end %>
     </template>
 
     <p>
-      <button type="button" class="icon icon-add" data-nested-form-add>
-        Add Line Item
+      <button type="button"
+              class="icon icon-add"
+              data-nested-form-add>
+        <%= l(:button_add) %>
       </button>
     </p>
   <% end %>
+
 </div>
\ No newline at end of file
diff --git a/app/views/line_items/_line_item_fields.html.erb b/app/views/line_items/_line_item_fields.html.erb
index 8b4bf5c..147456b 100644
--- a/app/views/line_items/_line_item_fields.html.erb
+++ b/app/views/line_items/_line_item_fields.html.erb
@@ -1,6 +1,6 @@
 <tr class="line-item">
   <%= f.hidden_field :id %>
-  <%= f.hidden_field :_destroy unless readonly %>
+  <%= f.hidden_field :_destroy %>
 
   <td>
     <%= f.text_field :description,
@@ -31,7 +31,7 @@
     <td style="text-align:center;">
       <button type="button"
               class="icon-only icon-del"
-              title="Remove"
+              title="<%=l(:label_remove)%>"
               data-nested-form-remove>
       </button>
     </td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5a5cf7f..396e7b8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -16,5 +16,6 @@ en:
   label_line_items: "Line Items"
   label_price: "Unit Price"
   label_qty: "Quantity"
+  label_remove: "Remove"
   label_total: "Total"
   
\ No newline at end of file