Fixed purchase page functionality
Merging issue-94 into develop and resolved conflicts