Added functionality to view checkout page
Merge origin/master