affiliate page and other minor changes to rest of the pages
merging issue-44 into develop and resolving conflicts