Formatting changes and updates to SendMail options