Added 'Add me' button to emails CC. Some cleanups