added more style to profile page
fixed merge conflict