added toggle for chat
fixed chats look
merged conflict