Tweaked the schedule shortcodes