Building resource filtering page
fixing merge conflicts, editing style problems on resource index