diff --git a/application/models/giftcard.php b/application/models/giftcard.php
index 017065427..6b3240129 100644
--- a/application/models/giftcard.php
+++ b/application/models/giftcard.php
@@ -28,7 +28,7 @@ class Giftcard extends CI_Model
 	/*
 	Returns all the giftcards
 	*/
-	function get_all($limit=10000, $offset=0)
+	function get_all($offset=0,$limit=10000)
 	{
 		$this->db->from('giftcards');
 		$this->db->join('people','people.person_id=giftcards.person_id');//GARRISON ADDED 4/25/2013
@@ -243,7 +243,7 @@ class Giftcard extends CI_Model
 		$this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search));
 		$this->db->or_like("giftcard_number",$this->db->escape_like_str($search));
 		$this->db->or_like("giftcards.person_id",$this->db->escape_like_str($search));
-		$this->db->where('deleted',$this->db->escape('0'));
+		$this->db->where('deleted','0');
 		$this->db->order_by("giftcard_number", "asc");
 		if ($rows > 0) {
 			$this->db->limit($rows, $limit_from);
diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 575deacf9..be575fd7d 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -78,30 +78,18 @@ if (isset($error_message))
 				<td class="item-name"><textarea rows="5" cols="6" class='long_name'><?php echo !empty($item['description']) ? $item['description'] : $item['name']; ?></textarea></td>
 				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['quantity']; ?></textarea></td>
 				<td><textarea rows="5" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
-				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['discount']; ?></textarea></td>
-				<td style='text-align:right;'><textarea rows="5" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
+				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['discount'] .'%'; ?></textarea></td>
+				<td style='border-right: solid 1px; text-align:right;'><textarea rows="5" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
 			</tr>
 		<?php
 		}
 		?>
 		<tr>
-			<?php if (!empty($item['description']))
-			{
-			?>
-			<td colspan="7" align="center"><?php echo $item['description']; ?></td>
-			<?php 
-			}
-			else
-			{
-			?>
-			<td colspan="7" align="center"><?php echo '&nbsp;'; ?></td>
-			<?php 
-			}
-			?>
+			<td class="blank" colspan="6" align="center"><?php echo '&nbsp;'; ?></td>
 		</tr>
 		     
 	  <tr>
-	      <td colspan="3" class="blank"> </td>
+	      <td colspan="3" class="blank-bottom"> </td>
 	      <td colspan="2" class="total-line"><textarea rows="5" cols="6"><?php echo $this->lang->line('sales_sub_total'); ?></textarea></td>
 	      <td class="total-value"><textarea rows="5" cols="6" id="subtotal"><?php echo to_currency($tax_exclusive_subtotal); ?></textarea></td>
 	  </tr>
diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index 5b5a4f6bf..ada375f31 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -35,13 +35,11 @@ if (isset($error_message))
 				?>
 			</td>
 			<td id="customer-title">
-				<pre>
-				<?php if(isset($customer))
+				<pre><?php if(isset($customer))
 				{
 					echo $customer_info;
 				}
-				?>
-				</pre>
+				?></pre>
 			</td>
 		</tr>
 		<tr>
@@ -91,26 +89,14 @@ if (isset($error_message))
 				<td class="item-name long_name"><?php echo !empty($item['description']) ? $item['description'] : $item['name']; ?></td>
 				<td><?php echo $item['quantity']; ?></td>
 				<td><?php echo to_currency($item['price']); ?></td>
-				<td><?php echo $item['discount']; ?></td>
+				<td><?php echo $item['discount'] .'%'; ?></td>
 				<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
 			</tr>
 		<?php
 		}
 		?>
 		<tr>
-			<?php if (!empty($item['description']))
-			{
-			?>
-			<td colspan="6" align="center"><?php echo $item['description']; ?></td>
-			<?php 
-			}
-			else
-			{
-			?>
 			<td colspan="6" align="center"><?php echo '&nbsp;'; ?></td>
-			<?php 
-			}
-			?>
 		</tr>
 		     
 	  <tr>
diff --git a/css/invoice.css b/css/invoice.css
index 14f932e13..d57c84bd7 100755
--- a/css/invoice.css
+++ b/css/invoice.css
@@ -11,6 +11,7 @@
 #page-wrap textarea { border: 0; font: 14px Georgia, Sans-Serif; overflow: hidden; resize: none; }
 #page-wrap table { border-collapse: collapse; }
 #page-wrap table td, #page-wrap table th { border: 1px solid black; padding: 5px; }
+#page-wrap table td { padding: 5px; }
 
 #header { height: 30px; width: 100%; margin: 20px 0; background: #222; text-align: center; color: white; font: bold 26px Helvetica, Sans-Serif; letter-spacing: 4px; padding: 8px 0px; }
 
@@ -37,7 +38,7 @@
 #meta td textarea { width: 100%; height: 20px; text-align: right; }
 
 #items { clear: both; width: 100%; margin: 30px 0 0 0; border: 1px solid black; }
-#items th { background: #eee; }
+#items th { background: #eee; text-align: center; }
 #items textarea { width: 80px; height: 40px; }
 #items tr.item-row td { border: 0; vertical-align: top; }
 #items td.description { width: 300px; }
@@ -49,6 +50,7 @@
 #items td.total-line textarea { height: 20px; width:150px; background: none; }
 #items td.balance { background: #eee; }
 #items td.blank { border: 0; }
+#items td.blank-bottom { border: 1px; }
 
 #terms { text-align: center; margin: 20px 0 0 0; }
 #terms h5 { text-transform: uppercase; font: 13px Helvetica, Sans-Serif; letter-spacing: 10px; border-bottom: 1px solid black; padding: 0 0 8px 0; margin: 0 0 8px 0; }