Refactor of form and newsletter cta markup