Fixed email and spacing