Move email into same column as name

Otherwise, the table gets pretty crowded