resources page issues fixed
Merging issue-24 into develop and resolving conflicts