Code cleanup.
Adding modal alerts for new compose window.
Updates for v21.