Cleaning up code, and adding UI to ChatButton