profile page styling
merge conflict