Messages
Merge, bug fixes, and design issues