Changed JS around, updated form output from shortcode