Layout; fix email