included chats on user page
minor change in user page layout
fix merge conflicts