Edit profile page separated out
Merging profile branch into master