Some display fixes to messages