changes to the home page and plugin page
merging issue-86 into develop and resolving conflicts