added profile page nfrastructure
fixed merge conflicts