After mailing

After mailing and minor UI modifications