Changed email container to table format