Improved the message buttons