working profile page look
Merge branch 'master' into jake