Fixed some titles, added shortcode data