fixes on the conversation page and settings page
merged