Updated template on orders page
Fixed merge conflicts, I hope