Uncommented email line.
Changed some layouts.