Added Message classes, some small UI changes