Fixed pricing page popup spacing issues
Merging issue-218 into develop and resolved conflicts