Test again and update the new UI on message panel