diff --git a/app/models/sale.rb b/app/models/sale.rb
index ef91fb76..ff10a3f2 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -614,8 +614,8 @@ def self.get_item_query()
                          " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
                          " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
                 # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
-
     query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
+    query = query.where("i.unit_price > 0")
     query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id")
 end
 
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 80749528..cb53c5f6 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -91,7 +91,7 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
             text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
         end
-        bounding_box([self.description_width,y_position], :width => self.price_num_width, :height => self.item_height) do
+        bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do
             text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
         end
         move_down 5
@@ -100,7 +100,7 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do
             text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
         end    
-        bounding_box([self.label_width,y_position], :width =>self.label_width, :height => self.item_height) do
+        bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
               text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
         end
         move_down 5