adding new chat button for easier navigation
fixing merge conflicts