Huge cleanup of message logic

Added some nice UI elements too