done with Profile Pic swap, refactored, fixed a few links