Jamie | Profile page new styling
merge conflicts