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