Enhance the UI and Adding groupchat handling