Added shortcode, fixed a few HTML bugs in the JS