diff --git a/registrasion/controllers/invoice.py b/registrasion/controllers/invoice.py
index 5ce562f363889dc16c399012a54781af227ac085..e9a654e4f968beeb7879694d6cf5a4b145143e79 100644
--- a/registrasion/controllers/invoice.py
+++ b/registrasion/controllers/invoice.py
@@ -59,20 +59,23 @@ class InvoiceController(object):
 
         # TODO: calculate line items.
         product_items = rego.ProductItem.objects.filter(cart=cart)
+        product_items = product_items.order_by(
+            "product__category__order", "product__order"
+        )
         discount_items = rego.DiscountItem.objects.filter(cart=cart)
         invoice_value = Decimal()
         for item in product_items:
+            product = item.product
             line_item = rego.LineItem.objects.create(
                 invoice=invoice,
-                description=item.product.name,
+                description="%s - %s" % (product.category.name, product.name),
                 quantity=item.quantity,
-                price=item.product.price,
+                price=product.price,
             )
             line_item.save()
             invoice_value += line_item.quantity * line_item.price
 
         for item in discount_items:
-
             line_item = rego.LineItem.objects.create(
                 invoice=invoice,
                 description=item.discount.description,