Make email field and clean up markup