Minor changes to the mailing option. Still under construction