WP-3262 Changes related to optional url, Add more button text, etc