Volunteer page refactoring to fix bugs