Cleaned up a few UI things and chatclient