Made the receipt move correctly, just need text
Fixed merge