added shortcode; changed templates;