diff --git a/app/views/line_items/_issue_form.html.erb b/app/views/line_items/_issue_form.html.erb
index fdfd9fe..34a94ca 100644
--- a/app/views/line_items/_issue_form.html.erb
+++ b/app/views/line_items/_issue_form.html.erb
@@ -1,11 +1,24 @@
 <% @issue.line_items.build if @issue.line_items.empty? %>
 
-<div data-nested-form data-wrapper-selector=".line-item">
-  <div data-nested-form-container>
-    <%= f.fields_for :line_items do |item_form| %>
-      <%= render "line_items/line_item_fields", f: item_form %>
-    <% end %>
-  </div>
+<div class="box tabular" data-nested-form data-wrapper-selector=".line-item">
+  <p><strong>Line Items</strong></p>
+
+  <table class="list line-items-table">
+    <thead>
+      <tr>
+        <th>Description</th>
+        <th style="width:120px;">Quantity</th>
+        <th style="width:150px;">Unit Price</th>
+        <th style="width:80px;"></th>
+      </tr>
+    </thead>
+
+    <tbody data-nested-form-container>
+      <%= f.fields_for :line_items do |item_form| %>
+        <%= render "line_items/line_item_fields", f: item_form %>
+      <% end %>
+    </tbody>
+  </table>
 
   <template data-nested-form-template>
     <%= f.fields_for :line_items, LineItem.new, child_index: "NEW_RECORD" do |item_form| %>
@@ -13,5 +26,9 @@
     <% end %>
   </template>
 
-  <button type="button" data-nested-form-add>Add Line Item</button>
+  <p>
+    <button type="button" class="icon icon-add" data-nested-form-add>
+      Add Line Item
+    </button>
+  </p>
 </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 4d9ed90..96d56a3 100644
--- a/app/views/line_items/_line_item_fields.html.erb
+++ b/app/views/line_items/_line_item_fields.html.erb
@@ -1,13 +1,34 @@
-<div class="line-item">
+<tr class="line-item">
   <%= f.hidden_field :id %>
-
-  <%= f.text_field :description, placeholder: "Description" %>
-  <%= f.number_field :quantity, step: 1, placeholder: "Quantity" %>
-  <%= f.number_field :unit_price, step: 0.01, placeholder: "Unit Price" %>
-
   <%= f.hidden_field :_destroy %>
 
-  <button type="button" data-nested-form-remove>
-    Remove
-  </button>
-</div>
\ No newline at end of file
+  <td>
+    <%= f.text_field :description,
+          size: 50,
+          placeholder: "Description",
+          :no_label => true %>
+  </td>
+
+  <td>
+    <%= f.number_field :quantity,
+          step: 1,
+          min: 1,
+          style: "width:90px;",
+          :no_label => true %>
+  </td>
+
+  <td>
+    <%= f.number_field :unit_price,
+          step: 0.01,
+          style: "width:120px;",
+          :no_label => true %>
+  </td>
+
+  <td style="text-align:center;">
+    <button type="button"
+            class="icon-only icon-del"
+            title="Remove"
+            data-nested-form-remove>
+    </button>
+  </td>
+</tr>
\ No newline at end of file