changes done to purchase page
Merging issue-46 into develop and resolving conflicts