Began working on my receipts page
Merged James Mulvihill's changes