Profile layout
added user profile page
conflict resolved