Fixed some things
Merge
Completed profile page