Tidied upcoming and added shortcode