Cleaned up email layout