design changes for messaging