Add an optional website field

And update the template so that it's used if present.