WP-2232: change markup.
WP-2267: Fix javascript on mobile program finder.