updated the profile pages
merged some conflicts