merge Message and fix ui